redpotion 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33d59f9fe4ed03ce50987479a11a745dfcee3b29
-  data.tar.gz: 68ce1bf746430e52535523f155b631553e88e358
+  metadata.gz: 62ecec116f423ede1149e470e67d497265969f96
+  data.tar.gz: c5c046f6ce6064129f0e34e4e1971090d87e49dc
 SHA512:
-  metadata.gz: 8b8171dc7f119d605a1e2215cc1d2d7aa160f6cfff55cfff067ea2e17302ddbd40cb2639d0286865db2c2c63279cafa87e6143f46275b224287d17d60fde40ca
-  data.tar.gz: a16471a01e726c6990177f49fd59d6d8fa48a1b99144ddfdbad90b12fe85b0438fe9b0103389a4e27d113276883bfb9808c59813308f8feed83e7855401ebf57
+  metadata.gz: 6e5e64bfd2696d11d25ad48c876916f64918c039a87d07a58103fb56124361e22df4330e360acca119388004a68d0883dff1f8cf2584fb4bc8f230451f70d09e
+  data.tar.gz: 7ea38189c9df9e7f22a3c7f689dbf0d09c862a8b8952d27fbde741045f929eb7c2e104445b3c046cab82b34aae7be37af6e48a664cc0ccbf0e85aed07e1cc0ee

data/README.md

@@ -68,6 +68,11 @@ potion create lib foo
 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
@@ -105,6 +110,9 @@ apply_style
 reapply_styles
 style
 color
+image
+stylesheet
+stylesheet=
 ```
 
 ### Stylesheet in your screens
@@ -142,6 +150,14 @@ end
 
 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)
+```
 
 ## Contributing
 

data/bin/potion

@@ -13,6 +13,7 @@ class PotionCommandLine
      Some things you can do with the potion command:
 
      > potion create my_new_app
+     > potion create my_new_app --skip-cdq # Setup application without CDQ
 
      > potion create model foo
      > potion create screen foo
@@ -24,38 +25,60 @@ class PotionCommandLine
      You can still create controllers, but you should create screens instead
      > potion create controller foos
      > potion create collection_view_controller foos
-     > potion create table_view_controller bars 
+     > potion create table_view_controller bars
+
+     You can remove CDQ or afmotion if your project does not use it
+     > potion remove cdq
+     > potion remove afmotion
 
      > potion -h, --help
-     > potion -v, --version 
+     > potion -v, --version
 
      > rmq_docs
      > rmq_docs query
      > rmq_docs "background image" }
 
   class << self
+    SKIP_FLAGS = [ "--skip-cdq", "--skip-afmotion" ]
+
     VALID_CREATE_TYPES = [
       :screen, :table_screen,
-      :model, :controller, 
-      :view, 
-      :shared, 
-      :lib, 
-      :collection_view_controller, 
+      :model, :controller,
+      :view,
+      :shared,
+      :lib,
+      :collection_view_controller,
       :table_view_controller
     ]
 
-    def create(template_or_app_name, name, options)
-      @dry_run = true if options == 'dry_run'
 
-      if name
-        if VALID_CREATE_TYPES.include?(template_or_app_name.to_sym)
-          insert_from_template(template_or_app_name, name)
-        else
+    def create(template_or_app_name, *options)
+      # Dry Run option - TODO - change this to --dry_run to streamline
+      if options.first == 'dry_run'
+        @dry_run = true
+        options.slice!(0)
+      end
+
+      unless options.first.include?('--')
+        name = options.slice!(0)
+        unless VALID_CREATE_TYPES.include?(template_or_app_name.to_sym)
           puts "potion - Invalid command, do something like this: potion create controller my_controller\n"
+          return
         end
+      end
+
+      if name
+        insert_from_template(template_or_app_name, name)
       else
         #ensure_template_dir
         create_app(template_or_app_name)
+        options.each do |option|
+          if SKIP_FLAGS.include?(option)
+            Dir.chdir("./#{template_or_app_name}")
+            remove(option.split('-').last, true)
+            Dir.chdir('..')
+          end
+        end
       end
     end
 
@@ -142,13 +165,13 @@ class PotionCommandLine
         @in_app_path = File.dirname(template_file_path_and_name).gsub(@template_path, '')
         @ext = File.extname(template_file_path_and_name)
         @file_name = File.basename(template_file_path_and_name, @ext)
-        
+
         @new_file_name = @file_name.gsub('name', @name)
         @new_file_path_name = "#{Dir.pwd}/#{@in_app_path}/#{@new_file_name}#{@ext}"
 
         if @dry_run
           puts "\n     Instance vars:"
-          self.instance_variables.each{|var| puts "     #{var} = #{self.instance_variable_get(var)}"} 
+          self.instance_variables.each{|var| puts "     #{var} = #{self.instance_variable_get(var)}"}
           puts
         end
 
@@ -177,10 +200,35 @@ class PotionCommandLine
       erb = ERB.new(template_file)
       erb.result(binding)
     end
+
+    def remove(type, show_output=true)
+      case type
+      when 'cdq'
+        remove_lines('Gemfile', /gem ('|")cdq('|")/, show_output)
+        remove_lines('app/app_delegate.rb', /include CDQ|cdq.setup/, show_output)
+        remove_lines('Rakefile', /schema:build/, show_output)
+        File.delete('schemas/0001_initial.rb') if File.exists?('schemas/0001_initial.rb')
+      when 'afmotion'
+        remove_lines('Gemfile', /gem ('|")afmotion('|")/, show_output)
+      else
+        puts "potion - Invalid command option '#{type}', potion remove only works with cdq"
+      end
+    end
+
+    def remove_lines(file, match, show_output)
+      puts "Modifying #{file}" if show_output
+      data = IO.readlines(file)
+      File.open(file, 'w') do |f|
+        data.each do |line|
+          unless line =~ match
+            f.puts line
+          end
+        end
+      end
+    end
   end
 end
 
-
 # Process input, execute actions
 unless ARGV.length > 0
   puts "potion - Invalid command, do something like this: potion create my_new_app\n"
@@ -202,6 +250,8 @@ when 'rmq_docs'
   else
     `open http://rubymotionquery.com/documentation`
   end
+when 'remove'
+  PotionCommandLine.remove(ARGV[1])
 when '--help', '-h'
   puts PotionCommandLine::HELP_TEXT
 when '-v', '--version'
@@ -210,4 +260,3 @@ else
   puts 'potion - Invalid action'
   puts PotionCommandLine::HELP_TEXT
 end
-

data/lib/project/ext/object.rb

@@ -0,0 +1,13 @@
+class Object
+  def app
+    rmq.app
+  end
+
+  def device
+    rmq.device
+  end
+
+  def find(*args) # Do not alias this, strange bugs happen where classes don't have methods
+    rmq(args)
+  end
+end

data/lib/project/ext/ui_color.rb

@@ -0,0 +1,13 @@
+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)
+
+    r = options[:r] || options[:red] || r.value
+    g = options[:g] || options[:green] || g.value
+    b = options[:b] || options[:blue] || b.value
+    a = options[:a] || options[:alpha] || a.value
+
+    UIColor.colorWithRed(r, green: g, blue: b, alpha: a)
+  end
+end

data/lib/project/ext/ui_view.rb

@@ -0,0 +1,88 @@
+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.
+  def rmq_build
+    on_load
+  end
+
+  def on_load
+  end
+
+  def on_styled
+  end
+
+  # You can user either rmq_style_applied or on_styled, not both.  If you have both on_styled will be ignored,
+  # you can however call it from rmq_style_applied.  They are the same, on_styled follows the Promotion style
+  # and is recommended.
+  def rmq_style_applied
+    on_styled
+  end
+
+  def append(view_or_constant, style=nil, opts = {})
+    rmq(self).append(view_or_constant, style, opts)
+  end
+  def append!(view_or_constant, style=nil, opts = {})
+    rmq(self).append!(view_or_constant, style, opts)
+  end
+
+  def prepend(view_or_constant, style=nil, opts = {})
+    rmq(self).prepend(view_or_constant, style, opts)
+  end
+  def prepend!(view_or_constant, style=nil, opts = {})
+    rmq(self).prepend!(view_or_constant, style, opts)
+  end
+
+  def create(view_or_constant, style=nil, opts = {})
+    rmq(self).create(view_or_constant, style, opts)
+  end
+  def create!(view_or_constant, style=nil, opts = {})
+    rmq(self).create!(view_or_constant, style, opts)
+  end
+
+  def build(view, style = nil, opts = {})
+    rmq(self).build(view, style, opts)
+  end
+  def build!(view, style = nil, opts = {})
+    rmq(self).build!(view, style, opts)
+  end
+
+  def on(event, args = {}, &block)
+    rmq(self).on(event, args, &block)
+  end
+
+  def off(*events)
+    rmq(self).off(*events)
+  end
+
+  def apply_style(style_name)
+    rmq(self).apply_style(style_name)
+  end
+
+  def reapply_styles
+    rmq(self).reapply_styles
+  end
+
+  def style(&block)
+    rmq(self).style(&block)
+  end
+
+  def color
+    rmq.color
+  end
+
+  def font
+    rmq.font
+  end
+
+  def image
+    rmq.image
+  end
+
+  def stylesheet
+    rmq.stylesheet
+  end
+  def stylesheet=(value)
+    rmq.stylesheet = value
+  end
+end

data/lib/project/{ruby_motion_query/ext.rb → ext/ui_view_controller.rb}

@@ -1,97 +1,3 @@
-class Object
-  def app
-    rmq.app
-  end
-
-  def find(*args) # Do not alias this, strange bugs happen where classes don't have methods
-    rmq(args)
-  end
-end
-
-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.
-  def rmq_build
-    on_load
-  end
-
-  def on_load
-  end
-
-  def on_styled
-  end
-
-  # You can user either rmq_style_applied or on_styled, not both.  If you have both on_styled will be ignored,
-  # you can however call it from rmq_style_applied.  They are the same, on_styled follows the Promotion style
-  # and is recommended.
-  def rmq_style_applied
-    on_styled
-  end
-
-  def append(view_or_constant, style=nil, opts = {})
-    rmq(self).append(view_or_constant, style, opts)
-  end
-  def append!(view_or_constant, style=nil, opts = {})
-    rmq(self).append!(view_or_constant, style, opts)
-  end
-
-  def prepend(view_or_constant, style=nil, opts = {})
-    rmq(self).prepend(view_or_constant, style, opts)
-  end
-  def prepend!(view_or_constant, style=nil, opts = {})
-    rmq(self).prepend!(view_or_constant, style, opts)
-  end
-
-  def create(view_or_constant, style=nil, opts = {})
-    rmq(self).create(view_or_constant, style, opts)
-  end
-  def create!(view_or_constant, style=nil, opts = {})
-    rmq(self).create!(view_or_constant, style, opts)
-  end
-
-  def build(view, style = nil, opts = {})
-    rmq(self).build(view, style, opts)
-  end
-  def build!(view, style = nil, opts = {})
-    rmq(self).build!(view, style, opts)
-  end
-
-  def on(event, args = {}, &block)
-    rmq(self).on(event, args, &block)
-  end
-
-  def apply_style(style_name)
-    rmq(self).apply_style(style_name)
-  end
-
-  def reapply_styles
-    rmq(self).reapply_styles
-  end
-
-  def style(&block)
-    rmq(self).style(&block)
-  end
-
-  def color
-    rmq.color
-  end
-
-  def font
-    rmq.font
-  end
-
-  def image
-    rmq.image
-  end
-
-  def stylesheet
-    rmq.stylesheet
-  end
-  def stylesheet=(value)
-    rmq.stylesheet = value
-  end
-end
 class UIViewController
   def append(view_or_constant, style=nil, opts = {})
     view.append(view_or_constant, style, opts)
@@ -165,7 +71,7 @@ class UIViewController
     end
 
     self.originalViewDidLoad
-    unless pm_handles_did_load?
+    unless pm_handles_delegates?
       unless self.class.included_modules.include?(ProMotion::ScreenModule)
         self.view_did_load
       end
@@ -173,32 +79,36 @@ class UIViewController
     end
   end
 
-  def pm_handles_did_load?
-    self.is_a?(ProMotion::ViewController) || self.is_a?(ProMotion::TableScreen)
-  end
-
   def view_will_appear(animated)
   end
   def viewWillAppear(animated)
-    self.view_will_appear(animated)
+    unless pm_handles_delegates?
+      self.view_will_appear(animated)
+    end
   end
 
   def view_did_appear(animated)
   end
   def viewDidAppear(animated)
-    self.view_did_appear(animated)
+    unless pm_handles_delegates?
+      self.view_did_appear(animated)
+    end
   end
 
   def view_will_disappear(animated)
   end
   def viewWillDisappear(animated)
-    self.view_will_disappear(animated)
+    unless pm_handles_delegates?
+      self.view_will_disappear(animated)
+    end
   end
 
   def view_did_disappear(animated)
   end
   def viewDidDisappear(animated)
-    self.view_did_disappear(animated)
+    unless pm_handles_delegates?
+      self.view_did_disappear(animated)
+    end
   end
 
   def should_rotate(orientation)
@@ -231,4 +141,10 @@ class UIViewController
   def willAnimateRotationToInterfaceOrientation(orientation, duration: duration)
     self.will_animate_rotate(orientation, duration)
   end
+
+  private
+
+  def pm_handles_delegates?
+    self.is_a?(ProMotion::ViewController) || self.is_a?(ProMotion::TableScreen)
+  end
 end

data/lib/project/pro_motion/data_table_screen.rb

@@ -0,0 +1,66 @@
+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
+
+    def self.cell_properties
+      @cell
+    end
+
+    def table_data
+      [{
+        cells: cell_data
+      }]
+    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
+    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]
+    end
+
+    def data_scope
+      @data_scope ||= cell_properties[:scope] || :all
+    end
+  end
+end

data/lib/project/pro_motion/table.rb

@@ -17,5 +17,4 @@ module ProMotion
       table_cell
     end
   end
-
 end

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module RedPotion
-  VERSION = "0.5.0"
+  VERSION = "0.7.0"
 end

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

@@ -24,6 +24,6 @@ class <%= @name_camel_case %>Screen < PM::<%= @screen_base %>
   # Then in will_animate_rotate
   #   find(:reapply_style).reapply_styles#
   def will_animate_rotate(orientation, duration)
-    find.all.reapply_styles
+    reapply_styles
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpotion
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
 platform: ruby
 authors:
 - InfiniteRed
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_motion_query
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: ProMotion
   requirement: !ruby/object:Gem::Requirement
@@ -92,10 +92,13 @@ extra_rdoc_files: []
 files:
 - README.md
 - bin/potion
+- lib/project/ext/object.rb
+- lib/project/ext/ui_color.rb
+- lib/project/ext/ui_view.rb
+- lib/project/ext/ui_view_controller.rb
+- lib/project/pro_motion/data_table_screen.rb
 - lib/project/pro_motion/table.rb
-- lib/project/redpotion.rb
 - lib/project/ruby_motion_query/app.rb
-- lib/project/ruby_motion_query/ext.rb
 - lib/project/ruby_motion_query/traverse.rb
 - lib/project/version.rb
 - lib/redpotion.rb