redpotion 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0abf1e1631d21bf8bfa879fe8e6fb14a9c3ec223
-  data.tar.gz: ee2269a3f65fa9ce99ffe036381160fbce750880
+  metadata.gz: abe41c73f1dd1327dd6a008509bd04f1d894fd5d
+  data.tar.gz: c1c67ea54c78dcd18a435f52bdd136dcfc8fef8d
 SHA512:
-  metadata.gz: 8b6241dfffefc134da38ea26078ba915543cdfdaf79495870a8f41e04ab6a34048632140c8c5596ba66ffc087d3c3c815a8bd27f2b32adbfe478fcae268f9af7
-  data.tar.gz: 8aec9fa68e66009ab06083150d51a54fbc90e305e89d0ba4e5fa4c146a2f755793f183e0308f3fa4374c2f9fe7fe8255583593e255f151433eaabe0ca8f6dff4
+  metadata.gz: c082e46b802e647b554824152393de86896fe71538fad1623c96a0bb755fe073ca27baaaab6bd20400683cc2fe9914cd723a5e7d4e1310333800463892dd996f
+  data.tar.gz: 1a2432aa8264225e94ccf5828afcff13cce8232670c6b56f8874961da0805eb19e7bbc343db0b6d80120c4b7ba5a80a84fd5c6417dde51fe47cee236ddf94ec2

data/README.md

@@ -7,10 +7,6 @@ We believe iPhone development should be clean, scalable, and fast with a languag
 
 RedPotion combines [RMQ](http://rubymotionquery.com/), [ProMotion](https://github.com/clearsightstudio/ProMotion), [CDQ](https://github.com/infinitered/cdq), [AFMotion](https://github.com/clayallsopp/afmotion), [MotionPrint](https://github.com/OTGApps/motion_print) and [MORE!](#full-listing-of-gems-and-pods-for-redpotion). It also adds new features to better integrate RMQ with ProMotion.  The goal is simply to choose standard libraries and promote best practices, allowing you to develop iOS apps in record time.
 
-=========
-
-## Read the [documentation](http://redpotion.readthedocs.org/en/latest) [here](http://redpotion.readthedocs.org/en/latest)
-
 
 The **makers of RMQ** at [InfiniteRed](http://infinitered.com/) and the **creators of ProMotion** at [ClearSight](https://clearsightstudio.com/) as well as [David Larrabee](https://twitter.com/Squidpunch) have teamed up to create the ultimate RubyMotion library.
 
@@ -18,13 +14,9 @@ The **makers of RMQ** at [InfiniteRed](http://infinitered.com/) and the **creato
 
 ProMotion for screens and RMQ for styles, animations, traversing, events, etc.
 
-## Plugins and Add-ons
-
-You can use both RMQ Plugins and ProMotion Add-ons
-
-![image](https://camo.githubusercontent.com/523372b371be1de2fb2cec421be423e2b89bcfd0/687474703a2f2f69725f77702e73332e616d617a6f6e6177732e636f6d2f77702d636f6e74656e742f75706c6f6164732f73697465732f31392f323031342f30392f726d715f706c7567696e2e706e67)
+=========
 
-![image](http://ir_wp.s3.amazonaws.com/wp-content/uploads/sites/11/2014/11/ProMotion-addon-logo.png)
+## Read the [documentation](http://redpotion.readthedocs.org/en/latest) [here](http://redpotion.readthedocs.org/en/latest)
 
 
 ## Quick start
@@ -51,297 +43,6 @@ add it to your `Gemfile`:
 - `gem 'redpotion'`
 
 
-## Let's build something
-
-Let's start by creating our app, do this:
-
-```
-> potion create myapp
-> cd myapp
-> bundle
-> rake pod:install
-> rake
-```
-
-Your app should be running now. Type `exit` in console to stop your app.
-
-Let's add a text field, a button, and an image to the main screen:
-
-Open the `home_screen.rb` file, then add this
-
-```ruby
-@image_url = append!(UITextField, :image_url)
-
-append UIButton, :go_button
-
-@sample_image = append!(UIImageView, :sample_image)
-```
-
-Delete this line:
-
-```ruby
-@hello_world = append!(UILabel, :hello_world)
-```
-
-Now we need to style them so you can see them on your screen.
-
-Open up `home_screen_stylesheet.rb`, then add this:
-
-```ruby
-def image_url(st)
-  st.frame = {left: 20, from_right: 20, top: 80, height: 30}
-  st.background_color = color.light_gray
-end
-
-def go_button(st)
-  st.frame = {below_prev: 10, from_right: 20, width: 40, height: 30}
-  st.text = "go"
-  st.background_color = color.blue
-  st.color = color.white
-end
-
-def sample_image(st)
-  st.frame = {left: 20, below_prev: 10, from_right: 20, from_bottom: 20}
-  st.background_color = color.gray
-
-  # an example of using the view directly
-  st.view.contentMode = UIViewContentModeScaleAspectFit
-end
-```
-
-Now let's add the logic. When the user enters a URL to an image in the text field, then tap **Go**, it shows the picture in the image view below.
-
-Let's add the event to the go_button:
-
-Replace this:
-```ruby
-append UIButton, :go_button
-```
-
-With this:
-```ruby
-append(UIButton, :go_button).on(:touch) do |sender|
-  @sample_image.remote_image = @image_url.text
-  @image_url.resignFirstResponder # Closes keyboard
-end
-```
-
-You should end up with this `on_load` method:
-
-```ruby
-def on_load
-  set_nav_bar_button :left, system_item: :camera, action: :nav_left_button
-  set_nav_bar_button :right, title: "Right", action: :nav_right_button
-
-  @image_url = append!(UITextField, :image_url)
-
-  append(UIButton, :go_button).on(:touch) do |sender|
-    @sample_image.remote_image = @image_url.text
-    @image_url.resignFirstResponder # Closes keyboard
-  end
-
-  @sample_image = append!(UIImageView, :sample_image)
-end
-```
-
-Now paste this URL in and hit **Go**
-`http://bit.ly/18iMhwc`
-
-You should have this:
-
-![image](http://ir_wp.s3.amazonaws.com/wp-content/uploads/sites/11/2015/03/myapp_screenshot.jpg)
-
-## Live stylesheet reloading
-
-In REPL, type: `live`
-
-![image](http://clrsight.co/jh/LiveReload4.gif?+)
-
-## New generators to integrate RMQ & ProMotion nicely ##
-
-Our new generators allow you to create your ProMotion screen and stylesheet template to let you hit the ground running.  Currently the following RedPotion generators exist:
-
-```
-potion create screen foo
-potion create table_screen foo
-potion create view foo
-
-# All rmq generators work with the potion command as well
-potion create model foo
-potion create shared foo
-potion create lib foo
-
-# rmq controller generators also still exist
-# but screens are preferred to get the redpotion value
-potion create controller foo
-potion create collection_view_controller foos
-potion create table_view_controller bars
-
-# RedPotion includes CDQ and afmotion by default, if you don't need these gems
-# we have provided command line tasks to remove either of them
-potion remove cdq
-potion remove afmotion
-```
-
-## New features for RMQ
-
-### `find` is aliased to `rmq` so you can use it for a more natural reading code:
-
-```ruby
-find.all.hide
-find(my_view).children.nudge(right: 10)
-```
-
-### You can use `app` directly in code, which is the same as `rmq.app`
-
-So you also get window, device, and delegate from that.
-
-```
-app.device
-app.window
-app.delegate
-```
-
-### You can use the following in a UIView or Screen or UIViewController without prefacing it with `rmq`:
-
-```ruby
-append
-append!
-prepend
-prepend!
-create
-create!
-build
-build!
-on
-apply_style
-reapply_styles
-style
-color
-image
-stylesheet
-stylesheet=
-```
-
-### Stylesheet in your screens
-
-You can specify the stylesheet in your screen like so:
-
-```ruby
-class HomeScreen < PM::Screen
-  title "RedPotion"
-  stylesheet HomeStylesheet
-
-  def on_load
-  end
-end
-```
-
-### rmq_build can now be called on_load
-
-You can use either rmq_build or on_load, they do exactly the same thing. You can only use one or the other. `on_load` is preferred as it matches the screen's onload.
-
-```ruby
-class Section < UIView
-  def on_load
-    apply_style :section
-
-    append(UIButton, :section_button).on(:touch) do
-      mp "Button touched"
-    end
-  end
-end
-```
-
-### Remote image loading for UIImageView styler
-
-You can set `remote_image` to a URL string or an instance of `NSURL` and it will automatically fetch the image and set the image (with caching) using the power of [JMImageCache](https://github.com/jakemarsh/JMImageCache).
-
-```ruby
-class MyStylesheet < ApplicationStylesheet
-  def my_ui_image_view(st)
-    # placeholder_image= is just an alias to image=
-    # Set the placeholder image you want from your resources directory
-    st.placeholder_image = image.resource("my_placeholder")
-    # Set the remote URL. It will be applied to the UIImageView
-    # when downloaded or retrieved from the local cache.
-    st.remote_image = "http://www.rubymotion.com/img/rubymotion-logo.png"
-    # or st.remote_image = NSURL.urlWithString(...)
-  end
-end
-```
-
-In order to use this feature, you must add the `JMIMageCache` cocoapod to your project (this is included in a new project):
-
-```ruby
-app.pods do
-  pod 'JMImageCache'
-end
-```
-
-## New features for ProMotion
-
-ProMotion 2.2.0 added on_load and on_styled to match RedPotion
-
-## RedPotion specific features
-
-UIColor has a `with` method.  Allowing you to build a color from an existing color easily
-
-```ruby
-# for example that time you want your existing color, but with a slight change
-color.my_custom_color.with(a: 0.5)
-```
-
-PM::DataTableScreen - added a clean way to integrate a table screen with a custom cell, and data backed model
-
-```ruby
-class ContributerScreen < PM::DataTableScreen
-  title "RedPotion Contributers"
-  refreshable
-  stylesheet ContributerScreenStylesheet
-  model Contributer
-end
-
-class Contributer < CDQManagedObject
-  def cell
-    {
-      cell_class: ContributerCell,
-      properties: {
-        name: name
-      }
-    }
-  end
-end
-
-class ContributerCell < ProMotion::TableViewCell
-  def on_load
-    apply_style :cell
-
-    find(self.contentView).tap do |q|
-      @title = q.append!(UILabel, :cell_title)
-    end
-  end
-
-  def name=(value)
-    @title.text = value
-  end
-end
-```
-
-## Full listing of Gems and Pods for RedPotion
-**Gems**
-* [RMQ](http://rubymotionquery.com/)
-* [ProMotion](https://github.com/clearsightstudio/ProMotion)
-* [CDQ](https://github.com/infinitered/cdq)
-* [AFMotion](https://github.com/clayallsopp/afmotion)
-* [motion_print](https://github.com/OTGApps/motion_print)
-* [motion-cocoapods](https://github.com/HipByte/motion-cocoapods)
-* (DEV) [webstub](https://github.com/nathankot/webstub)
-* (DEV) [newclear](https://github.com/IconoclastLabs/newclear)
-
-**Pods**
-* [JMImageCache](https://github.com/jakemarsh/JMImageCache)
-
 ## Contributing
 
 0. Create an issue in GitHub to make sure your PR will be accepted.

data/bin/potion

@@ -19,6 +19,7 @@ class PotionCommandLine
      > potion create screen foo
      > potion create table_screen foo
      > potion create metal_table_screen foo
+     > potion create collection_view_screen
      > potion create view bar
      > potion create shared some_class_used_app_wide
      > potion create lib some_class_used_by_multiple_apps
@@ -48,6 +49,7 @@ class PotionCommandLine
       :screen, :table_screen,
       :model, :controller,
       :metal_table_screen,
+      :collection_view_screen,
       :view,
       :shared,
       :lib,
@@ -153,7 +155,7 @@ class PotionCommandLine
 
     def insert_from_template(template_name, name)
       # TODO refactor this, it's less than wonderful
-      if %w{metal_table_screen view}.include? template_name
+      if %w{metal_table_screen view collection_view_screen}.include? template_name
         # Do nothing
       elsif template_name =~ /.*screen/
         @screen_base = template_name.split('_').collect(&:capitalize).join

data/lib/project/ext/ui_view.rb

@@ -86,8 +86,4 @@ class UIView
   def stylesheet=(value)
     rmq.stylesheet = value
   end
-
-  def find(*args)
-    rmq(self).find(*args)
-  end
 end

data/lib/project/ext/ui_view_controller.rb

@@ -51,10 +51,6 @@ class UIViewController
     rmq.stylesheet = value
   end
 
-  def find(*args)
-    rmq(self.view).find(*args)
-  end
-
   def self.stylesheet(style_sheet_class)
     @rmq_style_sheet_class = style_sheet_class
   end
@@ -74,7 +70,7 @@ class UIViewController
   def viewDidLoad
     if self.class.rmq_style_sheet_class
       self.rmq.stylesheet = self.class.rmq_style_sheet_class
-      self.view.rmq.apply_style :root_view
+      self.view.rmq.apply_style(:root_view) if self.rmq.stylesheet.respond_to?(:root_view)
     end
 
     self.originalViewDidLoad
@@ -161,6 +157,6 @@ class UIViewController
   private
 
   def pm_handles_delegates?
-    self.is_a?(ProMotion::ViewController) || self.is_a?(ProMotion::TableScreen)
+    self.is_a?(ProMotion::ViewController) || self.is_a?(ProMotion::TableViewController)
   end
 end

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module RedPotion
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/templates/collection_view_screen/app/screens/name_screen.rb

@@ -0,0 +1,54 @@
+class <%= @name_camel_case %>Screen < UICollectionViewController
+  include ProMotion::ScreenModule
+
+  title "Your title here"
+  stylesheet <%= @name_camel_case %>ScreenStylesheet
+
+  <%= @name.upcase %>_CELL_ID = "<%= @name_camel_case %>Cell"
+
+  def self.new(args = {})
+    # Set layout
+    layout = UICollectionViewFlowLayout.alloc.init
+    s = self.alloc.initWithCollectionViewLayout(layout)
+    s.screen_init(args) if s.respond_to?(:screen_init)
+    s
+  end
+
+  def on_load
+    collectionView.tap do |cv|
+      cv.registerClass(<%= @name_camel_case %>Cell, forCellWithReuseIdentifier: <%= @name.upcase %>_CELL_ID)
+      cv.delegate = self
+      cv.dataSource = self
+      cv.allowsSelection = true
+      cv.allowsMultipleSelection = false
+      find(cv).apply_style :collection_view
+    end
+  end
+
+  # Remove the following if you're only using portrait
+  def will_animate_rotate(orientation, duration)
+    reapply_styles
+  end
+
+  def numberOfSectionsInCollectionView(view)
+    1
+  end
+
+  def collectionView(view, numberOfItemsInSection: section)
+    200
+  end
+
+  def collectionView(view, cellForItemAtIndexPath: index_path)
+    view.dequeueReusableCellWithReuseIdentifier(<%= @name.upcase %>_CELL_ID, forIndexPath: index_path).tap do |cell|
+      build(cell) unless cell.reused
+
+      # Update cell's data here
+    end
+  end
+
+  def collectionView(view, didSelectItemAtIndexPath: index_path)
+    cell = view.cellForItemAtIndexPath(index_path)
+    puts "Selected at section: #{index_path.section}, row: #{index_path.row}"
+  end
+
+end

data/templates/collection_view_screen/app/stylesheets/name_cell_stylesheet.rb

@@ -0,0 +1,13 @@
+module <%= @name_camel_case %>CellStylesheet
+  def cell_size
+    {w: 96, h: 96}
+  end
+
+  def <%= @name %>_cell(st)
+    st.frame = cell_size
+    st.background_color = color.random
+
+    # Style overall view here
+  end
+
+end

data/templates/collection_view_screen/app/stylesheets/name_screen_stylesheet.rb

@@ -0,0 +1,25 @@
+class <%= @name_camel_case %>ScreenStylesheet < ApplicationStylesheet
+
+  include <%= @name_camel_case %>CellStylesheet
+
+  def setup
+    # Add stylesheet specific setup stuff here.
+    # Add application specific setup stuff in application_stylesheet.rb
+
+    @margin = ipad? ? 12 : 8
+  end
+
+  def collection_view(st)
+    st.view.contentInset = [@margin, @margin, @margin, @margin]
+    st.background_color = color.white
+
+    st.view.collectionViewLayout.tap do |cl|
+      cl.itemSize = [cell_size[:w], cell_size[:h]]
+      #cl.scrollDirection = UICollectionViewScrollDirectionHorizontal
+      #cl.headerReferenceSize = [cell_size[:w], cell_size[:h]]
+      cl.minimumInteritemSpacing = @margin
+      cl.minimumLineSpacing = @margin
+      #cl.sectionInset = [0,0,0,0]
+    end
+  end
+end

data/templates/collection_view_screen/app/views/name_cell.rb

@@ -0,0 +1,16 @@
+class <%= @name_camel_case %>Cell < UICollectionViewCell
+  attr_reader :reused
+
+  def on_load
+    find(self).apply_style :<%= @name %>_cell
+
+    q = find(self.contentView)
+    # Add your subviews, init stuff here
+    # @foo = q.append!(UILabel, :foo)
+  end
+
+  def prepareForReuse
+    @reused = true
+  end
+
+end

data/templates/collection_view_screen/spec/screens/name_screen_spec.rb

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>Screen' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

data/templates/collection_view_screen/spec/views/name_cell_spec.rb

@@ -0,0 +1,9 @@
+describe '<%= @name_camel_case %>Cell' do
+
+  before do
+  end
+
+  after do
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpotion
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - InfiniteRed
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_motion_query
@@ -133,6 +133,12 @@ files:
 - lib/project/ruby_motion_query/traverse.rb
 - lib/project/version.rb
 - lib/redpotion.rb
+- templates/collection_view_screen/app/screens/name_screen.rb
+- templates/collection_view_screen/app/stylesheets/name_cell_stylesheet.rb
+- templates/collection_view_screen/app/stylesheets/name_screen_stylesheet.rb
+- templates/collection_view_screen/app/views/name_cell.rb
+- templates/collection_view_screen/spec/screens/name_screen_spec.rb
+- templates/collection_view_screen/spec/views/name_cell_spec.rb
 - templates/metal_table_screen/app/screens/name_screen.rb
 - templates/metal_table_screen/app/stylesheets/name_screen_stylesheet.rb
 - templates/metal_table_screen/app/views/name_cell.rb