ProMotion 0.7.8 → 1.0.0

data/spec/unit/split_screen_spec.rb

@@ -28,12 +28,12 @@ describe "split screen functionality" do
 
   it "should set the first viewController to MasterScreen" do
     @split_screen.master_screen.should == @master_screen
-    @split_screen.viewControllers.first.should == @master_screen.pm_main_controller
+    @split_screen.viewControllers.first.should == (@master_screen.navigationController || @master_screen)
   end
 
   it "should set the second viewController to DetailScreen" do
     @split_screen.detail_screen.should == @detail_screen
-    @split_screen.viewControllers.last.should == @detail_screen.pm_main_controller
+    @split_screen.viewControllers.last.should == (@detail_screen.navigationController || @detail_screen)
   end
 
   it "should set the title on both screens" do

data/spec/unit/tab_spec.rb

@@ -0,0 +1,41 @@
+describe "tab bar functionality" do
+
+  before do
+    @app = TestDelegate.new
+
+    @tab_1 = TabScreen.new
+    @tab_2 = BasicScreen.new
+    @tab_3 = HomeScreen.new
+    @tab_4 = TestTableScreen.new
+
+    @tab_bar = @app.open_tab_bar @tab_1, @tab_2, @tab_3, @tab_4
+  end
+
+  after do
+    
+  end
+
+  it "should have created a tab bar with four items" do
+    @tab_bar.should != nil
+    @tab_bar.should.be.kind_of(UITabBarController)
+    @tab_bar.viewControllers.length.should == 4
+  end
+  
+  it "should have set a custom tab bar item" do
+    @tab_bar.tabBar.items.first.title.should == "Tab Item"
+  end
+  
+  it "should have set the others to their respective titles" do
+    @tab_bar.tabBar.items[1].title.should == "Basic"
+    @tab_bar.tabBar.items[2].title.should == "Home"
+    @tab_bar.tabBar.items[3].title.should == "TestTableScreen"
+  end
+  
+  it "should allow changing the tab bar item with set_tab_bar_item" do
+    @tab_1.set_tab_bar_item title: "Custom", icon: "test.jpeg"
+    @tab_bar.tabBar.items.first.title.should == "Custom"
+  end
+
+end
+
+

data/spec/unit/tables/formotion_screen_spec.rb

@@ -0,0 +1,16 @@
+describe "PM::FormotionScreen" do
+
+  before do
+    @screen = TestFormotionScreen.new
+  end
+
+  it "should store title" do
+    TestFormotionScreen.get_title.should == 'Formotion Test'
+    @screen.class.get_title.should == "Formotion Test"
+  end
+
+  it "should set default title on new instances" do
+    @screen.title.should == "Formotion Test"
+  end
+
+end

data/spec/unit/tables/table_indexable_spec.rb

@@ -0,0 +1,12 @@
+describe "PM::Table module" do
+  
+  before do
+    @screen = TableScreenIndexable.new
+  end
+  
+  it "should automatically return the first letter of each section" do
+    result = %w{ A G M O S U }
+    @screen.sectionIndexTitlesForTableView(@screen.table_view).should == result
+  end
+
+end

data/spec/unit/tables/table_module_spec.rb

@@ -5,6 +5,7 @@ describe "PM::Table module" do
   end
 
   def custom_cell
+    @image = UIImage.imageNamed("list")
     cell_factory({
       title: "Crazy Full Featured Cell",
       subtitle: "This is way too huge..see note",
@@ -15,16 +16,14 @@ describe "PM::Table module" do
       cell_identifier: "Cell",
       cell_class: PM::TableViewCell,
       masks_to_bounds: true,
-      background_color: UIColor.whiteColor,
+      background_color: UIColor.colorWithPatternImage(@image),
       selection_style: UITableViewCellSelectionStyleGray,
-      cell_class_attributes: {
-        # any Obj-C attributes to set on the cell
-        backgroundColor: UIColor.whiteColor
+      accessory: {
+        view: :switch, # currently only :switch is supported
+        type: UITableViewCellAccessoryCheckmark,
+        checked: true # whether it's "checked" or not
       },
-      accessory: :switch, # currently only :switch is supported
-      accessory_type: UITableViewCellAccessoryCheckmark,
-      accessory_checked: true, # whether it's "checked" or not
-      image: { image: UIImage.imageNamed("something"), radius: 15 },
+      image: { image: @image, radius: 15 },
       remote_image: {  # remote image, requires SDWebImage CocoaPod
         url: "http://placekitten.com/200/300", placeholder: "some-local-image",
         size: 50, radius: 15
@@ -41,7 +40,7 @@ describe "PM::Table module" do
       },{
         title: "Table cell group 2", cells: [ cell_factory ]
       },{
-        title: "Table cell group 3", cells: [ cell_factory(title: "3-1"), cell_factory(title: "3-2") ]
+        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") ]
       }]
@@ -103,5 +102,21 @@ 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
+    cell = @subject.tableView(@subject.table_view, cellForRowAtIndexPath: ip)
+    cell.should.be.kind_of(UITableViewCell)
+    cell.backgroundColor.should.be.kind_of(UIColor)
+    cell.backgroundColor.should == UIColor.colorWithPatternImage(@image)
+  end
+
+  it "should set a custom cell background color" do
+    cell = @subject.tableView(@subject.table_view, cellForRowAtIndexPath: @ip)
+    cell.should.be.kind_of(UITableViewCell)
+    cell.backgroundColor.should.be.kind_of(UIColor)
+    cell.backgroundColor.should == UIColor.blueColor
+  end
 
 end

data/spec/unit/tables/table_screen_spec.rb

@@ -12,7 +12,7 @@ describe "table screens" do
     end
 
     it "should have proper cell numbers" do
-      @screen.tableView(@screen.tableView, numberOfRowsInSection:0).should == 6
+      @screen.tableView(@screen.tableView, numberOfRowsInSection:0).should == 7
       @screen.tableView(@screen.tableView, numberOfRowsInSection:1).should == 2
       @screen.tableView(@screen.tableView, numberOfRowsInSection:2).should == 4
       @screen.tableView(@screen.tableView, numberOfRowsInSection:3).should == 3

data/spec/unit/tables/table_view_cell_spec.rb

@@ -8,7 +8,7 @@ describe "PM::TableViewCellModule" do
       action: :tapped_cell_1,
       height: 50, # manually changes the cell's height
       cell_style: UITableViewCellStyleSubtitle,
-      cell_identifier: "Cell",
+      cell_identifier: "Custom Cell",
       cell_class: PM::TableViewCell,
       layer: { masks_to_bounds: true },
       background_color: UIColor.redColor,
@@ -28,7 +28,7 @@ describe "PM::TableViewCellModule" do
         { title: "", cells: [
           {title: "Test 1", accessory_type: UITableViewCellStateShowingEditControlMask },
           custom_cell,
-          { title: "Test2", accessory: button } ] }
+          { title: "Test2", accessory: { view: button } } ] }
       ]
     end
 
@@ -54,12 +54,13 @@ describe "PM::TableViewCellModule" do
   end
 
   it "should have the right custom re-use identifier" do
-    @subject.reuseIdentifier.should == "Cell"
+    @subject.reuseIdentifier.should == "Custom Cell"
   end
+
   it "should have the right generated re-use identifier" do
     ip = NSIndexPath.indexPathForRow(2, inSection: 1)
     subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: ip)
-    subject.reuseIdentifier.should == "Cell-accessory"
+    subject.reuseIdentifier.should == "ProMotion::TableViewCell-accessory"
   end
 
   it "should have the correct height" do
@@ -71,7 +72,7 @@ describe "PM::TableViewCellModule" do
   end
 
   it "should set the background color" do
-    @subject.backgroundView.backgroundColor.should == UIColor.redColor
+    @subject.backgroundColor.should == UIColor.redColor
   end
 
   it "should set the selection color style" do
@@ -102,9 +103,9 @@ describe "PM::TableViewCellModule" do
   end
 
   it "should create two extra subviews" do
-    @subject.subviews.length.should == 4
-    @subject.subviews[2].class.should == UIView
-    @subject.subviews[3].class.should == UILabel
+    @subject.subviews.length.should == 3
+    @subject.subviews[1].class.should == UIView
+    @subject.subviews[2].class.should == UILabel
   end
 
 

data/spec/unit/view_helper_spec.rb

@@ -6,7 +6,7 @@ describe "view helpers" do
 
   before do
     @dummy = UIView.alloc.initWithFrame CGRectZero
-    @dummy.extend ProMotion::ViewHelper
+    @dummy.extend ProMotion::Styling
   end
 
   it "should allow you to set attributes" do
@@ -78,7 +78,7 @@ describe "view helpers" do
 
     before do
       @dummy = UIView.alloc.initWithFrame CGRectZero
-      @dummy.extend ProMotion::ViewHelper
+      @dummy.extend ProMotion::Styling
       
       @parent = UIView.alloc.initWithFrame(CGRectMake(0, 0, 320, 480))
       @child = UIView.alloc.initWithFrame(CGRectZero)

data/spec/unit/web_spec.rb

@@ -0,0 +1,106 @@
+describe "web screen properties" do
+  extend WebStub::SpecHelpers
+
+  before  { disable_network_access! }
+  after   { enable_network_access! }
+
+  describe "when open web page with http request" do
+    before do
+      class TestWebScreenWithHTTPRequest < TestWebScreen
+        attr_accessor :on_request, :on_request_args
+        def on_request(request, type)
+          self.on_request_args = [request, type]
+          self.on_request = true
+        end
+      end
+      stub_request(:get, "http://mixi.jp/").
+        to_return(body: "<html><body>[mixi]</body></html>", content_type: "text/html")
+      # Simulate AppDelegate setup of web screen
+      @webscreen = TestWebScreenWithHTTPRequest.new modal: true, nav_bar: true, external_links: false
+    end
+
+    it "should get the current url" do
+      @webscreen.open_url(NSURL.URLWithString('http://mixi.jp/'))
+
+      wait_for_change @webscreen, 'load_finished' do
+        @webscreen.current_url.should == 'http://mixi.jp/'
+      end
+    end
+
+    it "should open web page by url string" do
+      @webscreen.open_url('http://mixi.jp/')
+      wait_for_change @webscreen, 'load_finished' do
+        @webscreen.html.should =~ /mixi/
+      end
+    end
+
+    it "should called on_request hook" do
+      @webscreen.open_url(NSURL.URLWithString('http://mixi.jp/'))
+
+      wait_for_change @webscreen, 'on_request' do
+        @webscreen.on_request_args[0].is_a?(NSURLRequest).should == true
+        # on_request is called when @webscreen request for some iframe
+        @webscreen.on_request_args[0].URL.absoluteString.should =~ %r|https?://.*|
+      end
+    end
+
+  end
+
+  describe "when use on_request hook by web brigde rpc" do
+    before do
+      class TestWebScreenWithRPC < TestWebScreen
+        attr_accessor :on_request, :on_request_args
+
+        def on_request(request, type)
+          self.on_request_args = [request, type]
+          self.on_request = true
+          # return false to prevent loadRequest
+          false
+        end
+      end
+      stub_request(:get, "http://mixi.jp/").
+        to_return(body: "<html><body>[mixi]</body></html>", content_type: "text/html")
+      # Simulate AppDelegate setup of web screen
+      @webscreen = TestWebScreenWithRPC.new modal: true, nav_bar: true, external_links: false
+    end
+
+    it "should called on_request hook" do
+      # simulate web bridge request from html links
+      @webscreen.open_url(NSURL.URLWithString('webbridge://method'))
+
+      wait_for_change @webscreen, 'on_request' do
+        request = @webscreen.on_request_args[0]
+        # on_request is called when @webscreen request for some iframe
+        request.URL.absoluteString.should == 'webbridge://method'
+      end
+
+      wait 0.3 do
+        # it should not load request when return false in on_request
+        !!(@webscreen.load_finished.should) == false
+      end
+    end
+  end
+
+  describe "when load static html file" do
+    before do
+      # Simulate AppDelegate setup of web screen
+      @webscreen = TestWebScreen.new modal: true, nav_bar: true, external_links: false
+      @webscreen.set_content("WebScreen.html")
+    end
+
+    it "should get the url of content" do
+      @webscreen.current_url.should == 'about:blank'
+    end
+
+    it "should have a UIWebView as the primary view" do
+      @webscreen.web.class.should == UIWebView
+    end
+
+    it "should load the about html page" do
+      wait_for_change @webscreen, 'load_finished' do
+        @webscreen.load_finished.should == true
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,8 +11,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: webstub
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-stump
   requirement: !ruby/object:Gem::Requirement
@@ -45,6 +61,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: formotion
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -83,71 +115,87 @@ files:
 - app/app_delegate.rb
 - app/screens/basic_screen.rb
 - lib/ProMotion.rb
-- lib/ProMotion/.DS_Store
-- lib/ProMotion/cocoatouch/NavigationController.rb
-- lib/ProMotion/cocoatouch/SplitViewController.rb
-- lib/ProMotion/cocoatouch/TableViewCell.rb
-- lib/ProMotion/cocoatouch/TableViewController.rb
-- lib/ProMotion/cocoatouch/ViewController.rb
+- lib/ProMotion/cocoatouch/navigation_controller.rb
+- lib/ProMotion/cocoatouch/split_view_controller.rb
+- lib/ProMotion/cocoatouch/tab_bar_controller.rb
+- lib/ProMotion/cocoatouch/table_view_cell.rb
+- lib/ProMotion/cocoatouch/table_view_controller.rb
+- lib/ProMotion/cocoatouch/view_controller.rb
+- lib/ProMotion/containers/split_screen.rb
+- lib/ProMotion/containers/tabs.rb
 - lib/ProMotion/delegate/delegate.rb
-- lib/ProMotion/delegate/delegate_helper.rb
+- lib/ProMotion/delegate/delegate_module.rb
 - lib/ProMotion/delegate/delegate_notifications.rb
-- lib/ProMotion/helpers/console.rb
-- lib/ProMotion/helpers/logger.rb
-- lib/ProMotion/helpers/measure_helper.rb
-- lib/ProMotion/helpers/system_helper.rb
-- lib/ProMotion/helpers/view_helper.rb
+- lib/ProMotion/delegate/delegate_parent.rb
+- lib/ProMotion/extensions/conversions.rb
+- lib/ProMotion/logger.rb
+- lib/ProMotion/map/map_screen.rb
+- lib/ProMotion/map/map_screen_annotation.rb
+- lib/ProMotion/map/map_screen_module.rb
 - lib/ProMotion/pro_motion.rb
-- lib/ProMotion/push_notifications/push_notification.rb
-- lib/ProMotion/screen_helpers/screen_elements.rb
-- lib/ProMotion/screen_helpers/screen_navigation.rb
-- lib/ProMotion/screen_helpers/screen_tabs.rb
-- lib/ProMotion/screen_helpers/split_screen.rb
-- lib/ProMotion/screens/_compatibility/formotion_screen.rb
-- lib/ProMotion/screens/_screen_module.rb
-- lib/ProMotion/screens/_table_screen_module.rb
-- lib/ProMotion/screens/_tables/_refreshable_table.rb
-- lib/ProMotion/screens/_tables/_searchable_table.rb
-- lib/ProMotion/screens/_tables/_sectioned_table.rb
-- lib/ProMotion/screens/_tables/_table.rb
-- lib/ProMotion/screens/_tables/grouped_table.rb
-- lib/ProMotion/screens/_tables/plain_table.rb
-- lib/ProMotion/screens/_tables/table_data.rb
-- lib/ProMotion/screens/_tables/table_view_cell_module.rb
-- lib/ProMotion/screens/behaves_like_screen.rb
-- lib/ProMotion/screens/screen.rb
-- lib/ProMotion/screens/table_screen.rb
+- lib/ProMotion/push_notification/push_notification.rb
+- lib/ProMotion/screen/screen.rb
+- lib/ProMotion/screen/screen_module.rb
+- lib/ProMotion/screen/screen_navigation.rb
+- lib/ProMotion/table/cell/table_view_cell_module.rb
+- lib/ProMotion/table/data/table_data.rb
+- lib/ProMotion/table/extensions/indexable.rb
+- lib/ProMotion/table/extensions/refreshable.rb
+- lib/ProMotion/table/extensions/searchable.rb
+- lib/ProMotion/table/grouped_table.rb
+- lib/ProMotion/table/grouped_table_screen.rb
+- lib/ProMotion/table/table.rb
+- lib/ProMotion/table/table_screen.rb
+- lib/ProMotion/thirdparty/formotion_screen.rb
 - lib/ProMotion/version.rb
+- lib/ProMotion/view/styling.rb
+- lib/ProMotion/web/web_screen.rb
+- lib/ProMotion/web/web_screen_module.rb
+- resources/WebScreen.html
 - resources/list.png
+- resources/test.jpeg
+- spec/functional/func_map_screen_spec.rb
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_searchable_table_spec.rb
 - spec/functional/func_split_screen_spec.rb
+- spec/functional/func_tab_bar_spec.rb
 - spec/functional/func_table_screen_spec.rb
+- spec/functional/func_web_screen_spec.rb
 - spec/helpers/basic_screen.rb
 - spec/helpers/detail_screen.rb
 - spec/helpers/dummy_class.rb
 - spec/helpers/functional_screen.rb
 - spec/helpers/home_screen.rb
+- spec/helpers/map_screen.rb
 - spec/helpers/master_screen.rb
+- spec/helpers/present_screen.rb
 - spec/helpers/screen_module_view_controller.rb
+- spec/helpers/tab_screen.rb
 - spec/helpers/table_screen.rb
+- spec/helpers/table_screen_formotion.rb
+- spec/helpers/table_screen_indexable.rb
 - spec/helpers/table_screen_refreshable.rb
 - spec/helpers/table_screen_searchable.rb
 - spec/helpers/test_delegate.rb
+- spec/helpers/web_screen.rb
 - spec/unit/delegate_spec.rb
-- spec/unit/ios_version_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/main_spec.rb
+- spec/unit/map_spec.rb
 - spec/unit/screen_helpers_spec.rb
 - spec/unit/screen_module_spec.rb
 - spec/unit/screen_spec.rb
 - spec/unit/split_screen_in_tab_bar_spec.rb
 - spec/unit/split_screen_open_screen_spec.rb
 - spec/unit/split_screen_spec.rb
+- spec/unit/tab_spec.rb
+- spec/unit/tables/formotion_screen_spec.rb
+- spec/unit/tables/table_indexable_spec.rb
 - spec/unit/tables/table_module_spec.rb
 - spec/unit/tables/table_screen_spec.rb
 - spec/unit/tables/table_view_cell_spec.rb
 - spec/unit/view_helper_spec.rb
+- spec/unit/web_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses: []
 post_install_message: 
@@ -176,32 +224,45 @@ summary: ProMotion is a new way to organize RubyMotion apps. Instead of dealing
   your app and include a ton of great utilities to make iOS development more like
   Ruby and less like Objective-C.
 test_files:
+- spec/functional/func_map_screen_spec.rb
 - spec/functional/func_screen_spec.rb
 - spec/functional/func_searchable_table_spec.rb
 - spec/functional/func_split_screen_spec.rb
+- spec/functional/func_tab_bar_spec.rb
 - spec/functional/func_table_screen_spec.rb
+- spec/functional/func_web_screen_spec.rb
 - spec/helpers/basic_screen.rb
 - spec/helpers/detail_screen.rb
 - spec/helpers/dummy_class.rb
 - spec/helpers/functional_screen.rb
 - spec/helpers/home_screen.rb
+- spec/helpers/map_screen.rb
 - spec/helpers/master_screen.rb
+- spec/helpers/present_screen.rb
 - spec/helpers/screen_module_view_controller.rb
+- spec/helpers/tab_screen.rb
 - spec/helpers/table_screen.rb
+- spec/helpers/table_screen_formotion.rb
+- spec/helpers/table_screen_indexable.rb
 - spec/helpers/table_screen_refreshable.rb
 - spec/helpers/table_screen_searchable.rb
 - spec/helpers/test_delegate.rb
+- spec/helpers/web_screen.rb
 - spec/unit/delegate_spec.rb
-- spec/unit/ios_version_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/main_spec.rb
+- spec/unit/map_spec.rb
 - spec/unit/screen_helpers_spec.rb
 - spec/unit/screen_module_spec.rb
 - spec/unit/screen_spec.rb
 - spec/unit/split_screen_in_tab_bar_spec.rb
 - spec/unit/split_screen_open_screen_spec.rb
 - spec/unit/split_screen_spec.rb
+- spec/unit/tab_spec.rb
+- spec/unit/tables/formotion_screen_spec.rb
+- spec/unit/tables/table_indexable_spec.rb
 - spec/unit/tables/table_module_spec.rb
 - spec/unit/tables/table_screen_spec.rb
 - spec/unit/tables/table_view_cell_spec.rb
 - spec/unit/view_helper_spec.rb
+- spec/unit/web_spec.rb