motion-prime 0.2.0 → 0.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTdmYjFmM2NhYWE3ZGQyNzFjYWZjYjg2NzUzOTFkMTkwZmVjYTBjMw==
+    NTVhZjliNTBlNWFkYWY5ODA2NGEzYmFiYmQ2OTZlMTUwODZjNzNkNw==
   data.tar.gz: !binary |-
-    NmI1OTFjNGRmYmZjOTYyNWExOGJlMjQ4YjVjYzc4M2M0Y2M3ZWQ4Zg==
+    YmRkODY4MTE5ZmUzNDZiMzE1YmU0MGVhN2YxOTQyOTgzM2YxOGY2Yg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODdiZTc3ZmIyM2ZlZDJhOTg1YTU2OGEyODFhZWE5MGI2NWUzY2ZiYTQ5NzU5
-    ZGFlYmRkZDllYjY4MjA4YjA3YTE5YmZlNmE4NjU5Zjk3OTVhNTJkM2IwMDI4
-    NGIzYTRjYzg5MzBhMmM1NjY0NmJmY2U4MWMzN2JiODczZWNmMjY=
+    MmJiMTg3YmM4ZjIxNGNhZWM5Njc5NzEwNmIyNTI4MTMyYzk0ODRiYzQzZTRm
+    MWIwNzdkNTBmMmM3NWZiYTNjNmY4NTRiZWUzZDVmODY5NTI4ZWRiNzY0MWVj
+    NzNlYTZkMTQ3YTMyOTFhOGZiYmM5ZDk0OWZhNzkyMzczMzJlMTk=
   data.tar.gz: !binary |-
-    MjBiMDY2NTg1ZWM1OGU3ZDUzYTcyYmY5YTgyMWVlNmE2M2EzYTE0YjVmYjBk
-    YzExOTI5ZDQ3MDZlN2Q1MDkwNjE0ZTU0OTRlM2Q1NjA2Y2ZmNThmZmUxNzUy
-    OThlMzU4NTI5ZDJkOTIwMmE3MDA2OTZkM2I2OTAwZDViY2ZmMzU=
+    YTY0NjliMWM1Y2Q4NGMyMjc3OTcwOThjNTUxNGYxM2JiNjc0NzVkZTdlZmI4
+    NjliNjlmZjJjNTVjN2Q1ZjU5MjBlYzdlNmNkMjEzM2FkNjgwZDU0YjI5Mzcw
+    YTM1ZjE3ZjJjOWE5NTI1ODAwN2M2OTMwNjBkN2VlMGEyOGExYjE=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.2.1
+* Bug fixes
+
 === 0.2.0
 * MP::BaseModel improvements
 * Added ability to observe form field errors

data/Gemfile.lock

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

data/motion-prime/config/config.rb

@@ -5,7 +5,7 @@ module MotionPrime
     end
 
     def [](key)
-      fetch(key.to_sym) || store(key, self.class.new)
+      @attributes.has_key?(key.to_sym) ? fetch(key) : store(key, self.class.new)
     end
 
     def store(key, value)
@@ -26,6 +26,10 @@ module MotionPrime
       !self[key].is_a?(self.class)
     end
 
+    def to_hash
+      @attributes
+    end
+
     class << self
       def method_missing(name, *args, &block)
         @base_config ||= self.new()

data/motion-prime/elements/base.rb

@@ -31,6 +31,7 @@ module MotionPrime
 
     def render!(&block)
       @view = screen.add_view view_class.constantize, computed_options, &block
+      @view
     end
 
     # Lazy-computing options

data/motion-prime/elements/map.rb

@@ -0,0 +1,7 @@
+module MotionPrime
+  class MapElement < BaseElement
+    def view_class
+      "MKMapView"
+    end
+  end
+end

data/motion-prime/models/association.rb

@@ -18,6 +18,8 @@ module MotionPrime
     # @param [String] name - the name of bag
     # @return [Nil]
     def bag(name)
+      klass = self
+
       define_method(name) do |*args, &block|
         return _bags[name] if _bags[name]
 
@@ -61,7 +63,6 @@ module MotionPrime
 
       define_method("#{association_name}=") do |value|
         self.send(bag_name).clear
-
         self.send(:"#{bag_name}") << value
         value
       end
@@ -93,21 +94,27 @@ module MotionPrime
       define_method("#{association_name}_attributes=") do |value|
         self.send(bag_name).clear
 
-        association = []
-        value.each do |attrs|
+        pending_save_counter = 0
+        collection = value.inject({}) do |result, attrs|
           model = association_name.classify.constantize.new
           model.fetch_with_attributes(attrs)
-          association << model
+          unique_key = model.id || "pending_#{pending_save_counter+=1}"
+          result.merge(unique_key => model)
         end
-        self.send(:"#{bag_name}=", association)
-        association
+        association_data = collection.values
+        self.send(:"#{bag_name}=", association_data)
+        association_data
       end
       define_method("#{association_name}=") do |value|
         self.send(bag_name).clear
         self.send(:"#{bag_name}=", value)
       end
-      define_method("#{association_name}") do
-        self.send(:"#{bag_name}").to_a
+      define_method("#{association_name}") do |options = {}|
+        bag = self.send(:"#{bag_name}")
+        collection_options = {
+          association_name: association_name
+        }
+        AssociationCollection.new(bag, collection_options, options)
       end
     end
   end

data/motion-prime/models/association_collection.rb

@@ -0,0 +1,43 @@
+module MotionPrime
+  class AssociationCollection < ::Array
+    attr_reader :bag
+
+    delegate :<<, to: :bag
+
+    def initialize(bag, options, fetch_options = {})
+      @bag = bag
+      @association_name = options[:association_name]
+      super(all(fetch_options))
+    end
+
+    def all(fetch_options = {})
+      data = bag.to_a
+      if sort_options = sort_options(fetch_options[:sort])
+        data = data.sort do |a, b|
+          left = []
+          right = []
+          sort_options.each do |key, order|
+            if order == :desc
+              left << b.send(key)
+              right << a.send(key)
+            else
+              left << a.send(key)
+              right << b.send(key)
+            end
+          end
+          left <=> right
+        end
+      end
+      data
+    end
+
+    def sort_options(options)
+      return options if options
+      model_class.default_sort_options
+    end
+
+    def model_class
+      @model_class ||= @association_name.classify.constantize
+    end
+  end
+end

data/motion-prime/models/bag.rb

@@ -1,3 +1,4 @@
+motion_require './finder.rb'
 module MotionPrime
   module BagInstanceMethods
     def self.included(base)

data/motion-prime/models/errors.rb

@@ -1,34 +1,35 @@
 module MotionPrime
   class Errors
     attr_accessor :keys
-    attr_accessor :errors
 
     def initialize(model)
       @keys = []
-      @errors = {}
       model.class.attributes.map(&:to_sym).each do |key|
         initialize_for_key key
       end
     end
 
     def initialize_for_key(key)
+      return if @keys.include?(key.to_sym)
       @keys << key.to_sym unless @keys.include?(key.to_sym)
-      @errors[key.to_sym] ||= []
+      unless instance_variable_get("@#{key}")
+        instance_variable_set("@#{key}", [])
+      end
+      self.class.send :attr_accessor, key.to_sym
     end
 
     def get(key)
       initialize_for_key(key)
-      @errors[key.to_sym]
+      send(:"#{key.to_sym}")
     end
 
     def set(key, errors)
       initialize_for_key(key)
-      @errors[key.to_sym] = Array.wrap(errors)
+      send :"#{key.to_sym}=", Array.wrap(errors)
     end
 
     def add(key, error)
-      initialize_for_key(key)
-      @errors[key.to_sym] << error
+      get(key) << error
     end
 
     def [](key)
@@ -46,7 +47,7 @@ module MotionPrime
     end
 
     def messages
-      errors.values.compact.flatten
+      @keys.map{ |k| get(k)}.compact.flatten
     end
 
     def blank?

data/motion-prime/models/finder.rb

@@ -4,6 +4,8 @@ module MotionPrime
     #
     # @return [Array] array of models
     def all(*args)
+      return [] unless self.store
+
       if args[0].is_a?(Hash)
         sort_options = args[0][:sort] || {}
       else

data/motion-prime/models/model.rb

@@ -1,5 +1,9 @@
 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)
@@ -146,5 +150,9 @@ module MotionPrime
       keys = find_keys(*args)
       self.store.delete_keys(keys)
     end
+
+    def default_sort(sort_options)
+      self.default_sort_options = sort_options
+    end
   end
 end

data/motion-prime/models/sync.rb

@@ -8,7 +8,7 @@ module MotionPrime
 
     def sync_url(method = :get)
       url = self.class.sync_url
-      url = url.call(method) if url.is_a?(Proc)
+      url = url.call(method, self) if url.is_a?(Proc)
       normalize_sync_url(url)
     end
 
@@ -51,7 +51,7 @@ module MotionPrime
       end
 
       should_fetch = !new_record? if should_fetch.nil?
-      should_update = new_record? if should_update.nil?
+      should_update ||= new_record? unless should_fetch
 
       fetch_with_url url do
         save if sync_options[:save]
@@ -186,8 +186,7 @@ module MotionPrime
       updatable_attributes = self.class.updatable_attributes
 
       if updatable_attributes.blank?
-        attrs = attributes_hash.slice(*slice_attributes) if slice_attributes
-        return attrs
+        return slice_attributes ? attributes_hash.slice(*slice_attributes) : attributes_hash
       end
 
       updatable_attributes = updatable_attributes.slice(*slice_attributes) if slice_attributes

data/motion-prime/sections/base.rb

@@ -11,6 +11,8 @@ module MotionPrime
     #   element :avatar, type: :image, image: 'defaults/avatar.jpg'
     # end
     #
+    KEYBOARD_HEIGHT_PORTRAIT = 216
+    KEYBOARD_HEIGHT_LANDSCAPE = 162
     DEFAULT_CONTENT_HEIGHT = 65
     include ::MotionSupport::Callbacks
     include MotionPrime::HasAuthorization
@@ -56,6 +58,11 @@ module MotionPrime
       options.merge(section: self)
     end
 
+    def cell
+      first_element = elements.values.first
+      first_element.view.superview
+    end
+
     def render(container_options = {})
       self.container_options.merge!(container_options)
       self.screen = container_options.delete(:to)
@@ -104,6 +111,30 @@ module MotionPrime
       container_options[:styles]
     end
 
+    def on_keyboard_show; end
+    def on_keyboard_hide; end
+    def keyboard_will_show; end
+    def keyboard_will_hide; end
+
+    def bind_keyboard_events
+      NSNotificationCenter.defaultCenter.addObserver self,
+                                         selector: :on_keyboard_show,
+                                             name: UIKeyboardDidShowNotification,
+                                           object: nil
+      NSNotificationCenter.defaultCenter.addObserver self,
+                                         selector: :on_keyboard_hide,
+                                             name: UIKeyboardDidHideNotification,
+                                           object: nil
+      NSNotificationCenter.defaultCenter.addObserver self,
+                                         selector: :keyboard_will_show,
+                                             name: UIKeyboardWillShowNotification,
+                                           object: nil
+      NSNotificationCenter.defaultCenter.addObserver self,
+                                         selector: :keyboard_will_hide,
+                                             name: UIKeyboardWillHideNotification,
+                                           object: nil
+    end
+
     class << self
       def element(name, options = {}, &block)
         options[:type] ||= :label
@@ -123,5 +154,7 @@ module MotionPrime
         set_callback :render, :after, method_name
       end
     end
+    after_render :bind_keyboard_events
+
   end
 end

data/motion-prime/sections/form.rb

@@ -17,15 +17,10 @@ module MotionPrime
     # end
     #
 
-    KEYBOARD_HEIGHT_PORTRAIT = 216
-    KEYBOARD_HEIGHT_LANDSCAPE = 162
-
     class_attribute :text_field_limits, :text_view_limits
     class_attribute :fields_options
     attr_accessor :fields, :field_indexes, :keyboard_visible
 
-    after_render :bind_keyboard_events
-
     def table_data
       fields.values
     end
@@ -90,6 +85,10 @@ module MotionPrime
       self.fields[field_name.to_sym]
     end
 
+    def fields_hash
+      fields.to_hash
+    end
+
     # Set focus on field cell
     #
     # Examples:
@@ -118,31 +117,6 @@ module MotionPrime
       self.keyboard_visible = false
     end
 
-
-
-    def on_keyboard_show; end
-    def on_keyboard_hide; end
-    def keyboard_will_show; end
-    def keyboard_will_hide; end
-
-    def bind_keyboard_events
-      NSNotificationCenter.defaultCenter.addObserver self,
-                                         selector: :on_keyboard_show,
-                                             name: UIKeyboardDidShowNotification,
-                                           object: nil
-      NSNotificationCenter.defaultCenter.addObserver self,
-                                         selector: :on_keyboard_hide,
-                                             name: UIKeyboardDidHideNotification,
-                                           object: nil
-      NSNotificationCenter.defaultCenter.addObserver self,
-                                         selector: :keyboard_will_show,
-                                             name: UIKeyboardWillShowNotification,
-                                           object: nil
-      NSNotificationCenter.defaultCenter.addObserver self,
-                                         selector: :keyboard_will_hide,
-                                             name: UIKeyboardWillHideNotification,
-                                           object: nil
-    end
     # ALIASES
     def on_input_change(text_field); end
     def on_input_edit(text_field); end

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

@@ -58,11 +58,6 @@ module MotionPrime
       @container_options || super
     end
 
-    def cell
-      first_element = elements.values.first
-      first_element.view.superview
-    end
-
     def focus(begin_editing = true)
       # scroll to cell
       path = form.table_view.indexPathForCell cell

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

@@ -1,14 +1,24 @@
 motion_require '../table.rb'
 module MotionPrime
   class TableFieldSection < TableSection
-    attr_accessor :form, :cell_element
+    attr_accessor :form, :cell_element, :delegate
+    after_render :on_render
 
     def initialize(options = {})
       @form = options.delete(:form)
+      @delegate = options.delete(:delegate) || form
       @container_options = options.delete(:container)
       super
     end
 
+    def on_render
+      add_pull_to_refresh do
+        model.sync! do
+          finish_pull_to_refresh
+        end
+      end if @options[:pull_to_refresh] && model.present?
+    end
+
     def render_table
       @styles ||= []
       @styles += [
@@ -24,17 +34,18 @@ module MotionPrime
       end
     end
 
-    def table_data
-      form.send("#{name}_table_data")
+    def on_click(table, index)
+      section = data[index.row]
+      delegate.send("#{name}_selected", section) if delegate.respond_to?("#{name}_selected")
     end
 
-    def container_height
-      form.send("#{name}_height")
+    def self.delegate_method(method_name)
+      define_method method_name do |*args|
+        delegate.send("#{name}_#{method_name}", *args) if delegate.respond_to?("#{name}_#{method_name}")
+      end
     end
 
-    def on_click(table, index)
-      section = data[index.row]
-      form.send("#{name}_selected", section)
-    end
+    delegate_method :table_data
+    delegate_method :container_height
   end
 end

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

@@ -0,0 +1,59 @@
+module MotionPrime
+  class TextWithButtonFieldSection < BaseFieldSection
+    element :label, type: :label do
+      {
+        styles: [
+          :base_field_label,
+          :base_text_field_label,
+          :"#{form_name}_field_label",
+          :"#{form_name}_#{name}_field_label"
+        ]
+      }.merge(options[:label] || {})
+    end
+    element :input, type: :text_view do
+      styles = [
+        :base_field_input,
+        :base_text_field_input,
+        :"#{form_name}_field_input",
+        :"#{form_name}_#{name}_field_input"
+      ]
+      styles << :base_field_input_with_errors if form.model && form.model.errors[name].present?
+
+      {
+        styles: styles,
+        editable: true
+      }.merge(options[:input] || {})
+    end
+    element :button, type: :button do
+      {
+        styles: [
+          :base_text_button,
+          :"#{form_name}_text_button",
+          :"#{form_name}_#{name}_text_button"
+        ]
+      }.merge(options[:button] || {}).except(:action)
+    end
+    element :error_message, type: :error_message do
+      {
+        styles: [
+          :base_field_label,
+          :base_string_field_label,
+          :"#{form_name}_field_label",
+          :"#{form_name}_#{name}_field_label",
+          :base_error_message
+        ],
+        hidden: proc { form.model && form.model.errors[name].blank? },
+        text: proc { form.model and form.model.errors[name].join("\n") }
+      }
+    end
+
+    after_render :bind_text_input
+    after_render :bind_button_action
+
+    def bind_button_action
+      view(:button).on :touch do
+        form.send(options[:button][:action])
+      end if options[:button].try(:[], :action)
+    end
+  end
+end

data/motion-prime/sections/table.rb

@@ -59,7 +59,6 @@ module MotionPrime
       if item.respond_to?(:name) && item.name.present?
         styles += [item.name.to_sym]
       end
-
       # DrawSection allows as to draw inside the cell view, so we can setup
       # to use cell view as container
       if item.is_a?(MotionPrime::DrawSection)

data/motion-prime/sections/table/refresh_mixin.rb

@@ -5,7 +5,7 @@ module MotionPrime
       screen.setup table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
     end
 
-    def fisnish_pull_to_refresh
+    def finish_pull_to_refresh
       reload_data
       table_view.pullToRefreshView.stopAnimating
     end

data/motion-prime/styles/base.rb

@@ -71,11 +71,11 @@ MotionPrime::Styles.define :base do
   # @background_image: PATH_TO_FILE
   style :submit_button,
     background_color: :gray,
+    title_color: :white,
     left: 0,
     right: 0,
     top: 10,
-    height: 44,
-    title_color: :white
+    height: 44
 
   style :select_field_button,
     background_color: :white,

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/motion-prime/views/view_builder.rb

@@ -90,9 +90,8 @@ module MotionPrime
             search_bar
           },
           'GMSMapView' => Proc.new{|klass, options|
-            camera = GMSCameraPosition.cameraWithLatitude(35.689466, longitude: 139.700196, zoom: 15)
-            map = GMSMapView.mapWithFrame(CGRectZero, camera: camera)
-            map
+            camera = GMSCameraPosition.cameraWithLatitude(23.42, longitude: 127.42, zoom: 15)
+            GMSMapView.mapWithFrame(CGRectZero, camera: camera)
           }
         }
       end

data/motion-prime/views/view_styler.rb

@@ -106,9 +106,9 @@ module MotionPrime
       # apply options
       if key.end_with?('title_color')
         view.setTitleColor value.uicolor, forState: UIControlStateNormal
-      elsif key.end_with?('alignment')
+      elsif key.end_with?('alignment') && value.is_a?(Symbol)
         view.setValue value.uitextalignment, forKey: key.camelize
-      elsif key.end_with?('line_break_mode')
+      elsif key.end_with?('line_break_mode') && value.is_a?(Symbol)
         view.setValue value.uilinebreakmode, forKey: key.camelize
       elsif key.end_with?('title_shadow_color')
         view.setTitleShadowColor value.uicolor, forState: UIControlStateNormal

data/spec/models/errors_spec.rb

@@ -23,7 +23,7 @@ describe "Model Errors" do
 
     it "should be convertable to string" do
       @user.errors.add(:foo, 'bar')
-      @user.errors.to_s.match(/foo/).should != nil
+      @user.errors.to_s.match(/bar/).should != nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -199,12 +199,14 @@ files:
 - motion-prime/elements/google_map.rb
 - motion-prime/elements/image.rb
 - motion-prime/elements/label.rb
+- motion-prime/elements/map.rb
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
 - motion-prime/helpers/has_authorization.rb
 - motion-prime/helpers/has_normalizer.rb
 - motion-prime/helpers/has_search_bar.rb
 - motion-prime/models/association.rb
+- motion-prime/models/association_collection.rb
 - motion-prime/models/bag.rb
 - motion-prime/models/base.rb
 - motion-prime/models/errors.rb
@@ -234,6 +236,7 @@ files:
 - motion-prime/sections/form/switch_field_section.rb
 - motion-prime/sections/form/table_field_section.rb
 - motion-prime/sections/form/text_field_section.rb
+- motion-prime/sections/form/text_with_button_field_section.rb
 - motion-prime/sections/tabbed.rb
 - motion-prime/sections/table.rb
 - motion-prime/sections/table/refresh_mixin.rb