motion-prime 0.9.7 → 0.9.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmEyMGMyMWQ4OTEwOGI2N2Y5YzZjYmI3MWRmY2Y4MzYzMGNiYjU2MQ==
+    OWYyOGRiMGJjNjc2MjdkM2JiOTBlMWZjMzk2YTFjZTgwNTUzMDA2YQ==
   data.tar.gz: !binary |-
-    YzI4NzhiNWJiYjJmY2EyMmFiM2M0MjE4MzVmMWM5OWMxNzNjYTdlMQ==
+    MWU3OTRmN2RjZjRlZDc1M2Y2ZjAwZDI1MDRjYjI4MDk5ODU4N2E1Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTlkZGM4MTg1YTI1NjVjOWU0M2U4MzYzNzQ5NzlhZWY5OWVkNjFjMTNkODY2
-    NDAwZjNiMTRlZmJlZDFjMzExODZlOTVhM2YxZmFiMzgwNWVmY2JhOWI1MTI4
-    ZGQ3MTYxOGI4NTAzNmVlMzQ0NDIyNTIxNDdiNmI0NWE4ZDMyMzM=
+    Y2U5NzJkZjkxMTMyMTNjMzk2NGJlYTRkYjZjNDljN2QwODI5NDg2OWYxNWI4
+    ZGU3ZTI3MWVlYWFiMGJjMjNhOGFmMzA2YWUyZmUwNzE0YjZmNTM4NzA0OWNl
+    ZDNmZDI4NjA5YWM5NWM4NWJlMDllZWEyN2ZkMGI0NjAzN2NjMTA=
   data.tar.gz: !binary |-
-    MTNlNWRkMDhkNTJiZWU1NTQ2NDA2ODAzMzRhYmQzMzEwODEyYzQ1NjFmOGM5
-    YWZjNWM0ZmY5ZTAyNTQyOGFjYTAzNjY0YzU2YjE1NjgzMWY2ZDhmZjdjMDY2
-    YWYyNDViYTQ2NzJjNzFmMDI3ZGM3ZTBkMDA4MjczYmE4N2YzYjE=
+    Zjc5MDQ2MjJhYWY2MzU1YTIwYWJmZmE0NDhiOWVjNmY5Njg0ZmE5NTA3ZDg2
+    YmM2NmNhNWNmNmQ4NjQwYzQ3MTZkNDljNTFiY2EyMzljZDI0OGYzOTc2YjM3
+    YzU3ODg5MTNjNWJmNzMzZTNkMzVhNzE2YmRiOWRlM2FjZjE5ZGI=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.9.8
+* Ability to fetch one record / all records from server using Model.fetch(id) or Model.fetch_all
+* Bug fixes
+
 === 0.9.7
 * BREAKING CHANGE: screen#set_options renamed to screen#set_options_for.
 * BREAKING CHANGE: section#reload_section renamed to section#hard_reload_section. in common cases use section#reload.

data/Gemfile

@@ -1,4 +1,4 @@
 source 'http://rubygems.org'
 
-gem 'motion-cocoapods', '~> 1.4.0'
+gem 'motion-cocoapods', '~> 1.4.1'
 gemspec

data/Gemfile.lock

@@ -1,17 +1,17 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.7)
+    motion-prime (0.9.8)
       activesupport
       afmotion (~> 2.1.0)
-      bubble-wrap (~> 1.5.0)
+      bubble-wrap (~> 1.6.0)
       cocoapods
       methadone
       motion-cocoapods
       motion-require
       motion-support (~> 0.2.6)
       rm-digest
-      sugarcube (~> 1.5.2)
+      sugarcube (~> 1.6.0)
       thor
 
 GEM
@@ -20,61 +20,62 @@ GEM
     activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    afmotion (2.1.2)
+    afmotion (2.1.4)
       motion-cocoapods (~> 1.4.0)
       motion-require (>= 0.1)
-    bubble-wrap (1.5.0)
-    claide (0.4.0)
-    cocoapods (0.29.0)
+    bubble-wrap (1.6.0)
+      bubble-wrap-http (= 1.6.0)
+    bubble-wrap-http (1.6.0)
+    claide (0.5.0)
+    cocoapods (0.32.1)
       activesupport (>= 3.2.15, < 4)
-      claide (~> 0.4.0)
-      cocoapods-core (= 0.29.0)
-      cocoapods-downloader (~> 0.3.0)
-      cocoapods-try-release-fix (~> 0.1.1)
+      claide (~> 0.5.0)
+      cocoapods-core (= 0.32.1)
+      cocoapods-downloader (~> 0.5.0)
+      cocoapods-try (~> 0.2.0)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
-      nap (~> 0.5)
+      nap (~> 0.7)
       open4 (~> 1.3)
-      xcodeproj (~> 0.14.1)
-    cocoapods-core (0.29.0)
+      xcodeproj (~> 0.16.1)
+    cocoapods-core (0.32.1)
       activesupport (>= 3.2.15, < 4)
       fuzzy_match (~> 2.0.4)
       json_pure (~> 1.8)
       nap (~> 0.5)
-    cocoapods-downloader (0.3.0)
-    cocoapods-try-release-fix (0.1.2)
+    cocoapods-downloader (0.5.0)
+    cocoapods-try (0.2.0)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
     i18n (0.6.9)
     json_pure (1.8.1)
-    methadone (1.3.2)
+    methadone (1.4.0)
       bundler
-    motion-cocoapods (1.4.0)
-      cocoapods (>= 0.26.2)
+    motion-cocoapods (1.4.1)
+      cocoapods (>= 0.32.1)
     motion-redgreen (0.1.0)
     motion-require (0.2.0)
-    motion-stump (0.3.1)
+    motion-stump (0.3.2)
     motion-support (0.2.6)
       motion-require (>= 0.0.6)
-    multi_json (1.9.0)
-    nap (0.6.0)
+    multi_json (1.9.3)
+    nap (0.7.0)
     open4 (1.3.3)
-    rake (10.1.1)
+    rake (10.3.1)
     rm-digest (0.0.2)
-    sugarcube (1.5.5)
+    sugarcube (1.6.0)
     thor (0.19.1)
-    xcodeproj (0.14.1)
+    xcodeproj (0.16.1)
       activesupport (~> 3.0)
       colored (~> 1.2)
-      rake
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  motion-cocoapods (~> 1.4.0)
+  motion-cocoapods (~> 1.4.1)
   motion-prime!
   motion-redgreen
   motion-stump

data/files/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'motion-cocoapods', '~> 1.4.0'
-gem 'motion-prime', '0.9.7'
+gem 'motion-cocoapods', '~> 1.4.1'
+gem 'motion-prime', '0.9.8'
 
 # add reside menu for sidebar support
 # gem 'prime_reside_menu', '~> 0.1.4'

data/files/app/config/base.rb

@@ -1,17 +1,19 @@
 Prime::Config.configure do |config|
   # Uncomments following if you don't want auto generating id for model on save
-  # 
+  #
   # config.model.auto_generate_id = false
 
   # After defining colors you will be able to use it via <uilabel>.text_color = :app_base.uicolor
   # config.colors do |colors|
+  #   colors.navigation_base = 0x1b75bc
   #   colors.base = 0x1b75bc
   #   colors.dark = 0x333333
   #   colors.error = 0xef471f
   # end
 
   # After defining fonts you will be able to use it via <uilabel>.font = :app_base.uifont
+  # Note: font should be copied to resources folder (e.g. resources/fonts/ubuntu.ttf) and added to Rakefile.
   # config.fonts do |fonts|
   #   fonts.base = "Ubuntu"
   # end
-end
+end

data/motion-prime.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "motion-cocoapods"
   spec.add_dependency "motion-require"
   spec.add_dependency "motion-support", '~> 0.2.6'
-  spec.add_dependency 'bubble-wrap', '~> 1.5.0'
-  spec.add_dependency 'sugarcube', '~> 1.5.2'
+  spec.add_dependency 'bubble-wrap', '~> 1.6.0'
+  spec.add_dependency 'sugarcube', '~> 1.6.0'
   spec.add_dependency 'afmotion', '~> 2.1.0'
   spec.add_dependency "methadone"
   spec.add_dependency "rm-digest"

data/motion-prime/elements/_text_mixin.rb

@@ -62,7 +62,7 @@ module MotionPrime
           paragrah_style.setLineSpacing(line_spacing)
         end
         if text_alignment
-          text_alignment = text_alignment.uitextalignment if text_alignment.is_a?(Symbol)
+          text_alignment = text_alignment.nstextalignment if text_alignment.is_a?(Symbol)
           paragrah_style.setAlignment(text_alignment)
         end
         if line_break_mode
@@ -76,4 +76,4 @@ module MotionPrime
       [attributes, paragrah_style]
     end
   end
-end
+end

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

@@ -12,7 +12,7 @@ module MotionPrime
       font = (options[:font] || :system).uifont
 
       text_alignment_name = options.fetch(:text_alignment, :left)
-      text_alignment = text_alignment_name.uitextalignment
+      text_alignment = text_alignment_name.nstextalignment
       line_break_mode_name = options.fetch(:line_break_mode, :tail_truncation)
       line_break_mode = line_break_mode_name.uilinebreakmode
 
@@ -105,4 +105,4 @@ module MotionPrime
       end
     end
   end
-end
+end

data/motion-prime/models/_sync_mixin.rb

@@ -139,7 +139,7 @@ module MotionPrime
     end
 
     # Assign model attributes, using fetch. Differenct between assign_attributes and fetch_with_attributes is
-    # ths you can create method named fetch_:attribute and it will be used to assign attribute only on fetch.
+    # that you can create method named fetch_:attribute and it will be used to assign attribute only on fetch.
     #
     # @example
     #   class User < Prime::Model
@@ -339,7 +339,63 @@ module MotionPrime
     end
 
     module ClassMethods
-      def fetch_all_with_attributes(data)
+      # Fetch model from server
+      #
+      # @param id [Integer] model id
+      # @param options [Hash] fetch options
+      # @option options [Symbol] :method Http method to calculate url, `:get` by default
+      # @option options [Boolean or Array] :associations Also fetch associations
+      # @option options [Boolean] :save Save model after fetch
+      # @param block [Proc] block to be executed after fetch
+      def fetch(id, options = {}, &block)
+        model = self.new(id: id)
+        model.fetch(options, &block)
+      end
+
+      # Fetch model from server and save on local
+      def fetch!(id, options = {}, &block)
+        fetch(id, options.merge(save: true), &block)
+      end
+
+      # Fetch collection from server
+      #
+      # @param options [Hash] fetch options
+      # @option options [Symbol] :method Http method to calculate url, `:get` by default
+      # @option options [Boolean] :save Save model after fetch
+      # @param block [Proc] block to be executed after fetch
+      def fetch_all(options = {}, &block)
+        use_callback = block_given?
+        url = self.new.sync_url(options[:method] || :get, options)
+
+        fetch_all_with_url url, options do |records, status_code, response|
+          records.each(&:save) if options[:save]
+          block.call(records, status_code, response) if use_callback
+        end if !url.blank?
+      end
+
+      # Fetch collection from server using url
+      #
+      # @param url [String] url to fetch
+      # @param block [Proc] block to be executed after fetch
+      def fetch_all_with_url(url, options = {}, &block)
+        use_callback = block_given?
+        App.delegate.api_client.get(url) do |response, status_code|
+          if response.present?
+            records = fetch_all_with_attributes(response, save_associations: options[:save], &block)
+          else
+            records = []
+          end
+          block.call(records, status_code, response) if use_callback
+        end
+      end
+
+      # Assign collection attributes, using fetch.
+      #
+      # @params attributes [Array<Hash>] attributes to be assigned
+      # @params options [Hash] options
+      # @option options [Boolean] :save_associations Save included to hash associations
+      # @return model [Prime::Model] the model
+      def fetch_all_with_attributes(data, options ={}, &block)
         data.map do |attrs|
           item = self.new
           item.fetch_with_attributes(attrs)
@@ -377,4 +433,4 @@ module MotionPrime
       end
     end
   end
-end
+end

data/motion-prime/support/mp_button.rb

@@ -1,3 +1,5 @@
+motion_require '../support/_key_value_store'
+motion_require '../support/_padding_attribute'
 class MPButton < UIButton
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute

data/motion-prime/support/mp_label.rb

@@ -1,3 +1,5 @@
+motion_require '../support/_key_value_store'
+motion_require '../support/_padding_attribute'
 class MPLabel < UILabel
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute

data/motion-prime/support/mp_text_field.rb

@@ -1,6 +1,8 @@
 # This class have some modifications for UITextField:
 # * support padding, padding_left, padding_right options
 # * support placeholder_color, placeholder_font options
+motion_require '../support/_key_value_store'
+motion_require '../support/_padding_attribute'
 class MPTextField < UITextField
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
@@ -32,7 +34,7 @@ class MPTextField < UITextField
 
     truncation = :tail_truncation.uilinebreakmode
     alignment = (placeholderAlignment || :left)
-    alignment = alignment.uitextalignment if alignment.is_a?(Symbol)
+    alignment = alignment.nstextalignment if alignment.is_a?(Symbol)
     self.placeholder.drawInRect(rect, withFont: font, lineBreakMode: truncation, alignment: alignment)
   end
 
@@ -51,4 +53,4 @@ class MPTextField < UITextField
         bounds.origin.x + padding_left, bounds.origin.y + padding_top,
         bounds.size.width - (padding_left + padding_right), bounds.size.height - (padding_top + padding_bottom))
     end
-end
+end

data/motion-prime/support/mp_text_view.rb

@@ -1,6 +1,8 @@
 # This class have some modifications for UITextView:
 # * support padding, padding_left, padding_right options
 # * support placeholder, placeholder_color, placeholder_font options
+motion_require '../support/_key_value_store'
+motion_require '../support/_padding_attribute'
 class MPTextView < UITextView
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/motion-prime/views/layout.rb

@@ -1,6 +1,10 @@
 # TODO: make it part of Sections
 motion_require '../support/mp_cell_with_section'
 motion_require '../support/mp_spinner'
+motion_require '../support/mp_button'
+motion_require '../support/mp_label'
+motion_require '../support/mp_text_field'
+motion_require '../support/mp_text_view'
 module MotionPrime
   module Layout
     def add_view(klass, options = {}, &block)
@@ -45,9 +49,9 @@ module MotionPrime
 
     def self.included base
       base.class_eval do
-        [::UIActionSheet, ::UIActivityIndicatorView, ::UIButton, ::UIDatePicker, ::UIImageView, ::UILabel,
+        [::UIActionSheet, ::UIActivityIndicatorView, ::MPButton, ::UIDatePicker, ::UIImageView, ::MPLabel,
           ::UIPageControl, ::UIPickerView, ::UIProgressView, ::UIScrollView, ::UISearchBar, ::UISegmentedControl,
-          ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::UITextField, ::UITextView,
+          ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::MPTextField, ::MPTextView,
           ::UIToolbar, ::UIWebView, ::UINavigationBar, ::MPCellWithSection, ::MBProgressHUD, ::MPSpinner].each do |klass|
 
           shorthand = "#{klass}"[2..-1].underscore.to_sym

data/motion-prime/views/view_styler.rb

@@ -151,7 +151,7 @@ module MotionPrime
           view.setValue "UIControlContentHorizontalAlignment#{value.camelize}".constantize, forKey: camelize_factory(key)
           true
         elsif key.end_with?('alignment') && value.is_a?(Symbol)
-          view.setValue value.uitextalignment, forKey: camelize_factory(key)
+          view.setValue value.nstextalignment, forKey: camelize_factory(key)
           true
         elsif key.end_with?('line_break_mode') && value.is_a?(Symbol)
           view.setValue value.uilinebreakmode, forKey: camelize_factory(key)
@@ -278,4 +278,4 @@ module MotionPrime
       UIOffset            => Proc.new {|v| NSValue.valueWithUIOffset(v) }
     }
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -115,28 +115,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sugarcube
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: afmotion
   requirement: !ruby/object:Gem::Requirement