ProMotion 0.7.4 → 0.7.5

data/README.md

@@ -96,7 +96,7 @@ Create a Gemfile and add the following lines:
 
 ```ruby
 source 'https://rubygems.org'
-gem "ProMotion", "~> 0.7.0"
+gem "ProMotion", "~> 0.7.5"
 ```
 
 Run `bundle install` in Terminal to install ProMotion.
@@ -507,4 +507,5 @@ incorporated.
 * Silas Matson: [@silasjmatson](https://twitter.com/silasjmatson)
 * Matt Brewer: [@macfanatic](https://twitter.com/macfanatic)
 * [Many others](https://github.com/clearsightstudio/ProMotion/graphs/contributors)
+* If you really want to know, run `git shortlog -s -n -e`
 

data/app/app_delegate.rb

@@ -1,7 +1,7 @@
 class AppDelegate
-  
+
   def on_load(app, options)
     open BasicScreen.new(nav_bar: true)
   end
-  
+
 end

data/app/screens/basic_screen.rb

@@ -8,7 +8,7 @@ class BasicScreen < PM::Screen
   def on_load
     # Fires just before a screen is opened for the first time.
   end
-  
+
   def will_appear
     # Fires every time the screen will appear
   end

data/lib/ProMotion/delegate/delegate_helper.rb

@@ -4,13 +4,13 @@ module ProMotion
     attr_accessor :window, :aps_notification, :home_screen
 
     def application(application, didFinishLaunchingWithOptions:launch_options)
-      
+
       apply_status_bar
-      
+
       on_load application, launch_options
 
       check_for_push_notification launch_options
-      
+
       # This will work when RubyMotion fixes a bug.
       # defined?(super) ? super : true
 
@@ -18,11 +18,11 @@ module ProMotion
       super rescue true
       PM.logger.info "You can ignore the NoMethodError -- this is a RubyMotion bug that should be fixed soon."
     end
-    
+
     def applicationWillTerminate(application)
-      
+
       on_unload if respond_to?(:on_unload)
-      
+
     end
 
     def app_delegate

data/lib/ProMotion/screen_helpers/screen_navigation.rb

@@ -107,7 +107,7 @@ module ProMotion
       screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] == true
 
       # Wrap in a PM::NavigationController?
-      screen.add_nav_bar if args[:nav_bar] && screen.respond_to?(:add_nav_bar)
+      screen.add_nav_bar(args) if args[:nav_bar] && screen.respond_to?(:add_nav_bar)
 
       # Return modified screen instance
       screen

data/lib/ProMotion/screens/_compatibility/formotion_screen.rb

@@ -19,7 +19,7 @@ module ProMotion
 
         s
       end
-      
+
       # emulate the ProMotion table update for formotion
       def update_table_data
         self.form            = table_data

data/lib/ProMotion/screens/_screen_module.rb

@@ -67,10 +67,13 @@ module ProMotion
       self.tabBarItem = create_tab_bar_item(self.tab_bar_item) if self.tab_bar_item
     end
 
-    def add_nav_bar
+    def add_nav_bar(args = {})
       self.navigation_controller ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
-        NavigationController.alloc.initWithRootViewController(self)
+        nav = NavigationController.alloc.initWithRootViewController(self)
+        nav.setModalTransitionStyle(args[:transition_style]) if args[:transition_style]
+        nav.setModalPresentationStyle(args[:presentation_style]) if args[:presentation_style]
+        nav
       end
     end
 

data/lib/ProMotion/screens/_tables/_refreshable_table.rb

@@ -28,7 +28,7 @@ module ProMotion
       @refresh_control.endRefreshing
     end
     alias :stop_refreshing :end_refreshing
-    
+
     ######### iOS methods, headless camel case #######
 
     # UIRefreshControl Delegates

data/lib/ProMotion/screens/_tables/table_data.rb

@@ -87,7 +87,7 @@ module ProMotion
 
     def set_data_cell_defaults(data_cell)
       data_cell[:cell_style] ||= UITableViewCellStyleDefault
-      data_cell[:cell_identifier] ||= "Cell"
+      data_cell[:cell_identifier] ||= build_cell_identifier(data_cell)
       data_cell[:cell_class] ||= ProMotion::TableViewCell
       data_cell
     end
@@ -129,6 +129,16 @@ module ProMotion
         data_cell[:styles][:label] = data_cell[:styles][:textLabel]
       end
 
+      # Fix the accessory view if needed
+      # Legacy Support < 0.7.4
+      data_cell[:accessory] ||= data_cell[:accessory_view]
+      data_cell[:accessory] = {
+        view: data_cell[:accessory],
+        value: data_cell[:accessory_value],
+        action: data_cell[:accessory_action],
+        arguments: data_cell[:accessory_arguments]
+      } unless data_cell[:accessory].is_a? Hash
+
       data_cell
     end
 
@@ -146,5 +156,20 @@ module ProMotion
       table_cell
     end
 
+    def build_cell_identifier(data_cell)
+      ident = "Cell"
+      unless data_cell[:accessory].nil?
+        if data_cell[:accessory][:view] == :switch
+          ident << "-switch"
+        elsif !data_cell[:accessory][:view].nil?
+          ident << "-accessory"
+        end
+      end
+      ident << "-subtitle" if data_cell[:subtitle]
+      ident << "-remoteimage" if data_cell[:remote_image]
+      ident << "-image" if data_cell[:image]
+      ident
+    end
+
   end
 end

data/lib/ProMotion/screens/_tables/table_view_cell_module.rb

@@ -43,16 +43,6 @@ module ProMotion
     end
 
     def set_accessory_view
-       # Legacy Support < 0.7.4
-      data_cell[:accessory] ||= data_cell[:accessory_view]
-      data_cell[:accessory] = {
-        view: data_cell[:accessory],
-        value: data_cell[:accessory_value],
-        action: data_cell[:accessory_action],
-        arguments: data_cell[:accessory_arguments]
-      } unless data_cell[:accessory].is_a? Hash
-      # End Legacy Support
-
       if data_cell[:accessory][:view] == :switch
         switch_view = UISwitch.alloc.initWithFrame(CGRectZero)
         switch_view.setAccessibilityLabel(data_cell[:accessory][:accessibility_label]) if data_cell[:accessory][:accessibility_label]

data/lib/ProMotion/version.rb

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

data/spec/functional/func_searchable_table_spec.rb

@@ -1,6 +1,6 @@
 describe "Searchable table spec" do
   tests TableScreenSearchable
-  
+
   # Override controller to properly instantiate
   def controller
     @controller ||= TableScreenSearchable.new(nav_bar: true)
@@ -16,17 +16,17 @@ describe "Searchable table spec" do
   it "should show all 50 states" do
     @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 50
   end
-  
+
   it "should allow searching for all the 'New' states" do
     @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"New")
     @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 4
   end
-  
+
   it "should allow ending searches" do
     @controller.searchDisplayController(@controller, shouldReloadTableForSearchString:"North")
     @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 2
     @controller.searchDisplayControllerWillEndSearch(@controller)
     @controller.tableView(@controller.tableView, numberOfRowsInSection:0).should == 50
   end
-    
+
 end

data/spec/helpers/functional_screen.rb

@@ -1,15 +1,15 @@
 class FunctionalScreen < PM::Screen
   attr_accessor :button_was_triggered
-  
+
   title "Functional"
-  
+
   def will_appear
     self.button_was_triggered = false
     add UILabel.alloc.initWithFrame([[ 10, 10 ], [ 300, 40 ]]),
       text: "Label Here"
   end
-  
+
   def triggered_button
     self.button_was_triggered = true
   end
-end
+end

data/spec/helpers/screen_module_view_controller.rb

@@ -3,7 +3,7 @@ class ScreenModuleViewController < UIViewController
   title 'Test Title'
 
   # Get rid of such hackiness when RubyMotion bug is fixed...
-  
+
   def self.new(args = {})
     s = self.alloc.initWithNibName(nil, bundle:nil)
     s.on_create(args) if s.respond_to?(:on_create)

data/spec/helpers/table_screen_searchable.rb

@@ -1,7 +1,7 @@
 class TableScreenSearchable < TestTableScreen
 
   searchable
-  
+
   def table_data
     @search_table_data ||= [{
       cells: [

data/spec/helpers/test_delegate.rb

@@ -1,6 +1,6 @@
 class TestDelegate < ProMotion::Delegate
   status_bar false
-  
+
   def on_load(app, options)
   end
 end

data/spec/unit/delegate_spec.rb

@@ -7,12 +7,12 @@ describe "PM::Delegate" do
       options[:jamon].should.be.true
       app.should.be.kind_of(UIApplication)
     end
-        
+
     @subject.application(UIApplication.sharedApplication, didFinishLaunchingWithOptions:{jamon: true})
   end
-  
+
   it "should handle push notifications" do
-    
+
     @subject.mock!(:on_push_notification) do |notification|
       notification.should.be.kind_of(PM::PushNotification)
       notification.alert.should == "Eating Bacon"
@@ -20,10 +20,10 @@ describe "PM::Delegate" do
       notification.sound.should == "jamon"
       @subject.aps_notification.should == notification
     end
-        
+
     launch_options = { UIApplicationLaunchOptionsRemoteNotificationKey => PM::PushNotification.fake_notification(alert: "Eating Bacon", badge: 42, sound: "jamon").notification }
     @subject.application(nil, didFinishLaunchingWithOptions:launch_options )
-    
+
   end
 
   it "should set home_screen when opening a new screen" do

data/spec/unit/logger_spec.rb

@@ -4,7 +4,7 @@ describe "logger functionality" do
     it "should respond to PM.logger with a logger instance" do
       PM.logger.is_a?(PM::Logger).should == true
     end
-    
+
     it "should allow setting the log level" do
       PM.logger.level = :warn
       PM.logger.level.should == :warn

data/spec/unit/tables/table_view_cell_spec.rb

@@ -34,11 +34,11 @@ describe "PM::TableViewCellModule" do
 
     @screen.on_load
 
-    custom_ip = NSIndexPath.indexPathForRow(1, inSection: 1) # Cell "Crazy Full Featured Cell"
+    @custom_ip = NSIndexPath.indexPathForRow(1, inSection: 1) # Cell "Crazy Full Featured Cell"
 
     @screen.update_table_data
 
-    @subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: custom_ip)
+    @subject = @screen.tableView(@screen.table_view, cellForRowAtIndexPath: @custom_ip)
   end
 
   it "should be a PM::TableViewCell" do
@@ -53,9 +53,18 @@ describe "PM::TableViewCellModule" do
     @subject.detailTextLabel.text.should == "This is way too huge..."
   end
 
-  it "should have the right re-use identifier" do
+  it "should have the right custom re-use identifier" do
     @subject.reuseIdentifier.should == "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"
+  end
+
+  it "should have the correct height" do
+    @screen.tableView(@screen.table_view, heightForRowAtIndexPath: @custom_ip).should == 50
+  end
 
   it "should set the layer.masksToBounds" do
     @subject.layer.masksToBounds.should == true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-08 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-stump