motion-prime 0.8.6 → 0.8.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjkxNWIwMDczNzQ2YmQ4ZDI0MTYzZTgyZWZmNjU5NjA1M2JmYzk4Yw==
+    MDNjNmUxZTA5MDQxMjZlMWZlYzU5YTQ5NDExZmU2NzRlNjA2ZGQ1Mw==
   data.tar.gz: !binary |-
-    ZTcyODg5OGMxNDY3YjUyYmM4ZDIzZjEzY2JjYzg2ZjIxYzE5M2NkYw==
+    MDY0MzhiNjc1MzU0YWExMTA1ZDdkOGM0MjYzOWM2Yzk0NGZkN2Q3OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzA4OGEzZTg0NWFkN2QwYmRlZjc3MTljMGM4MDk0MDU3NzY5MzAzMTQzNDJi
-    YzU5ODE5NmRjMjRhMDE3MjRlYzRiNWU3M2U2YWVkZGFjNjA0Nzc5NjYwZGY5
-    NmVmNzAwNDU5OGM2MmQ4NzY0NzJjNmJiMGJmYWFiYjUzOWQ4MDc=
+    MzVhOTRjNjA3NDI1ODNlMzNkZWQ0NzlkYTU2ZmRkMzA5ZjljMGUwYTk5Zjlm
+    MzIxMmIwZjA0MDkyMjg0MDk3YzdlNDZiZmEzNDM1NTE5YjMwNTJkYmJkZDBh
+    OGIxYmE0ZWZjZmU1MmNmZWNiY2Q5MzAyYWVjODViZGIzNWQyMTE=
   data.tar.gz: !binary |-
-    ODkxN2E4Y2ExZWQ1OGY4NjRiMmQ2ZTM3ZDU4NThiMDQ0MTliZDcyMzgwYmRl
-    ZjUxZDg5YjIwMzEyYzQ1NmZlZDA0YzhjOWU0MDUyNzZiNjhkNDRmOGIzZGMy
-    NGJjNDI4NGY0OTNhODFhYWI0NDUxMDM4MmMwMmYxM2M3MDZiOWY=
+    YzBlZjk3NmRjM2I3NzA0NjU5ZTllMmEzNjYwY2VmNDhjMzY1YWYyMjc5OTA2
+    ZGVkZGUxMDVlNzFlNDA3NGVjMGVjZmY1NjgyOTI2N2Y4MGI0MTJjOTRiNGJm
+    Y2MxODBlMWUyOWZiZmVkZTU4NTFhOWYyZTBlM2E4MDljODZhMDc=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 0.8.7
+* Refactored and improved model attributes convertion.
+* Refactored and improved model#dirty.
+* Added auto-generating model id by default.
+
 === 0.8.6
 * Ability to pass :after_render to form field.
 * Ability to append data to collection on sync.

data/Gemfile

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

data/Gemfile.lock

@@ -1,49 +1,51 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.6)
+    motion-prime (0.8.7)
       afmotion (~> 2.0.0)
-      bubble-wrap (~> 1.4.0)
+      bubble-wrap (~> 1.5.0)
       cocoapods
       methadone
       motion-cocoapods
       motion-require
-      motion-support
+      motion-support (~> 0.2.6)
       rm-digest
-      sugarcube (~> 1.3.11)
+      sugarcube (~> 1.5.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.16)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     afmotion (2.0.0)
       motion-cocoapods (~> 1.4.0)
       motion-require (~> 0.0.7)
-    bubble-wrap (1.4.0)
+    bubble-wrap (1.5.0)
     claide (0.4.0)
-    cocoapods (0.28.0)
+    cocoapods (0.29.0)
       activesupport (>= 3.2.15, < 4)
       claide (~> 0.4.0)
-      cocoapods-core (= 0.28.0)
-      cocoapods-downloader (~> 0.2.0)
+      cocoapods-core (= 0.29.0)
+      cocoapods-downloader (~> 0.3.0)
+      cocoapods-try-release-fix (~> 0.1.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
+      nap (~> 0.5)
       open4 (~> 1.3)
       xcodeproj (~> 0.14.1)
-    cocoapods-core (0.28.0)
+    cocoapods-core (0.29.0)
       activesupport (>= 3.2.15, < 4)
       fuzzy_match (~> 2.0.4)
-      json (~> 1.8)
+      json_pure (~> 1.8)
       nap (~> 0.5)
-    cocoapods-downloader (0.2.0)
+    cocoapods-downloader (0.3.0)
+    cocoapods-try-release-fix (0.1.2)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
     i18n (0.6.9)
-    json (1.8.1)
     json_pure (1.8.1)
     methadone (1.3.2)
       bundler
@@ -51,15 +53,15 @@ GEM
       cocoapods (>= 0.26.2)
     motion-redgreen (0.1.0)
     motion-require (0.0.7)
-    motion-stump (0.3.0)
-    motion-support (0.2.5)
+    motion-stump (0.3.1)
+    motion-support (0.2.6)
       motion-require (>= 0.0.6)
-    multi_json (1.8.2)
+    multi_json (1.9.0)
     nap (0.6.0)
-    open4 (1.3.0)
-    rake (10.1.0)
+    open4 (1.3.3)
+    rake (10.1.1)
     rm-digest (0.0.2)
-    sugarcube (1.3.11)
+    sugarcube (1.5.2)
     xcodeproj (0.14.1)
       activesupport (~> 3.0)
       colored (~> 1.2)
@@ -73,5 +75,4 @@ DEPENDENCIES
   motion-prime!
   motion-redgreen
   motion-stump
-  motion-support (~> 0.2.4)
   rake

data/ROADMAP.md

@@ -2,7 +2,7 @@
 * Move api_client and model sync mixin to prime_api gem.
 * Move bind keyboard events to forms.
 
-=== 0.1.0
+=== 1.0.0
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text
 * bug: size_to_fit works incorrect with relative width.
 * bug: bind_keyboard_close breaks bind_guesture
@@ -23,4 +23,4 @@
 * add computed_options.get(), this will allow to make sure that options is computed.
 * add testing framework
 * add DSL for ViewStyles#setValue conditions
-* add embed/regular has many types. embedded by default.
+* add embed/regular has many types. embedded by default.

data/files/Gemfile

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

data/files/app/config/base.rb

@@ -1,3 +1,17 @@
 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.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
+  # config.fonts do |fonts|
+  #   fonts.base = "Ubuntu"
+  # end
 end

data/motion-prime.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cocoapods"
   spec.add_dependency "motion-cocoapods"
   spec.add_dependency "motion-require"
-  spec.add_dependency "motion-support"
-  spec.add_dependency 'bubble-wrap', '~> 1.4.0'
-  spec.add_dependency 'sugarcube', '~> 1.3.11'
+  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 'afmotion', '~> 2.0.0'
   spec.add_dependency "methadone"
   spec.add_dependency "rm-digest" 

data/motion-prime/config/base.rb

@@ -5,6 +5,7 @@ MotionPrime::Config.configure do |config|
   else
     config.model.store_type = :file
   end
+  config.model.auto_generate_id = true
   
   config.fonts do |fonts|
     fonts.base = :system

data/motion-prime/models/_base_mixin.rb

@@ -10,6 +10,7 @@ module MotionPrime
     #
     # @return [Prime::Model] model
     def save
+      set_default_id_if_needed
       raise StoreError, 'No store provided' unless self.store
       error_ptr = Pointer.new(:id)
       self.store.addObject(self, error: error_ptr)
@@ -112,6 +113,41 @@ module MotionPrime
       self.class.new(self.info.select { |key, value| !key.to_s.ends_with?('_bag') })
     end
 
+    protected
+      def set_default_id_if_needed
+        if !self.id && MotionPrime::Config.model.auto_generate_id
+          self.id = RmDigest::MD5.hexdigest(Time.now.to_s + self.object_id.to_s)
+        end
+      end
+
+      def attribute_convert_out(value, type)
+        return value if value.nil? || type.blank?
+        case type.to_s
+        when 'integer'
+          value.to_i
+        when 'float'
+          value.to_f
+        when 'time'
+          Time.short_iso8601(value)
+        else
+          value
+        end
+      end
+
+      def attribute_convert_in(value, type)
+        return value if value.nil? || type.blank?
+        case type.to_s
+        when 'integer'
+          value.to_i
+        when 'float'
+          value.to_f
+        when 'time'
+          value.to_short_iso8601 unless value.is_a?(String)
+        else
+          value
+        end
+      end
+
     module ClassMethods
       # Initialize a new object
       #
@@ -123,17 +159,8 @@ module MotionPrime
       # @option options [Boolean] :validate_attribute_presence Raise error if model do not have attribute
       # @return MotionPrime::Model unsaved model
       def new(data = {}, options = {})
-        data.keys.each do |key|
-          unless self.attributes.member? key.to_sym
-            if options[:validate_attribute_presence]
-              raise StoreError, "unknown attribute: '#{key}'"
-            else
-              data.delete(key)
-            end
-          end
-        end
-
-        object = self.nanoObjectWithDictionary(data)
+        object = self.nanoObjectWithDictionary({})
+        object.assign_attributes(data, options)
         object
       end
 
@@ -162,47 +189,26 @@ module MotionPrime
       def attribute(name, options = {})
         attributes << name
 
-        define_method(name) do |*args, &block|
-          value = self.info[name]
-          case options[:type].to_s
-          when 'time'
-            value = Time.short_iso8601(value) if value
+        define_method(:"#{name}=") do |value, &block|
+          track_changed_attributes do
+            if options[:convert] || !options.has_key?(:convert)
+              self.info[name] = attribute_convert_in(value, options[:type])
+            else
+              self.info[name] = value
+            end
           end
-          value
-        end
-
-        define_method((name + "=").to_sym) do |*args, &block|
-          value = args[0]
-          case options[:type].to_s
-          when 'integer'
-            value = value.to_i
-          when 'float'
-            value = value.to_f
-          when 'time'
-            value = value.to_short_iso8601 unless value.is_a?(String)
-          end unless value.nil?
-
-          self.info[name] = value
         end
 
         define_method(name.to_sym) do
-          value = self.info[name]
-          case options[:type].to_s
-          when 'integer'
-            value.to_i
-          when 'float'
-            value.to_f
-          when 'time' && !value.is_a?(String)
-            value.to_short_iso8601
+          if options[:convert] || !options.has_key?(:convert)
+            attribute_convert_out(self.info[name], options[:type])
           else
-            value
+            self.info[name]
           end
-        end if options[:convert]
+        end
 
-        if options[:type].to_s == 'boolean'
-          define_method("#{name}?") do
-            !!self.info[name]
-          end
+        define_method("#{name}?") do
+          self.info[name].present?
         end
       end
 

data/motion-prime/models/_dirty_mixin.rb

@@ -25,13 +25,41 @@ module MotionPrime
       result
     end
 
-    def has_changed?(key = nil)
+    def changed_attributes
       @_changed_attributes ||= {}
+    end
+
+    def reset_changed_attributes
+      @_changed_attributes = {}
+    end
+
+    # Return true if model was changed
+    #
+    # @param key [Symbol,String] (not required) will return result only for that attribute if specified
+    # @return result [Boolean] result
+    def has_changed?(key = nil)
       if key
-        @_changed_attributes.has_key?(key.to_s)
+        changed_attributes.has_key?(key.to_s)
       else
-        @_changed_attributes.present?
+        changed_attributes.present?
+      end
+    end
+
+    def save
+      super
+      reset_changed_attributes
+      self
+    end
+
+    # Reverts model changes and returns saved version
+    #
+    # @return model [MotionPrime::Model] reloaded model
+    def reload
+      changed_attributes.each do |key, value|
+        self.info[key] = value
       end
+      reset_changed_attributes
+      self
     end
   end
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.6"
+  VERSION = "0.8.7"
 end

data/spec/helpers/models.rb

@@ -1,15 +1,10 @@
 class User < MotionPrime::Model
   attributes :name, :age, :created_at
 end
-
 class Plane < MotionPrime::Model
   attributes :name, :age
 end
 
-class Listing < MotionPrime::Model
-  attribute :name
-end
-
 class Todo < MotionPrime::Model
   attribute :title
   bag :items
@@ -25,14 +20,6 @@ class Page < MotionPrime::Model
   attribute :index
 end
 
-class Animal < MotionPrime::Model
-  attribute :name
-end
-
-class Autobot < MotionPrime::Model
-  attribute :name
-end
-
 class Organization < MotionPrime::Model
   attribute :name
   has_many :projects
@@ -42,6 +29,13 @@ class Project < MotionPrime::Model
   attribute :title
 end
 
+class Autobot < MotionPrime::Model
+  attribute :name
+  attribute :uid, type: :integer
+  attribute :release_at, type: :time
+  attribute :strength, type: :float
+end
+
 module CustomModule; end
 class CustomModule::Car < MotionPrime::Model
   attribute :name

data/spec/models/dirty_spec.rb

@@ -0,0 +1,34 @@
+describe MotionPrime::Model do
+  before do
+    MotionPrime::Store.connect
+    @store = MotionPrime::Store.shared_store
+  end
+
+  after do
+    @store.clear
+  end
+
+  describe "has_changed?" do
+    before do
+      @user = stub_user("Bob", 10, Time.now)
+      @user.save
+    end
+
+    it "should be false after save" do
+      puts @user.changed_attributes
+      @user.has_changed?.should.be.false
+    end
+
+    it "should be true after attribute change" do
+      @user.name = "Smith"
+      @user.has_changed?.should.be.true
+    end
+
+    it "should be false after reload" do
+      @user.name = "Smith"
+      @user.reload
+      @user.has_changed?.should.be.false
+      @user.name.should == "Bob"
+    end
+  end
+end

data/spec/models/model_spec.rb

@@ -73,8 +73,8 @@ describe MotionPrime::Model do
 
     it "create object in their class" do
       @store.allObjectClasses.should == []
-      Autobot.create(:name => "Bumblebee")
-      @store.allObjectClasses.should == ["Autobot"]
+      Organization.create(:name => "Bumblebee")
+      @store.allObjectClasses.should == ["Organization"]
     end
   end
 
@@ -85,6 +85,17 @@ describe MotionPrime::Model do
       @store.count(User).should == 1
     end
 
+    it "should set default id" do
+      user1 = User.new
+      user2 = User.new
+      user1.id = 123
+      user1.save
+      user2.save
+
+      user1.id.should == 123
+      user2.id.present?.should.be.true
+    end
+
     # per object store since NanoStore 2.5.1
     it "user per instance store to save" do
       store1 = MotionPrime::Store.create
@@ -207,4 +218,17 @@ describe MotionPrime::Model do
       Plane.count.should == 1
     end
   end
+
+  describe "#attribute" do
+    it "should correctly save non-string attributes" do
+      release = Time.now + 1.day.to_i
+      Autobot.create(name: "Optimus Prime", uid: 1, release_at: release, strength: 15.7)
+      autobot = Autobot.find(uid: 1).first
+      autobot.name.is_a?(String).should.be.true
+      autobot.uid.is_a?(Integer).should.be.true
+      autobot.release_at.is_a?(Time).should.be.true
+      autobot.strength.is_a?(Float).should.be.true
+      autobot.release_at.should == release
+    end
+  end
 end

data/spec/models/store_extension_spec.rb

@@ -21,13 +21,13 @@ describe "Prime::Model Store Extension" do
   end
 
   it "should add, delete objects and count them" do
-    obj1 = Animal.new
+    obj1 = Organization.new
     obj1.name = "Cat"
-    obj2 = Animal.new
+    obj2 = Organization.new
     obj2.name = "Dog"
-    obj3 = Animal.new
+    obj3 = Organization.new
     obj3.name = "Cow"
-    obj4 = Animal.new
+    obj4 = Organization.new
     obj4.name = "Duck"
 
     @store << obj1
@@ -35,86 +35,86 @@ describe "Prime::Model Store Extension" do
     @store += obj4
 
     @store.save
-    Animal.count.should == 4
+    Organization.count.should == 4
 
     @store.delete(obj1)
-    Animal.count.should == 3
+    Organization.count.should == 3
 
     @store.delete_keys([obj2.key])
-    Animal.count.should == 2
+    Organization.count.should == 2
 
     @store.clear
-    Animal.count.should == 0
+    Organization.count.should == 0
   end
 
   it "should discard unsave changes" do
     @store.save_interval = 1000 # must use save_interval= to set auto save interval first
     @store.engine.synchronousMode = SynchronousModeFull
 
-    Animal.count.should == 0
-    obj1 = Animal.new
+    Organization.count.should == 0
+    obj1 = Organization.new
     obj1.name = "Cat"
-    obj2 = Animal.new
+    obj2 = Organization.new
     obj2.name = "Dog"
 
     @store << [obj1, obj2]
     @store.changed?.should.be.true
     @store.discard
     @store.changed?.should.be.false
-    Animal.count.should == 0
+    Organization.count.should == 0
     @store.save_interval = 1
   end
 
   it "should create a transaction and commit" do
     @store.transaction do |the_store|
-      Animal.count.should == 0
-      obj1 = Animal.new
+      Organization.count.should == 0
+      obj1 = Organization.new
       obj1.name = "Cat"
       obj1.save
 
-      obj2 = Animal.new
+      obj2 = Organization.new
       obj2.name = "Dog"
       obj2.save
-      Animal.count.should == 2
+      Organization.count.should == 2
     end
     @store.save
-    Animal.count.should == 2
+    Organization.count.should == 2
   end
 
   it "should create a transaction and rollback when fail" do
     begin
       @store.transaction do |the_store|
-        Animal.count.should == 0
-        obj1 = Animal.new
+        Organization.count.should == 0
+        obj1 = Organization.new
         obj1.name = "Cat"
         obj1.save
 
-        obj2 = Animal.new
+        obj2 = Organization.new
         obj2.name = "Dog"
         obj2.save
-        Animal.count.should == 2
+        Organization.count.should == 2
         raise "error"
       end
     rescue
     end
     @store.save
-    Animal.count.should == 0
+    Organization.count.should == 0
   end
 
   it "should save in batch" do
     @store.save_interval = 1000
 
-    Animal.count.should == 0
-    obj1 = Animal.new
+    Organization.count.should == 0
+    obj1 = Organization.new
     obj1.name = "Cat"
     @store << obj1
 
-    obj2 = Animal.new
+    obj2 = Organization.new
     obj2.name = "Dog"
     @store << obj2
     @store.save
 
-    Animal.count.should == 2
+    Organization.count.should == 2
   end
 
 end

data/spec/models/store_spec.rb

@@ -32,14 +32,14 @@ describe "Prime::Model Store" do
   end
 
   it "should use shared_store if a model has no store defined" do
-    Autobot.store = nil
+    Organization.store = nil
     MotionPrime::Store.connect
-    Autobot.store.should.not.be.nil
+    Organization.store.should.not.be.nil
     MotionPrime::Store.shared_store.should.not.be.nil
-    Autobot.store.should == MotionPrime::Store.shared_store
+    Organization.store.should == MotionPrime::Store.shared_store
 
-    Autobot.store = MotionPrime::Store.create :temp
-    Autobot.store.should.not == MotionPrime::Store.shared_store
+    Organization.store = MotionPrime::Store.create :temp
+    Organization.store.should.not == MotionPrime::Store.shared_store
   end
 
   it "should enable and disable debug mode" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-28 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -99,44 +99,44 @@ dependencies:
   name: motion-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: sugarcube
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: afmotion
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +365,7 @@ files:
 - spec/models/association_collection_spec.rb
 - spec/models/associations_spec.rb
 - spec/models/bag_spec.rb
+- spec/models/dirty_spec.rb
 - spec/models/errors_spec.rb
 - spec/models/finder_spec.rb
 - spec/models/json.rb
@@ -408,6 +409,7 @@ test_files:
 - spec/models/association_collection_spec.rb
 - spec/models/associations_spec.rb
 - spec/models/bag_spec.rb
+- spec/models/dirty_spec.rb
 - spec/models/errors_spec.rb
 - spec/models/finder_spec.rb
 - spec/models/json.rb