ProMotion 0.5.0 → 0.5.2

data/.gitignore

@@ -10,6 +10,6 @@ pom.xml
 /build
 .DS_Store
 *.clj
-.repl_histroy
 .rvmrc
 *.gem
+.repl_history

data/.ruby-gemset

@@ -0,0 +1 @@
+promotion

data/.ruby-version

@@ -0,0 +1 @@
+ruby-1.9.3-p392

data/Gemfile

@@ -3,3 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ProMotion.gemspec
 gemspec
 
+# Use this in development
+gem "motion-stump"

data/Gemfile.lock

@@ -1,14 +1,16 @@
 PATH
   remote: .
   specs:
-    ProMotion (0.4.0)
+    ProMotion (0.5.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    motion-stump (0.2.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   ProMotion!
+  motion-stump

data/README.md

@@ -8,6 +8,7 @@ with your app's designed screens.
 1. [Tutorials](#tutorials)
   * [Screencasts](#screencasts)
   * [Sample Apps](#sample-apps)
+  * [Apps Built With ProMotion](#apps-built-with-promotion)
 1. **[Getting Started](#getting-started)**
   * [Setup](#setup)
 1. [What's New?](#whats-new)
@@ -36,13 +37,20 @@ Video tutorial with 0.4.
 
 http://www.clearsightstudio.com/insights/tutorial-make-youtube-video-app-rubymotion-promotion/
 
-### Sample apps
+### Sample Apps
 
-Sample app here: https://github.com/jamonholmgren/promotion-tutorial
+#### ProMotion Tutorial
+Sample app here: [https://github.com/jamonholmgren/promotion-tutorial](https://github.com/jamonholmgren/promotion-tutorial)
 
-Also, check out the free [BigDay! Reminder app](https://itunes.apple.com/us/app/bigday!/id571756685?ls=1&mt=8) on the 
+### Apps Built With ProMotion
+
+#### BigDay! Reminder App
+Check out the free [BigDay! Reminder app](https://itunes.apple.com/us/app/bigday!/id571756685?ls=1&mt=8) on the 
 App Store to see what's possible. ClearSight Studio built the app for Kijome Software, a small app investment company.
 
+#### TipCounter App
+[TipCounter](http://www.tipcounterapp.com) was built by [Matt Brewer](https://github.com/macfanatic/) for bartenders and servers to easily track their tips.  Used ProMotion and the development was a lot of fun!
+
 ## Getting Started
 
 ProMotion is designed to be as intuitive and Ruby-like as possible. For example, here is a 
@@ -85,7 +93,7 @@ Create a Gemfile and add the following lines:
 
 ```ruby
 source 'https://rubygems.org'
-gem "ProMotion", "~> 0.4.1"
+gem "ProMotion", "~> 0.5.0"
 ```
 
 Run `bundle install` in Terminal to install ProMotion.
@@ -122,11 +130,13 @@ Run `rake`. You should now see the simulator open with your home screen and a na
 
 ## What's New?
 
-### Version 0.5.0
+### Version 0.5
 
-Version 0.5.0 is mostly a documentation and consistency release. It should be backwards-compatible
-with 0.4.0.
+Version 0.5 is mostly a documentation and consistency release. It should be backwards-compatible
+with 0.4.
 
+* `on_return` fires after animation complete on modals now
+* Added tests ... run with `rake spec` (thanks [@macfanatic](http://twitter.com/macfanatic))
 * Rearranged internal folders to make a lot more sense
 * More complete API documentation
 * Refactored camelCase methods and configs to under_score
@@ -135,7 +145,7 @@ with 0.4.0.
 * `add_element` is now `add` (and `remove_element` is `remove`)
 * Removed built-in app (will release some sample apps soon, including a "Kitchen Sink" one)
 
-### Version 0.4.0
+### Version 0.4
 
 * Screens are now UIViewControllers (they used to contain UIViewControllers, but that got too funky) so you can do normal UIViewController stuff with them
 * Screen functionality can also be inherited as a module in your own UIViewController, but you need to provide your own methods for viewDidLoad and whatnot.
@@ -164,8 +174,8 @@ class HomeScreen < ProMotion::Screen
   end
   
   def will_appear
-    # Set up the elements in your view with add_view
-    @label = add_view UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20))
+    # Set up the elements in your view with add
+    @label ||= add UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20))
   end
   
   def on_appear
@@ -306,22 +316,22 @@ end
 
 ### Adding view elements
 
-Any view item (UIView, UIButton, custom UIView subclasses, etc) can be added to the current view with `add_view`.
-`add_view` accepts a second argument which is a hash of attributes that get applied to the element before it is
+Any view item (UIView, UIButton, custom UIView subclasses, etc) can be added to the current view with `add`.
+`add` accepts a second argument which is a hash of attributes that get applied to the element before it is
 dropped into the view.
 
 ```ruby
-@label = add_view UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20)), {
+@label = add UILabel.alloc.initWithFrame(CGRectMake(5, 5, 20, 20)), {
   text: "This is awesome!",
   font: UIFont.systemFontOfSize(18)
 }
 
-@element = add_view UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
+@element = add UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
   backgroundColor: UIColor.whiteColor
 }
 ```
 
-The `set_attributes` method is identical to add_view except that it does not add it to the current view.
+The `set_attributes` method is identical to add except that it does not add it to the current view.
 
 ```ruby
 @element = set_attributes UIView.alloc.initWithFrame(CGRectMake(0, 0, 20, 20)), {
@@ -448,29 +458,26 @@ end
 
 ## Reference
 
+### Screen
+
 <table>
   <tr>
-    <th>Class or Module</th>
     <th>Method</th>
     <th>Description</th>
   </tr>
   <tr>
-    <td>Screen</td>
     <td>is_modal?</td>
     <td>Returns if the screen was opened in a modal window.</td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>self</td>
     <td>Returns the Screen which is a subclass of UIViewController or UITableViewController</td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>has_nav_bar?</td>
     <td>Returns if the screen is contained in a navigation controller.</td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>set_tab_bar_item(args)</td>
     <td>
       Creates the tab that is shown in a tab bar item.<br />
@@ -478,14 +485,12 @@ end
     </td>
   </tr>  
   <tr>
-    <td>&nbsp;</td>
     <td>on_appear</td>
     <td>
       Callback for when the screen appears.<br />
     </td>
   </tr> 
   <tr>
-    <td>&nbsp;</td>
     <td>will_appear</td>
     <td>
       Callback for before the screen appears.<br />
@@ -494,21 +499,18 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>will_disappear</td>
     <td>
       Callback for before the screen disappears.<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>will_rotate(orientation, duration)</td>
     <td>
       Callback for before the screen rotates.<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>on_opened **Deprecated**</td>
     <td>
       Callback when screen is opened via a tab bar. Please don't use this, as it will be removed in the future<br />
@@ -516,14 +518,12 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>set_nav_bar_left_button(title, args = {})</td>
     <td>
       Set a left nav bar button.<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>set_nav_bar_right_button(title, args = {})</td>
     <td>
       Set a right nav bar button.<br />
@@ -531,7 +531,6 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>should_autorotate</td>
     <td>
       (iOS 6) return true/false if screen should rotate.<br />
@@ -539,21 +538,18 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>should_rotate(orientation)</td>
     <td>
       (iOS 5) Return true/false for rotation to orientation.<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>title</td>
     <td>
       Returns title of current screen.<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>title=(title)</td>
     <td>
       Sets title of current screen.<br />
@@ -570,24 +566,19 @@ end
     </td>
   </tr>
   <tr>
-    <td>
-      ScreenElements<br />
-      Included in Screen by default
-    </td>
     <td>add(view, attrs = {})</td>
     <td>
       Adds the view to the screen after applying the attributes.<br />
       (alias: `add_element`, `add_view`)<br />
       Example:
       <code>
-        add_view UIInputView.alloc.initWithFrame(CGRectMake(10, 10, 300, 40)), {
+        add UIInputView.alloc.initWithFrame(CGRectMake(10, 10, 300, 40)), {
           backgroundColor: UIColor.grayColor
         }
       </code>
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>remove(view)</td>
     <td>
       Removes the view from the superview and sets it to nil<br />
@@ -595,96 +586,78 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>bounds</td>
     <td>
       Accessor for self.view.bounds<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>frame</td>
     <td>
       Accessor for self.view.frame<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>view</td>
     <td>
       The main view for this screen.<br />
     </td>
   </tr>
   <tr>
-    <td>
-      SystemHelper<br />
-      Included in Screen by default
-    </td>
     <td>ios_version</td>
     <td>
       Returns the iOS version that is running on the device<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>ios_version_greater?(version)</td>
     <td>
       Returns true if 'ios_version' is greater than the version passed in, false otherwise<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>ios_version_greater_eq?(version)</td>
     <td>
       Returns true if 'ios_version' is greater than or equal to the version passed in, false otherwise<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>ios_version_is?(version)</td>
     <td>
       Returns true if 'ios_version' is equal to the version passed in, false otherwise<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>ios_version_less?(version)</td>
     <td>
       Returns true if 'ios_version' is less than the version passed in, false otherwise<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>ios_version_less_eq?(version)</td>
     <td>
       Returns true if 'ios_version' is less than or equal to the version passed in, false otherwise<br />
     </td>
   </tr>
   <tr>
-    <td>ScreenNavigation<br />
-      included in Screen
-    </td>
     <td>app_delegate</td>
     <td>
       Returns the AppDelegate<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>close(args = {})</td>
     <td>
       Closes the current screen, passes args back to the previous screen's <code>on_return</code> method<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>open_root_screen(screen)</td>
     <td>
       Closes all other open screens and opens <code>screen</code> as the root view controller.<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>open(screen, args = {})</td>
     <td>
       Pushes the screen onto the navigation stack or opens in a modal<br />
@@ -699,37 +672,37 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>open_tab_bar(*screens)</td>
     <td>
       Open a UITabBarController with the specified screens as the root view controller of the current app<br />
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>open_tab(tab)</td>
     <td>
       Opens the tab where the "string" title matches the passed in tab<br />
     </td>
   </tr>
-  
+</table>
+
+### TableScreen
+
+*Has all the methods of Screen*
+
+<table>
   <tr>
-    <td>TableScreen</td>
-    <td>&nbsp;</td>
-    <td>*Has all the methods of Screen*</td>
+    <th>Method</th>
+    <th>Description</th>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>self</td>
     <td>Returns the current UITableViewController (not UITableView)</td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>searchable(placeholder: "placeholder text")</td>
     <td>Class method to make the current table searchable.</td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td colspan="2">
       <h3>table_data</h3>
       Method that is called to get the table's cell data and build the table.<br />
@@ -788,16 +761,22 @@ end
     </td>
   </tr>
   <tr>
-    <td>&nbsp;</td>
     <td>update_table_data</td>
     <td>
       Causes the table data to be refreshed, such as when a remote data source has
       been downloaded and processed.<br />
     </td>
   </tr>
+</table>
 
+### Console
+
+<table>
+  <tr>
+    <th>Method</th>
+    <th>Description</th>
+  </tr>
   <tr>
-    <td>Console</td>
     <td>log(log, with_color:color)</td>
     <td>
       Class method to output a colored console message.<br />
@@ -813,3 +792,20 @@ If you need help, feel free to ping me on twitter @jamonholmgren or email jamon@
 ## Contributing
 
 I'm really looking for feedback. Tweet me with your ideas or open a ticket (I don't mind!) and let's discuss.
+
+### Submitting a Pull Request
+
+1. Fork the project
+2. Create a feature branch
+3. Code
+4. Update or create new specs
+5. Make sure tests are passing by running `rake spec`
+6. Submit pull request
+
+### Primary Contributors
+
+* Jamon Holmgren: [@jamonholmgren](https://twitter.com/jamonholmgren)
+* Silas Matson: [@silasjmatson](https://twitter.com/silasjmatson)
+* Matt Brewer: [@macfanatic](https://twitter.com/macfanatic)
+
+

data/app/app_delegate.rb

@@ -0,0 +1,2 @@
+class AppDelegate
+end

data/lib/ProMotion/helpers/console.rb

@@ -8,15 +8,18 @@ module ProMotion
 
     class << self
       def log(log, with_color:color)
+        return if RUBYMOTION_ENV == "test"
         puts color[0] + NAME + log + color[1]
       end
       
       def log(log, withColor:color)
+        return if RUBYMOTION_ENV == "test"
         warn "[DEPRECATION] `log(log, withColor:color)` is deprecated. Use `log(log, with_color:color)`"
         self.log(log, with_color:color)
       end
 
       def log(log)
+        return if RUBYMOTION_ENV == "test"
         log(log, with_color: DEFAULT_COLOR)
       end
     end

data/lib/ProMotion/helpers/view_helper.rb

@@ -19,7 +19,7 @@ module ProMotion
 
     def frame_from_array(array)
       return CGRectMake(array[0], array[1], array[2], array[3]) if array.length == 4
-      Console.log(" - frame_from_array expects an array with four elements: [x, y, width, height]", withColor: Console::RED_COLOR)
+      Console.log(" - frame_from_array expects an array with four elements: [x, y, width, height]", with_color: Console::RED_COLOR)
       CGRectZero
     end
 

data/lib/ProMotion/screen_helpers/screen_elements.rb

@@ -27,17 +27,5 @@ module ProMotion
       return self.view.frame
     end
 
-    def content_height(view)
-      height = 0
-      view.subviews.each do |subview|
-        next if subview.isHidden
-        y = subview.frame.origin.y
-        h = subview.frame.size.height
-        if (y + h) > height
-          height = y + h
-        end
-      end
-      height
-    end
   end
 end

data/lib/ProMotion/screen_helpers/screen_navigation.rb

@@ -1,55 +1,35 @@
 module ProMotion
   module ScreenNavigation
-    # TODO: De-uglify this method.
-    def open_screen(screen, args = {})
-      # Instantiate screen if given a class
-      screen = screen.new if screen.respond_to?(:new)
-
-      screen.parent_screen = self if screen.respond_to?("parent_screen=")
-      
-      screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
 
-      screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
+    def open_screen(screen, args = {})
       
-      screen.hidesBottomBarWhenPushed = args[:hide_tab_bar] unless args[:hide_tab_bar].nil?
+      # Apply properties to instance
+      screen = setup_screen_for_open(screen, args)
+      ensure_wrapper_controller_in_place(screen, args)
 
-      screen.add_nav_bar if args[:nav_bar] && screen.respond_to?(:add_nav_bar)       
-
-      unless args[:close_all] || args[:modal]
-        screen.navigation_controller ||= self.navigation_controller if screen.respond_to?("navigation_controller=")
-        screen.tab_bar ||= self.tab_bar if screen.respond_to?("tab_bar=")
-      end
-
-      screen.send(:on_load) if screen.respond_to?(:on_load)
-      
-      animated = args[:animated]
-      animated ||= true
+      screen.send(:on_load) if screen.respond_to?(:on_load)      
+      animated = args[:animated] || true
 
       if args[:close_all]
-        open_root_screen(screen)
+        open_root_screen screen
+
       elsif args[:modal]
-        vc = screen
-        vc = screen.main_controller if screen.respond_to?("main_controller=")
-        self.presentModalViewController(vc, animated:animated)
+        present_modal_view_controller screen, animated
+
       elsif args[:in_tab] && self.tab_bar
-        vc = open_tab(args[:in_tab])
-        if vc
-          if vc.is_a?(UINavigationController)
-            screen.navigation_controller = vc if screen.respond_to?("navigation_controller=")
-            push_view_controller(screen, vc)
-          else
-            self.tab_bar.selectedIndex = vc.tabBarItem.tag
-          end
-        else
-          Console.log("No tab bar item '#{args[:in_tab]}'", with_color: Console::RED_COLOR)
-        end
+        present_view_controller_in_tab_bar_controller screen, args[:in_tab]
+
       elsif self.navigation_controller
         push_view_controller screen
+
       elsif screen.respond_to?(:main_controller)
         open_view_controller screen.main_controller
+
       else
         open_view_controller screen
+
       end
+
     end
     alias :open :open_screen
 
@@ -65,36 +45,36 @@ module ProMotion
     # TODO: De-uglify this method.
     def close_screen(args = {})
       args ||= {}
-      args[:animated] = true
+      args[:animated] ||= true
       
       # Pop current view, maybe with arguments, if in navigation controller
-      previous_screen = self.parent_screen
       if self.is_modal?
-        self.parent_screen.dismissModalViewControllerAnimated(args[:animated])
+        close_modal_screen args
+
       elsif self.navigation_controller
-        if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
-          self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
-          previous_screen = args[:to_screen]
-        else
-          self.navigation_controller.popViewControllerAnimated(args[:animated])
-        end
+        close_nav_screen args
+        send_on_return(args) # TODO: this would be better implemented in a callback or view_did_disappear.
+
       else
         Console.log("Tried to close #{self.to_s}; however, this screen isn't modal or in a nav bar.", withColor: Console::PURPLE_COLOR)
+        
       end
-      
-      if previous_screen && previous_screen.respond_to?(:on_return)
+    end
+    alias :close :close_screen
+
+    def send_on_return(args = {})
+      if self.parent_screen && self.parent_screen.respond_to?(:on_return)
         if args
-          previous_screen.send(:on_return, args)
+          self.parent_screen.send(:on_return, args)
         else
-          previous_screen.send(:on_return)
+          self.parent_screen.send(:on_return)
         end
-        ProMotion::Screen.current_screen = previous_screen
+        ProMotion::Screen.current_screen = self.parent_screen
       end
     end
-    alias :close :close_screen
 
     def open_view_controller(vc)
-      UIApplication.sharedApplication.delegate.load_root_view vc
+      app_delegate.load_root_view vc
     end
 
     def push_view_controller(vc, nav_controller=nil)
@@ -102,5 +82,78 @@ module ProMotion
       nav_controller ||= self.navigation_controller
       nav_controller.pushViewController(vc, animated: true)
     end
+
+
+
+
+    protected
+
+    def setup_screen_for_open(screen, args={})
+
+      # Instantiate screen if given a class
+      screen = screen.new if screen.respond_to?(:new)
+
+      # Set parent, title & modal properties
+      screen.parent_screen = self if screen.respond_to?("parent_screen=")
+      screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
+      screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
+      
+      # Hide bottom bar?
+      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)
+
+      # Return modified screen instance
+      screen
+
+    end
+
+    def ensure_wrapper_controller_in_place(screen, args={})
+      unless args[:close_all] || args[:modal]
+        screen.navigation_controller ||= self.navigation_controller if screen.respond_to?("navigation_controller=")
+        screen.tab_bar ||= self.tab_bar if screen.respond_to?("tab_bar=")
+      end
+    end
+
+    def present_modal_view_controller(screen, animated)
+      vc = screen
+      vc = screen.main_controller if screen.respond_to?(:main_controller)
+      self.presentModalViewController(vc, animated:animated)
+    end
+
+    def present_view_controller_in_tab_bar_controller(screen, tab_name)
+      vc = open_tab tab_name
+      if vc
+
+        if vc.is_a?(UINavigationController)
+          screen.navigation_controller = vc if screen.respond_to?("navigation_controller=")
+          push_view_controller(screen, vc)
+        else
+          self.tab_bar.selectedIndex = vc.tabBarItem.tag
+        end
+
+      else
+        Console.log("No tab bar item '#{tab_name}'", with_color: Console::RED_COLOR)
+      end
+    end
+
+    def close_modal_screen(args={})
+      args[:animated] ||= true
+      self.parent_screen.dismissViewControllerAnimated(args[:animated], completion: lambda {
+        send_on_return(args)
+      })
+    end
+
+    def close_nav_screen(args={})
+      args[:animated] ||= true
+      if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
+        self.parent_screen = args[:to_screen]
+        self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
+      else
+        self.navigation_controller.popViewControllerAnimated(args[:animated])
+      end
+    end
+
   end
 end

data/lib/ProMotion/screens/_screen_module.rb

@@ -131,7 +131,7 @@ module ProMotion
     end
 
     def main_controller
-      return self.navigationController if self.navigationController
+      return self.navigation_controller if self.navigation_controller
       self
     end
 

data/lib/ProMotion/version.rb

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

data/spec/helpers/basic_screen.rb

@@ -0,0 +1,2 @@
+class BasicScreen < ProMotion::Screen
+end

data/spec/helpers/dummy_class.rb

@@ -0,0 +1,3 @@
+class DummyClass
+  # will dynamically do things with this thing
+end

data/spec/helpers/home_screen.rb

@@ -0,0 +1,13 @@
+class HomeScreen < ProMotion::Screen
+
+  title "Home"
+
+  def on_load
+    set_nav_bar_right_button "Save", action: :save_something, type: UIBarButtonItemStyleDone
+    set_nav_bar_left_button "Cancel", action: :return_to_some_other_screen, type: UIBarButtonItemStylePlain
+  end
+
+  def on_return(args={})
+  end
+
+end

data/spec/ios_version_spec.rb

@@ -0,0 +1,28 @@
+describe "ios version" do
+
+  before do
+    @dummy = DummyClass.new
+    @dummy.extend ProMotion::SystemHelper
+  end
+
+  it "#ios_version_is?" do
+    @dummy.ios_version_is?(@dummy.ios_version).should == true
+  end
+
+  it "#ios_version_greater?" do
+    @dummy.ios_version_greater?('1.0').should == true
+  end
+
+  it "#ios_version_greater_eq?" do
+    @dummy.ios_version_greater_eq?(@dummy.ios_version).should == true
+  end
+
+  it "#ios_version_less?" do
+    @dummy.ios_version_less?('9.0').should == true
+  end
+
+  it "#ios_version_less_eq?" do
+    @dummy.ios_version_less_eq?(@dummy.ios_version).should == true
+  end
+    
+end

data/spec/main_spec.rb

@@ -0,0 +1,13 @@
+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
+    should.raise(StandardError) { dummy.on_create }
+  end
+
+end

data/spec/screen_helpers_spec.rb

@@ -0,0 +1,191 @@
+describe "screen helpers" do
+
+  describe "screen elements" do
+
+    before do
+      @screen = HomeScreen.new
+      @screen.on_load
+      @subview = UIView.alloc.initWithFrame CGRectZero
+    end
+
+    it "should add a subview" do
+      @screen.add @subview
+      @screen.view.subviews.count.should == 1
+    end
+
+    it "should set attributes before adding a subview" do
+      @screen.add @subview, backgroundColor: UIColor.redColor
+      @screen.view.subviews.first.backgroundColor.should == UIColor.redColor
+    end
+
+    it "should let you remove a view" do
+      @screen.view.addSubview @subview
+      @screen.remove @subview
+      @screen.view.subviews.count.should == 0
+    end
+
+  end
+
+
+  describe "screen navigation" do
+
+    before do
+      @screen = HomeScreen.new nav_bar: true
+      @screen.on_load
+      @second_vc = UIViewController.alloc.initWithNibName(nil, bundle:nil)
+    end
+
+    it "#push_view_controller should use the default navigation controller if not provided" do
+      vcs = @screen.navigation_controller.viewControllers
+      @screen.push_view_controller @second_vc
+      @screen.navigation_controller.viewControllers.count.should == vcs.count + 1
+    end
+
+    it "#push_view_controller should use a provided navigation controller" do
+      second_nav_controller = UINavigationController.alloc.initWithRootViewController @screen
+      @screen.push_view_controller @second_vc, second_nav_controller
+      second_nav_controller.viewControllers.count.should == 2
+    end
+
+    it "should return the application delegate" do
+      @screen.app_delegate.should == UIApplication.sharedApplication.delegate
+    end
+
+
+
+    describe "opening a screen" do
+
+      it "should create an instance from class when opening a new screen" do
+        @screen.send(:setup_screen_for_open, BasicScreen).should.be.instance_of BasicScreen
+      end
+
+      it "should apply properties when opening a new screen" do
+        new_screen = @screen.send(:setup_screen_for_open, BasicScreen, title: 'Some Title', modal: true, hide_tab_bar: true, nav_bar: true)
+
+        new_screen.parent_screen.should == @screen
+        new_screen.title.should == 'Some Title'
+        new_screen.is_modal?.should == true
+        new_screen.hidesBottomBarWhenPushed.should == true
+        new_screen.has_nav_bar?.should == true
+      end
+
+      it "should present the #main_controller when showing a modal screen" do
+        new_screen = @screen.send(:setup_screen_for_open, BasicScreen, modal: true)
+
+        @screen.mock!('presentModalViewController:animated:') do |vc, animated|
+          vc.should == new_screen.main_controller
+          animated.should == true
+        end
+        @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 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 }
+        @screen.open_screen BasicScreen, close_all: true
+      end
+
+      it "should present a modal screen if :modal is provided" do
+        @screen.mock!(:present_modal_view_controller) do |screen, animated|
+          screen.should.be.instance_of BasicScreen
+          animated.should == true
+        end
+        @screen.open_screen BasicScreen, modal: true
+      end
+
+      it "should open screen in tab bar if :in_tab is provided" do
+        @screen.stub!(:tab_bar, return: true)
+        @screen.mock!(:present_view_controller_in_tab_bar_controller) do |screen, tab_name|
+          screen.should.be.instance_of BasicScreen
+          tab_name.should == 'my_tab'
+        end
+        @screen.open_screen BasicScreen, in_tab: 'my_tab'
+      end
+
+      it "should pop onto navigation controller if current screen is on nav stack already" do
+        @screen.mock!(:push_view_controller) { |vc| vc.should.be.instance_of BasicScreen }
+        @screen.open_screen BasicScreen
+      end
+
+      it "should open the main controller if no options are provided" do
+        parent_screen = HomeScreen.new
+        nav_controller = ProMotion::NavigationController.new
+        new_screen = BasicScreen.new
+        new_screen.stub! :main_controller, return: nav_controller
+
+        parent_screen.mock!(:open_view_controller) { |vc| vc.should.be == nav_controller  }
+        parent_screen.open_screen new_screen
+      end
+
+      it "should open the provided view controller if no other conditions are met" do
+        parent_screen = HomeScreen.new
+        new_screen = BasicScreen.new
+        parent_screen.mock!(:open_view_controller) { |vc| vc.should.be == new_screen }
+        parent_screen.open_screen new_screen
+      end
+
+    end
+
+
+    describe "closing a screen" do
+
+      before do
+        @second_screen = BasicScreen.new
+      end
+
+      it "should close a modal screen" do
+        parent_screen = HomeScreen.new
+        @screen.parent_screen = parent_screen
+        @screen.modal = true
+
+        @screen.mock!(:close_modal_screen) { |args| args.should.be.instance_of Hash }
+        @screen.close
+      end
+
+      it "#close_modal_screen should call #send_on_return" do
+        parent_screen = HomeScreen.new
+        @screen.parent_screen = parent_screen
+        @screen.modal = true
+
+        @screen.mock!(:send_on_return) { |args| args.should.be.instance_of Hash }
+        parent_screen.mock!('dismissViewControllerAnimated:completion:') do |animated, completion|
+          animated.should == true
+          completion.should.be.instance_of Proc
+          completion.call
+        end
+        @screen.close
+      end
+
+      it "#close should pop from the navigation controller" do
+        @screen.navigation_controller.mock!(:popViewControllerAnimated) { |animated| animated.should == true }
+        @screen.close
+      end
+
+      it "#send_on_return shouldn't pass args to parent screen if there are none" do
+        parent_screen = HomeScreen.new
+        @screen.parent_screen = parent_screen
+
+        parent_screen.mock!(:on_return) { |args| args.count.should == 0 }
+        @screen.send_on_return
+      end
+
+      it "#send_on_return should pass args to parent screen" do
+        parent_screen = HomeScreen.new
+        @screen.parent_screen = parent_screen
+
+        parent_screen.mock!(:on_return) { |args| args[:key].should == :value }
+        @screen.send_on_return key: :value
+      end
+
+    end
+
+  end
+
+end

data/spec/view_controller_spec.rb

@@ -0,0 +1,111 @@
+describe "screen properties" do
+    
+  before do
+
+    # Simulate AppDelegate setup of main screen
+    @screen = HomeScreen.new modal: true, nav_bar: true
+    @screen.on_load
+
+  end
+
+  it "should store title" do
+    HomeScreen.get_title.should == 'Home'
+  end
+
+  it "should let the instance reset the title" do
+    @screen.title = "instance method"
+    HomeScreen.get_title.should == 'instance method'
+  end
+
+  it "should store debug mode" do
+    HomeScreen.debug_mode = true
+    HomeScreen.debug_mode.should == true
+  end
+
+  it "#is_modal? should be true" do
+    @screen.is_modal?.should == true
+  end
+
+  it "should know it is the first screen" do
+    @screen.first_screen?.should == true
+  end
+
+  it "#should_autorotate should default to 'true'" do
+    @screen.should_autorotate.should == true
+  end
+
+
+  describe "iOS lifecycle methods" do
+
+    it "-viewDidLoad" do
+      @screen.mock!(:view_did_load) { true }
+      @screen.viewDidLoad.should == true
+    end
+
+    it "-viewWillAppear" do
+      @screen.mock!(:view_will_appear) { |animated| animated.should == true }
+      @screen.viewWillAppear(true)
+    end
+
+    it "-viewDidAppear" do
+      @screen.mock!(:view_did_appear) { |animated| animated.should == true }
+      @screen.viewDidAppear(true)
+    end
+
+    it "-viewWillDisappear" do
+      @screen.mock!(:view_will_disappear) { |animated| animated.should == true }
+      @screen.viewWillDisappear(true)
+    end
+
+    it "-viewDidDisappear" do
+      @screen.mock!(:view_did_disappear) { |animated| animated.should == true }
+      @screen.viewDidDisappear(true)
+    end
+
+    it "-shouldAutorotateToInterfaceOrientation" do
+      @screen.mock!(:should_rotate) { |o| o.should == UIInterfaceOrientationPortrait }
+      @screen.shouldAutorotateToInterfaceOrientation(UIInterfaceOrientationPortrait)
+    end
+
+    it "-shouldAutorotate" do
+      @screen.mock!(:should_autorotate) { true }
+      @screen.shouldAutorotate.should == true
+    end
+
+    it "-willRotateToInterfaceOrientation" do
+      @screen.mock! :will_rotate do |orientation, duration| 
+        orientation.should == UIInterfaceOrientationPortrait
+        duration.should == 0.5
+      end 
+      @screen.willRotateToInterfaceOrientation(UIInterfaceOrientationPortrait, duration: 0.5)
+    end
+
+    it "-didRotateFromInterfaceOrientation" do
+      @screen.mock!(:on_rotate) { true }
+      @screen.didRotateFromInterfaceOrientation(UIInterfaceOrientationPortrait).should == true
+    end
+
+  end
+
+
+  describe "navigation controller behavior" do
+
+    it "should have a nav bar" do
+      @screen.has_nav_bar?.should == true
+    end
+
+    it "#main_controller should return a navigation controller" do
+      @screen.main_controller.should.be.instance_of ProMotion::NavigationController
+    end
+
+    it "have a right bar button item" do
+      @screen.navigationItem.rightBarButtonItem.should.not == nil
+    end
+
+    it "should have a left bar button item" do
+      @screen.navigationItem.leftBarButtonItem.should.not == nil
+    end
+
+  end
+
+end

data/spec/view_helper_spec.rb

@@ -0,0 +1,43 @@
+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)
+  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)) 
+  end
+
+  it "should allow you to set attributes" do
+    @dummy.set_attributes @dummy, backgroundColor: UIColor.redColor
+    @dummy.backgroundColor.should == UIColor.redColor
+  end
+
+  describe "content height" do
+
+    before do
+      @child = UIView.alloc.initWithFrame([[20,100],[300,380]])
+      @dummy.addSubview @child
+    end
+
+    it "should return content height" do
+      @dummy.content_height(@dummy).should == 480
+    end
+
+    it "should ignore hidden subviews" do
+      @child.hidden = true
+      @dummy.content_height(@dummy).should == 0
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies: []
 description: ProMotion is a new way to easily build RubyMotion iOS apps.
 email:
@@ -23,13 +23,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .repl_history
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - ProMotion.gemspec
 - README.md
 - Rakefile
+- app/app_delegate.rb
 - lib/ProMotion.rb
 - lib/ProMotion/.DS_Store
 - lib/ProMotion/app_delegate.rb
@@ -55,6 +57,15 @@ files:
 - 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/ios_version_spec.rb
+- spec/main_spec.rb
+- spec/screen_helpers_spec.rb
+- spec/view_controller_spec.rb
+- spec/view_helper_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion
 licenses: []
 post_install_message: 
@@ -82,4 +93,13 @@ summary: ProMotion is a new way to organize RubyMotion apps. Instead of dealing
   UIViewControllers, you work with Screens. Screens are a logical way to think of
   your app and include a ton of great utilities to make iOS development more like
   Ruby and less like Objective-C.
-test_files: []
+test_files:
+- spec/helpers/.gitkeep
+- spec/helpers/basic_screen.rb
+- spec/helpers/dummy_class.rb
+- spec/helpers/home_screen.rb
+- spec/ios_version_spec.rb
+- spec/main_spec.rb
+- spec/screen_helpers_spec.rb
+- spec/view_controller_spec.rb
+- spec/view_helper_spec.rb