redpotion 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d21e4e6f969c24f37a4353f71e9eee37ec2eb46f
-  data.tar.gz: 7e13e159041370cb4356f2d8d6b1f005e340fbf5
+  metadata.gz: dc77574563b630914de6587aacae72b20f999385
+  data.tar.gz: 4b8900f7a93ec82b96c875c034423aa38081b4e9
 SHA512:
-  metadata.gz: ab585f17e01afda7512152fc28e73c9390e1994291c9d6af386c69e9543179f7a36a160e71924d8fdb95dc43b67ad3ff85918d967ec55698a7ecf10c8f515710
-  data.tar.gz: 4ad4a47811f1c80f25db4bac1da5d6faf25b944ec3ebfa739a8d8dff2bb3d0a5ca3f8096ffe8796f21f1bfe3ede8bb7dbfbc53599bd57b413de1120e2e343680
+  metadata.gz: 7ea81b4f72947a4d27bd87cb138b711056ce0f2b4fd2a718f8f0617b6272f50b489e2d29ac03c972a078b00df60d9e0a74e51a2306c2805673acbe9b00f90c56
+  data.tar.gz: ba39d2a5f701f04350e92ecdcdde2408fa709084438709dc849310dffe683d74d708c5a559637a4dc7e11704335bbe6bd86a06da069acdcdc5308b7bb145cc87

data/README.md

@@ -1,6 +1,7 @@
-![image](http://ir_wp.s3.amazonaws.com/wp-content/uploads/sites/11/2015/01/RedPotion_logo_1000w_padding.png)
+![image](http://ir_public.s3.amazonaws.com/projects/redpotion/RedPotion_logo_transparent.png)
 
 # RedPotion
+[![Build Status](https://travis-ci.org/infinitered/redpotion.svg?branch=master)](https://travis-ci.org/infinitered/redpotion)
 
 We believe iPhone development should be clean, scalable, and fast with a language that developers not only enjoy, but actively choose.  With the advent of Ruby for iPhone development the RubyMotion community has combined and tested the most active and powerful gems into a single package called **RedPotion**
 
@@ -70,7 +71,7 @@ Open the `home_screen.rb` file, then add this
 
 append UIButton, :go_button
 
-@sample_image = append UIImageView, :sample_image
+@sample_image = append!(UIImageView, :sample_image)
 ```
 
 Delete this line:
@@ -99,6 +100,9 @@ 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
 ```
 
@@ -113,8 +117,9 @@ append UIButton, :go_button
 
 With this:
 ```ruby
-append(UIButton, :go_button).on(:touch) do
+append(UIButton, :go_button).on(:touch) do |sender|
   @sample_image.remote_image = @image_url.text
+  @image_url.resignFirstResponder # Closes keyboard
 end
 ```
 
@@ -127,16 +132,21 @@ def on_load
 
   @image_url = append!(UITextField, :image_url)
 
-  append(UIButton, :go_button).on(:touch) do
+  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
+  @sample_image = append!(UIImageView, :sample_image)
 end
 ```
 
 Now paste this URL in and hit **Go**
-`http://bit.ly/1M3UEZL`
+`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)
 
 
 ## New generators to integrate RMQ & ProMotion nicely ##
@@ -274,6 +284,42 @@ UIColor has a `with` method.  Allowing you to build a color from an existing col
 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/)

data/bin/potion

@@ -35,7 +35,7 @@ class PotionCommandLine
      Misc
      > potion -h, --help
      > potion -v, --version
-     
+
      Documentation
      > rmq docs
      > rmq docs query
@@ -57,6 +57,11 @@ class PotionCommandLine
 
 
     def create(template_or_app_name, *options)
+      if template_or_app_name.nil?
+        puts "potion - Invalid command, try adding an application name or template name."
+        return
+      end
+
       options.compact!
       # Dry Run option - TODO - change this to --dry_run to streamline
       if options.first == 'dry_run'

data/lib/project/ext/kernel.rb

@@ -0,0 +1,11 @@
+if RUBYMOTION_ENV == "development"
+  module Kernel
+    def live_stylesheets(interval = 0.5, debug=false)
+      rmq_live_stylesheets interval, debug
+    end
+
+    def enable_live_stylesheets(interval)
+      enable_rmq_live_stylesheets interval
+    end
+  end
+end

data/lib/project/ext/object.rb

@@ -8,6 +8,6 @@ class Object
   end
 
   def find(*args) # Do not alias this, strange bugs happen where classes don't have methods
-    rmq(args)
+    rmq(*args)
   end
 end

data/lib/project/ext/ui_color.rb

@@ -1,7 +1,12 @@
 class UIColor
   def with(options)
-    r, g, b, a = Pointer.new('d'), Pointer.new('d'), Pointer.new('d'), Pointer.new('d')
-    self.getRed(r, green: g, blue: b, alpha: a)
+    begin
+      r, g, b, a = Pointer.new('d'), Pointer.new('d'), Pointer.new('d'), Pointer.new('d')
+      self.getRed(r, green: g, blue: b, alpha: a)
+    rescue
+      r, g, b, a = Pointer.new('f'), Pointer.new('f'), Pointer.new('f'), Pointer.new('f')
+      self.getRed(r, green: g, blue: b, alpha: a)
+    end
 
     r = options[:r] || options[:red] || r.value
     g = options[:g] || options[:green] || g.value

data/lib/project/ext/ui_view.rb

@@ -82,7 +82,12 @@ class UIView
   def stylesheet
     rmq.stylesheet
   end
+
   def stylesheet=(value)
     rmq.stylesheet = value
   end
+
+  def find(*args)
+    rmq(self).find(*args)
+  end
 end

data/lib/project/ext/ui_view_controller.rb

@@ -46,12 +46,19 @@ class UIViewController
   def stylesheet
     rmq.stylesheet
   end
+
   def stylesheet=(value)
     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
+
   def self.rmq_style_sheet_class
     @rmq_style_sheet_class
   end
@@ -81,6 +88,7 @@ class UIViewController
 
   def view_will_appear(animated)
   end
+
   def viewWillAppear(animated)
     unless pm_handles_delegates?
       self.view_will_appear(animated)
@@ -89,6 +97,7 @@ class UIViewController
 
   def view_did_appear(animated)
   end
+
   def viewDidAppear(animated)
     unless pm_handles_delegates?
       self.view_did_appear(animated)
@@ -97,6 +106,7 @@ class UIViewController
 
   def view_will_disappear(animated)
   end
+
   def viewWillDisappear(animated)
     unless pm_handles_delegates?
       self.view_will_disappear(animated)
@@ -105,6 +115,7 @@ class UIViewController
 
   def view_did_disappear(animated)
   end
+
   def viewDidDisappear(animated)
     unless pm_handles_delegates?
       self.view_did_disappear(animated)
@@ -113,6 +124,7 @@ class UIViewController
 
   def should_rotate(orientation)
   end
+
   def shouldAutorotateToInterfaceOrientation(orientation)
     self.should_rotate(orientation)
   end
@@ -120,24 +132,28 @@ class UIViewController
   def should_autorotate
     true
   end
+
   def shouldAutorotate
     self.should_autorotate
   end
 
   def will_rotate(orientation, duration)
   end
+
   def willRotateToInterfaceOrientation(orientation, duration:duration)
     self.will_rotate(orientation, duration)
   end
 
   def on_rotate(orientation)
   end
+
   def didRotateFromInterfaceOrientation(orientation)
     self.on_rotate orientation
   end
 
   def will_animate_rotate(orientation, duration)
   end
+
   def willAnimateRotationToInterfaceOrientation(orientation, duration: duration)
     self.will_animate_rotate(orientation, duration)
   end

data/lib/project/pro_motion/data_table_screen.rb

@@ -1,21 +1,17 @@
 module ProMotion
-  #TODO ? - set_attributes is called twice - seems like this is in PM core
-  # this is because we call setup when we build the cell and setup when its
-  # about to display - this is because PM wants styling to fire in each case -
-  # and properties was where the styling is done in PM
-  #
-  # if we are going to wire an event when a value is set on a cell, this could
-  # be problematic, especially likely since cells are reused, etc
-  # see my new cell for example, where I have to remove and then add events
-  # because of the double call
-
   class DataTableScreen < TableScreen
-    def self.cell(cell)
-      @cell = cell
-    end
+    class << self
+      def model(value, scope=nil)
+        if value.method_defined?(:cell)
+          @data_model = value
+          @data_scope = scope || :all
+        else
+          raise "#{value} must define the cell method"
+        end
+      end
 
-    def self.cell_properties
-      @cell
+      def data_model; @data_model; end
+      def data_scope; @data_scope; end
     end
 
     def table_data
@@ -24,43 +20,20 @@ module ProMotion
       }]
     end
 
-    def cell_properties
-      self.class.cell_properties
-    end
-
     def cell_data
-      return [] if cell_properties.nil?
       return [] if data_model.nil?
 
-      data_model.send(data_scope).collect do |c|
-        {
-          cell_class: cell_class,
-          properties: properties.inject({}) do |hash, element|
-            hash[element.first] = c.send(element.last)
-            hash
-          end
-        }
-      end
+      data_model.send(data_scope).collect(&:cell)
     end
 
     private
 
-    def properties
-      @properties ||= cell_properties[:template].reject do |k,v|
-        k == :cell_class
-      end
-    end
-
-    def cell_class
-      @cell_class ||= cell_properties[:template][:cell_class]
-    end
-
     def data_model
-      @data_model ||= cell_properties[:model]
+      self.class.data_model
     end
 
     def data_scope
-      @data_scope ||= cell_properties[:scope] || :all
+      self.class.data_scope
     end
   end
 end

data/lib/project/pro_motion/table.rb

@@ -1,20 +1,7 @@
 module ProMotion
   class TableScreen < TableViewController
-
-    # Temporarily here until this is added to ProMotion
-    def create_table_cell(data_cell)
-      new_cell = nil
-      table_cell = table_view.dequeueReusableCellWithIdentifier(data_cell[:cell_identifier]) || begin
-        new_cell = data_cell[:cell_class].alloc.initWithStyle(data_cell[:cell_style], reuseIdentifier:data_cell[:cell_identifier])
-        new_cell.extend(PM::TableViewCellModule) unless new_cell.is_a?(PM::TableViewCellModule)
-        new_cell.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleLeftMargin|UIViewAutoresizingFlexibleRightMargin
-        new_cell.clipsToBounds = true # fix for changed default in 7.1
-        new_cell.send(:on_load) if new_cell.respond_to?(:on_load)
-        new_cell.setup(data_cell, self)
-        new_cell
-      end
-      table_cell.send(:on_reuse) if !new_cell && table_cell.respond_to?(:on_reuse)
-      table_cell
-    end
+    # For some reason, this empty class definition is required
+    # or we get a NoMethodError with the `searchable`
+    # class method call. O_o
   end
 end

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module RedPotion
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

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

@@ -54,8 +54,6 @@ class <%= @name_camel_case %>Screen < UITableViewController
     cell
   end
 
-  # Remove the following if you're only using portrait
-
   # You don't have to reapply styles to all UIViews, if you want to optimize, another way to do it
   # is tag the views you need to restyle in your stylesheet, then only reapply the tagged views, like so:
   #   def logo(st)
@@ -67,6 +65,8 @@ class <%= @name_camel_case %>Screen < UITableViewController
   #
   # Then in will_animate_rotate
   #   find(:reapply_style).reapply_styles#
+
+  # Remove the following if you're only using portrait
   def will_animate_rotate(orientation, duration)
     reapply_styles
   end

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

@@ -10,8 +10,6 @@ class <%= @name_camel_case %>Screen < PM::<%= @screen_base %>
   end
   <% end %>
 
-  # Remove the following if you're only using portrait
-
   # You don't have to reapply styles to all UIViews, if you want to optimize, another way to do it
   # is tag the views you need to restyle in your stylesheet, then only reapply the tagged views, like so:
   #   def logo(st)
@@ -23,6 +21,8 @@ class <%= @name_camel_case %>Screen < PM::<%= @screen_base %>
   #
   # Then in will_animate_rotate
   #   find(:reapply_style).reapply_styles#
+
+  # Remove the following if you're only using portrait
   def will_animate_rotate(orientation, duration)
     reapply_styles
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpotion
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - InfiniteRed
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_motion_query
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: ProMotion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: motion_print
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/potion
+- lib/project/ext/kernel.rb
 - lib/project/ext/object.rb
 - lib/project/ext/ui_color.rb
 - lib/project/ext/ui_image_view.rb