ProMotion 0.5.2 → 0.6.0

data/spec/{view_controller_spec.rb → screen_spec.rb}

@@ -1,5 +1,5 @@
 describe "screen properties" do
-    
+
   before do
 
     # Simulate AppDelegate setup of main screen

data/spec/split_screen_in_tab_bar_spec.rb

@@ -0,0 +1,49 @@
+describe "split screen in tab bar functionality" do
+
+  before do
+    @app = TestDelegate.new
+
+    @master_screen = HomeScreen.new nav_bar: true
+    @detail_screen = BasicScreen.new nav_bar: true
+
+    @split_screen = @app.create_split_screen @master_screen, @detail_screen
+    @tab = @app.open_tab_bar @split_screen, HomeScreen, BasicScreen
+  end
+
+  it "should create a UISplitViewController" do
+    @split_screen.is_a?(UISplitViewController).should == true
+  end
+
+  it "should have two viewControllers" do
+    @split_screen.viewControllers.length.should == 2
+  end
+
+  it "should set the root view to the tab bar" do
+    @app.window.rootViewController.should == @tab
+  end
+
+  it "should return screens for the master_screen and detail_screen methods" do
+    @split_screen.master_screen.is_a?(PM::Screen).should == true
+    @split_screen.detail_screen.is_a?(PM::Screen).should == true
+  end
+
+  it "should return navigationControllers" do
+    @split_screen.viewControllers.first.is_a?(UINavigationController).should == true
+    @split_screen.viewControllers.last.is_a?(UINavigationController).should == true
+  end
+
+  it "should set the first viewController to HomeScreen's main controller" do
+    @split_screen.master_screen.should == @master_screen
+    @split_screen.viewControllers.first.should == @master_screen.main_controller
+  end
+
+  it "should set the second viewController to BasicScreen's main controller" do
+    @split_screen.detail_screen.should == @detail_screen
+    @split_screen.viewControllers.last.should == @detail_screen.main_controller
+  end
+
+  it "should set the tab bar first viewController to the split screen" do
+    @tab.viewControllers.first.should == @split_screen
+  end
+
+end

data/spec/split_screen_open_screen_spec.rb

@@ -0,0 +1,46 @@
+describe "split screen `open` functionality" do
+
+  before do
+    @app = TestDelegate.new
+
+    @master_screen = HomeScreen.new nav_bar: true
+    @detail_screen_1 = BasicScreen.new # no nav_bar on this one
+    @detail_screen_2 = BasicScreen.new(nav_bar: true)
+
+    @split_screen = @app.open_split_screen @master_screen, @detail_screen_1
+  end
+
+  it "should open a new screen in the detail view" do
+    @master_screen.open @detail_screen_2, in_detail: true
+    @split_screen.detail_screen.should == @detail_screen_2
+    @split_screen.viewControllers.first.should == @master_screen.main_controller
+    @split_screen.viewControllers.last.should == @detail_screen_2.main_controller
+  end
+
+  it "should open a new screen in the master view" do
+    @detail_screen_1.open @detail_screen_2, in_master: true
+    @split_screen.master_screen.should == @detail_screen_2
+    @split_screen.viewControllers.first.should == @detail_screen_2.main_controller
+    @split_screen.viewControllers.last.should == @detail_screen_1.main_controller
+  end
+
+  it "should open a new screen in the master view's navigation controller" do
+    @master_screen.open @detail_screen_2
+    @split_screen.detail_screen.should == @detail_screen_1 # no change
+    @master_screen.navigationController.topViewController.should == @detail_screen_2
+  end
+
+  it "should open a new modal screen in the detail view" do
+    @detail_screen_1.open @detail_screen_2, modal: true
+    @split_screen.detail_screen.should == @detail_screen_1
+    @detail_screen_1.presentedViewController.should == @detail_screen_2.main_controller
+  end
+
+  it "should not interfere with normal non-split screen navigation" do
+    home = HomeScreen.new(nav_bar: true)
+    child = BasicScreen.new
+    home.open child, in_detail: true, in_master: true
+    home.navigation_controller.topViewController.should == child
+  end
+
+end

data/spec/split_screen_spec.rb

@@ -0,0 +1,35 @@
+describe "split screen functionality" do
+
+  before do
+    @app = TestDelegate.new
+
+    @master_screen = HomeScreen.new nav_bar: true
+    @detail_screen = BasicScreen.new # no nav_bar on this one
+
+    @split_screen = @app.open_split_screen @master_screen, @detail_screen
+  end
+
+  it "should have created a split screen" do
+    @split_screen.should != nil
+    @split_screen.is_a?(UISplitViewController).should == true
+  end
+
+  it "should have two viewControllers" do
+    @split_screen.viewControllers.length.should == 2
+  end
+
+  it "should set the root view to the UISplitScreenViewController" do
+    @app.window.rootViewController.should == @split_screen
+  end
+
+  it "should set the first viewController to HomeScreen" do
+    @split_screen.master_screen.should == @master_screen
+    @split_screen.viewControllers.first.should == @master_screen.main_controller
+  end
+
+  it "should set the second viewController to BasicScreen" do
+    @split_screen.detail_screen.should == @detail_screen
+    @split_screen.viewControllers.last.should == @detail_screen.main_controller
+  end
+
+end

data/spec/table_screen_spec.rb

@@ -0,0 +1,72 @@
+describe "table screens" do
+  
+  describe "basic functionality" do
+
+    before do
+      UIView.setAnimationsEnabled false # avoid animation issues
+
+      @screen = TableScreen.new
+      @screen.on_load
+    end
+    
+    it "should display 2 sections" do
+      @screen.tableView.numberOfSections.should == 2
+    end
+
+    it "should have proper cell numbers" do
+      @screen.tableView.numberOfRowsInSection(0).should == 3
+      @screen.tableView.numberOfRowsInSection(1).should == 2
+    end
+
+    it "should have a placeholder image in the last cell" do
+      index_path = NSIndexPath.indexPathForRow(1, inSection: 1)
+      
+      @screen.tableView(@screen.tableView, cellForRowAtIndexPath: index_path).imageView.class.should == UIImageView
+    end
+  
+  end
+  
+  describe "search functionality" do
+    
+    before do
+      @screen = TableScreenSearchable.new
+      @screen.on_load
+    end
+    
+    it "should be searchable" do
+      @screen.class.get_searchable.should == true
+    end
+    
+    it "should create a search header" do
+      @screen.table_view.tableHeaderView.class.should == UISearchBar
+    end
+    
+  end
+
+  describe "refresh functionality" do
+    
+    # Note this test only works if on iOS 6+ or when using CKRefreshControl.
+    
+    before do
+      @screen = TableScreenRefreshable.new
+      @screen.on_load
+    end
+    
+    it "should be refreshable" do
+      @screen.class.get_refreshable.should == true
+    end
+    
+    it "should create a refresh object" do
+      @screen.instance_variable_get("@refresh_control").class.should == UIRefreshControl
+    end
+    
+    it "should respond to start_refreshing and end_refreshing" do
+      @screen.respond_to?(:start_refreshing).should == true
+      @screen.respond_to?(:end_refreshing).should == true
+    end
+    
+    # Animations cause the refresh object to fail when tested. Test manually.
+    
+  end
+
+end

data/spec/view_helper_spec.rb

@@ -3,25 +3,59 @@ describe "view helpers" do
   def equal_rect(rect)
     ->(obj) { CGRectEqualToRect obj, rect }
   end
-  
+
   before do
     @dummy = UIView.alloc.initWithFrame CGRectZero
     @dummy.extend ProMotion::ViewHelper
   end
 
-  it "#frame_from_array should return zero rect for bad input" do
-    @dummy.frame_from_array([]).should equal_rect(CGRectZero)
+  it "should allow you to set attributes" do
+    @dummy.set_attributes @dummy, backgroundColor: UIColor.redColor
+    @dummy.backgroundColor.should == UIColor.redColor
   end
 
-  it "#frame_from_array should return a valid CGRect" do
-    @dummy.frame_from_array([0,0,320,480]).should equal_rect(CGRectMake(0,0,320,480)) 
+  it "should allow you to set nested attributes" do
+    layered_view = UIView.alloc.initWithFrame(CGRectMake(0, 0, 10, 10))
+
+    @dummy.set_attributes layered_view, {
+      layer: {
+        backgroundColor: UIColor.redColor.CGColor
+      }
+    }
+
+    layered_view.layer.backgroundColor.should == UIColor.redColor.CGColor
   end
 
-  it "should allow you to set attributes" do
-    @dummy.set_attributes @dummy, backgroundColor: UIColor.redColor
-    @dummy.backgroundColor.should == UIColor.redColor
+  it "should allow you to set multiple nested attributes" do
+    mask_layer = CAShapeLayer.layer
+    layered_view = UIView.alloc.initWithFrame(CGRectMake(0, 0, 10, 10))
+    layered_view.layer.mask = mask_layer
+    @dummy.set_attributes layered_view, {
+      layer: {
+        mask: {
+          backgroundColor: UIColor.redColor.CGColor
+        }
+      }
+    }
+
+    layered_view.layer.mask.backgroundColor.should == UIColor.redColor.CGColor
   end
 
+  it "should allow you to set snake_case attributes" do
+    layered_view = UIView.alloc.initWithFrame(CGRectMake(0, 0, 10, 10))
+
+    @dummy.set_attributes layered_view, {
+      layer: {
+        background_color: UIColor.redColor.CGColor
+      },
+      content_mode: UIViewContentModeBottom
+    }
+
+    layered_view.contentMode.should == UIViewContentModeBottom
+    layered_view.layer.backgroundColor.should == UIColor.redColor.CGColor
+  end
+
+
   describe "content height" do
 
     before do
@@ -40,4 +74,74 @@ describe "view helpers" do
 
   end
 
+  describe "set_easy_attributes" do
+
+    before do
+      @dummy = UIView.alloc.initWithFrame CGRectZero
+      @dummy.extend ProMotion::ViewHelper
+      
+      @parent = UIView.alloc.initWithFrame(CGRectMake(0, 0, 320, 480))
+      @child = UIView.alloc.initWithFrame(CGRectZero)
+    end
+
+    it "Should set the autoresizingMask for all" do
+      @dummy.set_easy_attributes @parent, @child, {
+        resize: [:left, :right, :top, :bottom, :width, :height]
+      }
+
+      mask =  UIViewAutoresizingFlexibleLeftMargin | 
+              UIViewAutoresizingFlexibleRightMargin | 
+              UIViewAutoresizingFlexibleTopMargin | 
+              UIViewAutoresizingFlexibleBottomMargin | 
+              UIViewAutoresizingFlexibleWidth | 
+              UIViewAutoresizingFlexibleHeight
+
+      @child.autoresizingMask.should == mask
+    end
+
+    it "Should set the autoresizingMask for half" do
+      @dummy.set_easy_attributes @parent, @child, {
+        resize: [:left, :right, :top]
+      }
+
+      mask =  UIViewAutoresizingFlexibleLeftMargin | 
+              UIViewAutoresizingFlexibleRightMargin | 
+              UIViewAutoresizingFlexibleTopMargin
+
+      @child.autoresizingMask.should == mask
+    end
+
+    it "Should set the autoresizingMask for the second half" do
+      @dummy.set_easy_attributes @parent, @child, {
+        resize: [:bottom, :width, :height]
+      }
+
+      mask =  UIViewAutoresizingFlexibleBottomMargin | 
+              UIViewAutoresizingFlexibleWidth | 
+              UIViewAutoresizingFlexibleHeight
+
+      @child.autoresizingMask.should == mask
+    end
+
+    it "Should not set the autoresizingMask" do
+      @dummy.set_easy_attributes @parent, @child, {}
+
+      mask =  UIViewAutoresizingNone
+
+      @child.autoresizingMask.should == mask
+    end
+
+    it "Should create a frame" do
+      @dummy.set_easy_attributes @parent, @child, {
+        left: 10,
+        top: 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: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies: []
 description: ProMotion is a new way to easily build RubyMotion iOS apps.
 email:
@@ -25,6 +25,7 @@ files:
 - .gitignore
 - .ruby-gemset
 - .ruby-version
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -32,19 +33,22 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
+- app/screens/basic_screen.rb
 - lib/ProMotion.rb
 - lib/ProMotion/.DS_Store
-- lib/ProMotion/app_delegate.rb
 - 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/delegate.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/tab_bar.rb
 - lib/ProMotion/helpers/view_helper.rb
 - lib/ProMotion/pro_motion.rb
+- lib/ProMotion/screen_helpers/_tables/_refreshable_table.rb
 - lib/ProMotion/screen_helpers/_tables/_searchable_table.rb
 - lib/ProMotion/screen_helpers/_tables/_sectioned_table.rb
 - lib/ProMotion/screen_helpers/_tables/grouped_table.rb
@@ -52,19 +56,28 @@ files:
 - 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/_screen_module.rb
 - lib/ProMotion/screens/_table_screen_module.rb
 - lib/ProMotion/screens/screen.rb
 - lib/ProMotion/screens/table_screen.rb
 - lib/ProMotion/version.rb
-- spec/helpers/.gitkeep
 - spec/helpers/basic_screen.rb
 - spec/helpers/dummy_class.rb
 - spec/helpers/home_screen.rb
+- spec/helpers/table_screen.rb
+- spec/helpers/table_screen_refreshable.rb
+- spec/helpers/table_screen_searchable.rb
+- spec/helpers/test_delegate.rb
 - spec/ios_version_spec.rb
+- spec/logger_spec.rb
 - spec/main_spec.rb
 - spec/screen_helpers_spec.rb
-- spec/view_controller_spec.rb
+- spec/screen_spec.rb
+- spec/split_screen_in_tab_bar_spec.rb
+- spec/split_screen_open_screen_spec.rb
+- spec/split_screen_spec.rb
+- spec/table_screen_spec.rb
 - spec/view_helper_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses: []
@@ -94,12 +107,20 @@ 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/helpers/.gitkeep
 - spec/helpers/basic_screen.rb
 - spec/helpers/dummy_class.rb
 - spec/helpers/home_screen.rb
+- spec/helpers/table_screen.rb
+- spec/helpers/table_screen_refreshable.rb
+- spec/helpers/table_screen_searchable.rb
+- spec/helpers/test_delegate.rb
 - spec/ios_version_spec.rb
+- spec/logger_spec.rb
 - spec/main_spec.rb
 - spec/screen_helpers_spec.rb
-- spec/view_controller_spec.rb
+- spec/screen_spec.rb
+- spec/split_screen_in_tab_bar_spec.rb
+- spec/split_screen_open_screen_spec.rb
+- spec/split_screen_spec.rb
+- spec/table_screen_spec.rb
 - spec/view_helper_spec.rb