ProMotion 1.2.1 → 2.0.0.rc1

data/lib/ProMotion/table/table_screen.rb

@@ -1,7 +1,3 @@
-motion_require '../cocoatouch/table_view_controller'
-motion_require '../screen/screen_module'
-motion_require 'table'
-
 module ProMotion
   class TableScreen < TableViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/{containers → tabs}/tabs.rb

@@ -1,9 +1,5 @@
-motion_require '../extensions/conversions'
-
 module ProMotion
   module Tabs
-    include Conversions
-
     attr_accessor :tab_bar, :tab_bar_item
 
     def open_tab_bar(*screens)
@@ -25,7 +21,7 @@ module ProMotion
     end
 
     def refresh_tab_bar_item
-      self.tabBarItem = create_tab_bar_item(self.tab_bar_item) if self.tab_bar_item && self.respond_to?(:tabBarItem=)
+      self.tabBarItem = create_tab_bar_item(self.tab_bar_item) if self.tab_bar_item && self.respond_to?("tabBarItem=")
     end
 
     def set_tab_bar_badge(number)
@@ -33,36 +29,39 @@ module ProMotion
       refresh_tab_bar_item
     end
 
-    def create_tab_bar_icon(icon, tag)
-      return UITabBarItem.alloc.initWithTabBarSystemItem(icon, tag: tag)
-    end
-
-    def create_tab_bar_icon_custom(title, icon_image, tag)
-      if icon_image.is_a?(String)
-        icon_image = UIImage.imageNamed(icon_image)
-      elsif icon_image.is_a?(Hash)
-        icon_selected = icon_image[:selected]
-        icon_unselected = icon_image[:unselected]
-        icon_image = nil
+    def create_tab_bar_item_custom(title, item_image, tag)
+      if item_image.is_a?(String)
+        item_image = UIImage.imageNamed(item_image)
+      elsif item_image.is_a?(Hash)
+        item_selected = item_image[:selected]
+        item_unselected = item_image[:unselected]
+        item_image = nil
       end
 
-      item = UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
+      item = UITabBarItem.alloc.initWithTitle(title, image:item_image, tag:tag)
 
-      if icon_selected || icon_unselected
-        item.setFinishedSelectedImage(icon_selected, withFinishedUnselectedImage: icon_unselected)
+      if item_selected || item_unselected
+        item.setFinishedSelectedImage(item_selected, withFinishedUnselectedImage: item_unselected)
       end
 
       return item
     end
 
     def create_tab_bar_item(tab={})
+      if tab[:system_icon] || tab[:icon]
+        PM.logger.deprecated("`system_icon:` no longer supported. Use `system_item:` instead.") if tab[:system_icon]
+        PM.logger.deprecated("`icon:` no longer supported. Use `item:` instead.") if tab[:icon]
+        tab[:system_item] ||= tab[:system_icon]
+        tab[:item] ||= tab[:icon]
+      end
+
       title = "Untitled"
       title = tab[:title] if tab[:title]
       tab[:tag] ||= @current_tag ||= 0
       @current_tag = tab[:tag] + 1
 
-      tab_bar_item = create_tab_bar_icon(map_tab_symbol(tab[:system_icon]), tab[:tag]) if tab[:system_icon]
-      tab_bar_item = create_tab_bar_icon_custom(title, tab[:icon], tab[:tag]) if tab[:icon]
+      tab_bar_item = UITabBarItem.alloc.initWithTabBarSystemItem(map_tab_symbol(tab[:system_item]), tag: tab[:tag]) if tab[:system_item]
+      tab_bar_item = create_tab_bar_item_custom(title, tab[:item], tab[:tag]) if tab[:item]
 
       tab_bar_item.badgeValue = tab[:badge_number].to_s unless tab[:badge_number].nil? || tab[:badge_number] <= 0
 

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "1.2.1" unless defined?(ProMotion::VERSION)
+  VERSION = "2.0.0.rc1" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/web/web_screen.rb

@@ -1,7 +1,3 @@
-motion_require '../cocoatouch/view_controller'
-motion_require '../screen/screen_module'
-motion_require 'web_screen_module'
-
 module ProMotion
   class WebScreen < ViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/web/web_screen_module.rb

@@ -1,20 +1,22 @@
 module ProMotion
   module WebScreenModule
 
-    attr_accessor :webview, :external_links, :detector_types
+    attr_accessor :webview, :external_links, :detector_types, :scale_to_fit
 
     def screen_setup
       check_content_data
       self.external_links ||= false
+      self.scale_to_fit ||= false
+      self.detector_types ||= :none
     end
 
     def on_init
-
-      self.detector_types ||= UIDataDetectorTypeNone
       if self.detector_types.is_a? Array
         detectors = UIDataDetectorTypeNone
         self.detector_types.each { |dt| detectors |= map_detector_symbol(dt) }
         self.detector_types = detectors
+      else
+        self.detector_types = map_detector_symbol(self.detector_types)
       end
 
       self.webview ||= add UIWebView.new, {
@@ -23,6 +25,7 @@ module ProMotion
         delegate: self,
         data_detector_types: self.detector_types
       }
+      self.webview.scalesPageToFit = self.scale_to_fit
       self.webview.scrollView.decelerationRate = UIScrollViewDecelerationRateNormal
       set_initial_content
     end
@@ -108,11 +111,11 @@ module ProMotion
     end
 
     def open_in_safari(inRequest)
-      #Open UIWebView delegate links in Safari.
+      # Open UIWebView delegate links in Safari.
       UIApplication.sharedApplication.openURL(inRequest.URL)
     end
 
-    #UIWebViewDelegate Methods - Camelcase
+    # UIWebViewDelegate Methods - Camelcase
     def webView(inWeb, shouldStartLoadWithRequest:inRequest, navigationType:inType)
       if self.external_links == true && inType == UIWebViewNavigationTypeLinkClicked
         if defined?(OpenInChromeController)

data/spec/functional/func_screen_spec.rb

@@ -4,18 +4,14 @@ describe "ProMotion::Screen functional" do
   # Override controller to properly instantiate
   def controller
     rotate_device to: :portrait, button: :bottom
-    @controller ||= FunctionalScreen.new(nav_bar: true)
-    @root_screen = @controller
+    @controller = FunctionalScreen.new(nav_bar: true)
     @controller.navigationController
   end
 
-  after do
-    @controller = nil
-    @root_screen = nil
-  end
-
   it "should have a navigation bar" do
-    view("Functional").should.be.kind_of UINavigationItemView
+    wait 0.5 do
+      view("Functional").should.be.kind_of UINavigationItemView
+    end
   end
 
   it "should allow a string title" do
@@ -23,19 +19,19 @@ describe "ProMotion::Screen functional" do
   end
 
   it "should allow setting a left nav bar button" do
-    @root_screen.set_nav_bar_button :left, title: "Cool", action: :triggered_button
+    @controller.set_nav_bar_button :left, title: "Cool", action: :triggered_button
     tap("Cool")
-    @root_screen.button_was_triggered.should.be.true
+    @controller.button_was_triggered.should.be.true
   end
 
   it "should allow setting a right nav bar button" do
-    @root_screen.set_nav_bar_button :right, title: "Cool2", action: :triggered_button
+    @controller.set_nav_bar_button :right, title: "Cool2", action: :triggered_button
     tap("Cool2")
-    @root_screen.button_was_triggered.should.be.true
+    @controller.button_was_triggered.should.be.true
   end
 
   it "should allow opening another screen in the same nav bar and have a back button that is operational" do
-    @root_screen.open BasicScreen
+    @controller.open BasicScreen
 
     wait 0.5 do
 
@@ -52,21 +48,21 @@ describe "ProMotion::Screen functional" do
   end
 
   it "should push another screen with animation by default" do
-    basic = @root_screen.open BasicScreen
+    basic = @controller.open BasicScreen
     wait 0.5 do
       basic.animation_ts.should.be > 0.2
     end
   end
 
   it "should push another screen with animation when animated: true" do
-    basic = @root_screen.open BasicScreen, animated: true
+    basic = @controller.open BasicScreen, animated: true
     wait 0.5 do
       basic.animation_ts.should.be > 0.2
     end
   end
 
   it "should push another screen without animation when animated: false" do
-    basic = @root_screen.open BasicScreen, animated: false
+    basic = @controller.open BasicScreen, animated: false
     wait 0.5 do
       basic.animation_ts.should.be < 0.2
     end
@@ -76,7 +72,7 @@ describe "ProMotion::Screen functional" do
   it "should allow opening and closing a modal screen" do
     @basic = BasicScreen.new(nav_bar: true)
     wait 0.1 do
-      @root_screen.open_modal @basic
+      @controller.open_modal @basic
 
       wait 0.6 do
 
@@ -94,7 +90,7 @@ describe "ProMotion::Screen functional" do
 
   it "should fire the will_present, on_present, will_dismiss, and on_dismiss_methods" do
     @presented_screen = PresentScreen.new
-    @root_screen.open @presented_screen
+    @controller.open @presented_screen
     wait 0.6 do
       @presented_screen.will_present_fired.should == true
       @presented_screen.on_present_fired.should == true

data/spec/functional/func_split_screen_spec.rb

@@ -67,14 +67,14 @@ describe "Split screen functional" do
     rotate_device to: :portrait, button: :bottom
 
     test_title = "Test Title"
-    @controller = @app.open_split_screen @master, @detail, button_title: test_title
+    @alt_controller = @app.open_split_screen @master, @detail, button_title: test_title
     @detail.navigationItem.leftBarButtonItem.title.should == test_title
   end
 
   it "should override the default swipe action, that reveals the menu" do
     rotate_device to: :portrait, button: :bottom
 
-    @controller = @app.open_split_screen @master, @detail, swipe: false
+    @alt_controller = @app.open_split_screen @master, @detail, swipe: false
     @app.home_screen.presentsWithGesture.should == false
   end
 

data/spec/functional/func_table_screen_spec.rb

@@ -1,25 +1,32 @@
 describe "ProMotion::TestTableScreen functionality" do
   tests PM::TestTableScreen
 
-  # Override controller to properly instantiate
+  def table_screen
+    @table_screen ||= begin
+      t = TestTableScreen.new(nav_bar: true)
+      t.on_load
+      t
+    end
+  end
+
   def controller
     rotate_device to: :portrait, button: :bottom
-    @controller ||= TestTableScreen.new(nav_bar: true)
-    @controller.on_load
-    @controller.navigationController
+    table_screen.navigationController
   end
 
   def confirmation_class
     TestHelper.ios7 ? UITableViewCellDeleteConfirmationButton : UITableViewCellDeleteConfirmationControl
   end
 
+  after { @table_screen = nil }
+
   it "should have a navigation bar" do
-    @controller.navigationController.should.be.kind_of(UINavigationController)
+    table_screen.navigationController.should.be.kind_of(UINavigationController)
   end
 
   it "should increment the tap counter on tap" do
     tap("Increment")
-    @controller.tap_counter.should == 3
+    table_screen.tap_counter.should == 3
   end
 
   it "should add a new table cell on tap" do
@@ -29,34 +36,34 @@ describe "ProMotion::TestTableScreen functionality" do
 
   it "should do nothing when no action specified" do
     tap("Just another blank row")
-    @controller.should == @controller
+    table_screen.should == table_screen
   end
 
   it "should increment the tap counter by one on tap" do
     tap("Increment One")
-    @controller.tap_counter.should == 1
+    table_screen.tap_counter.should == 1
   end
 
   it "should delete the specified row from the table view on tap" do
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
+    table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
     tap("Delete the row below")
     wait 0.3 do
-      @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+      table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
     end
   end
 
   it "should delete the specified row from the table view on tap with an animation" do
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
+    table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
     tap("Delete the row below with an animation")
     wait 0.3 do
-      @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
+      table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
     end
   end
 
   # TODO: Why is it so complicated to find the delete button??
   it "should use editing_style to delete the table row" do
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
-    @controller.cell_was_deleted.should != true
+    table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
+    table_screen.cell_was_deleted.should != true
     flick("Just another deletable blank row", :to => :left)
 
     wait 0.25 do
@@ -65,8 +72,8 @@ describe "ProMotion::TestTableScreen functionality" do
         if subview.class == confirmation_class
           tap subview
           wait 0.25 do
-            @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 6
-            @controller.cell_was_deleted.should == true
+            table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 6
+            table_screen.cell_was_deleted.should == true
           end
         end
       end
@@ -74,8 +81,8 @@ describe "ProMotion::TestTableScreen functionality" do
   end
 
   it "should not allow deleting if on_cell_delete returns `false`" do
-    @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
-    @controller.cell_was_deleted.should != true
+    table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
+    table_screen.cell_was_deleted.should != true
     flick("A non-deletable blank row", :to => :left)
 
     wait 0.25 do
@@ -84,42 +91,49 @@ describe "ProMotion::TestTableScreen functionality" do
         if subview.class == confirmation_class
           tap subview
           wait 0.25 do
-            @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 7
-            @controller.cell_was_deleted.should != false
+            table_screen.tableView(table_screen.tableView, numberOfRowsInSection:0).should == 7
+            table_screen.cell_was_deleted.should != false
           end
         end
       end
     end
   end
 
-  # Disabled by Jamon 10/16/2013 -- Bacon doesn't appear to use accessibility labels?
   it "should call a method when the switch is flipped" do
-  #   @controller.scroll_to_bottom
-  #   tap "switch_1"
-  #   wait 0.3 do
-  #     @controller.tap_counter.should == 1
-  #   end
+    table_screen.scroll_to_bottom
+    tap "switch_1"
+    wait 0.3 do
+      table_screen.tap_counter.should == 1
+    end
   end
 
   it "should call the method with arguments when the switch is flipped and when the cell is tapped" do
-  #   @controller.scroll_to_bottom
-  #   tap "switch_3"
-  #   wait 0.3 do
-  #     @controller.tap_counter.should == 3
+    table_screen.scroll_to_bottom
+    tap "switch_3"
+    wait 0.3 do
+      table_screen.tap_counter.should == 3
 
-  #     tap "Switch With Cell Tap, Switch Action And Parameters"
-  #     wait 0.3 do
-  #       @controller.tap_counter.should == 13
-  #     end
-  #   end
+      tap "Switch With Cell Tap, Switch Action And Parameters"
+      wait 0.3 do
+        table_screen.tap_counter.should == 13
+      end
+    end
   end
 
   it "should call the method with arguments when the switch is flipped" do
-  #   @controller.scroll_to_bottom
-  #   tap "switch_2"
-  #   wait 0.3 do
-  #     @controller.tap_counter.should == 3
-  #   end
+    table_screen.scroll_to_bottom
+    tap "switch_2"
+    wait 0.3 do
+      table_screen.tap_counter.should == 3
+    end
+  end
+
+  it "should not crash if cell with editing_style is swiped left" do
+    Proc.new { flick("Just another deletable blank row", to: :left) }.should.not.raise(StandardError)
+  end
+
+  it "should not crash if cell with no editing_style is swiped left" do
+    Proc.new { flick("Increment", to: :left) }.should.not.raise(StandardError)
   end
 
 end

data/spec/functional/func_web_screen_spec.rb

@@ -4,27 +4,22 @@ describe "ProMotion::TestWebScreen functionality" do
   before  { disable_network_access! }
   after   { enable_network_access! }
 
-  tests PM::TestWebScreen
-
-  # Override controller to properly instantiate
   def controller
-    rotate_device to: :portrait, button: :bottom
-    @webscreen ||= TestWebScreen.new(nav_bar: true)
-    @webscreen.navigationController
+    @controller ||= TestWebScreen.new(nav_bar: true)
   end
 
   after do
-    @webscreen = nil
+    @controller = nil
   end
 
   it "should have the proper html content" do
     file_name = "WebScreen.html"
 
-    @webscreen.set_content(file_name)
+    controller.set_content(file_name)
 
     @loaded_file = File.read(File.join(NSBundle.mainBundle.resourcePath, file_name))
-    wait_for_change @webscreen, 'is_load_finished' do
-      @webscreen.html.delete("\n").should == @loaded_file.delete("\n")
+    wait_for_change controller, 'is_load_finished' do
+      controller.html.delete("\n").should == @loaded_file.delete("\n")
     end
   end
 
@@ -32,18 +27,18 @@ describe "ProMotion::TestWebScreen functionality" do
     stub_request(:get, "https://www.google.com/").
       to_return(body: %q{Google! <form action="/search">%}, content_type: "text/html")
 
-    @webscreen.open_url(NSURL.URLWithString("https://www.google.com/"))
-    wait_for_change @webscreen, 'is_load_finished' do
-      @webscreen.html.include?('<form action="/search"').should == true
+    controller.open_url(NSURL.URLWithString("https://www.google.com/"))
+    wait_for_change controller, 'is_load_finished' do
+      controller.html.include?('<form action="/search"').should == true
     end
   end
 
   it "should manipulate the webscreen contents with javascript" do
-    @webscreen.set_content('<h1 id="cool">Something Cool</h1>')
+    controller.set_content('<h1 id="cool">Something Cool</h1>')
 
-    wait_for_change @webscreen, 'is_load_finished' do
-      @webscreen.evaluate('document.getElementById("cool").innerHTML = "Changed"')
-      @webscreen.html.should =~ /<h1 id="cool">Changed<\/h1>/
+    wait_for_change controller, 'is_load_finished' do
+      controller.evaluate('document.getElementById("cool").innerHTML = "Changed"')
+      controller.html.should =~ /<h1 id="cool">Changed<\/h1>/
     end
 
   end