motion-prime 0.4.5 → 0.5.0

data/motion-prime/models/{sync.rb → _sync_mixin.rb}

@@ -1,5 +1,7 @@
 module MotionPrime
-  module ModelSyncMethods
+  module ModelSyncMixin
+    extend ::MotionSupport::Concern
+
     def self.included(base)
       base.class_attribute :_sync_url
       base.class_attribute :_updatable_attributes
@@ -21,54 +23,47 @@ module MotionPrime
       delete
     end
 
-    # sync with server and save on local
-    def sync!(sync_options = {}, &block)
-      sync(sync_options.merge(save: true), &block)
+    # fetch from server and save on local
+    def fetch!(options = {}, &block)
+      fetch(options.merge(save: true), &block)
     end
 
-    # sync with with server
-    # TODO: order of fetch/update should be based on updated time?
-    def sync(sync_options = {}, &block)
+    # fetch from server
+    def fetch(options = {}, &block)
       use_callback = block_given?
-      should_fetch = sync_options[:fetch]
-      should_update = sync_options[:update]
-      should_fetch_associations = if sync_options.has_key?(:fetch_associations)
-        sync_options[:fetch_associations]
-      else # do not need to fetch unless this is a GET request
-        should_fetch
-      end
+      method = options[:method] || :get
+      url = sync_url(method, options)
 
-      should_fetch = persisted? if should_fetch.nil?
-      should_update ||= new_record? unless should_fetch
-
-      method = sync_options[:method]
-      method ||= if should_update
-        persisted? ? :put : :post
-      else
-        :get
-      end
-      url = sync_url(method, sync_options)
-
-      if url.blank?
-        should_fetch = false
-        should_update = false
-      end
+      will_fetch_model = !url.blank?
+      will_fetch_associations = !options.has_key?(:associations) || options[:associations]
 
       fetch_with_url url do |data, status_code|
-        save if sync_options[:save]
-        block.call(data, status_code, data) if use_callback
-      end if should_fetch
+        save if options[:save]
+        block.call(data, status_code, data) if use_callback && !will_fetch_associations
+      end if will_fetch_model
 
-      update_with_url url, sync_options do |data, status_code|
-        save if sync_options[:save] && status_code.to_s =~ /20\d/
+      fetch_associations(options) do |data, status_code|
         # run callback only if it wasn't run on fetch
-        block.call(data, status_code, data) if use_callback && !should_fetch
-      end if should_update
+        block.call(data, status_code, data) if use_callback
+      end if will_fetch_associations
+    end
 
-      fetch_associations(sync_options) do |data, status_code|
-        # run callback only if it wasn't run on fetch or update
-        block.call(data, status_code, data) if use_callback && !should_fetch && !should_update
-      end if should_fetch_associations
+    # update on server and save response on local
+    def update!(options = {}, &block)
+      update(options.merge(save_response: true), &block)
+    end
+
+    # update on server
+    def update(options = {}, &block)
+      use_callback = block_given?
+
+      method = options[:method] || (persisted? ? :put : :post)
+      url = sync_url(method, options)
+      will_update_model = !url.blank?
+
+      update_with_url url, options do |data, status_code|
+        block.call(data, status_code, data) if use_callback
+      end if will_update_model
     end
 
     # fetch from server using url
@@ -81,22 +76,23 @@ module MotionPrime
     end
 
     # update on server using url
-    def update_with_url(url, sync_options = nil, &block)
+    def update_with_url(url, options = {}, &block)
       use_callback = block_given?
-      filtered_attributes = filtered_updatable_attributes(sync_options)
+      filtered_attributes = filtered_updatable_attributes(options)
 
-      post_data = sync_options[:params_root] || {}
+      post_data = options[:params_root] || {}
       post_data[:files] = {}
       filtered_attributes.delete(:files).each do |file_name, file|
         post_data[:files][[model_name, file_name].join] = file
       end
       post_data[model_name] = filtered_attributes
 
-      method = sync_options[:method] || (id ? :put : :post)
+      method = options[:method] || (persisted? ? :put : :post)
       api_client.send(method, url, post_data) do |data, status_code|
-        update_from_response = sync_options.has_key?(:update_from_response) ? sync_options[:update_from_response] : true
-        if update_from_response && status_code.to_s =~ /20\d/ && data.is_a?(Hash)
+        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)
+          save
         end
         block.call(data, status_code, data) if use_callback
       end
@@ -109,11 +105,13 @@ module MotionPrime
 
     # set attributes, using fetch
     def fetch_with_attributes(attrs)
-      attrs.each do |key, value|
-        if respond_to?(:"fetch_#{key}")
-          self.send(:"fetch_#{key}", value)
-        elsif respond_to?(:"#{key}=")
-          self.send(:"#{key}=", value)
+      track_changed_attributes do
+        attrs.each do |key, value|
+          if respond_to?(:"fetch_#{key}")
+            self.send(:"fetch_#{key}", value)
+          elsif respond_to?(:"#{key}=")
+            self.send(:"#{key}=", value)
+          end
         end
       end
       self
@@ -156,16 +154,17 @@ module MotionPrime
       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|
         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 = key.classify.constantize.new
+              model = model_class.new
               self.send(:"#{key}_bag") << model
             end
             model.fetch_with_attributes(attributes)
-            model.save if 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}
@@ -238,36 +237,36 @@ module MotionPrime
     def normalize_sync_url(url)
       url.to_s.gsub(':id', id.to_s)
     end
-  end
 
-  module ModelSyncClassMethods
-    def new(data = {}, options = {})
-      model = super
-      if fetch_attributes = options[:fetch_attributes]
-        model.fetch_with_attributes(fetch_attributes)
+    module ClassMethods
+      def new(data = {}, options = {})
+        model = super
+        if fetch_attributes = options[:fetch_attributes]
+          model.fetch_with_attributes(fetch_attributes)
+        end
+        model
       end
-      model
-    end
 
-    def sync_url(url = nil, &block)
-      if url || block_given?
-        self._sync_url = url || block
-      else
-        self._sync_url
+      def sync_url(url = nil, &block)
+        if url || block_given?
+          self._sync_url = url || block
+        else
+          self._sync_url
+        end
       end
-    end
 
-    def updatable_attributes(*attrs)
-      return self._updatable_attributes if attrs.blank?
-      attrs.each do |attribute|
-        updatable_attribute attribute
+      def updatable_attributes(*attrs)
+        return self._updatable_attributes if attrs.blank?
+        attrs.each do |attribute|
+          updatable_attribute attribute
+        end
       end
-    end
 
-    def updatable_attribute(attribute, options = {}, &block)
-      options[:block] = block if block_given?
-      self._updatable_attributes ||= {}
-      self._updatable_attributes[attribute] = options
+      def updatable_attribute(attribute, options = {}, &block)
+        options[:block] = block if block_given?
+        self._updatable_attributes ||= {}
+        self._updatable_attributes[attribute] = options
+      end
     end
   end
 end

data/motion-prime/models/json.rb

@@ -1,12 +1,13 @@
 module MotionPrime
-  module JSON
+  class JsonParseError < StandardError; end
+
+  class JSON
     PARAMETRIZE_CLASSES = [Time, Date]
-    class ParserError < StandardError; end
 
     # Parses a string or data object and converts it in data structure.
     #
     # @param [String, NSData] str_data the string or data to convert.
-    # @raise [ParserError] If the parsing of the passed string/data isn't valid.
+    # @raise [JsonParseError] If the parsing of the passed string/data isn't valid.
     # @return [Hash, Array, NilClass] the converted data structure, nil if the incoming string isn't valid.
     def self.parse(str_data, &block)
       return nil unless str_data
@@ -14,12 +15,8 @@ module MotionPrime
       opts = NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves | NSJSONReadingAllowFragments
       error = Pointer.new(:id)
       obj = NSJSONSerialization.JSONObjectWithData(data, options: opts, error: error)
-      raise ParserError, error[0].description if error[0]
-      if block_given?
-        yield obj
-      else
-        obj
-      end
+      raise JsonParseError, error[0].description if error[0]
+      obj
     end
 
     # Generates a string from data structure.

data/motion-prime/models/model.rb

@@ -1,178 +1,30 @@
+motion_require '../helpers/has_authorization'
+motion_require './_nano_bag_mixin.rb'
+motion_require './_finder_mixin.rb'
+motion_require './_base_mixin.rb'
+motion_require './_sync_mixin.rb'
+motion_require './_association_mixin.rb'
+motion_require './_dirty_mixin.rb'
+motion_require './store.rb'
+motion_require './store_extension.rb'
 module MotionPrime
-  module ModelMethods
-    def self.included(base)
-      base.class_attribute :default_sort_options
-    end
-
-    def save
-      raise StoreError, 'No store provided' unless self.store
-      error_ptr = Pointer.new(:id)
-      self.store.addObject(self, error: error_ptr)
-      raise StoreError, error_ptr[0].description if error_ptr[0]
-      self
-    end
-
-    def delete
-      raise StoreError, 'No store provided' unless self.store
-
-      error_ptr = Pointer.new(:id)
-      self.store.removeObject(self, error: error_ptr)
-      raise StoreError, error_ptr[0].description if error_ptr[0]
-      self
-    end
-
-    def store
-      super || self.class.store
-    end
-
-    def assign_attributes(new_attributes, options = {})
-      attributes = new_attributes.symbolize_keys
-      attributes.each do |k, v|
-        if has_attribute?(k)
-          assign_attribute(k, v) unless options[:skip_nil_values] && v.nil?
-        elsif options[:check_attribute_presence]
-          NSLog("unknown attribute: #{k}")
-        else
-          raise(NoMethodError, "unknown attribute: #{k}")
-        end
-      end
-    end
-
-    def assign_attribute(name, value)
-      self.send("#{name}=", value) if has_attribute?(name)
-    end
-
-    def has_attribute?(name)
-      respond_to?("#{name}=")
-    end
-
-    def attributes_hash
-      self.info.to_hash.symbolize_keys
-    end
-
-    def new_record?
-      id.blank?
-    end
-
-    def persisted?
-      !new_record?
-    end
-
-    def model_name
-      self.class_name_without_kvo.underscore
-    end
+  class Model < NSFNanoObject
+    include MotionPrime::HasAuthorization
+    include MotionPrime::ModelBaseMixin
+    include MotionPrime::ModelAssociationMixin
+    include MotionPrime::ModelSyncMixin
+    include MotionPrime::ModelFinderMixin
+    include MotionPrime::ModelDirtyMixin
 
-    def inspect
-      "#<#{self.class}:0x#{self.object_id.to_s(16)}> " + MotionPrime::JSON.generate(info)
-    end
-  end
-
-  module ModelClassMethods
-    # Initialize a new object
-    #
-    # Examples:
-    #   User.new(name: "Bob", age: 10)
-    #
-    # @return MotionPrime::BaseModel unsaved model
-    def new(data = {}, options = {})
-      data.keys.each { |k|
-        unless self.attributes.member? k.to_sym
-          raise StoreError, "'#{k}' is not a defined attribute for this model"
-        end
-      }
-
-      object = self.nanoObjectWithDictionary(data)
-      object
-    end
-
-    # Initialize a new object and save it
-    #
-    # Examples:
-    #   User.create(name: "Bob", age: 10)
-    #
-    # @return MotionPrime::BaseModel saved model
-    def create(data = {})
-      object = self.new(data)
-      object.save
-    end
-
-    # Define model attribute
-    #
-    # Examples:
-    #   class User < MotionPrime::BaseModel
-    #     attribute :name
-    #     attribute :age
-    #   end
-    #
-    # @return Nil
-    def attribute(name, options = {})
-      attributes << name
-
-      define_method(name) do |*args, &block|
-        self.info[name]
-      end
-
-      define_method((name + "=").to_sym) do |*args, &block|
-        value = args[0]
-        case options[:type].to_s
-        when 'integer' then value = value.to_i
-        when 'float' then value = value.to_f
-        end unless value.nil?
-
-        self.info[name] = value
-      end
+    attribute :bag_key # need this as we use shared store; each nested resource must belong to parent bag
+    attribute :id
 
-      if options[:type].to_s == 'boolean'
-        define_method("#{name}?") do
-          !!self.info[name]
-        end
-      end
+    def errors
+      @errors ||= Errors.new(self.weak_ref)
     end
 
-    # Return all model attribute names
-    #
-    # @return Array array of attribute names
-    def attributes(*attrs)
-      if attrs.size > 0
-        attrs.each{|attr| attribute attr}
-      else
-        @attributes ||= []
-      end
-    end
-
-    # Return store associated with model class, or shared store by default
-    #
-    # @return MotionPrime::Store store
-    def store
-      @store ||= MotionPrime::Store.shared_store
-    end
-
-    # Define store associated with model class
-    #
-    # @param MotionPrime::Store store
-    # @return MotionPrime::Store store
-    def store=(store)
-      @store = store
-    end
-
-    # Count of models
-    #
-    # @return Fixnum count
-    def count
-      self.store.count(self)
-    end
-
-    # Delete objects from store
-    #
-    # @param [Array, MotionPrime::BaseModel] objects to delete
-    # @return [Array] result
-    def delete(*args)
-      keys = find_keys(*args)
-      self.store.delete_keys(keys)
-    end
-
-    def default_sort(sort_options)
-      self.default_sort_options = sort_options
-    end
+    # def dealloc
+    #   pp 'deall model'
+    # end
   end
-end
+end

data/motion-prime/{mp.rb → prime.rb}

@@ -15,5 +15,4 @@ module MotionPrime
     ENV['PRIME_ENV'] || ENV['RUBYMOTION_ENV'] || 'development'
   end
 end
-::MP = MotionPrime unless defined?(::MP)
 ::Prime = MotionPrime unless defined?(::Prime)

data/motion-prime/screens/_base_mixin.rb

@@ -21,23 +21,15 @@ module MotionPrime
       UIApplication.sharedApplication.delegate
     end
 
-    def show_sidebar
-      app_delegate.show_sidebar
-    end
-
-    def hide_sidebar
-      app_delegate.hide_sidebar
-    end
-
     def on_screen_load
       run_callbacks :load do
         on_load
       end
     end
 
-    # Setup the screen, will be called when you run MPViewController.new
+    # Setup the screen, this method will be called when you run MPViewController.new
     # @param options [hash] Options passed to setup
-    # @return [MotionPrime::BaseScreen] Ready to use screen
+    # @return [MotionPrime::Screen] Ready to use screen
     def on_create(options = {})
       unless self.is_a?(UIViewController)
         raise StandardError.new("ERROR: Screens must extend UIViewController.")
@@ -88,6 +80,13 @@ module MotionPrime
       def after_load(method_name)
         set_callback :load, :after, method_name
       end
+      def create_with_options(screen, navigation = true, options = {})
+        if screen.is_a?(Symbol)
+          options[:navigation] = navigation unless options.has_key?(:navigation)
+          screen = class_factory("#{screen}_screen").new(options)
+        end
+        screen
+      end
     end
   end
 end

data/motion-prime/screens/_navigation_mixin.rb

@@ -6,26 +6,21 @@ module MotionPrime
     #   animated: open screen with animation.
     #   modal: open screen as model
 
-    # @param screen [MotionPrime::BaseScreen] Screen to be opened
+    # @param screen [MotionPrime::Screen] Screen to be opened
     # @param args [Hash] Options for opening screen
-    # @return [MotionPrime::BaseScreen]
+    # @return [MotionPrime::Screen]
     def open_screen(screen, args = {})
-      if args[:modal] || has_navigation?
-        screen = setup_screen_for_open(screen, args)
-        screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
-        args[:animated] = args.has_key?(:animated) ? args[:animated] : true
-        if args[:modal] || !has_navigation?
-          open_screen_modal(screen, args)
-        else
-          open_screen_navigational(screen, args)
-        end
+      screen = setup_screen_for_open(screen, args)
+      screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
+      args[:animated] = args.has_key?(:animated) ? args[:animated] : true
+      if args[:modal] || !has_navigation?
+        open_screen_modal(screen, args)
       else
-        app_delegate.open_screen(screen.main_controller)
+        open_screen_navigational(screen, args)
       end
       screen
     end
 
-
     def close_screen(args = {})
       args[:animated] = args.has_key?(:animated) ? args[:animated] : true
       # Pop current view, maybe with arguments, if in navigation controller
@@ -47,7 +42,7 @@ module MotionPrime
     end
 
     def wrap_in_navigation?
-      options[:navigation]
+      options[:navigation] || options[:navigation].nil?
     end
 
     def wrap_in_navigation
@@ -71,10 +66,10 @@ module MotionPrime
     private
       def setup_screen_for_open(screen, args = {})
         # Instantiate screen if given a class
-        screen = screen.new if screen.respond_to?(:new)
+        screen = Screen.create_with_options(screen, true, args)
 
         # Set parent, title & modal properties
-        screen.parent_screen = self.weak_ref if screen.respond_to?("parent_screen=")
+        screen.parent_screen = self if screen.respond_to?("parent_screen=")
         screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
         screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
 
@@ -98,7 +93,7 @@ module MotionPrime
 
       def close_screen_navigational(args = {})
         if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
-          self.parent_screen = args[:to_screen].weak_ref
+          self.parent_screen = args[:to_screen]
 
           screens = self.navigation_controller.childViewControllers
           self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])

data/motion-prime/screens/extensions/_indicators_mixin.rb

@@ -3,7 +3,7 @@ module MotionPrime
     def show_activity_indicator
       if @activity_indicator_view.nil?
         @activity_indicator_view = UIActivityIndicatorView.gray
-        @activity_indicator_view.center = CGPointMake(view.center.x, view.center.y - 50)
+        @activity_indicator_view.center = CGPointMake(view.center.x, view.center.y)
         view.addSubview @activity_indicator_view
       end
       @activity_indicator_view.startAnimating

data/motion-prime/screens/extensions/_navigation_bar_mixin.rb

@@ -24,8 +24,9 @@ module MotionPrime
       navigationItem.leftBarButtonItem = create_navigation_button(title, {action: :back}.merge(args))
     end
 
+    # should be extracted to sidebar gem
     def set_navigation_back_or_menu(back_title = 'Back')
-      if parent_screen.is_a?(MotionPrime::SidebarContainerScreen)
+      if parent_screen.is_a?(PrimeResideMenu::SidebarContainerScreen)
         set_navigation_left_button 'Menu', image: 'images/navigation/menu_button.png', action: :show_sidebar
       else
         set_navigation_back_button back_title, icon: 'images/navigation/back_icon.png'
@@ -41,7 +42,6 @@ module MotionPrime
 
     def create_navigation_button(title, args = {})
       args[:style]  ||= UIBarButtonItemStylePlain
-      args[:target] = (args[:target] || self).weak_ref
       args[:action] ||= nil
       # TODO: Find better place for this code, may be just create custom control
       if args[:image]
@@ -66,7 +66,7 @@ module MotionPrime
         UIBarButtonItem.alloc.initWithCustomView(face)
       else
         UIBarButtonItem.alloc.initWithTitle(title,
-          style: args[:style], target: args[:target], action: args[:action])
+          style: args[:style], target: args[:target] || self, action: args[:action])
       end
     end
   end

data/motion-prime/screens/{base_screen.rb → screen.rb}

@@ -6,7 +6,7 @@ motion_require './extensions/_navigation_bar_mixin'
 motion_require '../helpers/has_authorization'
 motion_require '../helpers/has_search_bar'
 module MotionPrime
-  class BaseScreen < MPViewController
+  class Screen < MPViewController
     include Layout
     include ScreenBaseMixin
 
@@ -18,6 +18,8 @@ module MotionPrime
     include HasAuthorization
     include HasSearchBar
 
+    extend HasClassFactory
+
     def render
     end
 
@@ -34,10 +36,14 @@ module MotionPrime
       @on_appear_happened = true
     end
 
-    # def dealloc
-    #   pp 'Deallocating Screen'
-    #   super
-    # end
+    def dealloc
+      pp 'Deallocating Screen'
+      @main_section.instance_variable_set(:"@break_preload", true) # TODO: find a better option
+      # FIXME: calling instance_eval in title method (_base_screen_mixin) instance variables need to be cleared manually
+      # clear_instance_variables cause BAD_ACCESS errors too
+      @main_section = nil
+      super
+    end
 
     def visible?
       self.isViewLoaded && view.window

data/motion-prime/sections/_cell_section_mixin.rb

@@ -1,3 +1,4 @@
+# This Mixin will be included only to sections, which added as cell to table section.
 module MotionPrime
   module CellSectionMixin
     extend ::MotionSupport::Concern
@@ -35,6 +36,11 @@ module MotionPrime
       @container_bounds ||= CGRectMake(0, 0, table.table_view.bounds.size.width, container_height)
     end
 
+    # should do nothing, because table section will care about it.
+    def render_container(options = {}, &block)
+      block.call
+    end
+
     def init_container_element(options = {})
       @container_element ||= begin
         options.merge!({
@@ -49,6 +55,7 @@ module MotionPrime
       end
     end
 
+    # FIXME: Why this duplicates functionality from other parts, e.g. draw_in?
     def load_container_element(options = {})
       init_container_element(options)
       load_elements
@@ -68,6 +75,12 @@ module MotionPrime
       container_view.setNeedsDisplay
     end
 
+    def dealloc
+      # TODO: remove this when solve this problem: dealloc TableCells on TableView.reloadData (in case when reuseIdentifier has been used)
+      container_view.section = nil if container_view.respond_to?(:setSection)
+      super
+    end
+
     module ClassMethods
       def set_cell_name(value)
         self.custom_cell_name = value