ProMotion 0.6.1 → 0.6.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ProMotion (0.6.0)
+    ProMotion (0.6.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -260,6 +260,12 @@ If you pass `:system` for the title, then you can get a system item. E.g.:
 set_nav_bar_right_button nil, action: :add_something, system_icon: UIBarButtonSystemItemAdd
 ```
 
+Additionally, if you pass an instance of a `UIBarButtonItem`, the `UIBarButton` will automatically display that particular button item.
+
+```ruby
+set_nav_bar_left_button self.editButtonItem
+```
+
 ## Opening and closing screens
 
 If the user taps something and you want to open a new screen, it's easy. Just use `open` and pass in the screen class

data/lib/ProMotion/screen_helpers/split_screen.rb

@@ -19,7 +19,11 @@ module ProMotion
 
       [ master, detail ].map { |s| s.on_load if s.respond_to?(:on_load) }
 
-      split_screen_controller master, detail
+      split = split_screen_controller master, detail
+      if args.has_key?(:icon) or args.has_key?(:title)
+        split.tabBarItem = create_tab_bar_item(args)
+      end
+      split
     end
 
     def open_split_screen(master, detail, args={})
@@ -39,4 +43,4 @@ module ProMotion
       svc.detail_screen.navigationItem.leftBarButtonItem = nil
     end
   end
-end
+end

data/lib/ProMotion/screens/_screen_module.rb

@@ -88,6 +88,8 @@ module ProMotion
           UIBarButtonItem.alloc.initWithImage(args[:title], style: args[:style], target: args[:target], action: args[:action])
         when Symbol, NilClass
           UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_icon], target: args[:target], action: args[:action]) if args[:system_icon]
+        when UIBarButtonItem
+          args[:title]
         else
           PM.logger.error("Please supply a title string, a UIImage or :system.")
       end

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "0.6.1" unless defined?(ProMotion::VERSION)
+  VERSION = "0.6.2" unless defined?(ProMotion::VERSION)
 end

data/spec/screen_helpers_spec.rb

@@ -68,6 +68,15 @@ describe "screen helpers" do
       @screen.navigationItem.leftBarButtonItem.image.should == image
     end
 
+    it "should add a left UIBarButtonItem" do
+      @screen.set_nav_bar_left_button @screen.editButtonItem
+      @screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
+    end
+
+    it "should add a right UIBarButtonItem" do
+      @screen.set_nav_bar_right_button @screen.editButtonItem
+      @screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
+    end
   end
 
   describe "screen navigation" do

data/spec/split_screen_in_tab_bar_spec.rb

@@ -6,7 +6,7 @@ describe "split screen in tab bar functionality" do
     @master_screen = HomeScreen.new nav_bar: true
     @detail_screen = BasicScreen.new nav_bar: true
 
-    @split_screen = @app.create_split_screen @master_screen, @detail_screen
+    @split_screen = @app.create_split_screen @master_screen, @detail_screen, icon: "list", title: "Spec"
     @tab = @app.open_tab_bar @split_screen, HomeScreen, BasicScreen
   end
 
@@ -49,5 +49,18 @@ describe "split screen in tab bar functionality" do
   it "should set the tab bar first viewController to the split screen" do
     @tab.viewControllers.first.should == @split_screen
   end
+  
+  it "should set the bar bar item for the split screen" do
+    @split_screen.tabBarItem.is_a?(UITabBarItem).should == true
+  end
+  
+  it "should set the tab bar icon of the split screen" do
+    @split_screen.tabBarItem.image.is_a?(UIImage).should == true
+  end
+  
+  it "should set the tab bar title of the split screen" do
+    @split_screen.tabBarItem.title.is_a?(String).should == true
+    @split_screen.tabBarItem.title.should == "Spec"
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies: []
 description: ProMotion is a new way to easily build RubyMotion iOS apps.
 email: