ProMotion 1.0.4 → 1.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 602b5c98e83522111d9b53bddef00fc265d7e190
-  data.tar.gz: 22427e49f5b04332fceb59b721b014a380402151
+  metadata.gz: 2a8dbafa82311f57f50c6d99c19cecae98f63b67
+  data.tar.gz: fdd29443346a2450e79dc914431a621f1a037d45
 SHA512:
-  metadata.gz: 8ef6b7a74482a7695a76b7745586cc79bb28974a2ad77cdd44a52b6d38208baf27ab49649fdc5e79efebd2febafcf444f61935303eb9b4a3a59b031a0639d2db
-  data.tar.gz: f9766e5e2568e7ca49fd21032de3a0e999541d4dff0abe8f38490a18ed0dfd39470563da0ac6dcffc12259c2baaeb09da9457760479e91b57e6e16a667fb3eb9
+  metadata.gz: 25ed34fdb3a9f089113559a1383baedf0b4de0cbf2c1472aadde51e7d920111b7e0aba7702bc061583b195e3020569cef2032ddf56ef87c2d6181f8466510ee1
+  data.tar.gz: 5085d8e82fadf7747305d270f669ab72db9301e139031a7851df8b892f53616c24fc4443b87b9cddae8930bfcad4041072e683faddb610420c7bda05d4f30904

data/ProMotion.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.executables   << "promotion"
+  gem.test_files    = gem.files.grep(%r{^(spec)/})
   gem.name          = "ProMotion"
   gem.require_paths = ["lib"]
   gem.version       = ProMotion::VERSION
@@ -26,4 +26,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("motion-redgreen")
   gem.add_development_dependency("formotion")
   gem.add_development_dependency("rake")
+  gem.add_dependency("methadone")
 end

data/README.md

@@ -1,12 +1,15 @@
 # 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)
 
-## A new way to easily build RubyMotion apps.
+## iPhone Apps, Ruby-style
 
 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.
 
+Watch the [September Motion Meetup](http://www.youtube.com/watch?v=rf7h-3AiMRQ) where Gant Laborde
+interviews Jamon Holmgren about ProMotion!
+
 ```ruby
 class AppDelegate < PM::Delegate
   def on_load(app, options)
@@ -16,7 +19,7 @@ end
 
 class RootScreen < PM::Screen
   title "Root Screen"
-  
+
   def push_new_screen
     open NewScreen
   end
@@ -24,7 +27,7 @@ end
 
 class NewScreen < PM::TableScreen
   title "Table Screen"
-  
+
   def table_data
     [{
       cells: [
@@ -40,16 +43,16 @@ end
 
 |Screens|Navigation Bars|Tab Bars|
 |---|---|---|
-|![ProMotion Screen](https://f.cloud.github.com/assets/1479215/751058/486b6e1e-e4e7-11e2-9d1f-d9380a58f643.png)|![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/751076/e4762858-e4e7-11e2-8442-ac7c9ad142e6.png)|![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/751128/76ebe320-e4e9-11e2-86ee-d81c4c1e92f2.png)|
+|![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)|![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)|![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)|
 
 |Table Screens|Grouped Tables|Searchable|Refreshable|
 |---|---|---|---|
-|![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/751067/8fe7631a-e4e7-11e2-84f1-6ae50ac4f8e8.png)|![ProMotion Grouped Table Screens](https://f.cloud.github.com/assets/1479215/751162/a805b9da-e4ea-11e2-9c39-0c65f8a8de77.png)|![Searchable](https://f.cloud.github.com/assets/1479215/707490/ba750216-de1d-11e2-9594-0880b12f8ffe.png)|![Refreshable](https://f.cloud.github.com/assets/139261/472574/af268e52-b735-11e2-8b9b-a9245b421715.gif)|
+|![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)|![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)|![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)|![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)|
 
 
 |iPad SplitScreens|Map Screens|Web Screens|
 |---|---|---|
-|![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/751188/13c3a7c6-e4ec-11e2-8c87-a94e0c07702b.png)|![MapScreen](https://f.cloud.github.com/assets/1479215/751217/dab20958-e4ed-11e2-9b3e-b42c0199d9e7.png)|![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/751235/b6fe91ba-e4ee-11e2-8707-c74c7f833de3.png)|
+|![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)|![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)|![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)|
 
 #### ...and much more.
 
@@ -136,7 +139,7 @@ incorporated.
 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`)*
-6. Submit pull request
+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/app/screens/basic_screen.rb

@@ -1,3 +1,15 @@
 class BasicScreen < PM::Screen
   title "Basic"
+
+  attr_reader :animation_ts
+
+  def will_appear
+    @will_appear_ts = NSDate.date
+  end
+  
+  def on_appear
+    @on_appear_ts = NSDate.date
+    @animation_ts = @on_appear_ts - @will_appear_ts
+  end
+
 end

data/bin/promotion

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'methadone'
+require 'ProMotion/version'
+
+class App
+  include Methadone::Main
+  include Methadone::CLILogging
+  include Methadone::SH
+  
+  main do |command, opt|
+    case command.to_sym
+    when :new then create(opt)
+    when :help then show_help
+    else show_help
+    end
+
+    0 # Good!
+  end
+
+  def self.show_help
+    info "promotion - Command line tools for ProMotion."
+    info "By Jamon Holmgren"
+    info ""
+    info "Commands:"
+    info "  new <appname>"
+    info "    Creates a new ProMotion app from a template."
+  end
+
+  def self.create(name)
+    return puts "Usage: promotion new <appname>" unless name.to_s.length > 0
+    info "Creating new ProMotion iOS app #{name}"
+    sh "motion create --template=git@github.com:jamonholmgren/promotion-template.git #{name}"
+  end
+
+  description "Command line for ProMotion."
+
+  arg :command
+  arg :opt, :optional
+
+  version ProMotion::VERSION
+
+  go!
+end

data/lib/ProMotion/cocoatouch/table_view_controller.rb

@@ -1,7 +1,7 @@
 module ProMotion
   class TableViewController < UITableViewController
     def self.new(args = {})
-      s = self.alloc.initWithNibName(nil, bundle:nil)
+      s = self.alloc.initWithStyle(table_style)
       s.on_create(args) if s.respond_to?(:on_create)
       s
     end
@@ -52,4 +52,4 @@ module ProMotion
       self.on_rotate
     end
   end
-end
+end

data/lib/ProMotion/cocoatouch/view_controller.rb

@@ -1,11 +1,11 @@
 module ProMotion
   class ViewController < UIViewController
     def self.new(args = {})
-      s = self.alloc.initWithNibName(nil, bundle:nil)
+      s = self.alloc.initWithNibName(args[:nib_name] || nil, bundle:args[:bundle] || nil)
       s.on_create(args) if s.respond_to?(:on_create)
       s
     end
-    
+
     def loadView
       super
       self.send(:on_load) if self.respond_to?(:on_load)

data/lib/ProMotion/containers/split_screen.rb

@@ -21,6 +21,11 @@ module ProMotion
       if args.has_key?(:icon) or args.has_key?(:title)
         split.tabBarItem = create_tab_bar_item(args)
       end
+
+      if args.has_key?(:button_title)
+        @button_title = args[:button_title]
+      end
+
       split
     end
 
@@ -33,7 +38,7 @@ module ProMotion
     # UISplitViewControllerDelegate methods
 
     def splitViewController(svc, willHideViewController: vc, withBarButtonItem: button, forPopoverController: pc)
-      button.title = vc.title
+      button.title = @button_title || vc.title
       svc.detail_screen.navigationItem.leftBarButtonItem = button;
     end
 

data/lib/ProMotion/containers/tabs.rb

@@ -38,8 +38,19 @@ module ProMotion
     def create_tab_bar_icon_custom(title, icon_image, tag)
       if icon_image.is_a?(String)
         icon_image = UIImage.imageNamed(icon_image)
+      elsif icon_image.is_a?(Hash)
+        icon_selected = icon_image[:selected]
+        icon_unselected = icon_image[:unselected]
+        icon_image = nil
       end
-      return UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
+      
+      item = UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
+
+      if icon_selected || icon_unselected
+        item.setFinishedSelectedImage(icon_selected, withFinishedUnselectedImage: icon_unselected)
+      end
+
+      return item
     end
 
     def create_tab_bar_item(tab={})

data/lib/ProMotion/delegate/delegate_module.rb

@@ -1,8 +1,7 @@
 module ProMotion
   module DelegateModule
-
     include ProMotion::Tabs
-    include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2") # Only with iPad
+    include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
     include ProMotion::DelegateNotifications
 
     attr_accessor :window, :aps_notification, :home_screen
@@ -38,6 +37,10 @@ module ProMotion
       on_unload if respond_to?(:on_unload)
     end
 
+    def application(application, openURL: url, sourceApplication:source_app, annotation: annotation)
+      on_open_url({ url: url, source_app: source_app, annotation: annotation }) if respond_to?(:on_open_url)
+    end
+
     def app_delegate
       self
     end
@@ -58,6 +61,7 @@ module ProMotion
 
       self.window ||= self.ui_window.alloc.initWithFrame(UIScreen.mainScreen.bounds)
       self.window.rootViewController = (screen.navigationController || screen)
+      self.window.tintColor = self.class.send(:get_tint_color) if self.window.respond_to?("tintColor=")
       self.window.makeKeyAndVisible
 
       screen
@@ -95,6 +99,16 @@ module ProMotion
         }[opt] || UIStatusBarAnimationNone
       end
 
+      def tint_color(c)
+        @tint_color = c
+      end
+      def tint_color=(c)
+        @tint_color = c
+      end
+      def get_tint_color
+        @tint_color || nil
+      end
+
     end
 
     def self.included(base)

data/lib/ProMotion/delegate/delegate_notifications.rb

@@ -27,10 +27,10 @@ module ProMotion
       mask = UIApplication.sharedApplication.enabledRemoteNotificationTypes
       types = []
 
-      types << :badge     if mask & UIRemoteNotificationTypeBadge
-      types << :sound     if mask & UIRemoteNotificationTypeSound
-      types << :alert     if mask & UIRemoteNotificationTypeAlert
-      types << :newsstand if mask & UIRemoteNotificationTypeNewsstandContentAvailability
+      types << :badge     if mask & UIRemoteNotificationTypeBadge > 0
+      types << :sound     if mask & UIRemoteNotificationTypeSound > 0
+      types << :alert     if mask & UIRemoteNotificationTypeAlert > 0
+      types << :newsstand if mask & UIRemoteNotificationTypeNewsstandContentAvailability > 0
 
       types
     end
@@ -51,11 +51,11 @@ module ProMotion
     end
 
     def application(application, didReceiveRemoteNotification:notification)
-      received_push_notification(notification, false)
+      received_push_notification(notification, application.applicationState != UIApplicationStateActive)
     end
-    
+
     protected
-    
+
     def map_notification_symbol(symbol)
       {
         none:       UIRemoteNotificationTypeNone,

data/lib/ProMotion/map/map_screen_annotation.rb

@@ -17,7 +17,7 @@ module ProMotion
       @params = {
         title: "Title",
         pin_color: MKPinAnnotationColorRed,
-        identifier: "Annotation-#{@params[:pin_color]}",
+        identifier: "Annotation-#{@params[:pin_color] || @params[:image]}",
         show_callout: true,
         animates_drop: false
       }.merge(@params)
@@ -52,5 +52,14 @@ module ProMotion
       @params
     end
 
+    def method_missing(meth, *args)
+      if @params[meth.to_sym]
+        @params[meth.to_sym]
+      else
+        PM.logger.warn "The annotation parameter \"#{meth}\" does not exist on this pin."
+        nil
+      end
+    end
+
   end
 end

data/lib/ProMotion/map/map_screen_module.rb

@@ -100,10 +100,15 @@ module ProMotion
         view.annotation = annotation
       else
         #Set the pin properties
-        view = MKPinAnnotationView.alloc.initWithAnnotation(annotation, reuseIdentifier:identifier)
+        if annotation.annotation_params[:image]
+          view = MKAnnotationView.alloc.initWithAnnotation(annotation, reuseIdentifier:identifier)
+          view.image =  annotation.annotation_params[:image]
+        else
+          view = MKPinAnnotationView.alloc.initWithAnnotation(annotation, reuseIdentifier:identifier)
+          view.animatesDrop = annotation.annotation_params[:animates_drop]
+          view.pinColor = annotation.annotation_params[:pin_color]
+        end
         view.canShowCallout = annotation.annotation_params[:show_callout]
-        view.animatesDrop = annotation.annotation_params[:animates_drop]
-        view.pinColor = annotation.annotation_params[:pin_color]
       end
       view
     end

data/lib/ProMotion/pro_motion.rb

@@ -1,3 +1,3 @@
 module ProMotion
 end
-::PM = ProMotion unless defined?(::PM)
+::PM = ProMotion unless defined?(::PM)

data/lib/ProMotion/screen/screen_module.rb

@@ -33,20 +33,23 @@ module ProMotion
     end
 
     def nav_bar?
-      !!self.navigation_controller
+      !!self.navigationController
     end
 
     def navigation_controller
-      @navigation_controller ||= self.navigationController
+      self.navigationController
     end
 
-    def navigation_controller=(val)
-      @navigation_controller = val
-      val
+    def navigation_controller=(nav)
+      @navigationController = nav
+    end
+
+    def navigationController=(nav)
+      @navigationController = nav
     end
 
     def add_nav_bar(args = {})
-      self.navigation_controller ||= begin
+      self.navigationController ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
         nav = NavigationController.alloc.initWithRootViewController(self)
         nav.setModalTransitionStyle(args[:transition_style]) if args[:transition_style]
@@ -66,22 +69,36 @@ module ProMotion
     end
 
     def set_nav_bar_button(side, args={})
+      button = create_toolbar_button(args)
+
+      self.navigationItem.leftBarButtonItem = button if side == :left
+      self.navigationItem.rightBarButtonItem = button if side == :right
+      self.navigationItem.backBarButtonItem = button if side == :back
+
+      button
+    end
+
+    def create_toolbar_button(args = {})
       args[:style] = map_bar_button_item_style(args[:style])
       args[:target] ||= self
       args[:action] ||= nil
+      args[:custom_view] = args[:custom_view] if args[:custom_view]
       args[:system_item] ||= args[:system_icon] # backwards compatibility
       args[:system_item] = map_bar_button_system_item(args[:system_item]) if args[:system_item] && args[:system_item].is_a?(Symbol)
-      
-      button_type = args[:image] || args[:button] || args[:system_item] || args[:title] || "Button"
 
-      button = bar_button_item button_type, args
+      button_type = args[:image] || args[:button] || args[:system_item] || args[:custom_view] || args[:title] || "Button"
 
-      self.navigationItem.leftBarButtonItem = button if side == :left
-      self.navigationItem.rightBarButtonItem = button if side == :right
+      bar_button_item button_type, args
+    end
 
-      button
+    def set_toolbar_items(buttons = [], animated = true)
+      buttons = Array(buttons)
+      self.toolbarItems = buttons.map{|b| b.is_a?(UIBarButtonItem) ? b : create_toolbar_button(b) }
+      navigation_controller.setToolbarHidden(false, animated:animated)
     end
-    
+    alias_method :set_toolbar_buttons, :set_toolbar_items
+    alias_method :set_toolbar_button,  :set_toolbar_items
+
     # TODO: Make this better. Not able to do image: "logo", for example.
     def bar_button_item(button_type, args)
       case button_type
@@ -92,7 +109,9 @@ module ProMotion
       when String
         UIBarButtonItem.alloc.initWithTitle(button_type, style: args[:style], target: args[:target], action: args[:action])
       else
-        if args[:system_item]
+        if args[:custom_view]
+          UIBarButtonItem.alloc.initWithCustomView(args[:custom_view])
+        elsif args[:system_item]
           UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_item], target: args[:target], action: args[:action])
         else
           PM.logger.error("Please supply a title string, a UIImage or :system.")
@@ -208,7 +227,7 @@ module ProMotion
     def frame
       return self.view_or_self.frame
     end
-    
+
     def map_bar_button_item_style(symbol)
       symbol = {
         plain:    UIBarButtonItemStylePlain,
@@ -217,7 +236,7 @@ module ProMotion
       }[symbol] if symbol.is_a?(Symbol)
       symbol || UIBarButtonItemStyleBordered
     end
-    
+
     def map_bar_button_system_item(symbol)
       {
         done:         UIBarButtonSystemItemDone,