redpotion 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3679810174cad62212f3453c6cbe5f7611db602c
-  data.tar.gz: 59c97b1182042a1bf47fc6b6ecb4736466ee6469
+  metadata.gz: d02a5ebf83ee813131955bcb138df65d3c0d46df
+  data.tar.gz: 14409d48ae7de7f9a20cdd14205f0e3acc84f5bc
 SHA512:
-  metadata.gz: ac377c93f8b763bef9dbabf3e4de8f2b3ad6a7611246316e2d824ad515a2e8b857e4546ad09d16766cc64b4fcc6d5416c0b8ab93d446ed4c5c1d3d20d2e3b8e0
-  data.tar.gz: fd9d7aa314eb3a8470385d3db426ffe7168d07eb68063016a3406d62b01ff4714fdcfdfcd5d1891685e664b1743bafb7d7e6b032036eed0bd06bc0a122051308
+  metadata.gz: bdd6442f259a64cdc1a948dab9039d31378b0a264aaf532c663eddd9545ae869ba9ee8e95393bdf4263dad7244ef5fe05fa02e1ddf97b245cfae224237a1e487
+  data.tar.gz: 3e8249d43d27b7af83dab08bcd0941f4f5aacb925d12fa73f54eb5cb5522146dc2a34e3b6d804103585686d7378a37fe36faa4015e27a6c43fae130a677f8ac8

data/README.md

@@ -60,17 +60,6 @@ add it to your `Gemfile`:
 
 - `gem 'redpotion'`
 
-
-## Contributing
-
-0. Create an issue in GitHub to make sure your PR will be accepted.
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-
 <br />
 
 ## Read the documentation at [docs.redpotion.org](http://docs.redpotion.org)

data/bin/potion

@@ -3,32 +3,31 @@
 require "erb"
 require "rubygems"
 require 'open-uri'
-
-$:.unshift(File.join(File.dirname(__FILE__), "/../lib/project"))
-require "version"
+require_relative "../lib/project/version"
 
 class PotionCommandLine
   HELP_TEXT = %{     potion version #{RedPotion::VERSION}
 
      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 new my_new_app
+     > potion new my_new_app --skip-cdq # Setup application without CDQ
+     > potion new my_new_app --skip-afmotion # Setup application without afmotion
 
-     > potion create model foo
-     > potion create screen foo
-     > potion create table_screen foo
-     > potion create table_screen_cell bar_cell
-     > 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
+     > potion g model foo
+     > potion g screen foo
+     > potion g table_screen foo
+     > potion g table_screen_cell bar_cell
+     > potion g metal_table_screen foo
+     > potion g collection_view_screen
+     > potion g view bar
+     > potion g shared some_class_used_app_wide
+     > potion g lib some_class_used_by_multiple_apps
 
      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 g controller foos
+     > potion g collection_view_controller foos
+     > potion g table_view_controller bars
 
      You can remove CDQ or afmotion if your project does not use it
      > potion remove cdq
@@ -59,50 +58,53 @@ class PotionCommandLine
       :table_view_controller
     ]
 
-
-    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."
+    def new(app_name, *options)
+      if app_name.nil?
+        puts "potion - Invalid command, try adding an application name. (ex: potion new my_app)\n"
         return
       end
 
       options.compact!
+      #ensure_template_dir
+      create_app(app_name, options)
+    end
+
+    def generate(template, *options)
+      name = options.slice!(0)
+      if VALID_CREATE_TYPES.include?(template.to_sym)
+        insert_from_template(template, name)
+      else
+        puts "potion - Invalid command, do something like this: potion g controller my_controller\n"
+      end
+    end
+
+    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
 
-      if options.count > 0
-        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
-      end
-
-      if name
-        insert_from_template(template_or_app_name, name)
+      if options.first && options.first.include?('--')
+        new(template_or_app_name, *options)
       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
+        generate(template_or_app_name, *options)
       end
     end
 
-    def create_app(app_name)
+    def create_app(app_name, options)
       puts '     Creating app'
 
       `motion create --template=https://github.com/infinitered/redpotion-template.git #{app_name}`
 
+      options.each do |option|
+        if SKIP_FLAGS.include?(option)
+          Dir.chdir("./#{app_name}")
+          remove(option.split('-').last, true)
+          Dir.chdir('..')
+        end
+      end
+
       ["bundle", "rake pod:install"].each do |command|
         puts "Running #{command}..."
 
@@ -230,6 +232,7 @@ class PotionCommandLine
         remove_lines('Rakefile', /schema:build/, show_output)
         File.delete('schemas/0001_initial.rb') if File.exists?('schemas/0001_initial.rb')
         File.delete('resources/cdq.yml') if File.exists?('resources/cdq.yml')
+        File.delete('spec/helpers/cdq.rb') if File.exists?('spec/helpers/cdq.rb')
         Dir.delete('schemas') if Dir.exists?('schemas')
       when 'afmotion'
         remove_lines('Gemfile', /gem ('|")afmotion('|")/, show_output)
@@ -269,7 +272,12 @@ action = ARGV[0]
 query = ARGV[1]
 
 case action
+when 'new'
+  PotionCommandLine.new(ARGV[1], ARGV[2], ARGV[3])
+when 'g', 'generate'
+  PotionCommandLine.generate(ARGV[1], ARGV[2], ARGV[3])
 when 'create'
+  # create provided as an alias for backwards compatibility
   PotionCommandLine.create(ARGV[1], ARGV[2], ARGV[3])
 when 'rmq_docs'
   if query

data/lib/project/ext/object.rb

@@ -7,6 +7,10 @@ class Object
     rmq.device
   end
 
+  def blank?
+    self.respond_to?(:empty?) ? self.empty? : !self
+  end
+
   def find(*args) # Do not alias this, strange bugs happen where classes don't have methods
     rmq(*args)
   end

data/lib/project/ext/ui_collection_view_cell.rb

@@ -0,0 +1,17 @@
+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.
+  def rmq_build
+    self.on_load
+  end
+
+  def reused
+    @reused
+  end
+
+  def prepareForReuse
+    super
+    @reused = true
+  end
+end

data/lib/project/ext/ui_color.rb

@@ -1,13 +1,9 @@
 class UIColor
   def with(options)
-    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
-
+    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

data/lib/project/ext/ui_table_view_cell.rb

@@ -0,0 +1,8 @@
+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/pro_motion/data_table.rb

@@ -0,0 +1,193 @@
+module ProMotion
+  module DataTable
+    include TableClassMethods
+    include ProMotion::Styling
+    include ProMotion::Table
+    include ProMotion::TableBuilder
+    include ProMotion::TableDataBuilder
+    include ProMotion::Table::Utils
+
+    include ProMotion::Table::Searchable
+    include ProMotion::Table::Refreshable
+    include ProMotion::Table::Indexable
+    include ProMotion::Table::Longpressable
+
+    def table_view
+      self.view
+    end
+
+    # This has to be defined in order to inherit everything from TableScreen
+    def table_data
+      [{cells:[]}]
+    end
+
+    def screen_setup
+      set_up_fetch_controller
+
+      set_up_header_footer_views
+      set_up_searchable
+      set_up_refreshable
+      set_up_longpressable
+      set_up_row_height
+    end
+
+    def set_up_fetch_controller
+      error_ptr = Pointer.new(:object)
+      fetch_controller.delegate = self
+
+      unless fetch_controller.performFetch(error_ptr)
+        raise "Error performing fetch: #{error_ptr[2].description}"
+      end
+    end
+
+    def update_table_data(notification = nil)
+      if notification.nil?
+        table_view.reloadData
+      else
+        Dispatch::Queue.main.async do
+          fetch_controller.managedObjectContext.mergeChangesFromContextDidSaveNotification(notification)
+        end
+      end
+    end
+
+    def fetch_scope
+      @_fetch_scope ||= begin
+        if respond_to?(:model_query)
+          data_with_scope = model_query
+        else
+          data_with_scope = data_model.send(data_scope)
+        end
+
+        if data_with_scope.sort_descriptors.empty?
+          # Try to be smart about how we sort things if a sort descriptor doesn't exist
+          attributes = data_model.send(:attribute_names)
+          sort_attribute = nil
+          [:updated_at, :created_at, :id].each do |att|
+            sort_attribute ||= att if attributes.include?(att.to_s)
+          end
+
+          if sort_attribute
+            mp "The `#{data_model}` model scope `#{data_scope}` needs a sort descriptor. Add sort_by(:property) to your scope. Currently sorting by :#{sort_attribute}.", force_color: :yellow
+            data_model.send(data_scope).sort_by(sort_attribute)
+          else
+            # This is where the application says goodbye and dies in a fiery crash.
+            mp "The `#{data_model}` model scope `#{data_scope}` needs a sort descriptor. Add sort_by(:property) to your scope.", force_color: :yellow
+          end
+        else
+          data_with_scope
+        end
+      end
+    end
+
+    def fetch_controller
+      if searching?
+        search_fetch_controller
+      else
+        @fetch_controller ||= NSFetchedResultsController.alloc.initWithFetchRequest(
+          fetch_scope.fetch_request,
+          managedObjectContext: fetch_scope.context,
+          sectionNameKeyPath: nil,
+          cacheName: nil
+        )
+      end
+    end
+
+    def on_cell_created(cell, data)
+      # Do not call super here
+      self.rmq.build(cell)
+    end
+
+    def cell_at(args = {})
+      index_path = args.is_a?(Hash) ? args[:index_path] : args
+      c = object_at_index(index_path).cell
+      set_data_cell_defaults(c)
+    end
+
+    def object_at_index(i)
+      fetch_controller.objectAtIndexPath(i)
+    end
+
+    def data_model
+      self.class.data_model
+    end
+
+    def data_scope
+      self.class.data_scope
+    end
+
+    def searching?
+      @_data_table_searching || false
+    end
+
+    def search_string
+      @_data_table_search_string
+    end
+
+    def original_search_string
+      search_string
+    end
+
+    def self.included(base)
+      base.extend(TableClassMethods)
+    end
+
+    # UITableViewDelegate methods
+    def numberOfSectionsInTableView(_)
+      fetch_controller.sections.count
+    end
+
+    def tableView(table_view, numberOfRowsInSection: section)
+      fetch_controller.sections[section].numberOfObjects
+    end
+
+    def tableView(table_view, didSelectRowAtIndexPath: index_path)
+      data_cell = cell_at(index_path: index_path)
+      table_view.deselectRowAtIndexPath(index_path, animated: true) unless data_cell[:keep_selection] == true
+      trigger_action(data_cell[:action], data_cell[:arguments], index_path) if data_cell[:action]
+    end
+
+    def tableView(_, cellForRowAtIndexPath: index_path)
+      params = index_path_to_section_index(index_path: index_path)
+      data_cell = cell_at(index_path: index_path)
+      return self.rmq.create(UITableViewCell) unless data_cell
+
+      create_table_cell(data_cell)
+    end
+
+    def tableView(_, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
+      data_cell = cell_at(index_path: index_path)
+      table_cell.send(:will_display) if table_cell.respond_to?(:will_display)
+      table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!) # Teacup compatibility
+    end
+
+    def tableView(table_view, heightForRowAtIndexPath: index_path)
+      (object_at_index(index_path).cell[:height] || table_view.rowHeight).to_f
+    end
+
+    def controllerWillChangeContent(controller)
+      # TODO - we should update the search results table when a new record is added
+      # or deleted or changed. For now, when the data changes, the search doesn't
+      # update. Closing the search will update the data and then searching again
+      # will show the new or changed content.
+      table_view.beginUpdates unless searching?
+    end
+
+    def controller(controller, didChangeObject: task, atIndexPath: index_path, forChangeType: change_type, newIndexPath: new_index_path)
+      unless searching?
+        case change_type
+        when NSFetchedResultsChangeInsert
+          table_view.insertRowsAtIndexPaths([new_index_path], withRowAnimation: UITableViewRowAnimationAutomatic)
+        when NSFetchedResultsChangeDelete
+          table_view.deleteRowsAtIndexPaths([index_path], withRowAnimation: UITableViewRowAnimationAutomatic)
+        when NSFetchedResultsChangeUpdate
+          table_view.reloadRowsAtIndexPaths([index_path], withRowAnimation: UITableViewRowAnimationAutomatic)
+        end
+      end
+    end
+
+    def controllerDidChangeContent(controller)
+      table_view.endUpdates unless searching?
+    end
+
+  end
+end

data/lib/project/pro_motion/data_table_screen.rb

@@ -1,39 +1,28 @@
 module ProMotion
-  class DataTableScreen < TableScreen
+  class DataTableScreen < TableViewController
+    include ProMotion::ScreenModule
+    include ProMotion::DataTable
+
     class << self
-      def model(value, scope=nil)
+      def model(value, opts = {})
         if value.method_defined?(:cell)
-          @data_model = value
-          @data_scope = scope || :all
+          @opts = {
+            model: value,
+            scope: :all,
+          }.merge(opts)
         else
           raise "#{value} must define the cell method"
         end
       end
 
-      def data_model; @data_model; end
-      def data_scope; @data_scope; end
-    end
-
-    def table_data
-      [{
-        cells: cell_data
-      }]
-    end
-
-    def cell_data
-      return [] if data_model.nil?
-
-      data_model.send(data_scope).collect(&:cell)
-    end
-
-    private
+      def data_model
+        @opts[:model]
+      end
 
-    def data_model
-      self.class.data_model
+      def data_scope
+        @opts[:scope]
+      end
     end
 
-    def data_scope
-      self.class.data_scope
-    end
   end
 end

data/lib/project/pro_motion/data_table_search_delegate.rb

@@ -0,0 +1,15 @@
+class DataTableSeachDelegate
+  attr_accessor :parent
+
+  def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
+    parent.dt_searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
+  end
+
+  def searchDisplayControllerWillEndSearch(controller)
+    parent.dt_searchDisplayControllerWillEndSearch(controller)
+  end
+
+  def searchDisplayControllerWillBeginSearch(controller)
+    parent.dt_searchDisplayControllerWillBeginSearch(controller)
+  end
+end

data/lib/project/pro_motion/data_table_searchable.rb

@@ -0,0 +1,89 @@
+module ProMotion
+  module Table
+    module Searchable
+
+      # Replace this method so that we can gather the predicate fields for DataTableScreen searchable
+      alias_method :old_set_searchable_param_defaults, :set_searchable_param_defaults
+      def set_searchable_param_defaults(params)
+        all_params = old_set_searchable_param_defaults(params)
+
+        if self.is_a?(ProMotion::DataTableScreen)
+          if params[:search_bar][:fields].nil?
+            raise "ERROR: You must specify fields:[:example] for your searchable DataTableScreen. It should be an array of fields you want searched in CDQ."
+          else
+            @data_table_predicate_fields = all_params[:search_bar][:fields]
+          end
+        end
+
+        all_params[:delegate] = search_delegate
+        all_params
+      end
+
+      def search_fetch_controller
+        @_search_fetch_controller ||= new_frc_with_search(search_string)
+      end
+
+      def new_frc_with_search(search_string)
+        # Create the predicate from the predetermined fetch scope.
+        where = @data_table_predicate_fields.map{|f| "#{f} CONTAINS[cd] \"#{search_string}\"" }.join(" OR ")
+        search_scope = fetch_scope.where(where)
+
+        # Create the search FRC with the predicate and set delegate
+        search = NSFetchedResultsController.alloc.initWithFetchRequest(
+          search_scope.fetch_request,
+          managedObjectContext: search_scope.context,
+          sectionNameKeyPath: nil,
+          cacheName: nil
+        )
+        search.delegate = search_delegate
+
+        # Perform the fetch
+        error_ptr = Pointer.new(:object)
+        unless search.performFetch(error_ptr)
+          raise "Error performing fetch: #{error_ptr[2].description}"
+        end
+
+        search
+      end
+
+      def reset_search_frc
+        # Update the filter, in this case just blow away the FRC and let
+        # lazy evaluation create another with the relevant search info
+        @_search_fetch_controller.delegate = nil unless @_search_fetch_controller.nil?
+        @_search_fetch_controller = nil
+      end
+
+      def search_delegate
+        @_search_delegate ||= begin
+          d = DataTableSeachDelegate.new
+          d.parent = WeakRef.new(self)
+          d
+        end
+      end
+
+      ######### iOS methods, headless camel case #######
+
+      def dt_searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
+        @_data_table_search_string = search_string
+        reset_search_frc
+        true
+      end
+
+      def dt_searchDisplayControllerWillEndSearch(controller)
+        @_data_table_searching = false
+        @_search_fetch_controller.delegate = nil unless @_search_fetch_controller.nil?
+        @_search_fetch_controller = nil
+        @_data_table_search_string = nil
+        self.table_view.setScrollEnabled true
+        @table_search_display_controller.delegate.will_end_search if @table_search_display_controller.delegate.respond_to? "will_end_search"
+        update_table_data
+      end
+
+      def dt_searchDisplayControllerWillBeginSearch(controller)
+        @_data_table_searching = true
+        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/ruby_motion_query/app.rb

@@ -4,6 +4,10 @@ module RubyMotionQuery
       def current_screen(root_view_controller = nil)
         current_view_controller root_view_controller
       end
+
+      def data(*args) # Do not alias this
+        CDQ.cdq(*args)
+      end
     end
   end
 end

data/lib/project/version.rb

@@ -1,3 +1,3 @@
 module RedPotion
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/redpotion.rb

@@ -7,7 +7,7 @@ end
 require 'ruby_motion_query'
 require 'ProMotion'
 require 'motion_print'
-require 'redalert'
+require 'RedAlert'
 
 lib_dir_path = File.dirname(File.expand_path(__FILE__))
 Motion::Project::App.setup do |app|

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

@@ -35,7 +35,7 @@ class <%= @name_camel_case %>Screen < UICollectionViewController
 
   def collectionView(view, cellForItemAtIndexPath: index_path)
     view.dequeueReusableCellWithReuseIdentifier(<%= @name.upcase %>_CELL_ID, forIndexPath: index_path).tap do |cell|
-      build(cell) unless cell.reused
+      self.rmq.build(cell) unless cell.reused
 
       # Update cell's data here
     end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redpotion
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - InfiniteRed
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-07-14 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.4.0
+        version: 1.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: ProMotion
   requirement: !ruby/object:Gem::Requirement
@@ -123,11 +123,16 @@ files:
 - lib/project/ext/kernel.rb
 - lib/project/ext/object.rb
 - lib/project/ext/pm_delegate.rb
+- lib/project/ext/ui_collection_view_cell.rb
 - lib/project/ext/ui_color.rb
 - lib/project/ext/ui_image_view.rb
+- lib/project/ext/ui_table_view_cell.rb
 - lib/project/ext/ui_view.rb
 - lib/project/ext/ui_view_controller.rb
+- lib/project/pro_motion/data_table.rb
 - lib/project/pro_motion/data_table_screen.rb
+- lib/project/pro_motion/data_table_search_delegate.rb
+- lib/project/pro_motion/data_table_searchable.rb
 - lib/project/pro_motion/screen.rb
 - lib/project/pro_motion/support.rb
 - lib/project/pro_motion/table.rb