ProMotion 2.4.2 → 2.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5b96025262856164455456dfcb5fd811c9a8b87
-  data.tar.gz: 52861b244be201c1d8f32adcf279498cb6c4e19e
+  metadata.gz: 77d8dcbafac1e2b4972fc44dae533bf1c847b443
+  data.tar.gz: 8a7d5813a1c005b76a1354012205cd03f6845f86
 SHA512:
-  metadata.gz: 34fcc571eb15f5b1bf90dc6b7b1abbbdd68a5babb8d910cf5ee269d87057888ca9bfd8e6ff8450e00a3335b51c435f034daaa5f21caac4c62be8a9ce25cafeff
-  data.tar.gz: 73b3d6bbe13fded0cf3fe934c81b9b54993bb6ae5dae3f6129d209598fea510cb7a8d18e03fa5dfbc867cf4881dddc7ca6fa9cf6279685661655b4ece1cc8e63
+  metadata.gz: eb9181c62d284ba7e7a22ea3dd1902b284574f056e2e4c420961bf0d589b37dc2e2333d51c77de9bacb7d275e829de73c5804ff35423f83d78f30dbd72099c4c
+  data.tar.gz: bc025137788d5920b72e852c0b8a12545e4c49ef7fefde496ac66b293b4acc724df87e97ce3761b23002920f1a53ecf9f7560ff8cff66c1e2cf75c8beef937e4

data/README.md

@@ -3,9 +3,6 @@
 [![Gem Version](https://img.shields.io/gem/v/ProMotion.svg?style=flat)](https://rubygems.org/gems/ProMotion)
 [![Build Status](https://img.shields.io/travis/clearsightstudio/ProMotion.svg?style=flat)](https://travis-ci.org/clearsightstudio/ProMotion)
 [![Code Climate](https://img.shields.io/codeclimate/github/clearsightstudio/ProMotion.svg?style=flat)](https://codeclimate.com/github/clearsightstudio/ProMotion)
-[![Dependency Status](https://img.shields.io/gemnasium/clearsightstudio/ProMotion.svg?style=flat)](https://gemnasium.com/clearsightstudio/ProMotion)
-[![omniref](https://img.shields.io/badge/omniref-docs-blue.svg?style=flat)](https://www.omniref.com/ruby/gems/ProMotion)
-[![Stories in Ready](https://badge.waffle.io/clearsightstudio/ProMotion.png?label=ready&title=Ready)](https://waffle.io/clearsightstudio/ProMotion)
 
 ## iPhone Apps, Ruby-style
 
@@ -14,23 +11,20 @@ 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 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)
+    open RootScreen
   end
 end
 
 # app/screens/root_screen.rb
 class RootScreen < PM::Screen
   title "Root Screen"
+  nav_bar true
 
   def on_load
     set_nav_bar_button :right, title: "Help", action: :open_help_screen
@@ -69,16 +63,18 @@ end
 
 |Screens|Navigation Bars|Tab Bars|
 |---|---|---|
-|[![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20Screen/)|[![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20Screen/#set_nav_bar_buttonside-args)|[![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20Tabs/)|
+|[![ProMotion Screen](https://f.cloud.github.com/assets/1479215/1534021/060aaaac-4c8f-11e3-903c-743e54252222.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20Screen/)|[![ProMotion Nav Bar](https://f.cloud.github.com/assets/1479215/1534077/db39aab6-4c8f-11e3-83f7-e03d52ac615d.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20Screen/#set_nav_bar_buttonside-args)|[![ProMotion Tabs](https://f.cloud.github.com/assets/1479215/1534115/9f4c4cd8-4c90-11e3-9285-96ac253facda.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20Tabs/)|
 
 |Table Screens|Grouped Tables|Searchable|Refreshable|
 |---|---|---|---|
-|[![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20TableScreen/)|[![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)](https://gist.github.com/jamonholmgren/382a6cf9963c5f0b2248)|[![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20TableScreen/#searchableplaceholder-placeholder-text)|[![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20TableScreen/#refreshableoptions)|
+|[![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20TableScreen/)|[![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)](https://gist.github.com/jamonholmgren/382a6cf9963c5f0b2248)|[![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20TableScreen/#searchableplaceholder-placeholder-text)|[![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20TableScreen/#refreshableoptions)|
 
 
-|iPad SplitScreens|Map Screens|Web Screens|
+|SplitScreens|Map Screens|Web Screens|
 |---|---|---|
-|[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/Reference/API%20Reference%20-%20ProMotion%20WebScreen/)|
+|[![ProMotion SplitScreens](https://f.cloud.github.com/assets/1479215/1534507/0edb8dd4-4c96-11e3-9896-d4583d0ed161.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20SplitScreen/)|[![MapScreen](https://f.cloud.github.com/assets/1479215/1534628/f7dbf7e8-4c97-11e3-8817-4c2a58824771.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20MapScreen/)|[![ProMotion WebScreen](https://f.cloud.github.com/assets/1479215/1534631/ffe1b36a-4c97-11e3-8c8f-c7b14e26182d.png)](http://promotion.readthedocs.org/en/master/Reference/ProMotion%20WebScreen/)|
+
+**NEW** [Live reloading!](http://promotion.readthedocs.org/en/master/Guides/Live Screen Reloading/) Use `pm_live_screens` to enable it, and `on_live_reload` in your screen to refresh things.
 
 #### ...and much more.
 
@@ -123,7 +119,7 @@ This release includes several new features and is backwards compatible with all
 
 ## Your app
 
-Open a pull request!
+Open a pull request! We love adding new ProMotion-built apps.
 
 # API Reference
 
@@ -131,6 +127,12 @@ We've created a comprehensive and always updated wiki with code examples, usage
 
 ### [ProMotion Documentation](https://github.com/clearsightstudio/ProMotion/blob/master/docs)
 
+# Screencasts
+
+* 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
+
 # Help
 
 ProMotion is not only an easy DSL to get started. The community is very helpful and

data/lib/ProMotion.rb

@@ -12,33 +12,59 @@ Motion::Project::App.setup do |app|
     app.files.insert(insert_point, file)
   end
 
+  app.development do
+    app.info_plist["ProjectRootPath"] ||= File.absolute_path(app.project_dir)
+  end
+
   # For compatibility with libraries that don't use detect_dependencies. :-(
   app.files_dependencies({
     "#{core_lib}/version.rb" => [ "#{core_lib}/pro_motion.rb" ],
     "#{core_lib}/cocoatouch/table_view_cell.rb" => [ "#{core_lib}/table/cell/table_view_cell_module.rb" ],
     "#{core_lib}/table/cell/table_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
+    "#{core_lib}/cocoatouch/collection_view_cell.rb" => [ "#{core_lib}/collection/cell/collection_view_cell_module.rb" ],
+    "#{core_lib}/collection/collection_screen.rb" => [
+       "#{core_lib}/screen/screen_module.rb",
+       "#{core_lib}/collection/cell/collection_view_cell_module.rb",
+    ],
+    "#{core_lib}/collection/cell/collection_view_cell_module.rb" => [ "#{core_lib}/styling/styling.rb" ],
     "#{core_lib}/delegate/delegate.rb" => [ "#{core_lib}/delegate/delegate_parent.rb" ],
     "#{core_lib}/delegate/delegate_parent.rb" => [ "#{core_lib}/delegate/delegate_module.rb" ],
     "#{core_lib}/delegate/delegate_module.rb" => [
-      "#{core_lib}/support/support.rb",
-      "#{core_lib}/tabs/tabs.rb",
-      "#{core_lib}/ipad/split_screen.rb"
+       "#{core_lib}/support/support.rb",
+       "#{core_lib}/tabs/tabs.rb",
+       "#{core_lib}/ipad/split_screen.rb"
     ],
     "#{core_lib}/screen/screen.rb" => [ "#{core_lib}/screen/screen_module.rb" ],
-    "#{core_lib}/screen/screen_module.rb" => [ "#{core_lib}/screen/screen_navigation.rb" ],
+    "#{core_lib}/screen/screen_navigation.rb" => [ "#{core_lib}/support/support.rb", ],
+    "#{core_lib}/screen/screen_module.rb" => [
+       "#{core_lib}/tabs/tabs.rb",
+       "#{core_lib}/screen/nav_bar_module.rb",
+       "#{core_lib}/screen/screen_navigation.rb",
+       "#{core_lib}/ipad/split_screen.rb",
+    ],
     "#{core_lib}/table/data/table_data.rb" => [
-      "#{core_lib}/table/data/table_data_builder.rb",
-      "#{core_lib}/table/table.rb"
+       "#{core_lib}/table/data/table_data_builder.rb",
+       "#{core_lib}/table/table.rb"
+    ],
+    "#{core_lib}/collection/data/collection_data.rb" => [
+       "#{core_lib}/collection/data/collection_data_builder.rb",
+       "#{core_lib}/collection/collection.rb",
+       "#{core_lib}/table/table_utils.rb"
     ],
     "#{core_lib}/table/table.rb" => [
-      "#{core_lib}/table/table_class_methods.rb",
-      "#{core_lib}/table/table_builder.rb",
-      "#{core_lib}/table/table_utils.rb",
-      "#{core_lib}/table/extensions/searchable.rb",
-      "#{core_lib}/table/extensions/refreshable.rb",
-      "#{core_lib}/table/extensions/indexable.rb",
-      "#{core_lib}/table/extensions/longpressable.rb"
+       "#{core_lib}/table/table_class_methods.rb",
+       "#{core_lib}/table/table_builder.rb",
+       "#{core_lib}/table/table_utils.rb",
+       "#{core_lib}/table/extensions/searchable.rb",
+       "#{core_lib}/table/extensions/refreshable.rb",
+       "#{core_lib}/table/extensions/indexable.rb",
+       "#{core_lib}/table/extensions/longpressable.rb"
+    ],
+    "#{core_lib}/collection/collection.rb" => [
+       "#{core_lib}/collection/collection_class_methods.rb",
+       "#{core_lib}/collection/collection_builder.rb",
+       "#{core_lib}/table/table_utils.rb"
     ],
     "#{core_lib}/web/web_screen.rb" => [ "#{core_lib}/web/web_screen_module.rb" ],
-  })
+    })
 end

data/lib/ProMotion/cocoatouch/collection_view_cell.rb

@@ -0,0 +1,8 @@
+  module ProMotion
+    class CollectionViewCell < UICollectionViewCell
+      include ProMotion::CollectionViewCellModule
+
+      attr_accessor :reused
+      KIdentifier = '__ProMotion_CollectionViewCell'
+    end
+  end

data/lib/ProMotion/cocoatouch/collection_view_controller.rb

@@ -0,0 +1,49 @@
+module ProMotion
+  class CollectionViewController < UICollectionViewController
+    def self.new(args = {})
+      s = self.alloc.initWithCollectionViewLayout(get_collection_layout)
+      s.screen_init(args) if s.respond_to?(:screen_init)
+      s
+    end
+
+    def loadView
+      self.respond_to?(:load_view) ? self.load_view : super
+    end
+
+    def viewWillAppear(animated)
+      super
+      self.view_will_appear(animated) if self.respond_to?("view_will_appear:")
+    end
+
+    def viewDidAppear(animated)
+      super
+      self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
+    end
+
+    def viewWillDisappear(animated)
+      self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
+      super
+    end
+
+    def viewDidDisappear(animated)
+      self.view_did_disappear(animated) if self.respond_to?("view_did_disappear:")
+      super
+    end
+
+    def shouldAutorotateToInterfaceOrientation(orientation)
+      self.should_rotate(orientation)
+    end
+
+    def shouldAutorotate
+      self.should_autorotate
+    end
+
+    def willRotateToInterfaceOrientation(orientation, duration:duration)
+      self.will_rotate(orientation, duration)
+    end
+
+    def didRotateFromInterfaceOrientation(orientation)
+      self.on_rotate
+    end
+  end
+end

data/lib/ProMotion/cocoatouch/view_controller.rb

@@ -35,6 +35,11 @@ module ProMotion
       super
     end
 
+    def didReceiveMemoryWarning
+      self.did_receive_memory_warning if self.respond_to?(:did_receive_memory_warning)
+      super
+    end
+
     def shouldAutorotateToInterfaceOrientation(orientation)
       self.should_rotate(orientation)
     end

data/lib/ProMotion/collection/cell/collection_view_cell_module.rb

@@ -0,0 +1,17 @@
+module ProMotion
+  module CollectionViewCellModule
+    include ProMotion::Styling
+
+    attr_accessor :data_cell, :collection_screen
+
+    def setup(data_cell, screen)
+      self.collection_screen = WeakRef.new(screen)
+      self.data_cell         = data_cell
+    end
+
+    def prepareForReuse
+      super
+      self.send(:prepare_for_reuse) if self.respond_to?(:prepare_for_reuse)
+    end
+  end
+end

data/lib/ProMotion/collection/collection.rb

@@ -0,0 +1,106 @@
+module ProMotion
+  module Collection
+    include ProMotion::Styling
+    include ProMotion::Table::Utils
+    include ProMotion::CollectionBuilder
+
+    attr_reader :promotion_collection_data
+
+    def collection_view
+      self.collectionView
+    end
+
+    def screen_setup
+      check_collection_data
+    end
+
+    # Override viewDidLoad here to register cell classes here.
+    # Calling it from `screen_setup` cause `on_load` to be called twice
+    def viewDidLoad
+      super
+      set_up_register_class
+    end
+
+    def set_up_register_class
+      collection_view.registerClass(PM::CollectionViewCell, forCellWithReuseIdentifier: PM::CollectionViewCell::KIdentifier)
+      if self.class.get_cell_classes
+        self.class.get_cell_classes.each do |identifier, klass|
+          collection_view.registerClass(klass, forCellWithReuseIdentifier: identifier.to_s)
+        end
+      end
+    end
+
+    def check_collection_data
+      mp("Missing #collection_data method in CollectionScreen #{self.class.to_s}.", force_color: :red) unless self.respond_to?(:collection_data)
+    end
+
+    def promotion_collection_data
+      @promotion_collection_data ||= CollectionData.new(collection_data, collection_view)
+    end
+
+    # Returns the data cell
+    def cell_at(args = {})
+      self.promotion_collection_data.cell(args)
+    end
+
+    def update_collection_view_data(data, args = {})
+      self.promotion_collection_data.data = data
+      if args[:index_paths]
+        collection_view.reloadItemsAtIndexPaths(Array(args[:index_paths]))
+      elsif args[:sections]
+        collection_view.reloadSections(args[:sections])
+      else
+        collection_view.reloadData
+      end
+    end
+
+    def reload_data
+      update_collection_view_data(collection_data)
+    end
+
+    ########## Cocoa touch methods #################
+
+    ## UICollectionViewDataSource ##
+    def collectionView(_, numberOfItemsInSection: section)
+      self.promotion_collection_data.section_length(section)
+    end
+
+    def numberOfSectionsInCollectionView(_)
+      self.promotion_collection_data.sections.length
+    end
+
+    def collectionView(_, cellForItemAtIndexPath: index_path)
+      params    = index_path_to_section_index(index_path: index_path)
+      data_cell = cell_at(index: params[:index], section: params[:section])
+      create_collection_cell(data_cell, index_path)
+    end
+
+    ## UICollectionViewDelegate ##
+    def collectionView(view, didSelectItemAtIndexPath: index_path)
+      params    = index_path_to_section_index(index_path: index_path)
+      data_cell = cell_at(index: params[:index], section: params[:section])
+
+      trigger_action(data_cell[:action], data_cell[:arguments], params) if data_cell[:action]
+    end
+
+    ## UICollectionViewDelegateFlowLayout ##
+    def collectionView(_, layout: view_layout, sizeForItemAtIndexPath: index_path)
+      if self.respond_to?(:size_at_index_path)
+        self.size_at_index_path(index_path_to_section_index(index_path: index_path))
+      elsif view_layout.itemSize
+        view_layout.itemSize
+      elsif view_layout.respond_to?(:estimatedItemSize) and view_layout.estimatedItemSize
+        view_layout.estimatedItemSize
+      else
+        mp "Implement the size_at_index_path method in your PM::CollectionScreen or add item_size or estimated_item_size in the layout options to configure the size of your cells.", force_color: :yellow
+      end
+    end
+
+    protected
+
+    def self.included(base)
+      base.extend(CollectionClassMethods)
+    end
+
+  end
+end

data/lib/ProMotion/collection/collection_builder.rb

@@ -0,0 +1,39 @@
+module ProMotion
+  module CollectionBuilder
+    def trigger_action(action, arguments, index_path)
+      action = (action.is_a?(Proc) ? action : method(action))
+      case arity = action.arity
+      when 0 then action.call # Just call the proc or the method
+      when 2 then action.call(arguments, index_path) # Send arguments and index path
+      else
+        mp("Action should not have optional parameters: #{action.to_s}", force_color: :yellow) if arity < 0
+        action.call(arguments) # Send arguments
+      end
+    end
+
+    def create_collection_cell(data_cell, index_path)
+      cell = collection_view.dequeueReusableCellWithReuseIdentifier(data_cell[:cell_identifier].to_s, forIndexPath: index_path)
+      cell.extend(PM::CollectionViewCellModule) unless cell.is_a?(PM::CollectionViewCellModule)
+      cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
+      cell.clipsToBounds    = true
+      if cell.respond_to?(:reused)
+        if cell.reused
+          on_cell_reused(cell)
+        else
+          on_cell_created(cell)
+          cell.reused = true
+        end
+      end
+      cell.setup(data_cell, self) if cell.respond_to?(:setup)
+      cell
+    end
+
+    def on_cell_created(cell)
+      cell.send(:on_created) if cell.respond_to?(:on_created)
+    end
+
+    def on_cell_reused(cell)
+      cell.send(:on_reuse) if cell.respond_to?(:on_reuse)
+    end
+  end
+end

data/lib/ProMotion/collection/collection_class_methods.rb

@@ -0,0 +1,38 @@
+module CollectionClassMethods
+
+  def collection_layout(klass, options={})
+    @layout                         = klass.new
+    @layout.scrollDirection         = map_layout_direction(options.fetch(:direction, :vertical))
+
+    @layout.minimumLineSpacing      = options[:minimum_line_spacing] if options.has_key?(:minimum_line_spacing)
+    @layout.minimumInteritemSpacing = options[:minimum_interitem_spacing] if options.has_key?(:minimum_interitem_spacing)
+    @layout.itemSize                = options[:item_size] if options.has_key?(:item_size)
+    @layout.estimatedItemSize       = options[:estimated_item_size] if options.has_key?(:estimated_item_size) and @layout.respond_to?(:estimatedItemSize)
+    @layout.sectionInset            = options[:section_inset] if options.has_key?(:section_inset)
+    @layout
+  end
+
+  def get_collection_layout
+    @layout ||= begin
+      layout                 = UICollectionViewFlowLayout.new
+      layout.scrollDirection = UICollectionViewScrollDirectionHorizontal
+
+      layout
+    end
+  end
+
+  def map_layout_direction(symbol)
+    {
+        horizontal: UICollectionViewScrollDirectionHorizontal,
+        vertical:   UICollectionViewScrollDirectionVertical
+    }[symbol] || symbol || UICollectionViewScrollDirectionVertical
+  end
+
+  def cell_classes(options={})
+    @cell_classes = options
+  end
+
+  def get_cell_classes
+    @cell_classes || nil
+  end
+end