ProMotion 1.2.1 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bef0e1c2d9dac5c7bc580ea6950a36c477446ec5
-  data.tar.gz: b6a8b220631abbe37a357f67f11ba43287569465
+  metadata.gz: 71f77fdb9b22a8f0cd193388c516ccdc22a1e809
+  data.tar.gz: 180d0751d10df56d4c1f3a17bb689a8b584b0bd3
 SHA512:
-  metadata.gz: 6bd4b1cd897fef08e8a476038acd43027d22d00d611fee8b4552bb36e10e89acfc7fdbee33c03574de25ebf599ef0b34fe3e736500739bd2ee6a573826615402
-  data.tar.gz: fa0fd455ad6e3e4e86ae0feff264215efa5962f7d3a5e913c6dfc3632edca57680ad89ab27d26aa20614c35969f5b93c322483c1f537304638f84bc8b643ccb2
+  metadata.gz: c2e5f9f37a826c0456b47995ecf36b8240ec45d07244523aa18256e2f8882f445973f950f6f389321b260c63c8f5608c1cc7d601de433d85d0aa01ff4d6e1fdd
+  data.tar.gz: 30404bfa59a50c7212a7881b40062f242001b5b5f46bff2b4d87f450a66421f28594e0179a12a7e1a6106054fe94d70cc52f6c7924a505e538701c67b2fe2096

data/README.md

@@ -7,12 +7,15 @@ It introduces a clean, Ruby-style syntax for building screens that is easy to le
 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
+* Watch Jamon Holmgren give a talk about ProMotion at [RubyMotion #inspect2014](http://confreaks.com/videos/3813-inspect-going-pro-with-promotion-from-prototype-to-production) (video)
+* Watch the [September 2013 Motion Meetup](http://www.youtube.com/watch?v=rf7h-3AiMRQ) where Gant Laborde
 interviews Jamon Holmgren about ProMotion!
 
 ```ruby
 # app/app_delegate.rb
 class AppDelegate < PM::Delegate
+  status_bar true, animation: :fade
+
   def on_load(app, options)
     open RootScreen.new(nav_bar: true)
   end
@@ -78,16 +81,39 @@ end
 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?
+# Changelog
+
+## Version 2.0.0
+
+Overview: In ProMotion 2.0, we removed deprecated APIs, refactored and cleaned up a ton of code, pulled `PushNotification` and `MapScreen` into their own gems, and simplified the API. It now builds 55% faster and is 20%+ lighter.
+
+**API changes**
+
+1. Extracted `PM::MapScreen` into [ProMotion-map](https://github.com/clearsightstudio/ProMotion-map)
+2. Extracted `PM::PushNotification` into [ProMotion-push](https://github.com/clearsightstudio/ProMotion-push)
+3. You can't pass a UIImage or UIView into a `title` anymore. Instead, pass a string into `title_image` (it'll fetch the image for you and create a UIImageView) or pass any arbitrary view into `title_view`. Now, `title` only takes a string title.
+4. `on_create` has been renamed `screen_init` to avoid confusion with Android's `onCreate` method. It may be reintroduced in a future version of ProMotion as an alias of `onCreate`. We recommend using `on_init` instead.
+5. `set_nav_bar_right_button` and `set_nav_bar_left_button` have been removed. Use `set_nav_bar_button :right` and `:left` instead.
+6. Added `NSString#to_url` and `NSURL#to_url` helper methods to help clean up a lot of code.
+7. `present_modal_view_controller` now takes two arguments: the ViewController and an argument hash. You shouldn't have been using it in the first place.
+8. `open_in_tab` now properly opens screens in tabs that didn't have a nav_bar. This is probably the closest thing to a new feature in PM 2.0 that we have, even though it should have worked before.
+9. Cell hash arbitrary values are no longer applied directly to the cell. Instead, use the style: hash to apply arbitrary attributes. [Example here](https://github.com/clearsightstudio/ProMotion/pull/457/files#discussion_r13211807).
+10. Removed cell hash `:subviews` attribute. Instead, subclass `PM::TableViewCell` and add your own subviews there.
+11. Actually, there is one new feature. It's called `longpressable`. By adding `longpressable` at the top of your `PM::TableScreen` and then supplying a `long_press_action:` in your cell hash, you can implement a different action for long presses on table cells.
+12. We no longer insert the cell hash into the arguments hash passed into your cell tap action. If you need that data, pass it in manually.
+13. Removed `add_element`, `add_view`, `remove_element`, `remove_view` aliases for `add` and `remove`.
+14. `on_load` now fires on `viewDidLoad` instead of `loadView`. Added a new `load_view` hook for that method & you can set your own view in there. If you don't implement `load_view`, one will be created for you (per Apple's recommendations). This change shouldn't change much in your app except that if you're setting `self.view = something`, you should do it in `load_view`.
 
-## Version 1.2.x
+**Internal changes:**
 
-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)
+1. Removed `motion-require`. ProMotion now relies entirely on RubyMotion's built-in dependency detector.
+2. Removed `rake spec:unit`, `rake spec:func`, `rake spec:single filename`. We don't really use these for development anymore.
+3. Moved many files around into a more logical, simpler structure.
+4. Removed `PM::Conversions`. The only helper we were using was the `objective_c_method_name` method, and that was only used in `PM::Styling`. So we moved it there.
+5. New module, `PM::NavBarModule`. Moved any navigation controller methods into this module, cleaning up the `PM::ScreenModule` quite a bit.
+6. Lots of code refactoring -- CodeClimate went from 2.47 to 3.42 GPA.
+7. Much cleaner `open` code!
+8. Converted several *slow* functional tests into *fast* unit tests with the same coverage.
 
 # API Reference
 
@@ -97,7 +123,7 @@ 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 
+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)

data/lib/ProMotion.rb

@@ -1,3 +1,12 @@
-require 'motion-require'
+unless defined?(Motion::Project::Config)
+  raise "The ProMotion gem must be required within a RubyMotion project Rakefile."
+end
 
-Motion::Require.all(Dir.glob(File.expand_path('../ProMotion/**/*.rb', __FILE__)))
+Motion::Project::App.setup do |app|
+  core_lib = File.join(File.dirname(__FILE__), 'ProMotion')
+  insert_point = app.files.find_index { |file| file =~ /^(?:\.\/)?app\// } || 0
+
+  Dir.glob(File.join(core_lib, '**/*.rb')).reverse.each do |file|
+    app.files.insert(insert_point, file)
+  end
+end

data/lib/ProMotion/cocoatouch/ns_string.rb

@@ -0,0 +1,5 @@
+class NSString
+  def to_url
+    NSURL.URLWithString(self)
+  end
+end

data/lib/ProMotion/cocoatouch/ns_url.rb

@@ -0,0 +1,5 @@
+class NSURL
+  def to_url
+    self
+  end
+end

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -4,16 +4,14 @@ module ProMotion
     def self.new(*screens)
       tab_bar_controller = alloc.init
 
-      view_controllers = []
-
       screens = screens.flatten.map { |s| s.respond_to?(:new) ? s.new : s } # Initialize any classes
 
       tag_index = 0
-      screens.each do |s|
+      view_controllers = screens.map do |s|
         s.tabBarItem.tag = tag_index
-        s.tab_bar = tab_bar_controller if s.respond_to?("tab_bar=")
-        view_controllers << (s.navigationController || s)
+        s.tab_bar = WeakRef.new(tab_bar_controller) if s.respond_to?("tab_bar=")
         tag_index += 1
+        s.navigationController || s
       end
 
       tab_bar_controller.viewControllers = view_controllers
@@ -28,7 +26,7 @@ module ProMotion
       end
 
       if selected_tab_vc
-        self.selectedViewController = selected_tab_vc if selected_tab_vc
+        self.selectedViewController = selected_tab_vc
       else
         PM.logger.error "Unable to open tab #{tab.to_s} -- not found."
         nil
@@ -36,7 +34,7 @@ module ProMotion
     end
 
     def find_tab(tab_title)
-      self.viewControllers.select{ |vc| vc.tabBarItem.title == tab_title }.first
+      self.viewControllers.find { |vc| vc.tabBarItem.title == tab_title }
     end
 
   end

data/lib/ProMotion/cocoatouch/table_view_cell.rb

@@ -1,21 +1,5 @@
-motion_require '../table/cell/table_view_cell_module'
-
 module ProMotion
   class TableViewCell < UITableViewCell
     include TableViewCellModule
-
-    attr_accessor :image_size
-
-    # TODO: Is this necessary?
-    def layoutSubviews
-      super
-
-      if self.image_size && self.imageView.image && self.imageView.image.size && self.imageView.image.size.width > 0
-        f = self.imageView.frame
-        size_inset_x = (self.imageView.size.width - self.image_size) / 2
-        size_inset_y = (self.imageView.size.height - self.image_size) / 2
-        self.imageView.frame = CGRectInset(f, size_inset_x, size_inset_y)
-      end
-    end
   end
 end

data/lib/ProMotion/cocoatouch/table_view_controller.rb

@@ -2,13 +2,12 @@ module ProMotion
   class TableViewController < UITableViewController
     def self.new(args = {})
       s = self.alloc.initWithStyle(table_style)
-      s.on_create(args) if s.respond_to?(:on_create)
+      s.screen_init(args) if s.respond_to?(:screen_init)
       s
     end
 
     def loadView
-      super
-      self.send(:on_load) if self.respond_to?(:on_load)
+      self.respond_to?(:load_view) ? self.load_view : super
     end
 
     def viewDidLoad

data/lib/ProMotion/cocoatouch/view_controller.rb

@@ -2,13 +2,12 @@ module ProMotion
   class ViewController < UIViewController
     def self.new(args = {})
       s = self.alloc.initWithNibName(args[:nib_name] || nil, bundle:args[:bundle] || nil)
-      s.on_create(args) if s.respond_to?(:on_create)
+      s.screen_init(args) if s.respond_to?(:screen_init)
       s
     end
 
     def loadView
-      super
-      self.send(:on_load) if self.respond_to?(:on_load)
+      self.respond_to?(:load_view) ? self.load_view : super
     end
 
     def viewDidLoad
@@ -32,9 +31,7 @@ module ProMotion
     end
 
     def viewDidDisappear(animated)
-      if self.respond_to?("view_did_disappear:")
-        self.view_did_disappear(animated)
-      end
+      self.view_did_disappear(animated) if self.respond_to?("view_did_disappear:")
       super
     end
 

data/lib/ProMotion/delegate/delegate.rb

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

data/lib/ProMotion/delegate/delegate_module.rb

@@ -1,14 +1,9 @@
-motion_require '../containers/tabs'
-motion_require '../containers/split_screen'
-motion_require 'delegate_notifications'
-
 module ProMotion
   module DelegateModule
     include ProMotion::Tabs
     include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
-    include ProMotion::DelegateNotifications
 
-    attr_accessor :window, :aps_notification, :home_screen
+    attr_accessor :window, :home_screen
 
     def application(application, willFinishLaunchingWithOptions:launch_options)
       will_load(application, launch_options) if respond_to?(:will_load)
@@ -18,32 +13,33 @@ module ProMotion
     def application(application, didFinishLaunchingWithOptions:launch_options)
       apply_status_bar
       on_load application, launch_options
-      check_for_push_notification launch_options
+      # Requires 'ProMotion-push' gem.
+      check_for_push_notification(launch_options) if respond_to?(:check_for_push_notification)
       super rescue true # Can cause error message if no super is found, but it's harmless. Ignore.
     end
 
     def applicationDidBecomeActive(application)
-      on_activate if respond_to?(:on_activate)
+      try :on_activate
     end
 
     def applicationWillResignActive(application)
-      will_deactivate if respond_to?(:will_deactivate)
+      try :will_deactivate
     end
 
     def applicationDidEnterBackground(application)
-      on_enter_background if respond_to?(:on_enter_background)
+      try :on_enter_background
     end
 
     def applicationWillEnterForeground(application)
-      will_enter_foreground if respond_to?(:will_enter_foreground)
+      try :will_enter_foreground
     end
 
     def applicationWillTerminate(application)
-      on_unload if respond_to?(:on_unload)
+      try :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)
+      try :on_open_url, { url: url, source_app: source_app, annotation: annotation }
     end
 
     def app_delegate
@@ -51,15 +47,14 @@ module ProMotion
     end
 
     def app_window
-      self.window
+      window
     end
 
     def ui_window
       (defined?(Motion) && defined?(Motion::Xray) && defined?(Motion::Xray::XrayWindow)) ? Motion::Xray::XrayWindow : UIWindow
     end
 
-    def open_screen(screen, args={})
-
+    def open(screen, args={})
       screen = screen.new if screen.respond_to?(:new)
 
       self.home_screen = screen
@@ -71,18 +66,25 @@ module ProMotion
 
       screen
     end
-    alias :open :open_screen
+    alias :open_screen :open
     alias :open_root_screen :open_screen
-    alias :home :open_screen
+
+    def status_bar?
+      UIApplication.sharedApplication.statusBarHidden
+    end
+
+  private
 
     def apply_status_bar
       self.class.send(:apply_status_bar)
     end
 
-    def status_bar?
-      UIApplication.sharedApplication.statusBarHidden
+    def try(method, *args)
+      send(method, *args) if respond_to?(method)
     end
 
+  public
+
     module ClassMethods
 
       def status_bar(visible = true, opts={})
@@ -107,9 +109,11 @@ module ProMotion
       def tint_color(c)
         @tint_color = c
       end
+
       def tint_color=(c)
         @tint_color = c
       end
+
       def get_tint_color
         @tint_color || nil
       end

data/lib/ProMotion/{containers → ipad}/split_screen.rb

@@ -1,53 +1,51 @@
 module ProMotion
   module SplitScreen
-    def split_screen_controller(master, detail)
-      master_main = master.navigationController ? master.navigationController : master
-      detail_main = detail.navigationController ? detail.navigationController : detail
-
-      split = SplitViewController.alloc.init
-      split.viewControllers = [ master_main, detail_main ]
-      split.delegate = self
-
-      [ master, detail ].map { |s| s.split_screen = split if s.respond_to?(:split_screen=) }
-
+    def open_split_screen(master, detail, args={})
+      split = create_split_screen(master, detail, args)
+      open split, args
       split
     end
 
     def create_split_screen(master, detail, args={})
       master = master.new if master.respond_to?(:new)
       detail = detail.new if detail.respond_to?(:new)
-
-      split = split_screen_controller master, detail
-      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
-
-      if args.has_key?(:swipe)
-        split.presentsWithGesture = args[:swipe]
-      end
-
-      split
-    end
-
-    def open_split_screen(master, detail, args={})
-      split = create_split_screen(master, detail, args)
-      open split, args
+      split = split_screen_controller(master, detail)
+      split_screen_setup(split, args)
       split
     end
 
     # UISplitViewControllerDelegate methods
 
     def splitViewController(svc, willHideViewController: vc, withBarButtonItem: button, forPopoverController: pc)
-      button.title = @button_title || vc.title
-      svc.detail_screen.navigationItem.leftBarButtonItem = button;
+      button.title = @pm_split_screen_button_title || vc.title
+      svc.detail_screen.navigationItem.leftBarButtonItem = button
     end
 
     def splitViewController(svc, willShowViewController: vc, invalidatingBarButtonItem: barButtonItem)
       svc.detail_screen.navigationItem.leftBarButtonItem = nil
     end
+
+  private
+
+    def split_screen_controller(master, detail)
+      split = SplitViewController.alloc.init
+      split.viewControllers = [ (master.navigationController || master), (detail.navigationController || detail) ]
+      split.delegate = self
+
+      [ master, detail ].map { |s| s.split_screen = split if s.respond_to?(:split_screen=) }
+
+      split
+    end
+
+    def split_screen_setup(split, args)
+      args[:icon] ||= args[:item] # TODO: Remove in PM 2.2+.
+      if (args[:item] || args[:title]) && respond_to?(:create_tab_bar_item)
+        split.tabBarItem = create_tab_bar_item(args)
+      end
+      @pm_split_screen_button_title = args[:button_title] if args.has_key?(:button_title)
+      split.presentsWithGesture = args[:swipe] if args.has_key?(:swipe)
+    end
+
   end
+
 end

data/lib/ProMotion/{logger.rb → logger/logger.rb}

@@ -36,26 +36,27 @@ module ProMotion
       return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
       color = COLORS[color] || COLORS[:default]
       puts color[0] + NAME + "[#{label}] #{message_text}" + color[1]
+      nil
     end
 
     def error(message)
-      self.log('ERROR', message, :red) if self.levels.include?(:error)
+      log('ERROR', message, :red) if self.levels.include?(:error)
     end
 
     def deprecated(message)
-      self.log('DEPRECATED', message, :yellow) if self.levels.include?(:warn)
+      log('DEPRECATED', message, :yellow) if self.levels.include?(:warn)
     end
 
     def warn(message)
-      self.log('WARN', message, :yellow) if self.levels.include?(:warn)
+      log('WARN', message, :yellow) if self.levels.include?(:warn)
     end
 
     def debug(message)
-      self.log('DEBUG', message, :purple) if self.levels.include?(:debug)
+      log('DEBUG', message, :purple) if self.levels.include?(:debug)
     end
 
     def info(message)
-      self.log('INFO', message, :green) if self.levels.include?(:info)
+      log('INFO', message, :green) if self.levels.include?(:info)
     end
 
   end