Merge pull request #766 from jcarbo/bug/nav-bar-button-class-method

Fix nav_bar_button class method

Author: jamonholmgren

app/screens/detail_screen.rb

@@ -1,5 +1,6 @@
 class DetailScreen < PM::Screen
   title "Detail"
 
+  nav_bar_button :left, title: "Back", style: :plain, action: :back
   nav_bar_button :right, title: "More", style: :plain, action: :back
 end

lib/ProMotion/screen/screen_module.rb

@@ -198,7 +198,9 @@ def resolve_status_bar
     end
 
     def add_nav_bar_buttons
-      set_nav_bar_button(self.class.get_nav_bar_button[:side], self.class.get_nav_bar_button) if self.class.get_nav_bar_button
+      self.class.get_nav_bar_button.each do |button_args|
+        set_nav_bar_button(button_args[:side], button_args)
+      end
     end
 
     def status_bar_hidden(hidden)
@@ -276,12 +278,14 @@ def get_nav_bar
       end
 
       def nav_bar_button(side, args={})
-        @nav_bar_button_args = args
-        @nav_bar_button_args[:side] = side
+        button_args = args.merge(:side => side)
+
+        @nav_bar_button_args ||= []
+        @nav_bar_button_args << button_args
       end
 
       def get_nav_bar_button
-        @nav_bar_button_args
+        @nav_bar_button_args ||= []
       end
     end
 

spec/unit/screen_helpers_spec.rb

@@ -89,8 +89,13 @@
 
     end
 
-    it "allows setting a nav_bar_button with a class method" do
+    it "allows setting nav bar buttons via nav_bar_button class method" do
       screen = DetailScreen.new(nav_bar: true)
+
+      screen.navigationItem.leftBarButtonItem.title.should == 'Back'
+      screen.navigationItem.rightBarButtonItem.title.should == 'More'
+
+      screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
       screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
     end
   end