motion-prime 0.1.3 → 0.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yjc5ZTE2MmM1MzZjZjg1MmY4NzAyZmE1YTk1YTM2YjMxNzcwOTk2Ng==
+    NzcwMzdlNzc2NDFkODU4MzU1MzA2NjQ1NjcxYTg2MWMyODJmODkwYg==
   data.tar.gz: !binary |-
-    MTlkMDA1NjI5ODJiYzEwM2NjM2E4MzUyZWQ5ZDc0N2YzYWY1YzgyMA==
+    MTcyZjUyODMwN2ZjMzAyMzU3NzVkZmNmYjA0MzY0ODY1ODliMDEyMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzZiYjU5Yjg0MTY3ZDU3ZThjOGE1MTVjYjRjNWMxZDU3MTg4NTA5ZWIyZTcz
-    MTgxNTdkOGNiODI2MTZiZWU1Nzg2ZTYxOWUxZDk0MjM2ZWFhY2UyMzk5YjEw
-    NzI4MzRmZWVjOTczYTZlZDE2ZWM3YWI5NjMxMDBjNzA4ODg0MjI=
+    ZTBlOTI1M2I0NDkyZmNiNzg5YWVjOTIwYzViYTQyZTZmNjdmM2U4MTIxY2Uz
+    YmVjMjQ4MGZkYjcxODY1MTRkMDkxYzQ1YTFiODY3MmEzM2M5Nzk4NzBkMDVi
+    OGUwYTI4ZTY0ZDVkMmNmN2Y2N2YzMGYyYzgwMjhkYjdhMzIyZTE=
   data.tar.gz: !binary |-
-    MjY5MDgzMDIxOWViYjVkMWE5MGNlZGQwOWZmOTBlNmI3ZTU4Yzc3YzQwNjg3
-    YWI3OGEwMDViMWZjNGEyMWFjNzU3YzZiN2JlODkyOTg2ZDk1NTY5NGNlNzNm
-    M2IzODlkNzFiN2IzOWM1ZTBiMTdkNWY1NDhlNWI5NTU4ZTU3MTY=
+    NTFmZmNmZmU4YWNmZjUzY2VjNjY3NGEyZjQ4ZGU1YTYzYTc5ZTg5NGEwMTJm
+    N2FmMDA3YTg2ZjIzNDI2NTZkMzRjNDMwNmQ0ODhkZmI1YWVjNTRhZThlYzY3
+    ZjgwZmI4ZjhjNmM2NTBjMDBjYzVhYzg5MzU1NDhkNDA1Yjg3YmI=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.1.4 (Breaking changes)
+* MotionPrime::BaseModel#sync_with_url renamed to fetch_with_url
+* MotionPrime::BaseModel#sync_with_attributes renamed to fetch_with_attributes
+* MotionPrime::BaseModel#sync_association renamed to fetch_association
+* MotionPrime::BaseModel#sync_attributes renamed to updatable_attributes
+
 === 0.1.3
 * added google map element support
 * fixes for tabbed section

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.1.3)
+    motion-prime (0.1.4)
       bubble-wrap
       cocoapods
       motion-cocoapods

data/doc/FAQ.md

@@ -0,0 +1,2 @@
+Q: Error: `Unable to find a specification for `Something``
+A: Try running `pod install`

data/lib/motion-prime.rb

@@ -3,12 +3,5 @@ require 'motion-require'
 Motion::Require.all(Dir.glob(File.expand_path('../../motion-prime/**/*.rb', __FILE__)))
 
 Motion::Project::App.setup do |app|
-  app.pods do
-    pod 'PKRevealController'
-    pod 'NanoStore', '~> 2.7.7'
-    pod 'SDWebImage'
-    pod 'SVPullToRefresh'
-    pod 'MBAlertView'
-  end
   app.detect_dependencies = false
 end

data/motion-prime/elements/base.rb

@@ -11,7 +11,7 @@ module MotionPrime
 
     def initialize(options = {})
       @options = options
-      @section = WeakRef.new(options.delete(:section))
+      @section = options.delete(:section)
       @name = options[:name]
       @block = options.delete(:block)
       @view_class = options.delete(:view_class) || "UIView"
@@ -19,7 +19,7 @@ module MotionPrime
     end
 
     def render(options = {}, &block)
-      self.screen = options[:to]
+      @screen = options[:to]
       run_callbacks :render do
         render!(&block)
       end

data/motion-prime/elements/draw.rb

@@ -24,9 +24,9 @@ module MotionPrime
 
       # calculate width if width is relative, e.g 0.7
       if width > 0 && width <= 1
-        computed_max_width * width
+        width * computed_max_width
       else
-        computed_max_width < width ? width : computed_max_width
+        width > computed_max_width ? computed_max_width : width
       end
     end
 
@@ -36,9 +36,9 @@ module MotionPrime
 
       # calculate height if height is relative, e.g 0.7
       if height > 0 && height <= 1
-        computed_max_height * height
+        height * computed_max_height
       else
-        computed_max_height < height ? height : computed_max_height
+        height > computed_max_height ? computed_max_height : height
       end
     end
 

data/motion-prime/helpers/has_authorization.rb

@@ -1,10 +1,15 @@
 module MotionPrime
   module HasAuthorization
     def current_user
-      @current_user = User.current
+      if defined?(User) && User.respond_to?(:current)
+        @current_user = User.current
+      end
+    end
+    def user_signed_in?
+      current_user.present?
     end
     def api_client
-      @api_client ||= ApiClient.new(access_token: current_user.access_token)
+      @api_client ||= ApiClient.new(access_token: current_user.try(:access_token))
     end
   end
 end

data/motion-prime/models/association.rb

@@ -70,7 +70,7 @@ module MotionPrime
         self.send(bag_name).clear
 
         association = association_name.classify.constantize.new
-        association.sync_with_attributes(value)
+        association.fetch_with_attributes(value)
         association.save
         self.send(:"#{bag_name}") << association
         association
@@ -97,7 +97,7 @@ module MotionPrime
         association = []
         value.each do |attrs|
           model = association_name.classify.constantize.new
-          model.sync_with_attributes(attrs)
+          model.fetch_with_attributes(attrs)
           association << model
         end
         self.send(:"#{bag_name}=", association)

data/motion-prime/models/base.rb

@@ -7,7 +7,7 @@ motion_require './store_extension.rb'
 module MotionPrime
   class BaseModel < NSFNanoObject
     class_attribute :sync_url
-    class_attribute :sync_attributes
+    class_attribute :_updatable_attributes
     class_attribute :_associations
     alias_method :attributes, :info
     include MotionPrime::HasAuthorization
@@ -32,6 +32,7 @@ module MotionPrime
       id.blank?
     end
 
+    # destroy on server and delete on local
     def destroy(&block)
       use_callback = block_given?
       api_client.delete(sync_url) do
@@ -40,41 +41,12 @@ module MotionPrime
       delete
     end
 
-    # fetch attributes from url
-    def sync_with_url(url, &block)
-      api_client.get(url) do |data|
-        if data.present?
-          sync_with_attributes(data, &block)
-        end
-      end
-    end
-
-    def update_with_url(url, &block)
-      use_callback = block_given?
-      post_data = { model_name => filtered_sync_attributes}
-      api_client.send(id ? :put : :post, url, post_data) do |data|
-        self.id ||= data['id']
-        block.call() if use_callback
-      end
-    end
-
-    # set attributes
-    def sync_with_attributes(attrs, &block)
-      attrs.each do |key, value|
-        if respond_to?(:"sync_#{key}")
-          self.send(:"sync_#{key}", value)
-        elsif respond_to?(:"#{key}=")
-          self.send(:"#{key}=", value)
-        end
-      end
-      block.call(self) if block_given?
-    end
-
+    # sync with server and save on local
     def sync!(sync_options = {}, &block)
       sync(sync_options.merge(save: true), &block)
     end
 
-    # sync with url and
+    # sync with with server
     # TODO: order of fetch/update should be based on updated time
     def sync(sync_options = {}, &block)
       use_callback = block_given?
@@ -84,7 +56,7 @@ module MotionPrime
       should_fetch = !new_record? if should_fetch.nil?
       should_update = new_record? if should_update.nil?
 
-      sync_with_url self.sync_url do
+      fetch_with_url self.sync_url do
         save if sync_options[:save]
         block.call if use_callback
       end if should_fetch
@@ -93,24 +65,55 @@ module MotionPrime
         block.call if use_callback
       end if should_update
 
-      sync_associations(sync_options)
+      fetch_associations(sync_options)
     end
 
-    def sync_associations(sync_options = {})
+    # fetch from server using url
+    def fetch_with_url(url, &block)
+      api_client.get(url) do |data|
+        if data.present?
+          fetch_with_attributes(data, &block)
+        end
+      end
+    end
+
+    # update on server using url
+    def update_with_url(url, &block)
+      use_callback = block_given?
+      post_data = { model_name => filtered_updatable_attributes}
+      api_client.send(id ? :put : :post, url, post_data) do |data|
+        self.id ||= data['id']
+        block.call() if use_callback
+      end
+    end
+
+    # set attributes, using fetch
+    def fetch_with_attributes(attrs, &block)
+      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
+      block.call(self) if block_given?
+    end
+
+    def fetch_associations(sync_options = {})
       (self.class._associations || []).each do |key, options|
-        sync_association(key, sync_options)
+        fetch_association(key, sync_options)
       end
     end
 
-    def sync_association(key, sync_options = {}, &block)
+    def fetch_association(key, sync_options = {}, &block)
       options = self.class._associations[key]
       return unless options[:sync_url]
       options[:type] == :many ?
-      sync_has_many(key, options, sync_options, &block) :
-      sync_has_one(key, options, sync_options, &block)
+      fetch_has_many(key, options, sync_options, &block) :
+      fetch_has_one(key, options, sync_options, &block)
     end
 
-    def sync_has_many(key, options = {}, sync_options = {}, &block)
+    def fetch_has_many(key, options = {}, sync_options = {}, &block)
       old_collection = self.send(key)
       use_callback = block_given?
       puts "SYNC: started sync for #{key} in #{self.class.name}"
@@ -123,7 +126,7 @@ module MotionPrime
               model = key.singularize.to_s.classify.constantize.new
               self.send(:"#{key}_bag") << model
             end
-            model.sync_with_attributes(attributes)
+            model.fetch_with_attributes(attributes)
             model.save if sync_options[:save]
           end
           old_collection.each do |old_model|
@@ -142,7 +145,7 @@ module MotionPrime
       end
     end
 
-    def sync_has_one(key, options = {}, &block)
+    def fetch_has_one(key, options = {}, &block)
       # TODO: add implementation
     end
 
@@ -150,10 +153,16 @@ module MotionPrime
       "#<#{self.class}:0x#{self.object_id.to_s(16)}> " + MotionPrime::JSON.generate(attributes)
     end
 
-    def filtered_sync_attributes
-      return attributes if self.class.sync_attributes.blank?
-      attributes.reject do |key, value|
-        self.class.sync_attributes.exclude?(key.to_sym)
+    def filtered_updatable_attributes
+      return attributes if self.class.updatable_attributes.blank?
+      self.class.updatable_attributes.to_a.inject({}) do |hash, attribute|
+        key, options = *attribute
+        if block = options[:block]
+          value = instance_eval(&block)
+        else
+          value = attributes[key]
+        end
+        hash.merge!(key => value)
       end
     end
 
@@ -162,8 +171,17 @@ module MotionPrime
         url ? self.sync_url = url : super
       end
 
-      def sync_attributes(*attrs)
-        attrs ? self.sync_attributes = attrs : super
+      def updatable_attributes(*attrs)
+        return self._updatable_attributes if attrs.blank?
+        attrs.each do |attribute|
+          updatable_attribute attribute
+        end
+      end
+
+      def updatable_attribute(attribute, options = {}, &block)
+        options[:block] = block if block_given?
+        self._updatable_attributes ||= {}
+        self._updatable_attributes[attribute] = options
       end
     end
   end

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

@@ -4,7 +4,7 @@ module MotionPrime
 
     def initialize(options = {})
       super
-      @form = WeakRef.new(options.delete(:form))
+      @form = options.delete(:form)
       @container_options = options.delete(:container)
     end
 

data/motion-prime/sections/form.rb

@@ -38,8 +38,6 @@ module MotionPrime
     end
 
     def render_cell(index, table)
-      cell = cached_cell(index)
-      return cell if cell
       item = data[index.row]
 
       screen.table_view_cell styles: [:base_form_field, :"#{name}_field"], reuse_identifier: cell_name(table, index) do

data/motion-prime/sections/table.rb

@@ -31,8 +31,6 @@ module MotionPrime
     end
 
     def render_cell(index, table)
-      cell = cached_cell(index)
-      return cell if cell
       item = data[index.row]
 
       # define default styles for cell

data/motion-prime/support/dm_cell_with_section.rb

@@ -2,7 +2,7 @@ class DMCellWithSection < UITableViewCell
   attr_accessor :section
 
   def setSection(section)
-    @section = WeakRef.new(section)
+    @section = section
   end
 
   def drawRect(rect)

data/motion-prime/support/dm_view_with_section.rb

@@ -2,7 +2,7 @@ class DMViewWithSection < UIView
   attr_accessor :section
 
   def setSection(section)
-    @section = WeakRef.new(section)
+    @section = section
   end
 
   def drawRect(rect)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/motion-prime/views/view_builder.rb

@@ -8,17 +8,17 @@ module MotionPrime
     end
 
     def view_for_class(klass, root_klass, options = {})
-      if VIEWS_MAP.key?(klass)
-        VIEWS_MAP[klass].call root_klass, options
+      if VIEWS_MAP.key?(klass.name)
+        VIEWS_MAP[klass.name].call root_klass, options
       else
         view_for_class klass.superclass, root_klass, options
       end
     end
 
     VIEWS_MAP = {
-      UIView => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
-      UIControl => Proc.new {|klass, options| klass.alloc.init },
-      UIActionSheet => Proc.new {|klass, options|
+      'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
+      'UIControl' => Proc.new {|klass, options| klass.alloc.init },
+      'UIActionSheet' => Proc.new {|klass, options|
         title = options.delete(:title) || ''
         delegate = options.delete(:delegate)
         cancel_button_title = options.delete(:cancel_button_title)
@@ -31,17 +31,17 @@ module MotionPrime
           destructiveButtonTitle: destructive_button_title,
           otherButtonTitles: other_button_titles, nil
       },
-      UIActivityIndicatorView => Proc.new{|klass, options|
+      'UIActivityIndicatorView' => Proc.new{|klass, options|
         style = options.delete(:style) || :large.uiactivityindicatorstyle
         klass.alloc.initWithActivityIndicatorStyle style
       },
-      UIButton => Proc.new{|klass, options|
+      'UIButton' => Proc.new{|klass, options|
         is_custom_button = options[:background_image] || options[:title_color]
         default_button_type = is_custom_button ? :custom : :rounded
         button_type = (options.delete(:button_type) || default_button_type).uibuttontype
         klass.buttonWithType button_type
       },
-      UIImageView => Proc.new{|klass, options|
+      'UIImageView' => Proc.new{|klass, options|
         image = options.delete(:image)
         highlighted_image = options.delete(:highlighted_image)
 
@@ -53,29 +53,29 @@ module MotionPrime
           klass.alloc.initWithFrame CGRectZero
         end
       },
-      UIProgressView => Proc.new{|klass, options|
+      'UIProgressView' => Proc.new{|klass, options|
         style = options.delete(:style) || UIProgressViewStyleDefault
         klass.alloc.initWithProgressViewStyle style
       },
-      UISegmentedControl => Proc.new{|klass, options|
+      'UISegmentedControl' => Proc.new{|klass, options|
         items = options.delete(:items) || []
         klass.alloc.initWithItems items
       },
-      UITableView => Proc.new{|klass, options|
+      'UITableView' => Proc.new{|klass, options|
         style = options.delete(:style) || UITableViewStylePlain
         klass.alloc.initWithFrame CGRectZero, style: style
       },
-      UITableViewCell => Proc.new{|klass, options|
+      'UITableViewCell' => Proc.new{|klass, options|
         style = options.delete(:style) || UITableViewCellStyleDefault
         klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
       },
-      UISearchBar => Proc.new{|klass, options|
+      'UISearchBar' => Proc.new{|klass, options|
         klass = options[:search_field_background_image] ? UISearchBarCustom : UISearchBar
         search_bar = klass.alloc.init
         search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
         search_bar
       },
-      GMSMapView => Proc.new{|klass, options|
+      'GMSMapView' => Proc.new{|klass, options|
         camera = GMSCameraPosition.cameraWithLatitude(35.689466, longitude: 139.700196, zoom: 15)
         map = GMSMapView.mapWithFrame(CGRectZero, camera: camera)
         map

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-28 00:00:00.000000000 Z
+date: 2013-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -165,6 +165,7 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
+- doc/FAQ.md
 - doc/SECTION.md
 - doc/STYLE.md
 - files/Gemfile