ProMotion 0.5.2 → 0.6.0

data/lib/ProMotion/screens/_screen_module.rb

@@ -4,21 +4,22 @@ module ProMotion
     include ProMotion::ScreenElements
     include ProMotion::SystemHelper
     include ProMotion::ScreenTabs
+    include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2")
 
-    attr_accessor :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal
+    attr_accessor :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal, :split_screen
 
     def on_create(args = {})
       unless self.is_a?(UIViewController)
         raise StandardError.new("ERROR: Screens must extend UIViewController or a subclass of UIViewController.")
       end
-      
+
       args.each do |k, v|
         self.send("#{k}=", v) if self.respond_to?("#{k}=")
       end
 
       self.add_nav_bar if args[:nav_bar]
-      self.table_setup if self.respond_to?(:table_setup)      
       self.on_init if self.respond_to?(:on_init)
+      self.table_setup if self.respond_to?(:table_setup)
       self
     end
 
@@ -54,28 +55,33 @@ module ProMotion
     end
 
     def add_nav_bar
-      self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
-      self.first_screen = true
+      self.navigation_controller ||= begin
+        self.first_screen = true if self.respond_to?(:first_screen=)
+        NavigationController.alloc.initWithRootViewController(self)
+      end
     end
 
     def set_nav_bar_right_button(title, args={})
-      args[:style]  ||= UIBarButtonItemStyleBordered
-      args[:target] ||= self
-      args[:action] ||= nil
-
-      right_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])
-      self.navigationItem.rightBarButtonItem = right_button
-      right_button
+      args[:title] = title
+      set_nav_bar_button :right, args
     end
 
     def set_nav_bar_left_button(title, args={})
+      args[:title] = title
+      set_nav_bar_button :left, args
+    end
+    
+    def set_nav_bar_button(side, args={})
       args[:style]  ||= UIBarButtonItemStyleBordered
       args[:target] ||= self
       args[:action] ||= nil
 
-      left_button = UIBarButtonItem.alloc.initWithTitle(title, style: args[:style], target: args[:target], action: args[:action])
-      self.navigationItem.leftBarButtonItem = left_button
-      left_button
+      button = UIBarButtonItem.alloc.initWithTitle(args[:title], style: args[:style], target: args[:target], action: args[:action])
+
+      self.navigationItem.leftBarButtonItem = button if side == :left
+      self.navigationItem.rightBarButtonItem = button if side == :right
+
+      button
     end
 
     # [DEPRECATED]
@@ -99,13 +105,11 @@ module ProMotion
     end
 
     def view_will_appear(animated)
-      # ProMotion::Screen.current_screen = self
       self.will_appear
     end
     def will_appear; end
 
     def view_did_appear(animated)
-      # ProMotion::Screen.current_screen = self
       self.on_appear
     end
     def on_appear; end
@@ -116,7 +120,6 @@ module ProMotion
     def will_disappear; end
 
     def view_did_disappear(animated)
-      # ProMotion::Screen.current_screen = self.parent_screen if self.parent_screen
       self.on_disappear
     end
     def on_disappear; end
@@ -131,8 +134,7 @@ module ProMotion
     end
 
     def main_controller
-      return self.navigation_controller if self.navigation_controller
-      self
+      self.navigation_controller || self
     end
 
     def view_controller
@@ -170,20 +172,35 @@ module ProMotion
     end
 
     def supported_orientations
-      ors = 0
+      orientations = 0
       NSBundle.mainBundle.infoDictionary["UISupportedInterfaceOrientations"].each do |ori|
         case ori
         when "UIInterfaceOrientationPortrait"
-          ors |= UIInterfaceOrientationMaskPortrait
+          orientations |= UIInterfaceOrientationMaskPortrait
         when "UIInterfaceOrientationLandscapeLeft"
-          ors |= UIInterfaceOrientationMaskLandscapeLeft
+          orientations |= UIInterfaceOrientationMaskLandscapeLeft
         when "UIInterfaceOrientationLandscapeRight"
-          ors |= UIInterfaceOrientationMaskLandscapeRight
+          orientations |= UIInterfaceOrientationMaskLandscapeRight
         when "UIInterfaceOrientationPortraitUpsideDown"
-          ors |= UIInterfaceOrientationMaskPortraitUpsideDown
+          orientations |= UIInterfaceOrientationMaskPortraitUpsideDown
         end
       end
-      ors
+      orientations
+    end
+
+    def supported_device_families
+      NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].map do |m|
+        case m
+        when "1"
+          :iphone
+        when "2"
+          :ipad
+        end
+      end
+    end
+
+    def supported_device_family?(family)
+      supported_device_families.include?(family)
     end
 
     # Class methods
@@ -196,14 +213,6 @@ module ProMotion
         @debug_mode = v
       end
 
-      def current_screen=(s)
-        @current_screen = s
-      end
-
-      def current_screen
-        @current_screen
-      end
-
       def title(t)
         @title = t
       end
@@ -219,4 +228,4 @@ module ProMotion
       base.extend(ClassMethods)
     end
   end
-end
+end

data/lib/ProMotion/screens/_table_screen_module.rb

@@ -2,13 +2,15 @@ module ProMotion
   module TableScreenModule
     include MotionTable::PlainTable
     include MotionTable::SearchableTable
+    include MotionTable::RefreshableTable
     include ProMotion::ScreenModule
-    
+
     def update_table_data
       self.update_table_view_data(table_data)
     end
 
     module TableClassMethods
+      # Searchable
       def searchable(params={})
         @searchable_params = params
         @searchable = true
@@ -21,6 +23,21 @@ module ProMotion
       def get_searchable
         @searchable ||= false
       end
+
+      # Refreshable
+      def refreshable(params = {})
+        @refreshable_params = params
+        @refreshable = true
+      end
+
+      def get_refreshable
+        @refreshable ||= false
+      end
+
+      def get_refreshable_params
+        @refreshable_params ||= nil
+      end
+
     end
     def self.included(base)
       base.extend(ClassMethods)

data/lib/ProMotion/screens/screen.rb

@@ -4,4 +4,4 @@ module ProMotion
     # Just make sure to implement the Obj-C methods in cocoatouch/ViewController.rb.
     include ProMotion::ScreenModule
   end
-end
+end

data/lib/ProMotion/version.rb

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

data/spec/helpers/table_screen.rb

@@ -0,0 +1,48 @@
+class TableScreen < ProMotion::SectionedTableScreen
+
+  def on_load
+    @tap_counter ||= 0
+  end
+
+  def table_data
+    [{
+      title: "Your Account",
+      cells: [
+        { title: "Increment", action: :increment_counter_by, arguments: { number: 3 } },
+        { title: "Add New Row", action: :add_tableview_row, accessibilityLabel: "Add New Row" },
+        { title: "Just another blank row" }
+      ]
+    }, {
+      title: "App Stuff",
+      cells: [
+        { title: "Increment One", action: :increment_counter },
+        { title: "Feedback", remote_image: { url: "http://placekitten.com/100/100", placeholder: "some-local-image", size: 50, radius: 15 } }
+      ]
+    }]
+  end
+
+  def edit_profile(args={})
+    args[:id]
+  end
+
+  def add_tableview_row
+    @data[0][:cells] << {
+      title: "Dynamically Added"
+    }
+    update_table_data
+  end
+
+  def increment_counter
+    @tap_counter += 1
+  end
+
+  def increment_counter_by(args)
+    @tap_counter = @tap_counter + args[:number]
+  end
+  
+  def tap_counter
+    @tap_counter
+  end
+
+
+end

data/spec/helpers/table_screen_refreshable.rb

@@ -0,0 +1,11 @@
+class TableScreenRefreshable < TableScreen
+  attr_accessor :on_refresh_called
+
+  refreshable
+
+  def on_refresh
+    self.on_refresh_called = true
+    end_refreshing
+  end
+
+end

data/spec/helpers/table_screen_searchable.rb

@@ -0,0 +1,5 @@
+class TableScreenSearchable < TableScreen
+
+  searchable
+
+end

data/spec/helpers/test_delegate.rb

@@ -0,0 +1,9 @@
+class TestDelegate < ProMotion::Delegate
+  def on_load(app, options)
+  end
+
+  # Hack to make RM 2.0 work.
+  # Ref: http://hipbyte.myjetbrains.com/youtrack/issue/RM-136
+  def dealloc
+  end
+end

data/spec/ios_version_spec.rb

@@ -6,23 +6,23 @@ describe "ios version" do
   end
 
   it "#ios_version_is?" do
-    @dummy.ios_version_is?(@dummy.ios_version).should == true
+    @dummy.ios_version_is?(@dummy.ios_version).should.be.true
   end
 
   it "#ios_version_greater?" do
-    @dummy.ios_version_greater?('1.0').should == true
+    @dummy.ios_version_greater?('1.0').should.be.true
   end
 
   it "#ios_version_greater_eq?" do
-    @dummy.ios_version_greater_eq?(@dummy.ios_version).should == true
+    @dummy.ios_version_greater_eq?(@dummy.ios_version).should.be.true
   end
 
   it "#ios_version_less?" do
-    @dummy.ios_version_less?('9.0').should == true
+    @dummy.ios_version_less?('9.0').should.be.true
   end
 
   it "#ios_version_less_eq?" do
-    @dummy.ios_version_less_eq?(@dummy.ios_version).should == true
+    @dummy.ios_version_less_eq?(@dummy.ios_version).should.be.true
   end
-    
+
 end

data/spec/logger_spec.rb

@@ -0,0 +1,68 @@
+describe "logger functionality" do
+
+  describe "basic logger" 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
+    end
+  end
+
+  describe "testing levels" do
+
+    before do
+      PM.logger.stub! :log {|a, b, c| "It worked" }
+    end
+
+    after do
+      PM.logger.level = :debug
+    end
+
+    it "should not log if level is set to :none" do
+
+      PM.logger.stub! :log do |label, message_text, color|
+        should.flunk "should not log if logging is turned off!"
+      end
+
+      PM.logger.level = :none
+      PM.logger.warn("I'm giving you a warning that you should ignore.").should == nil
+
+    end
+
+    it "#error should log if set to :error level or above" do
+
+      PM.logger.level = :error
+      PM.logger.error("test message").should == "It worked"
+
+    end
+
+    it "#deprecated should log if set to :warn level or above" do
+
+      PM.logger.level = :warn
+      PM.logger.deprecated("test message").should == "It worked"
+
+    end
+    it "#warn should log if set to :warn level or above" do
+
+      PM.logger.level = :warn
+      PM.logger.warn("test message").should == "It worked"
+
+    end
+    it "#debug should log if set to :debug level or above" do
+
+      PM.logger.level = :debug
+      PM.logger.debug("test message").should == "It worked"
+
+    end
+    it "#info should log if set to :info level or above" do
+
+      PM.logger.level = :info
+      PM.logger.info("test message").should == "It worked"
+
+    end
+
+  end
+end

data/spec/main_spec.rb

@@ -3,7 +3,7 @@ describe "pro motion module" do
   it "should have 'PM' module" do
     should.not.raise(NameError) { PM }
   end
-  
+
   it "should not allow screen inclusion into just any class" do
     dummy = DummyClass.new
     dummy.extend ProMotion::ScreenModule

data/spec/screen_helpers_spec.rb

@@ -24,8 +24,37 @@ describe "screen helpers" do
       @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 a subview to another element with attributes" do
+      sub_subview = UIView.alloc.initWithFrame CGRectZero
+      @screen.add_to @subview, sub_subview, { backgroundColor: UIColor.redColor }
+      @subview.subviews.last.backgroundColor.should == UIColor.redColor
+    end
+    
   end
 
+  describe "nav bar buttons" do
+    
+    before do
+      @screen = HomeScreen.new(nav_bar: true)
+    end
+    
+    it "should add a left nav bar button" do
+      @screen.set_nav_bar_left_button "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_right_button "Cancel", action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
+      @screen.navigationItem.rightBarButtonItem.class.should == UIBarButtonItem
+    end
+    
+  end
 
   describe "screen navigation" do
 
@@ -79,13 +108,13 @@ describe "screen helpers" do
         @screen.send(:present_modal_view_controller, new_screen, true)
       end
 
-      it "should push screen onto nav controller stack inside a tab bar" do
-        # TODO: Implement this test
-      end
+      # it "should push screen onto nav controller stack inside a tab bar" do
+      #   # TODO: Implement this test
+      # end
 
-      it "should set the tab bar selectedIndex when opening a screen inside a tab bar" do
-        # TODO: Implement this test
-      end
+      # it "should set the tab bar selectedIndex when opening a screen inside a tab bar" do
+      #   # TODO: Implement this test
+      # end
 
       it "should open a root screen if :close_all is provided" do
         @screen.mock!(:open_root_screen) { |screen| screen.should.be.instance_of BasicScreen }