redpotion 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c612a7c529685b2e3d9788f59c71f6326ed2e9c5
-  data.tar.gz: 0868dfb194fad46b871c527a278ea85e356e39af
+  metadata.gz: 04e83a3c050909fd7827bc277ca1f71f1316e849
+  data.tar.gz: d1413854f702ecbf9d36d66a1d64f6bf5561650b
 SHA512:
-  metadata.gz: db1174afce9b8419e240349f1dc88a43b06d6dcdb69ae2b2a95062825a4a0888061b30d38eb9a61054810ad25625e50e9be9a2b32fe3bcdabe4578fd42b472d5
-  data.tar.gz: 2384817d833b77a6950aaf56ad8c60039bf6cbb99bbe623d97f2a26ef1da4020a4f3bf273464f449642bc0174e9603f5b7af73a7e8e70275f2e471288e56de7f
+  metadata.gz: da82e2a3404ad63a8e77b89f71d7353c5331132f66710af74ee918b2ab285b9a8280af968e1d545943fd5bfe288319a5eb1f0fed0b3083a2017c1943beb1a0a8
+  data.tar.gz: 4d9cb28f587bdb43c719710f4d6aa5128f9807888c29a4d2e8d16c62e7ab6ad631793514ca73840c717a8984dee8cd1e4a6727c71815d9e9ffe4c8e32b71e572

data/README.md

@@ -10,12 +10,12 @@
 
 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**
 
-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.
+RedPotion combines [RMQ](http://rubymotionquery.com/), [ProMotion](https://github.com/infinitered/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.
 
 
-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.
+The **makers of RMQ and ProMotion** at [InfiniteRed](http://infinite.red) (web and mobile developers based in Portland, OR and San Francisco, CA) have teamed up with [David Larrabee](https://twitter.com/Squidpunch) to create the ultimate RubyMotion library.
 
-[![image](https://ir_wp.s3.amazonaws.com/wp-content/uploads/sites/11/2013/08/InfiniteRed_logo_100h.png)](http://infinitered.com/)               [![image](https://clearsightstudio.com/assets/images/clearsight-logos/color-logo@2x-458a9655.png)](https://clearsightstudio.com/)
+[![image](http://infinite.red/images/ir-logo.svg)](http://infinite.red)
 
 ProMotion for screens and RMQ for styles, animations, traversing, events, etc.
 

data/bin/potion

@@ -6,6 +6,7 @@ require 'open-uri'
 require_relative "../lib/project/version"
 
 class PotionCommandLine
+
   HELP_TEXT = %{     potion version #{RedPotion::VERSION}
 
      Some things you can do with the potion command:
@@ -43,6 +44,7 @@ class PotionCommandLine
      > rmq docs "background image" }
 
   class << self
+
     SKIP_FLAGS = [ "--skip-cdq", "--skip-afmotion" ]
 
     VALID_CREATE_TYPES = [
@@ -262,7 +264,9 @@ class PotionCommandLine
       data = IO.readlines("Gemfile.lock")
       data.any?{|l| l.match(/\s.cdq\s\(/) }
     end
+    
   end
+
 end
 
 # Process input, execute actions

data/lib/project/ext/kernel.rb

@@ -1,5 +1,6 @@
 if RUBYMOTION_ENV == "development"
   class TopLevel
+
     def live(interval = 1.0, debug=false)
       rmq_live_stylesheets interval, debug
     end
@@ -15,5 +16,6 @@ if RUBYMOTION_ENV == "development"
     def close(args={})
       find.screen.close(args)
     end
+    
   end
 end

data/lib/project/ext/object.rb

@@ -1,4 +1,5 @@
 class Object
+  
   def app
     rmq.app
   end
@@ -22,4 +23,5 @@ class Object
   def screen
     rmq.screen
   end
+  
 end

data/lib/project/ext/pm_delegate.rb

@@ -5,22 +5,28 @@ end
 # Defines which ProMotion classes handle delegates
 module ProMotion
   class ViewController < UIViewController
+    
     def class_handles_delegates?
       true
     end
+    
   end
 
   class TableViewController < UITableViewController
+    
     def class_handles_delegates?
       true
     end
+    
   end
 
   # Include the entire class declaration chain for people that may not have
   # the ProMotion-form gem installed.
   class FormViewController < FXFormViewController
+    
     def class_handles_delegates?
       true
     end
+    
   end
 end

data/lib/project/ext/ui_collection_view_cell.rb

@@ -1,4 +1,5 @@
 class UICollectionViewCell
+
   # You can use either rmq_build or on_load, not both. If you have both, on_load will be ignored,
   # you can however call it from rmq_build. They are the same, on_load follows the ProMotion style
   # and is recommended.
@@ -14,4 +15,5 @@ class UICollectionViewCell
     super
     @reused = true
   end
+  
 end

data/lib/project/ext/ui_color.rb

@@ -1,9 +1,10 @@
 class UIColor
+  
   def with(options)
     type = CGSize.type[/(f|d)/]
     r, g, b, a = Pointer.new(type), Pointer.new(type), Pointer.new(type), Pointer.new(type)
     self.getRed(r, green: g, blue: b, alpha: a)
-    
+
     r = options[:r] || options[:red] || r.value
     g = options[:g] || options[:green] || g.value
     b = options[:b] || options[:blue] || b.value
@@ -11,4 +12,5 @@ class UIColor
 
     UIColor.colorWithRed(r, green: g, blue: b, alpha: a)
   end
+  
 end

data/lib/project/ext/ui_image_view.rb

@@ -1,27 +1,55 @@
 class UIImageView
 
-  def remote_image=(value)
-    if !!defined?(SDWebImageManager)
-      @remote_image_operations ||= {}
+  def remote_image=(args)
+    url = args.respond_to?(:fetch) ? args.fetch(:url) : args
+    callback = args.respond_to?(:fetch) ? args.fetch(:on_load, -> {}) : -> {}
+    load_remote_image(url, callback)
+  end
+
+  private
 
+  def load_remote_image(url, callback = nil)
+    if defined?(SDWebImageManager)
+      @remote_image_operations ||= {}
       # Cancel the previous remote operation if it exists
       operation = @remote_image_operations[("%p" % self)]
       if operation && operation.respond_to?(:cancel)
         operation.cancel
         @remote_image_operations[("%p" % self)] = nil
       end
+      url = NSURL.URLWithString(url) unless url.is_a?(NSURL)
+      @remote_image_operations[("%p" % self)] = load_remote_image_using_sdwebimage(url, callback)
+    else
+      puts "\n[RedPotion ERROR]  tried to set remote_image without SDWebImage CocoaPod. Please add this to your Rakefile: \n\napp.pods do\n  pod \"SDWebImage\"\nend\n"
+    end
+  end
 
-      value = NSURL.URLWithString(value) unless value.is_a?(NSURL)
-      @remote_image_operations[("%p" % self)] = SDWebImageManager.sharedManager.downloadWithURL(value,
-        options:SDWebImageRefreshCached,
-        progress:nil,
+  def load_remote_image_using_sdwebimage(url, callback = nil)
+    manager = SDWebImageManager.sharedManager
+    if manager.respond_to?('downloadWithURL:options:progress:completed')
+      # Support for SDWebImage v3.x
+      manager.downloadWithURL(url,
+        options: SDWebImageRefreshCached,
+        progress: nil,
         completed: -> image, error, cacheType, finished {
           Dispatch::Queue.main.async do
             self.image = image
+            callback.call if callback
           end unless image.nil?
-      })
+        }
+      )
     else
-      puts "\n[RedPotion ERROR]  tried to set remote_image without SDWebImage cocoapod. Please add this to your Rakefile: \n\napp.pods do\n  pod \"SDWebImage\"\nend\n"
+      # Support for SDWebImage v4.x
+      manager.loadImageWithURL(url,
+        options: SDWebImageRefreshCached,
+        progress: nil,
+        completed: -> image, imageData, error, cacheType, finished, imageURL {
+          Dispatch::Queue.main.async do
+            self.image = image
+            callback.call if callback
+          end unless image.nil?
+        }
+      )
     end
   end
 

data/lib/project/ext/ui_table_view_cell.rb

@@ -1,8 +1,10 @@
 class UITableViewCell
+  
   # You can use either rmq_build or on_load, not both. If you have both, on_load will be ignored,
   # you can however call it from rmq_build. They are the same, on_load follows the ProMotion style
   # and is recommended.
   def rmq_build
     self.on_load
   end
+  
 end

data/lib/project/ext/ui_view.rb

@@ -1,4 +1,5 @@
 class UIView
+
   # You can use either rmq_build or on_load, not both. If you have both, on_load will be ignored,
   # you can however call it from rmq_build. They are the same, on_load follows the ProMotion style
   # and is recommended.
@@ -86,4 +87,5 @@ class UIView
   def stylesheet=(value)
     rmq.stylesheet = value
   end
+  
 end

data/lib/project/ext/ui_view_controller.rb

@@ -1,4 +1,5 @@
 class UIViewController
+  
   def append(view_or_constant, style=nil, opts = {})
     self.rmq.append(view_or_constant, style, opts)
   end
@@ -164,4 +165,5 @@ class UIViewController
   def pm_handles_delegates?
     self.respond_to?(:class_handles_delegates?) && self.class_handles_delegates?
   end
+
 end

data/lib/project/pro_motion/data_table.rb

@@ -1,5 +1,6 @@
 module ProMotion
   module DataTable
+    
     include TableClassMethods
     include ProMotion::Styling
     include ProMotion::Table

data/lib/project/pro_motion/data_table_screen.rb

@@ -1,5 +1,6 @@
 module ProMotion
   class DataTableScreen < TableViewController
+    
     include ProMotion::ScreenModule
     include ProMotion::DataTable
 

data/lib/project/pro_motion/data_table_searchable.rb

@@ -80,6 +80,7 @@ module ProMotion
         self.table_view.setScrollEnabled false
         @table_search_display_controller.delegate.will_begin_search if @table_search_display_controller.delegate.respond_to? "will_begin_search"
       end
+      
     end
   end
 end

data/lib/project/pro_motion/screen.rb

@@ -1,7 +1,9 @@
 module ProMotion
   class Screen < ViewController
+
     def app
       RubyMotionQuery::App
     end
+    
   end
 end

data/lib/project/pro_motion/support.rb

@@ -1,7 +1,9 @@
 module ProMotion
   module Support
+
     def app
       RubyMotionQuery::App
     end
+
   end
 end

data/lib/project/pro_motion/table.rb

@@ -1,4 +1,5 @@
 module ProMotion
+
   class TableScreen < TableViewController
     # Don't call super -- would result in two on_load calls to the cell.
     def on_cell_created(cell, data)

data/lib/project/ruby_motion_query/app.rb

@@ -1,6 +1,7 @@
 module RubyMotionQuery
   class App
     class << self
+
       def current_screen(root_view_controller = nil)
         current_view_controller root_view_controller
       end
@@ -13,11 +14,18 @@ module RubyMotionQuery
         if !!defined?(SDWebImageManager)
           image_cache = SDImageCache.sharedImageCache
           image_cache.clearMemory
-          image_cache.clearDisk
+          if image_cache.respond_to?(:clearDisk)
+            # Support for SDWebImage v3.x
+            image_cache.clearDisk
+          else
+            # Support for SDWebImage v4.x
+            image_cache.deleteOldFilesWithCompletion(nil)
+          end
         else
           puts "\n[RedPotion ERROR]  tried to reset image cache without SDWebImage cocoapod. Please add this to your Rakefile: \n\napp.pods do\n  pod \"SDWebImage\"\nend\n"
         end
       end
+
     end
   end
 end

data/lib/project/ruby_motion_query/stylers/ui_image_view.rb

@@ -11,6 +11,7 @@ module RubyMotionQuery
       def placeholder_image=(value)
         @view.image = value
       end
+      
     end
   end
 end

data/lib/project/ruby_motion_query/traverse.rb

@@ -1,9 +1,11 @@
 module RubyMotionQuery
   class RMQ
+
     # TODO Why doesn't this work?
     #alias :screen :view_controller
     def screen
       view_controller
     end
+    
   end
 end

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module RedPotion
-  VERSION = "1.5.0"
+  VERSION = "1.6.0"
 end

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

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %>Screen < UICollectionViewController
+
   include ProMotion::ScreenModule
 
   title "Your title here"
@@ -50,4 +51,5 @@ class <%= @name_camel_case %>Screen < UICollectionViewController
   def will_animate_rotate(orientation, duration)
     reapply_styles
   end
+  
 end

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

@@ -1,4 +1,5 @@
 module <%= @name_camel_case %>CellStylesheet
+  
   def cell_size
     {w: 96, h: 96}
   end

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

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %>Cell < UICollectionViewCell
+
   def on_load
     find(self).apply_style :<%= @name %>_cell
 
@@ -6,4 +7,5 @@ class <%= @name_camel_case %>Cell < UICollectionViewCell
     # Add your subviews, init stuff here
     # @foo = q.append!(UILabel, :foo)
   end
+  
 end

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

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %>Screen < UITableViewController
+
   include ProMotion::ScreenModule
 
   title "Your title here"
@@ -70,4 +71,5 @@ class <%= @name_camel_case %>Screen < UITableViewController
   def will_animate_rotate(orientation, duration)
     reapply_styles
   end
+  
 end

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

@@ -22,4 +22,5 @@ class <%= @name_camel_case %>ScreenStylesheet < ApplicationStylesheet
     st.frame = {left: 5, top: 5, from_right: 10, from_bottom: 5}
     st.color = color.black
   end
+  
 end

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

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %>Cell < UITableViewCell
+  
   def on_load
     find(self.contentView).tap do |q|
       @name = q.append!(UILabel, :cell_name)
@@ -8,4 +9,5 @@ class <%= @name_camel_case %>Cell < UITableViewCell
   def update(data)
     @name.text = "#{data[:name]} is #{data[:num]}"
   end
+  
 end

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

@@ -5,4 +5,5 @@ describe '<%= @name_camel_case %>Screen' do
 
   after do
   end
+  
 end

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

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %>Screen < PM::<%= @screen_base %>
+  
   title "Your title here"
   stylesheet <%= @name_camel_case %>ScreenStylesheet
 
@@ -26,4 +27,5 @@ class <%= @name_camel_case %>Screen < PM::<%= @screen_base %>
   def will_animate_rotate(orientation, duration)
     reapply_styles
   end
+  
 end

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

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %>ScreenStylesheet < ApplicationStylesheet
+  
   # Add your view stylesheets here. You can then override styles if needed,
   # example: include FooStylesheet
 
@@ -10,4 +11,5 @@ class <%= @name_camel_case %>ScreenStylesheet < ApplicationStylesheet
   def root_view(st)
     st.background_color = color.white
   end
+  
 end

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

@@ -5,4 +5,5 @@ describe '<%= @name_camel_case %>Screen' do
 
   after do
   end
+  
 end

data/templates/table_screen_cell/app/views/name.rb

@@ -1,4 +1,5 @@
 class <%= @name_camel_case %> < PM::TableViewCell
+
   def on_load
     apply_style :<%= @name %>
 
@@ -22,8 +23,6 @@ class <%= @name_camel_case %> < PM::TableViewCell
 
 end
 
-
-
 __END__
 
 You can use this like so in your table_screen:

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redpotion
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
-- InfiniteRed
-- ClearSight Studio
+- Infinite Red
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2017-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_motion_query
@@ -111,8 +110,7 @@ dependencies:
         version: '0'
 description: RedPotion - The best combination of RubyMotion tools and libraries
 email:
-- hello@infinitered.com
-- hello@clearsightstudio.com
+- hello@infinite.red
 executables:
 - potion
 extensions: []
@@ -181,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: RedPotion combines RMQ, ProMotion, CDQ, AFMotion, and more for the perfect