motion-prime 0.5.4 → 0.5.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDEyOWU0OGJhMGZmOGE2MTgyZjA0ZGYyNzlkYzA0MWJkZWE4NjI5YQ==
+    ZWI5NzE3MDI4ZThhZGM4ZTk4NGQ1NzhkZjFlYTNhZGJkY2Q0OTM2YQ==
   data.tar.gz: !binary |-
-    NjI0YjU0MTAzM2I3OGRiODM2NTI2ZmVlOTdjZDdlMmU1ZjdlYjM4NQ==
+    NmRiZDc2ZGNlYjEzMDQ1M2QxMTk1ZGY1Nzg0MDYzOTgxOWMxNDUyNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmRmNDU1YThiN2QwZDM5YmVhZjhhZTNhZmVjNDYwZmVjYmE1ZDhmYWJiNWJk
-    YmVhNWMwMGIzNzYwM2JmMzRmNmUwOWE3YmYwYzgzNmY3MmVmYjdmYjAxNjA5
-    MmZhMGFiZWRiZWM4YmE2NDhhYmZjNmFkMjkwZDI5ODBmNzFkYjY=
+    ZGE4ZTcyOTA1MzQ5MTk5MTYyOWE5ZDRlMGEzNTczYjZlNzI5Y2NkMThmNzli
+    NzhmNjdjZmRjM2I4NmY2ZTAwNjAyOWY2NzJjZTE4ZGE1N2I0NjA3ZjNmZjAz
+    M2JiN2U1ODAzNTAyNjVkMDhiNTkxYzY1NjMyY2RiOTNmOWZhYWI=
   data.tar.gz: !binary |-
-    MjFmOWYwNzg4ZDA5MzVlNjcyOTg2YWIyODlkM2ZhMmE5ZDcyNDJhZTRiMWEz
-    YzAxYWM0ZTQ5N2QwNmJlOTgxY2M3ZDJmOWNiYzMzZTc2N2Y4YTBhZjA3ZGFh
-    MjYzZTM0MjY1MTUyOTBkZmY2ODQ0NThlMDhlYTAwYTAzZjc5ZWU=
+    NzFjOGJjNTZlOWIyYjJhZDA5YmQ5MWQyM2JiYzdhMTk2NjVjMmY0MTFhZmE0
+    YWIwODQ4NmQ3MDJlYmRlZTVhNzUzNTE3OWY3MWEzOWZkYmY1MTYxNDQ0YWU0
+    YjVmODhkYzI4YWQ5MDE5MzUyNzc3MWNlYTYzNzZhNjM0NmY3ZjI=

data/.yardopts

@@ -0,0 +1 @@
+{motion-prime}/**/*.rb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.5.5
+* improve association fetch speed and login.
+* "delete" method is not supported for model collection now, use delete_all.
+
 === 0.5.4
 * ApiClient#authenticate returns full data and status instead of only token.
 * Made table cell more configuralble.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.5.4)
+    motion-prime (0.5.5)
       bubble-wrap
       cocoapods
       methadone

data/README.md

@@ -43,8 +43,8 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
     title 'Main screen'
 
     def render
-      @main_section = MyProfileSection.new(model: User.first)
-      @main_section.render(to: self)
+      @main_section = MyProfileSection.new(screen: self)
+      @main_section.render
     end
   end
 
@@ -69,6 +69,7 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 
 * [ECSlidingViewController 2 integration](https://github.com/droidlabs/prime_sliding_menu) (Sidebar)
 * [RESideMenu integration](https://github.com/droidlabs/prime_reside_menu) (Sidebar)
+* [Sliding actions support](https://github.com/droidlabs/prime_sliding_action)
 
 ## Samples
 

data/ROADMAP.md

@@ -5,6 +5,7 @@
 * add more and better default options for fields
 
 === 0.7.0
+* bug: if mp label do not have text and was set as hidden, it should unhide after setting text
 * add cleanup for section events
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.

data/files/Gemfile

@@ -5,7 +5,7 @@ gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
 gem 'bubble-wrap', '~> 1.4.0'
 
-gem 'motion-prime', '~> 0.5.3'
+gem 'motion-prime', '~> 0.5.4'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.3'

data/files/Gemfile.lock

@@ -34,7 +34,7 @@ GEM
       bundler
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)
-    motion-prime (0.5.3)
+    motion-prime (0.5.4)
       bubble-wrap
       cocoapods
       methadone
@@ -67,7 +67,7 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap (~> 1.4.0)
   motion-cocoapods (~> 1.4.0)
-  motion-prime (~> 0.5.3)
+  motion-prime (~> 0.5.4)
   motion-support (~> 0.2.4)
   prime_reside_menu (~> 0.1.3)
   sugarcube (~> 1.3.7)

data/files/app/config/base.rb

@@ -6,7 +6,7 @@ Prime::Config.configure do |config|
 
   config.font.name = "Ubuntu"
 
-  config.api do |api|
+  config.api_client do |api|
     api.base = "http://example.com"
     api.client_id = ""
     api.client_secret = ""

data/motion-prime/api_client.rb

@@ -38,8 +38,9 @@ class ApiClient
     }
     use_callback = block_given?
     BW::HTTP.post("#{config.base}#{config.auth_path}", request_params(data)) do |response|
-      auth_data = if response.ok?
-        parse_json(response.body)
+      body = response.body.to_s
+      auth_data = if body.present?
+        parse_json(body)
       else
         false
       end
@@ -122,7 +123,7 @@ class ApiClient
       NSLog("Can't parse json: #{text}")
       false
     end
-  
+
     def user_defaults
       @user_defaults ||= NSUserDefaults.standardUserDefaults
     end

data/motion-prime/helpers/has_normalizer.rb

@@ -12,7 +12,7 @@ module MotionPrime
       end
     end
 
-    def normalize_object(object, receiver)
+    def normalize_object(object, receiver = nil)
       receiver ||= self
       if object.is_a?(Proc)
         receiver.send(:instance_exec, self, &object)

data/motion-prime/models/_base_mixin.rb

@@ -167,15 +167,25 @@ module MotionPrime
         self.store.count(self)
       end
 
-      # Delete objects from store
+      # Delete objects from store by given options
+      #
+      # Examples:
+      #   User.delete(:name => "Bob") #
       #
       # @param [Array, MotionPrime::Model] objects to delete
-      # @return [Array] result
+      # @return [Array] removed item keys
       def delete(*args)
+        if args.blank?
+          raise "Using delete with no args is not allowed. Please use delete_all to delete all records"
+        end
         keys = find_keys(*args)
         self.store.delete_keys(keys)
       end
 
+      def delete_all
+        self.store.delete_keys(find_keys)
+      end
+
       def default_sort(sort_options)
         self.default_sort_options = sort_options
       end

data/motion-prime/models/_sync_mixin.rb

@@ -14,6 +14,12 @@ module MotionPrime
       normalize_sync_url(url)
     end
 
+    def association_sync_url(key, options)
+      url = options[:sync_url]
+      url = url.call(self) if url.is_a?(Proc)
+      normalize_sync_url(url)
+    end
+
     # destroy on server and delete on local
     def destroy(&block)
       use_callback = block_given?
@@ -88,7 +94,7 @@ module MotionPrime
       post_data[model_name] = filtered_attributes
 
       method = options[:method] || (persisted? ? :put : :post)
-      api_client.send(method, url, post_data) do |data, status_code|
+      api_client.send(method, url, post_data, options) do |data, status_code|
         save_response = !options.has_key?(:save_response) || options[:save_response]
         if save_response && status_code.to_s =~ /20\d/ && data.is_a?(Hash)
           set_attributes_from_response(data)
@@ -104,11 +110,14 @@ module MotionPrime
     end
 
     # set attributes, using fetch
-    def fetch_with_attributes(attrs)
+    def fetch_with_attributes(attrs, sync_options = {})
       track_changed_attributes do
         attrs.each do |key, value|
           if respond_to?(:"fetch_#{key}")
             self.send(:"fetch_#{key}", value)
+          elsif has_association?(key) && (value.is_a?(Hash) || value.is_a?(Array))
+            should_save = sync_options[:save_associations]
+            fetch_association_with_attributes(key, value, save: should_save)
           elsif respond_to?(:"#{key}=")
             self.send(:"#{key}=", value)
           end
@@ -131,10 +140,14 @@ module MotionPrime
       end
     end
 
+    def has_association?(key)
+      !(self.class._associations || {})[key.to_sym].nil?
+    end
+
     def fetch_association?(key)
       options = self.class._associations[key]
-      return if options[:if] && !options[:if].to_proc.call(self)
-      options[:sync_url].present?
+      return false if options[:if] && !options[:if].to_proc.call(self)
+      association_sync_url(key, options).present?
     end
 
     def fetch_association(key, sync_options = {}, &block)
@@ -147,32 +160,23 @@ module MotionPrime
       end
     end
 
-    def fetch_has_many(key, options = {}, sync_options = {}, &block)
-      old_collection = self.send(key)
+    def fetch_association_with_attributes(key, data, sync_options = {})
+      options = (self.class._associations || {})[key.to_sym]
+      return unless options
+      if options[:type] == :many
+        fetch_has_many_with_attributes(key, data, sync_options)
+      else
+        fetch_has_one_with_attributes(key, data, sync_options)
+      end
+    end
 
+    def fetch_has_many(key, options = {}, sync_options = {}, &block)
       use_callback = block_given?
       NSLog("SYNC: started sync for #{key} in #{self.class_name_without_kvo}")
-      api_client.get normalize_sync_url(options[:sync_url]) do |response, status_code|
+      api_client.get association_sync_url(key, options) do |response, status_code|
         data = options[:sync_key] && response ? response[options[:sync_key]] : response
-        model_class = key.classify.constantize
         if data
-          # Update/Create existing records
-          data.each do |attributes|
-            model = old_collection.detect{ |model| model.id == attributes[:id]}
-            unless model
-              model = model_class.new
-              self.send(:"#{key}_bag") << model
-            end
-            model.fetch_with_attributes(attributes)
-            model.save if sync_options[:save] && model.has_changed?
-          end
-          old_collection.each do |old_model|
-            model = data.detect{ |model| model[:id] == old_model.id}
-            unless model
-              old_model.delete
-            end
-          end
-          save if sync_options[:save]
+          fetch_has_many_with_attributes(key, data, sync_options)
           NSLog("SYNC: finished sync for #{key} in #{self.class_name_without_kvo}")
           block.call(data, status_code, response) if use_callback
         else
@@ -182,19 +186,37 @@ module MotionPrime
       end
     end
 
+    def fetch_has_many_with_attributes(key, data, sync_options = {})
+      old_collection = self.send(key)
+      model_class = key.classify.constantize
+      self.class.store.save_interval = data.count
+      # Update/Create existing records
+      data.each do |attributes|
+        model = old_collection.detect{ |model| model.id == attributes[:id]}
+        unless model
+          model = model_class.new
+          self.send(:"#{key}_bag") << model
+        end
+        model.fetch_with_attributes(attributes, save_associations: sync_options[:save])
+        model.save if sync_options[:save] && model.has_changed?
+      end
+      old_collection.each do |old_model|
+        model = data.detect{ |model| model[:id] == old_model.id}
+        unless model
+          old_model.delete
+        end
+      end
+      save if sync_options[:save]
+      self.class.store.save_interval = 1
+    end
+
     def fetch_has_one(key, options = {}, &block)
       use_callback = block_given?
       NSLog("SYNC: started sync for #{key} in #{self.class_name_without_kvo}")
-      api_client.get normalize_sync_url(options[:sync_url]) do |response, status_code|
+      api_client.get association_sync_url(key, options) do |response, status_code|
         data = options.has_key?(:sync_key) ? response[options[:sync_key]] : response
         if data.present?
-          model = self.send(key)
-          unless model
-            model = key.classify.constantize.new
-            self.send(:"#{key}_bag") << model
-          end
-          model.fetch_with_attributes(data)
-          model.save if sync_options[:save]
+          fetch_has_one_with_attributes(key, data, save_associations: sync_options[:save])
           block.call(data, status_code, response) if use_callback
         else
           NSLog("SYNC ERROR: failed sync for #{key} in #{self.class_name_without_kvo}")
@@ -203,6 +225,16 @@ module MotionPrime
       end
     end
 
+    def fetch_has_one_with_attributes(key, data, sync_options = {})
+      model = self.send(key)
+      unless model
+        model = key.classify.constantize.new
+        self.send(:"#{key}_bag") << model
+      end
+      model.fetch_with_attributes(data)
+      model.save if sync_options[:save]
+    end
+
     def filtered_updatable_attributes(options = {})
       slice_attributes = options[:updatable_attributes].map(&:to_sym) if options.has_key?(:updatable_attributes)
       updatable_attributes = self.class.updatable_attributes
@@ -235,7 +267,7 @@ module MotionPrime
     end
 
     def normalize_sync_url(url)
-      url.to_s.gsub(':id', id.to_s)
+      normalize_object(url).to_s.gsub(':id', id.to_s)
     end
 
     module ClassMethods

data/motion-prime/models/association_collection.rb

@@ -75,5 +75,9 @@ module MotionPrime
     def model_class
       @model_class ||= @association_name.classify.constantize
     end
+
+    def delete_all
+      all.each { |obj| obj.delete }
+    end
   end
 end

data/motion-prime/models/model.rb

@@ -10,6 +10,7 @@ motion_require './store_extension.rb'
 module MotionPrime
   class Model < NSFNanoObject
     include MotionPrime::HasAuthorization
+    include MotionPrime::HasNormalizer
     include MotionPrime::ModelBaseMixin
     include MotionPrime::ModelAssociationMixin
     include MotionPrime::ModelSyncMixin

data/motion-prime/models/store_extension.rb

@@ -57,14 +57,6 @@ class NSFNanoStore
     result
   end
 
-  # Delete objects by keys
-  def delete_keys(keys)
-    error_ptr = Pointer.new(:id)
-    success = self.store.removeObjectsWithKeysInArray(keys, error: error_ptr)
-    raise MotionPrime::StoreError, error_ptr[0].description if error_ptr[0]
-    result
-  end
-
 
   # delete all objects from store
   def clear

data/motion-prime/screens/_navigation_mixin.rb

@@ -21,6 +21,7 @@ module MotionPrime
       screen
     end
 
+    # @return screen [Prime::Screen] screen appearing after close
     def close_screen(args = {})
       args[:animated] = args.has_key?(:animated) ? args[:animated] : true
       # Pop current view, maybe with arguments, if in navigation controller
@@ -85,22 +86,33 @@ module MotionPrime
         navigation_controller.pushViewController(screen, animated: args[:animated])
       end
 
+      # @return screen [Prime::Screen] screen appearing after close
       def close_screen_modal(args = {})
         parent_screen.dismissViewControllerAnimated(args[:animated], completion: lambda {
           send_on_return(args)
         })
+        parent_screen
       end
 
+      # @return screen [Prime::Screen] screen appearing after close
       def close_screen_navigational(args = {})
         if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
           self.parent_screen = args[:to_screen]
 
           screens = self.navigation_controller.childViewControllers
           self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
+          result = self.parent_screen
         else
-          self.navigation_controller.popViewControllerAnimated(args[:animated])
+          if args[:to_root]
+            self.navigation_controller.popToRootViewControllerAnimated(args[:animated])
+            result = self.navigation_controller.childViewControllers.first
+          else
+            self.navigation_controller.popViewControllerAnimated(args[:animated])
+            result = self.navigation_controller.childViewControllers.last
+          end
         end
         send_on_return(args)
+        result
       end
 
       def wrap_in_navigation!

data/motion-prime/sections/base_section.rb

@@ -221,7 +221,9 @@ module MotionPrime
       elements = Array.wrap(keyboard_close_bindings_options[:elements])
       views = Array.wrap(keyboard_close_bindings_options[:views])
 
-      elements.each { |el| views << el.view if %w[text_field text_view].include?(el.view_name) && el.view }
+      elements.each do |el| 
+        views << el.view if %w[text_field text_view].include?(el.view_name) && el.view
+      end
       views.compact.each(&:resignFirstResponder)
     end
 
@@ -247,6 +249,7 @@ module MotionPrime
       end
 
       def keyboard_close_bindings_options
+        return {} unless self.class.keyboard_close_bindings.present?
         @keyboard_close_bindings_options ||= normalize_options(self.class.keyboard_close_bindings.clone, self)
       end
 

data/motion-prime/sections/form/base_field_section.rb

@@ -12,12 +12,13 @@ module MotionPrime
     def prepare_table_data
       @form = @options[:table]
       if options[:observe_errors]
-        @errors_observer_options = normalize_options(options.delete(:observe_errors), self)
+        # Do not remove clone() after delete()
+        @errors_observer_options = normalize_options(options.delete(:observe_errors).clone, self)
       end
     end
 
     # Returns true if we should render element in current state
-    # 
+    #
     # @param element_name [Symbol] name of element in field
     # @return [Boolean]
     def render_element?(element_name)
@@ -31,7 +32,7 @@ module MotionPrime
     end
 
     # Changes height of the field (the cell in table) with animation.
-    # 
+    #
     # @param height [Integet] new height of field
     # @return [MotionPrime::BaseFieldSection]
     def update_height(height)
@@ -39,7 +40,7 @@ module MotionPrime
       field_index = form.field_indexes[name]
       index = field_index.split('_').map(&:to_i)
       path = NSIndexPath.indexPathForRow(index.last, inSection: index.first)
-      form.table_view.reloadRowsAtIndexPaths([path], withRowAnimation: UITableViewRowAnimationNone)
+      form.table_view.reloadRowsAtIndexPaths([path], withRowAnimation: UITableViewRowAnimationFade)
       self
     end
 

data/motion-prime/sections/table.rb

@@ -250,7 +250,9 @@ module MotionPrime
     private
       def display_pending_cells
         table_view.visibleCells.each do |cell_view|
-          cell_view.section.display if cell_view.section.pending_display
+          if cell_view.section && cell_view.section.pending_display
+            cell_view.section.display
+          end
         end
       end
 

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -175,6 +175,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- .yardopts
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock