ProMotion 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d52b3c967747924f07a39d41e638f10e7c3b4a6
-  data.tar.gz: be1644c4f79b07f1abf082901b5049a2a6c01961
+  metadata.gz: d80aa6f8f7ae03f3f2be1c808fa782037024aa91
+  data.tar.gz: 773f16d3e3c22101d89685f69ec374626e6d078f
 SHA512:
-  metadata.gz: 48f1861d837c3e923a3f6bb25b8e06ab63fd4ac432fd169c24cf702a7398b50c867768b759866840a780787cafcb84c1ec79b63f9a0c5344eaa3c1fa0b446ad5
-  data.tar.gz: 48ae7511082003a422d3b4d13476a17ac92a472fbfc3eb73debc65f4da678964e6ea7722b7dd6f295814fc46e4fc6219dad4e4823576aa937c15469de1542905
+  metadata.gz: 8e3a843a9b12a979de97ee5f089830945b2f08f7db2943cadbc8cf88349c73e92b30fcf7de006af0b32c64fc1de00316d5db4798de2c87ffc82e38cf6149083a
+  data.tar.gz: 0ce42b3ff248b019b1e63badad6c0f700da9a930a0f494b1f7e2775953fe2d62a44f97688fc4ae461a376ed7e62d3cc4ea926a0c01ff3edc85bd35c7c528596c

data/CONTRIBUTING.md

@@ -14,7 +14,7 @@ Over 20 developers have contributed to ProMotion. We love it when ProMotion user
 2. Create a feature branch
 3. Code
 4. Update or create new specs ** NOTE: your PR is far more likely to be merged if you include comprehensive tests! **
-5. Make sure tests are passing by running `rake spec` *(you can run functional and unit specs separately with `rake spec:functional` and `rake spec:unit`)*
+5. Make sure tests are passing by running `rake spec` *(you can run functional and unit specs separately with `rake spec:func` and `rake spec:unit`, and a single spec with `rake spec:single f=test_file_name`)*
 6. Submit pull request to `edge` (for new features) or `master` (for bugfixes)
 7. Make a million little nitpicky changes that @jamonholmgren wants
 8. Merged, then fame, adoration, kudos everywhere

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'motion-require'
 # Specify your gem's dependencies in ProMotion.gemspec
 gemspec

data/ProMotion.gemspec

@@ -2,14 +2,14 @@
 require File.expand_path('../lib/ProMotion/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Jamon Holmgren", "Silas Matson", "ClearSight Studio"]
-  gem.email         = ["jamon@clearsightstudio.com", "silas@clearsightstudio.com", "contact@clearsightstudio.com"]
-  gem.description   = "ProMotion is a new way to easily build RubyMotion iOS apps."
-  gem.summary       = "
-                        ProMotion is a new way to organize RubyMotion apps. Instead of dealing
-                        with 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.
+  gem.authors       = ["Jamon Holmgren", "Silas Matson", "Mark Rickert"]
+  gem.email         = ["jamon@clearsightstudio.com", "silas@clearsightstudio.com", "mark@mohawkapps.com"]
+  gem.summary       = "ProMotion makes it easy to build RubyMotion iOS screen-based apps."
+  gem.description   = "
+                        ProMotion is a RubyMotion gem that makes iOS development more like Ruby and less like Objective-C.
+                        It introduces a clean, Ruby-style syntax for building screens that is easy to learn and remember and
+                        abstracts a ton of boilerplate UIViewController, UINavigationController, and other iOS code into a
+                        simple, Ruby-like DSL.
                       "
   gem.homepage      = "https://github.com/clearsightstudio/ProMotion"
   gem.license       = 'MIT'
@@ -21,10 +21,10 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ProMotion::VERSION
 
-  gem.add_development_dependency("rake")
-  gem.add_development_dependency("webstub")
-  gem.add_development_dependency("motion-stump")
-  gem.add_development_dependency("motion-redgreen")
-  gem.add_development_dependency("formotion")
-  gem.add_dependency("methadone")
+  gem.add_dependency "motion-require", "~> 0.2"
+  gem.add_runtime_dependency("methadone", "~> 1.3")
+  gem.add_development_dependency("webstub", "~> 1.0")
+  gem.add_development_dependency("motion-stump", "~> 0.3")
+  gem.add_development_dependency("motion-redgreen", "~> 0.1")
+  gem.add_development_dependency("rake", "~> 10.1")
 end

data/README.md

@@ -1,4 +1,4 @@
-# ProMotion [![Build Status](https://travis-ci.org/clearsightstudio/ProMotion.png)](https://travis-ci.org/clearsightstudio/ProMotion) [![Code Climate](https://codeclimate.com/github/clearsightstudio/ProMotion.png)](https://codeclimate.com/github/clearsightstudio/ProMotion)
+# ProMotion [![Gem Version](https://badge.fury.io/rb/ProMotion.png)](http://badge.fury.io/rb/ProMotion) [![Build Status](https://travis-ci.org/clearsightstudio/ProMotion.png)](https://travis-ci.org/clearsightstudio/ProMotion) [![Code Climate](https://codeclimate.com/github/clearsightstudio/ProMotion.png)](https://codeclimate.com/github/clearsightstudio/ProMotion) [![Dependency Status](https://gemnasium.com/clearsightstudio/ProMotion.png)](https://gemnasium.com/clearsightstudio/ProMotion)
 
 ## iPhone Apps, Ruby-style
 
@@ -23,10 +23,10 @@ class RootScreen < PM::Screen
   title "Root Screen"
 
   def on_load
-    set_nav_bar_button :right, title: "Help", action: :help
+    set_nav_bar_button :right, title: "Help", action: :open_help_screen
   end
 
-  def help
+  def open_help_screen
     open HelpScreen
   end
 end
@@ -44,6 +44,14 @@ class HelpScreen < PM::TableScreen
       ]
     }]
   end
+
+  def tapped_about(args={})
+    open AboutScreen
+  end
+
+  def log_out
+    # Log out!
+  end
 end
 ```
 
@@ -67,48 +75,19 @@ end
 # Getting Started
 
 1. Check out the [Getting Started Guide](https://github.com/clearsightstudio/ProMotion/wiki/Guide:-Getting-Started) in the wiki
-2. Follow a tutorial: [Building an ESPN app using RubyMotion, ProMotion, and TDD](http://jamonholmgren.com/building-an-espn-app-using-rubymotion-promotion-and-tdd)
+2. Watch the excellent [MotionInMotion screencast about ProMotion](https://motioninmotion.tv/screencasts/8) (very reasonably priced subscription required)
+3. Follow a tutorial: [Building an ESPN app using RubyMotion, ProMotion, and TDD](http://jamonholmgren.com/building-an-espn-app-using-rubymotion-promotion-and-tdd)
 
 # What's New?
 
-## Version 1.1.x
-
-* Added a [ProMotion executable](https://github.com/clearsightstudio/ProMotion/wiki/Command-Line-Tool) called `promotion`. You can type `promotion new <myapp>` and it will create a ProMotion-specific app. We will be adding more functionality in the future.
-* Can now pass a symbol to `add`, `add_to`, and `set_attributes` to call a method with that name to get styles.
-* Added `button_title:` to `open_split_screen` to [customize the auto-generated button title](https://github.com/clearsightstudio/ProMotion/wiki/API-Reference:-ProMotion::SplitScreen#open_split_screenmaster-detail-args--)
-* Updates to [set_tab_bar_button](https://github.com/clearsightstudio/ProMotion/wiki/API-Reference:-ProMotion::Tabs#set_tab_bar_itemargs)
-* Added to PM::Delegate [`on_open_url(args = {})`](https://github.com/clearsightstudio/ProMotion/wiki/API-Reference:-ProMotion::Delegate#on_open_urlargs--) where `args` contains `:url`, `:source_app`, and `:annotation`
-* Added to PM::Delegate [`tint_color`](https://github.com/clearsightstudio/ProMotion/wiki/API-Reference:-ProMotion::Delegate#tint_color) to customize the application-wide tint color
-* Added to [PM::MapScreen annotations](https://github.com/clearsightstudio/ProMotion/wiki/API-Reference:-ProMotion::MapScreen) the ability to set an image
-* Removed legacy `navigation_controller` references which were causing confusion.
-* Allowed setting a `custom_view` for `bar_button_item`s.
-* Added `will_begin_search` and `will_end_search` callbacks to PM::TableScreen.
-* Added `title_view` and `title_view_height` to sections in PM::TableScreen.
-* Updated screenshots for iOS 7
-* Refactored code and lots of new passing tests
-
-# Tutorials
-
-Shows how to make a basic app in ProMotion. Updated in May.
-
-[http://www.clearsightstudio.com/insights/ruby-motion-promotion-tutorial](http://www.clearsightstudio.com/insights/ruby-motion-promotion-tutorial)
-
-## Screencasts
+## Version 1.2.x
 
-Shows how to create a Youtube app that shows Portland Trailblazer highlights.
-
-[http://www.clearsightstudio.com/insights/tutorial-make-youtube-video-app-rubymotion-promotion/](http://www.clearsightstudio.com/insights/tutorial-make-youtube-video-app-rubymotion-promotion/)
-
-## Sample Apps
-
-Here's a demo app that is used to test new functionality. You might have to change the Gemfile
-source to pull from Github.
-
-[https://github.com/jamonholmgren/promotion-demo](https://github.com/jamonholmgren/promotion-demo)
-
-Here's a demo app showing some styling options.
-
-[https://github.com/jamonholmgren/promotion-styling](https://github.com/jamonholmgren/promotion-styling)
+1. Now uses [motion-require](https://github.com/clayallsopp/motion-require) for better compatibility with other libraries [6046dd7f4](https://github.com/clearsightstudio/ProMotion/commit/6046dd7f49ba174f309baaa428eaac80ce0290b6)
+2. SplitScreen: New option `swipe:` allows you to specify if a splitscreen master screen can be opened with a swipe. [ffbb76caf](https://github.com/clearsightstudio/ProMotion/commit/ffbb76caf3071297347d4cf43784069999a746b3)
+3. FormotionScreen: Removed `PM::FormotionScreen` and the Formotion testing dependency. Use [ProMotion-formotion](https://github.com/rheoli/ProMotion-formotion) instead.
+4. Styling: Added a `content_width` helper to PM::Styling (similar to `content_height`) [08a984815](https://github.com/clearsightstudio/ProMotion/commit/08a984815a7c96b9465c31b2e2664ac0086d2e1c)
+5. TableScreen: Removed SDWebImage in favor of similar but more reliable JDImageCache [59ed747e9](https://github.com/clearsightstudio/ProMotion/commit/59ed747e93567e32bdb5099fed12297161cea05a)
+6. Screen: Allow custom views (including images) for `title` setting [#415](https://github.com/clearsightstudio/ProMotion/pull/415)
 
 # API Reference
 
@@ -118,13 +97,16 @@ We've created a comprehensive and always updated wiki with code examples, usage
 
 # Help
 
+ProMotion is not only an easy DSL to get started. The community is very helpful and 
+welcoming to new RubyMotion developers. We don't mind newbie questions.
+
 If you need help, feel free to tweet [@jamonholmgren](http://twitter.com/jamonholmgren)
-or open an issue on GitHub. Opening an issue is usually the best and we respond to those pretty quickly.
-If we don't respond within a day, tweet Jamon or Mark a link to the issue.
+or open an issue on GitHub. Opening an issue is usually the best and we respond to those
+pretty quickly. If we don't respond within a day, tweet Jamon or Mark a link to the issue.
 
 # Contributing
 
-See [CONTRIBUTING.md](https://github.com/clearsightstudio/ProMotion/edit/master/CONTRIBUTING.md).
+See [CONTRIBUTING.md](https://github.com/clearsightstudio/ProMotion/blob/master/CONTRIBUTING.md).
 
 ## Primary Contributors
 
@@ -133,5 +115,3 @@ See [CONTRIBUTING.md](https://github.com/clearsightstudio/ProMotion/edit/master/
 * Matt Brewer: [@macfanatic](https://twitter.com/macfanatic)
 * Mark Rickert: [@markrickert](https://twitter.com/markrickert)
 * [Many others](https://github.com/clearsightstudio/ProMotion/graphs/contributors)
-* Run `git shortlog -s -n -e` to see everyone who has contributed.
-

data/Rakefile

@@ -1,11 +1,7 @@
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project/template/ios'
 require 'bundler'
-
-# this follow from gemspec
 Bundler.require(:development)
-
-# this follow development code
 require 'ProMotion'
 
 Motion::Project::App.setup do |app|
@@ -17,8 +13,6 @@ Motion::Project::App.setup do |app|
   # Devices
   app.deployment_target = "6.0"
   app.device_family = [:ipad] # so we can test split screen capability
-
-  app.detect_dependencies = true
 end
 
 def all_files
@@ -26,11 +20,11 @@ def all_files
 end
 
 def functional_files
-  Dir.glob('./spec/functional/*.rb')
+  Dir.glob('./spec/functional/**/*.rb')
 end
 
 def unit_files
-  Dir.glob('./spec/unit/*.rb')
+  Dir.glob('./spec/unit/**/*.rb')
 end
 
 namespace :spec do
@@ -54,6 +48,17 @@ namespace :spec do
     Rake::Task["simulator"].invoke
   end
 
+  task :single do
+    App.config.spec_mode = true
+    spec_files = App.config.spec_files
+    spec_files -= unit_files
+    spec_files -= functional_files
+    spec_files += Dir.glob("./spec/unit/**/#{ENV['f'] || ENV['file']}.rb")
+    spec_files += Dir.glob("./spec/functional/**/#{ENV['f'] || ENV['file']}.rb")
+    App.config.instance_variable_set("@spec_files", spec_files)
+    Rake::Task["simulator"].invoke
+  end
+
 end
 
 task :sim_close do

data/lib/ProMotion.rb

@@ -1,13 +1,3 @@
-unless defined?(Motion::Project::Config)
-  raise "This file must be required within a RubyMotion project Rakefile."
-end
+require 'motion-require'
 
-require "ProMotion/version"
-
-Motion::Project::App.setup do |app|
-  app.detect_dependencies = true
-  original_files = app.files
-  delegate = File.join(File.dirname(__FILE__), 'ProMotion/delegate/delegate.rb')
-  promotion_files = FileList[File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')].exclude(delegate).to_a
-  app.files = (promotion_files << delegate) + original_files
-end
+Motion::Require.all(Dir.glob(File.expand_path('../ProMotion/**/*.rb', __FILE__)))

data/lib/ProMotion/cocoatouch/navigation_controller.rb

@@ -1,15 +1,15 @@
 module ProMotion
-	class NavigationController < UINavigationController
-		def shouldAutorotate
-			visibleViewController.shouldAutorotate
-		end
+  class NavigationController < UINavigationController
+    def shouldAutorotate
+      visibleViewController.shouldAutorotate
+    end
 
-		def supportedInterfaceOrientations
-			visibleViewController.supportedInterfaceOrientations
-		end
+    def supportedInterfaceOrientations
+      visibleViewController.supportedInterfaceOrientations
+    end
 
-		def preferredInterfaceOrientationForPresentation
-			visibleViewController.preferredInterfaceOrientationForPresentation
-		end
-	end
+    def preferredInterfaceOrientationForPresentation
+      visibleViewController.preferredInterfaceOrientationForPresentation
+    end
+  end
 end

data/lib/ProMotion/cocoatouch/split_view_controller.rb

@@ -4,16 +4,16 @@ module ProMotion
       s = self.viewControllers.first
       s.respond_to?(:visibleViewController) ? s.visibleViewController : s
     end
-    
+
     def detail_screen
       s = self.viewControllers.last
       s.respond_to?(:visibleViewController) ? s.visibleViewController : s
     end
-    
+
     def master_screen=(s)
       self.viewControllers = [ (s.navigationController || s), self.viewControllers.last]
     end
-    
+
     def detail_screen=(s)
       # set the button from the old detail screen to the new one
       button = detail_screen.navigationItem.leftBarButtonItem
@@ -21,7 +21,7 @@ module ProMotion
 
       self.viewControllers = [self.viewControllers.first, (s.navigationController || s)]
     end
-    
+
     def screens=(s_array)
       self.viewControllers = s_array
     end

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -1,6 +1,6 @@
 module ProMotion
   class TabBarController < UITabBarController
-    
+
     def self.new(*screens)
       tab_bar_controller = alloc.init
 
@@ -19,14 +19,14 @@ module ProMotion
       tab_bar_controller.viewControllers = view_controllers
       tab_bar_controller
     end
-    
+
     def open_tab(tab)
       if tab.is_a? String
         selected_tab_vc = find_tab(tab)
       elsif tab.is_a? Numeric
         selected_tab_vc = viewControllers[tab]
       end
-      
+
       if selected_tab_vc
         self.selectedViewController = selected_tab_vc if selected_tab_vc
       else
@@ -34,10 +34,10 @@ module ProMotion
         nil
       end
     end
-    
+
     def find_tab(tab_title)
       self.viewControllers.select{ |vc| vc.tabBarItem.title == tab_title }.first
     end
-  
+
   end
 end

data/lib/ProMotion/cocoatouch/table_view_cell.rb

@@ -1,3 +1,5 @@
+motion_require '../table/cell/table_view_cell_module'
+
 module ProMotion
   class TableViewCell < UITableViewCell
     include TableViewCellModule

data/lib/ProMotion/containers/split_screen.rb

@@ -26,6 +26,10 @@ module ProMotion
         @button_title = args[:button_title]
       end
 
+      if args.has_key?(:swipe)
+        split.presentsWithGesture = args[:swipe]
+      end
+
       split
     end
 

data/lib/ProMotion/containers/tabs.rb

@@ -1,9 +1,11 @@
+motion_require '../extensions/conversions'
+
 module ProMotion
   module Tabs
     include Conversions
-    
+
     attr_accessor :tab_bar, :tab_bar_item
-    
+
     def open_tab_bar(*screens)
       self.tab_bar = PM::TabBarController.new(screens)
 
@@ -43,7 +45,7 @@ module ProMotion
         icon_unselected = icon_image[:unselected]
         icon_image = nil
       end
-      
+
       item = UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
 
       if icon_selected || icon_unselected
@@ -66,13 +68,13 @@ module ProMotion
 
       return tab_bar_item
     end
-    
+
     def replace_current_item(tab_bar_controller, view_controller: vc)
       controllers = NSMutableArray.arrayWithArray(tab_bar_controller.viewControllers)
       controllers.replaceObjectAtIndex(tab_bar_controller.selectedIndex, withObject: vc)
       tab_bar_controller.viewControllers = controllers
     end
-    
+
     def map_tab_symbol(symbol)
       @_tab_symbols ||= {
         more:         UITabBarSystemItemMore,
@@ -90,7 +92,7 @@ module ProMotion
       }
       @_tab_symbols[symbol] || symbol
     end
-    
+
     module TabClassMethods
       def tab_bar_item(args={})
         @tab_bar_item = args
@@ -99,10 +101,10 @@ module ProMotion
         @tab_bar_item
       end
     end
-    
+
     def self.included(base)
       base.extend(TabClassMethods)
     end
-    
+
   end
 end

data/lib/ProMotion/delegate/delegate.rb

@@ -1,3 +1,6 @@
+motion_require 'delegate_module'
+motion_require 'delegate_parent'
+
 module ProMotion
   class Delegate < DelegateParent
     include ProMotion::DelegateModule

data/lib/ProMotion/delegate/delegate_module.rb

@@ -1,3 +1,7 @@
+motion_require '../containers/tabs'
+motion_require '../containers/split_screen'
+motion_require 'delegate_notifications'
+
 module ProMotion
   module DelegateModule
     include ProMotion::Tabs
@@ -8,6 +12,7 @@ module ProMotion
 
     def application(application, willFinishLaunchingWithOptions:launch_options)
       will_load(application, launch_options) if respond_to?(:will_load)
+      true
     end
 
     def application(application, didFinishLaunchingWithOptions:launch_options)