ProMotion 1.0.4 → 1.1.0.rc1

data/spec/unit/map_spec.rb

@@ -30,6 +30,28 @@ describe "map properties" do
     @map.annotations.count.should == 6
   end
 
+  it "should return custom annotation parameters" do
+    ann = {
+      longitude: -82.966093558105,
+      latitude: 35.092520895652,
+      title: "Custom",
+      another_value: "Mark"
+    }
+    @map.add_annotation(ann)
+    @map.annotations.last.another_value.should == "Mark"
+  end
+
+  it "should return nil for custom annotation parameters that don't exist" do
+    ann = {
+      longitude: -82.966093558105,
+      latitude: 35.092520895652,
+      title: "Custom",
+      another_value: "Mark"
+    }
+    @map.add_annotation(ann)
+    @map.annotations.last.another_value_fake.should == nil
+  end
+
   it "should clear annotations" do
     @map.clear_annotations
     @map.annotations.count.should == 0

data/spec/unit/screen_helpers_spec.rb

@@ -18,18 +18,40 @@ describe "screen helpers" do
       @screen.view.subviews.first.backgroundColor.should == UIColor.redColor
     end
 
+    it "should set attributes using a symbol" do
+      @screen.add @subview, :subview_styles
+      @screen.view.subviews.first.backgroundColor.should == UIColor.greenColor
+    end
+
     it "should let you remove a view" do
       @screen.view.addSubview @subview
       @screen.remove @subview
       @screen.view.subviews.count.should == 0
     end
 
+    it "should let you remove an array of subviews" do
+      subview_a = UIView.alloc.initWithFrame CGRectZero
+      subview_b = UIView.alloc.initWithFrame CGRectZero
+      @screen.view.addSubview subview_a
+      @screen.view.addSubview subview_b
+      @screen.remove [subview_a, subview_b]
+      @screen.view.subviews.count.should == 0
+    end
+
     it "should add a subview to another element" do
       sub_subview = UIView.alloc.initWithFrame CGRectZero
       @screen.add_to @subview, sub_subview
       @subview.subviews.include?(sub_subview).should == true
     end
 
+    it "should add an array of subviews to another element" do
+      sub_subview_a = UIView.alloc.initWithFrame CGRectZero
+      sub_subview_b = UIView.alloc.initWithFrame CGRectZero
+      @screen.add_to @subview, [sub_subview_a, sub_subview_b]
+      @subview.subviews.include?(sub_subview_a).should == true
+      @subview.subviews.include?(sub_subview_b).should == true
+    end
+
     it "should add a subview to another element with attributes" do
       sub_subview = UIView.alloc.initWithFrame CGRectZero
       @screen.add_to @subview, sub_subview, { backgroundColor: UIColor.redColor }
@@ -44,38 +66,27 @@ describe "screen helpers" do
       @screen = HomeScreen.new(nav_bar: true)
     end
 
-    it "should add a left nav bar button" do
-      @screen.set_nav_bar_button :left, title: "Save", action: :save_something, type: UIBarButtonItemStyleDone
-      @screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
-    end
 
-    it "should add a right nav bar button" do
-      @screen.set_nav_bar_button :right, title: "Cancel", action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
-      @screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
-    end
+    [:left, :right, :back].each do |placement|
+      buttonItemMethod = :"#{placement}BarButtonItem"
 
-    it "should add an image right nav bar button" do
-      image = UIImage.imageNamed("list.png")
-      @screen.set_nav_bar_button :right, image: image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
-      @screen.navigationItem.rightBarButtonItem.image.class.should == UIImage
-      @screen.navigationItem.rightBarButtonItem.image.should == image
-    end
+      it "should add a #{placement} nav bar button" do
+        @screen.set_nav_bar_button placement, title: "Save", action: :save_something, type: UIBarButtonItemStyleDone
+        @screen.navigationItem.send(buttonItemMethod).class.should == UIBarButtonItem
+      end
 
-    it "should add an image left nav bar button" do
-      image = UIImage.imageNamed("list.png")
-      @screen.set_nav_bar_button :left, image: image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
-      @screen.navigationItem.leftBarButtonItem.image.class.should == UIImage
-      @screen.navigationItem.leftBarButtonItem.image.should == image
-    end
+      it "should add an image #{placement} nav bar button" do
+        image = UIImage.imageNamed("list.png")
+        @screen.set_nav_bar_button placement, image: image, action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
+        @screen.navigationItem.send(buttonItemMethod).image.class.should == UIImage
+        @screen.navigationItem.send(buttonItemMethod).image.should == image
+      end
 
-    it "should add a left UIBarButtonItem" do
-      @screen.set_nav_bar_button :left, system_item: :edit
-      @screen.navigationItem.leftBarButtonItem.class.should == UIBarButtonItem
-    end
+      it "should add a #{placement} UIBarButtonItem" do
+        @screen.set_nav_bar_button placement, system_item: :add
+        @screen.navigationItem.send(buttonItemMethod).class.should == UIBarButtonItem
+      end
 
-    it "should add a right UIBarButtonItem" do
-      @screen.set_nav_bar_button :right, system_item: :add
-      @screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
     end
   end
 
@@ -88,9 +99,9 @@ describe "screen helpers" do
     end
 
     it "#push_view_controller should use the default navigation controller if not provided" do
-      vcs = @screen.navigation_controller.viewControllers
+      vcs = @screen.navigationController.viewControllers
       @screen.push_view_controller @second_vc
-      @screen.navigation_controller.viewControllers.count.should == vcs.count + 1
+      @screen.navigationController.viewControllers.count.should == vcs.count + 1
     end
 
     it "#push_view_controller should use a provided navigation controller" do
@@ -153,7 +164,7 @@ describe "screen helpers" do
         screen = @screen.open BasicScreen, modal: true
         screen.should.be.kind_of BasicScreen
       end
-      
+
       it "should present a modal screen if open_modal is used" do
         @screen.mock!(:present_modal_view_controller) do |screen, animated|
           screen.should.be.instance_of BasicScreen
@@ -185,18 +196,16 @@ describe "screen helpers" do
       end
 
       it "should pop onto navigation controller if current screen is on nav stack already" do
-        @screen.mock!(:push_view_controller) { |vc| vc.should.be.instance_of BasicScreen }
+        @screen.mock!(:push_view_controller) { |vc, n, a| vc.should.be.instance_of BasicScreen }
         screen = @screen.open BasicScreen
         screen.should.be.kind_of BasicScreen
       end
-      
+
       it "should ignore its own navigation controller if current screen has a navigation controller" do
         basic = BasicScreen.new(nav_bar: true) # creates a dangling nav_bar that will be discarded.
         screen = @screen.open basic
         screen.should.be.kind_of BasicScreen
         basic.navigationController.should == @screen.navigationController
-        basic.navigation_controller.should == @screen.navigationController
-        @screen.navigation_controller.should == @screen.navigationController
       end
 
       it "should open the provided view controller as root view if no other conditions are met" do
@@ -252,7 +261,7 @@ describe "screen helpers" do
       end
 
       it "#close should pop from the navigation controller" do
-        @screen.navigation_controller.mock!(:popViewControllerAnimated) { |animated| animated.should == true }
+        @screen.navigationController.mock!(:popViewControllerAnimated) { |animated| animated.should == true }
         @screen.close
       end
 

data/spec/unit/screen_spec.rb

@@ -25,7 +25,7 @@ describe "screen properties" do
     @screen.title = "instance method"
     HomeScreen.get_title.should != 'instance method'
   end
-  
+
   it "should set the tab bar item with a system icon" do
     @screen.set_tab_bar_item system_icon: :contacts
     comparison = UITabBarItem.alloc.initWithTabBarSystemItem(UITabBarSystemItemContacts, tag: 0)
@@ -36,10 +36,10 @@ describe "screen properties" do
 
   it "should set the tab bar item with a custom icon and title" do
     @screen.set_tab_bar_item title: "My Screen", icon: "list"
-    
+
     icon_image = UIImage.imageNamed("list")
     comparison = UITabBarItem.alloc.initWithTitle("My Screen", image: icon_image, tag: 0)
-    
+
     @screen.tabBarItem.systemItem.should == comparison.systemItem
     @screen.tabBarItem.tag.should == comparison.tag
     @screen.tabBarItem.image.should == comparison.image
@@ -134,8 +134,7 @@ describe "screen properties" do
       @screen.nav_bar?.should == true
     end
 
-    it "#navigation_controller should return a navigation controller" do
-      @screen.navigation_controller.should.be.instance_of ProMotion::NavigationController
+    it "#navigationController should return a navigation controller" do
       @screen.navigationController.should.be.instance_of ProMotion::NavigationController
     end
 
@@ -197,6 +196,18 @@ describe "screen properties" do
       end
     end
 
+    describe 'custom view bar buttons' do
+      before do
+        @activity = UIActivityIndicatorView.alloc.initWithActivityIndicatorStyle(UIActivityIndicatorViewStyleWhite)
+        @screen.set_nav_bar_button :right, {custom_view: @activity}
+      end
+
+      it "has a right bar button item of the correct type" do
+        @screen.navigationItem.rightBarButtonItem.should.be.instance_of UIBarButtonItem
+        @screen.navigationItem.rightBarButtonItem.customView.should.be.instance_of UIActivityIndicatorView
+      end
+    end
+
   end
 
 end
@@ -211,10 +222,38 @@ describe "screen with toolbar" do
   end
 
   it "hidden" do
-    # Simulate AppDelegate setup of main screen
     screen = HomeScreen.new modal: true, nav_bar: true, toolbar: false
     screen.on_load
     screen.navigationController.toolbarHidden?.should == true
   end
 
+  it "adds a single item" do
+    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen.on_load
+    screen.set_toolbar_button([{title: "Testing Toolbar"}])
+
+    screen.navigationController.toolbar.items.should.be.instance_of Array
+    screen.navigationController.toolbar.items.count.should == 1
+    screen.navigationController.toolbar.items.first.should.be.instance_of UIBarButtonItem
+    screen.navigationController.toolbar.items.first.title.should == "Testing Toolbar"
+  end
+
+  it "adds multiple items" do
+    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: true
+    screen.set_toolbar_buttons [{title: "Testing Toolbar"}, {title: "Another Test"}]
+
+    screen.navigationController.toolbar.items.should.be.instance_of Array
+    screen.navigationController.toolbar.items.count.should == 2
+    screen.navigationController.toolbar.items.first.title.should == "Testing Toolbar"
+    screen.navigationController.toolbar.items.last.title.should == "Another Test"
+  end
+
+  it "shows the toolbar when setting items" do
+    screen = HomeScreen.new modal: true, nav_bar: true, toolbar: false
+    screen.on_load
+    screen.navigationController.toolbarHidden?.should == true
+    screen.set_toolbar_button([{title: "Testing Toolbar"}], false)
+    screen.navigationController.toolbarHidden?.should == false
+  end
 end
+

data/spec/unit/split_screen_open_screen_spec.rb

@@ -48,7 +48,7 @@ describe "split screen `open` functionality" do
     home = HomeScreen.new(nav_bar: true)
     child = BasicScreen.new
     screen = home.open child, in_detail: true, in_master: true
-    home.navigation_controller.topViewController.should == child
+    home.navigationController.topViewController.should == child
     screen.should == child
   end
 

data/spec/unit/tables/formotion_screen_spec.rb

@@ -13,4 +13,10 @@ describe "PM::FormotionScreen" do
     @screen.title.should == "Formotion Test"
   end
 
+  it "should fire the on_submit method when form is submitted" do
+    @screen.form.submit
+    @screen.submitted_form.should.not.be.nil
+    @screen.submitted_form.render.should.be.kind_of(Hash)
+  end
+
 end

data/spec/unit/tables/table_module_spec.rb

@@ -43,6 +43,10 @@ describe "PM::Table module" do
         title: "Table cell group 3", cells: [ cell_factory(title: "3-1"), cell_factory(title: "3-2", background_color: UIColor.blueColor) ]
       },{
         title: "Table cell group 4", cells: [ custom_cell, cell_factory(title: "4-2"), cell_factory(title: "4-3"), cell_factory(title: "4-4") ]
+      },{
+        title: "Custom section title 1", title_view: CustomTitleView, cells: [ ]
+      },{
+        title: "Custom section title 2", title_view: CustomTitleView.new, title_view_height: 50, cells: [ ]
       }]
     end
 
@@ -55,7 +59,7 @@ describe "PM::Table module" do
   end
 
   it "should have the right number of sections" do
-    @subject.numberOfSectionsInTableView(@subject.table_view).should == 4
+    @subject.numberOfSectionsInTableView(@subject.table_view).should == 6
   end
 
   it "should set the section titles" do
@@ -63,6 +67,8 @@ describe "PM::Table module" do
     @subject.tableView(@subject.table_view, titleForHeaderInSection:1).should == "Table cell group 2"
     @subject.tableView(@subject.table_view, titleForHeaderInSection:2).should == "Table cell group 3"
     @subject.tableView(@subject.table_view, titleForHeaderInSection:3).should == "Table cell group 4"
+    @subject.tableView(@subject.table_view, titleForHeaderInSection:4).should == "Custom section title 1"
+    @subject.tableView(@subject.table_view, titleForHeaderInSection:5).should == "Custom section title 2"
   end
 
   it "should create the right number of cells" do
@@ -70,6 +76,8 @@ describe "PM::Table module" do
     @subject.tableView(@subject.table_view, numberOfRowsInSection:1).should == 1
     @subject.tableView(@subject.table_view, numberOfRowsInSection:2).should == 2
     @subject.tableView(@subject.table_view, numberOfRowsInSection:3).should == 4
+    @subject.tableView(@subject.table_view, numberOfRowsInSection:4).should == 0
+    @subject.tableView(@subject.table_view, numberOfRowsInSection:5).should == 0
   end
 
   it "should create the jumplist" do
@@ -102,7 +110,7 @@ describe "PM::Table module" do
 
     @subject.tableView(@subject.table_view, didSelectRowAtIndexPath:@custom_ip)
   end
-  
+
   it "should set a custom cell background image" do
     @image.should.not.be.nil
     ip = NSIndexPath.indexPathForRow(0, inSection: 3) # Cell 2-1
@@ -119,4 +127,22 @@ describe "PM::Table module" do
     cell.backgroundColor.should == UIColor.blueColor
   end
 
+  describe("section with custom title_view") do
+
+    it "should use the correct class for section view" do
+      cell = @subject.tableView(@subject.table_view, viewForHeaderInSection: 4)
+      cell.should.be.kind_of(CustomTitleView)
+    end
+
+    it "should use the default section height if none is specified" do
+      header_height = (UIDevice.currentDevice.systemVersion.to_f >= 7.0) ? 23.0 : 22.0
+      @subject.tableView(@subject.table_view, heightForHeaderInSection:4).should == header_height # Built-in default
+    end
+
+    it "should use the set title_view_height if one is specified" do
+      @subject.tableView(@subject.table_view, heightForHeaderInSection:5).should == 50.0
+    end
+
+  end
+
 end

data/spec/unit/tables/table_view_cell_spec.rb

@@ -111,7 +111,7 @@ describe "PM::TableViewCellModule" do
   it "should set the accessory view to a button" do
     ip = NSIndexPath.indexPathForRow(2, inSection: 1)
     subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: ip)
-    subject.accessoryView.should.be.kind_of(UIRoundedRectButton)
+    subject.accessoryView.should.be.kind_of(UIButton)
   end
 
   it "should set the accessory type to edit" do
@@ -128,9 +128,10 @@ describe "PM::TableViewCellModule" do
   end
 
   it "should create two extra subviews" do
-    @subject.subviews.length.should == 3
-    @subject.subviews[1].class.should == UIView
-    @subject.subviews[2].class.should == UILabel
+    content_view = TestHelper.ios7 ? @subject.subviews.first : @subject
+    content_view.subviews.length.should == 3
+    content_view.subviews[1].class.should == UIView
+    content_view.subviews[2].class.should == UILabel
   end
 
 

data/spec/unit/view_helper_spec.rb

@@ -79,7 +79,7 @@ describe "view helpers" do
     before do
       @dummy = UIView.alloc.initWithFrame CGRectZero
       @dummy.extend ProMotion::Styling
-      
+
       @parent = UIView.alloc.initWithFrame(CGRectMake(0, 0, 320, 480))
       @child = UIView.alloc.initWithFrame(CGRectZero)
     end
@@ -89,11 +89,11 @@ describe "view helpers" do
         resize: [:left, :right, :top, :bottom, :width, :height]
       }
 
-      mask =  UIViewAutoresizingFlexibleLeftMargin | 
-              UIViewAutoresizingFlexibleRightMargin | 
-              UIViewAutoresizingFlexibleTopMargin | 
-              UIViewAutoresizingFlexibleBottomMargin | 
-              UIViewAutoresizingFlexibleWidth | 
+      mask =  UIViewAutoresizingFlexibleLeftMargin |
+              UIViewAutoresizingFlexibleRightMargin |
+              UIViewAutoresizingFlexibleTopMargin |
+              UIViewAutoresizingFlexibleBottomMargin |
+              UIViewAutoresizingFlexibleWidth |
               UIViewAutoresizingFlexibleHeight
 
       @child.autoresizingMask.should == mask
@@ -104,8 +104,8 @@ describe "view helpers" do
         resize: [:left, :right, :top]
       }
 
-      mask =  UIViewAutoresizingFlexibleLeftMargin | 
-              UIViewAutoresizingFlexibleRightMargin | 
+      mask =  UIViewAutoresizingFlexibleLeftMargin |
+              UIViewAutoresizingFlexibleRightMargin |
               UIViewAutoresizingFlexibleTopMargin
 
       @child.autoresizingMask.should == mask
@@ -116,8 +116,8 @@ describe "view helpers" do
         resize: [:bottom, :width, :height]
       }
 
-      mask =  UIViewAutoresizingFlexibleBottomMargin | 
-              UIViewAutoresizingFlexibleWidth | 
+      mask =  UIViewAutoresizingFlexibleBottomMargin |
+              UIViewAutoresizingFlexibleWidth |
               UIViewAutoresizingFlexibleHeight
 
       @child.autoresizingMask.should == mask
@@ -142,6 +142,17 @@ describe "view helpers" do
       @child.frame.should == CGRectMake(10, 20, 100, 50)
     end
 
+    it "Should create a frame with x & y" do
+      @dummy.set_easy_attributes @parent, @child, {
+        x: 10,
+        y: 20,
+        width: 100,
+        height: 50
+      }
+
+      @child.frame.should == CGRectMake(10, 20, 100, 50)
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0.rc1
 platform: ruby
 authors:
 - Jamon Holmgren
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: webstub
@@ -82,12 +82,27 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: methadone
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ProMotion is a new way to easily build RubyMotion iOS apps.
 email:
 - jamon@clearsightstudio.com
 - silas@clearsightstudio.com
 - contact@clearsightstudio.com
-executables: []
+executables:
+- promotion
 extensions: []
 extra_rdoc_files: []
 files:
@@ -101,6 +116,7 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - app/screens/basic_screen.rb
+- bin/promotion
 - lib/ProMotion.rb
 - lib/ProMotion/cocoatouch/navigation_controller.rb
 - lib/ProMotion/cocoatouch/split_view_controller.rb
@@ -140,7 +156,7 @@ files:
 - lib/ProMotion/web/web_screen_module.rb
 - resources/WebScreen.html
 - resources/list.png
-- resources/test.jpeg
+- resources/test.png
 - spec/functional/func_map_screen_spec.rb
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_searchable_table_spec.rb
@@ -149,6 +165,7 @@ files:
 - spec/functional/func_table_screen_spec.rb
 - spec/functional/func_web_screen_spec.rb
 - spec/helpers/basic_screen.rb
+- spec/helpers/custom_title_view.rb
 - spec/helpers/detail_screen.rb
 - spec/helpers/dummy_class.rb
 - spec/helpers/functional_screen.rb
@@ -164,6 +181,8 @@ files:
 - spec/helpers/table_screen_refreshable.rb
 - spec/helpers/table_screen_searchable.rb
 - spec/helpers/test_delegate.rb
+- spec/helpers/test_delegate_colors.rb
+- spec/helpers/test_helper.rb
 - spec/helpers/web_screen.rb
 - spec/unit/delegate_spec.rb
 - spec/unit/logger_spec.rb
@@ -198,9 +217,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -219,6 +238,7 @@ test_files:
 - spec/functional/func_table_screen_spec.rb
 - spec/functional/func_web_screen_spec.rb
 - spec/helpers/basic_screen.rb
+- spec/helpers/custom_title_view.rb
 - spec/helpers/detail_screen.rb
 - spec/helpers/dummy_class.rb
 - spec/helpers/functional_screen.rb
@@ -234,6 +254,8 @@ test_files:
 - spec/helpers/table_screen_refreshable.rb
 - spec/helpers/table_screen_searchable.rb
 - spec/helpers/test_delegate.rb
+- spec/helpers/test_delegate_colors.rb
+- spec/helpers/test_helper.rb
 - spec/helpers/web_screen.rb
 - spec/unit/delegate_spec.rb
 - spec/unit/logger_spec.rb