motion-prime 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzc2NmYzMWIzZTRkOTA3ODFjZjc0NTdkYWM0ZmVjMTQ0OTU1OGM4Yw==
+    MjdhZjg1NjJhYTYxNGZlMTA1ZWNkZGQ0ZmUwZTg3YzdiZjBkM2MyNw==
   data.tar.gz: !binary |-
-    YWUzZWRiOTRjMmQyOTcyYzQzMjFhZWY4YzM0MDY0MzYwZDkzZThlOA==
+    Mjg3NjUzNDE3ZTA1ZDVkZmZmZWMwNDUwMmMxZjlhNDczN2I5NWVjNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDNhMTg1MmYxYjhkMTE3MTAzMjAyY2M0NjAzODE4Mjc0ZjZmOTIxMzNkNmQ3
-    Y2Q2MTlmNmYzMGI5YWE5YjExZmUwNWE3N2FkNWY2YzNmMmI5ZDU4OTliZDI2
-    MzUxMzg5NGVmMWVkMjk0MDQxYjlmZWY2OGYzYzUzNGJjMjcyNTk=
+    MWVjMjhiMThkMjk3N2M1NWQ5MzU4ZjBjMDc3MWY5MmFiYzEwMWFlN2NlNzE0
+    OTM0NzM5NDMwZDMxNjhlODAzNjdiN2I3MmMyMGFlNDhiYjhjZmQ3MjFlOGI5
+    NjkzZTM5ZTQzZDNhMDMyZjgyYzg4MmUzYjYyZDI5ZGUzMjY1OWI=
   data.tar.gz: !binary |-
-    YmI1OTU0YTVjYjE1NDY3MzJkMGMwZmJkOGVlZGVlOGJlZTllNjA1ODVjMzg1
-    YWUxMDlhOGE1N2Q2YTY1ODVlNjhiYjVmOGUwN2JmYjYxYjJmZjg2MWU1ZTBi
-    NTMwM2YwYTFkOGRmNmU1NjJhNDc5NjNiYzZmODk3ZTYzYzE2OTA=
+    MDY1MzIwNjJlOThmN2Q2NWZhZjI0YjJkMDZlMzBhNDI2MTc3MjZhNmYzMmRj
+    MGI2ODFhNWVlY2MyMjBhNTc4M2VjN2E2ZmM2ZWJlZDE1MGM2ODVmOTE1NjNk
+    YjNhZGYwNjZiZDRkMzQwZmIyYzBhMTRlNGFjZjdjODAxMzcyNzM=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.1.7
+* MP::BaseModel#fetch_associations now supports callback option
+* MP::LabelDrawElement now supports `size_to_fit` option
+
 === 0.1.6
 * Section container options now support proc values
 

data/Gemfile.lock

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

data/motion-prime/elements/draw/label.rb

@@ -6,12 +6,18 @@ module MotionPrime
     def draw_in(rect)
       options = computed_options
       return if options[:hidden]
+
+      if options[:size_to_fit]
+        @computed_options[:height] = outer_height
+      end
+
       color = options[:text_color]
       color.uicolor.set if color
+      font = options[:font] || :system
       if options[:number_of_lines] != 0
         options[:text].to_s.drawAtPoint(
           CGPointMake(computed_left, computed_top),
-          withFont: options[:font].uifont
+          withFont: font.uifont
         )
       else
         rect = CGRectMake(
@@ -20,7 +26,7 @@ module MotionPrime
         line_break = options.has_key?(:line_break_mode) ? options[:line_break_mode] : :wordwrap
         alignment = options.has_key?(:text_alignment) ? options[:text_alignment] : :left
         options[:text].to_s.drawInRect(
-          rect, withFont: options[:font].uifont,
+          rect, withFont: font.uifont,
           lineBreakMode: line_break.uilinebreakmode,
           alignment: alignment.uitextalignment
         )

data/motion-prime/models/base.rb

@@ -6,7 +6,7 @@ motion_require './store.rb'
 motion_require './store_extension.rb'
 module MotionPrime
   class BaseModel < NSFNanoObject
-    class_attribute :sync_url
+    class_attribute :_sync_url
     class_attribute :_updatable_attributes
     class_attribute :_associations
     alias_method :attributes, :info
@@ -21,7 +21,7 @@ module MotionPrime
     extend MotionPrime::ModelAssociationClassMethods
 
     def sync_url
-      self.class.sync_url.to_s.gsub(':id', id.to_s)
+      normalize_sync_url(self.class.sync_url)
     end
 
     def model_name
@@ -53,6 +53,9 @@ module MotionPrime
       should_fetch = sync_options[:fetch]
       should_update = sync_options[:update]
 
+      should_fetch = false if sync_url.blank?
+      should_update = false if sync_url.blank?
+
       should_fetch = !new_record? if should_fetch.nil?
       should_update = new_record? if should_update.nil?
 
@@ -62,10 +65,15 @@ module MotionPrime
       end if should_fetch
       update_with_url self.sync_url do
         save if sync_options[:save]
-        block.call if use_callback
+
+        # run callback only if it wasn't run on fetch
+        block.call if use_callback && !should_fetch
       end if should_update
 
-      fetch_associations(sync_options)
+      fetch_associations(sync_options) do
+        # run callback only if it wasn't run on fetch or update
+        block.call if use_callback && !should_fetch && !should_update
+      end
     end
 
     # fetch from server using url
@@ -99,9 +107,16 @@ module MotionPrime
       block.call(self) if block_given?
     end
 
-    def fetch_associations(sync_options = {})
-      (self.class._associations || []).each do |key, options|
-        fetch_association(key, sync_options)
+    def fetch_associations(sync_options = {}, &block)
+      use_callback = block_given?
+      associations = self.class._associations || {}
+
+      associations.keys.each_with_index do |key, index|
+        if use_callback && associations.count - 1 == index
+          fetch_association(key, sync_options, &block)
+        else
+          fetch_association(key, sync_options)
+        end
       end
     end
 
@@ -117,7 +132,8 @@ module MotionPrime
       old_collection = self.send(key)
       use_callback = block_given?
       puts "SYNC: started sync for #{key} in #{self.class.name}"
-      api_client.get(options[:sync_url]) do |data|
+      api_client.get normalize_sync_url(options[:sync_url]) do |data|
+        data = data[options[:sync_key]] if options[:sync_key]
         if data.present?
           # Update/Create existing records
           data.each do |attributes|
@@ -167,9 +183,13 @@ module MotionPrime
       end
     end
 
+    def normalize_sync_url(url)
+      url.to_s.gsub(':id', id.to_s)
+    end
+
     class << self
       def sync_url(url = nil)
-        url ? self.sync_url = url : super
+        url ? self._sync_url = url : self._sync_url
       end
 
       def updatable_attributes(*attrs)

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

@@ -0,0 +1,32 @@
+module MotionPrime
+  class DateFieldSection < BaseFieldSection
+    container height: 190
+    element :label, type: :label do
+      {
+        styles: [
+          :base_field_label,
+          :base_date_picker_field_label,
+          :"#{form_name}_field_label",
+          :"#{form_name}_#{name}_field_label"
+        ]
+      }.merge(options[:label] || {})
+    end
+    element :date_picker, type: :date_picker do
+      {
+        styles: [
+          :base_date_picker,
+          :"#{form_name}_date_picker",
+          :"#{form_name}_#{name}_date_picker"
+        ]
+      }
+    end
+
+    after_render :bind_date_picker
+
+    def bind_date_picker
+      picker = view(:date_picker)
+      picker.setDelegate form
+      picker.setDate NSDate.date, animated: true
+    end
+  end
+end

data/motion-prime/styles/base.rb

@@ -100,4 +100,9 @@ MotionPrime::Styles.define :base do
 
   style :google_map,
     top: 0, left: 0, right: 0, bottom: 0
+
+  style :date_picker,
+    width: 300,
+    height: 150,
+    top: 30, left: 0
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-25 00:00:00.000000000 Z
+date: 2013-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -223,6 +223,7 @@ files:
 - motion-prime/sections/draw.rb
 - motion-prime/sections/form.rb
 - motion-prime/sections/form/base_field_section.rb
+- motion-prime/sections/form/date_field_section.rb
 - motion-prime/sections/form/password_field_section.rb
 - motion-prime/sections/form/select_field_section.rb
 - motion-prime/sections/form/string_field_section.rb