motion-prime 0.8.10 → 0.8.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGJiNzlkZDEwMDg5OTE0MmRmYTE5OTdhNTYxNzE1NTI5NjJiNzNiMg==
-  data.tar.gz: !binary |-
-    ZmVlMzZmYmYwZWY2Y2Y1ZjMwYWQ1ODMyMDUzNDk2ZDQ1MDE3OGJhOQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OGM2N2VhZmIyMGFmYTQ1MjJkZjdlZjc0NTkwYWViMTkzNjYxMzc0YjVkZTQ3
-    YjdjNDE0MGVhNmZkYzhhZTA3NWYwOGMzYTdmN2ExZWU0MjhhMWZjOWMzNTAy
-    ZTQxY2QwMGQ5YjQxYjQ3OTIwN2UzZDBlN2JkYTIwMGUyMDQzMmU=
-  data.tar.gz: !binary |-
-    Y2E0ZTZjMzBkMDZiMTRjZTE5NTM4MjFkZmZhN2Y3YTRiY2U0ZTZjMjZlOTE0
-    OGM3ZTdkOWU2YjFhZDU1OGJiMmU1MGFiMmQyMDJiZmY2ZmU1MzFkYWUyYjU3
-    YWFiZDYxMTk0MWFhNjI0NTA1ZjUzMmY1ZGZmN2QyZGZhMmFiYzQ=
+SHA1:
+  metadata.gz: 2d46d1511acff3435a0cb081f7276b3728e2c5eb
+  data.tar.gz: fe0d22a532d8f2cfd7b4b4a66e9950498aae5296
+SHA512:
+  metadata.gz: df56ca13d08064cf8e4a24e28101a45d2e86b46475743cdfeb23487e6c5ec8c46c9550a926a281954cfe1b4fc8a2f8b0f403bc708624b90543cec371eccdce7d
+  data.tar.gz: 1db69c0bf00648b86c335f4798958d2ee457d34dcd044c9b6b1404d4b41efab8a1eb6081c1bcbf6dd7ea771342666372871beab9ac24fa074bf9b07cc7725152

data/.gitignore

@@ -1,4 +1,5 @@
 .repl_history
+.bundle
 build
 tags
 app/pixate_code.rb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 0.8.11
+* Ability to send block to after_render/before_render
+* Added ability to get all form field values via `field_values`
+* Ability to automatically set models saved_at/created_at using `timestamp_attributes`.
+
 === 0.8.10
 * Added font_name/font_size options support.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.10)
+    motion-prime (0.8.11)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.5.0)
       cocoapods

data/motion-prime/models/_base_mixin.rb

@@ -201,7 +201,8 @@ module MotionPrime
       #
       # @return Nil
       def attribute(name, options = {})
-        attributes << name
+        attributes << name.to_sym
+        attributes.uniq!
 
         define_method(:"#{name}=") do |value, &block|
           track_changed_attributes do

data/motion-prime/models/_timestamps_mixin.rb

@@ -0,0 +1,33 @@
+module MotionPrime
+  module ModelTimestampsMixin
+    extend ::MotionSupport::Concern
+
+    def self.included(base)
+      base.class_attribute :_timestamp_attributes
+    end
+
+    def save
+      time = Time.now
+      trigger_timestamp(:save, time)
+      trigger_timestamp(:create, time) if new_record?
+      super
+    end
+
+    def trigger_timestamp(action_name, time)
+      field = (_timestamp_attributes || {})[action_name]
+      return unless field
+      self.send(:"#{field}=", time)
+    end
+    
+    module ClassMethods
+      def timestamp_attributes(actions = nil)
+        self._timestamp_attributes ||= {}
+        actions ||= {save: :saved_at, create: :created_at}
+        actions.each do |action_name, field|
+          _timestamp_attributes[action_name.to_sym] = field
+          self.attribute field, type: :time
+        end
+      end
+    end
+  end
+end

data/motion-prime/models/model.rb

@@ -16,6 +16,7 @@ module MotionPrime
     include MotionPrime::ModelSyncMixin
     include MotionPrime::ModelFinderMixin
     include MotionPrime::ModelDirtyMixin
+    include MotionPrime::ModelTimestampsMixin
 
     attribute :bag_key # need this as we use shared store; each nested resource must belong to parent bag
     attribute :id

data/motion-prime/screens/_base_mixin.rb

@@ -70,11 +70,11 @@ module MotionPrime
           t ? @title = t : @title ||= self.to_s
         end
       end
-      def before_render(method_name)
-        set_callback :render, :before, method_name
+      def before_render(*method_names, &block)
+        set_callback :render, :before, *method_names, &block
       end
-      def after_render(method_name)
-        set_callback :render, :after, method_name
+      def after_render(*method_names)
+        set_callback :render, :after, *method_names, &block
       end
       def create_with_options(screen, navigation = true, options = {})
         screen = create_tab_bar(screen, options) if screen.is_a?(Array)

data/motion-prime/sections/base_section.rb

@@ -371,17 +371,17 @@ module MotionPrime
       def container(options)
         self.container_options = options
       end
-      def before_render(method_name)
-        set_callback :render, :before, method_name
+      def before_render(*method_names, &block)
+        set_callback :render, :before, *method_names, &block
       end
-      def after_render(method_name)
-        set_callback :render, :after, method_name
+      def after_render(*method_names, &block)
+        set_callback :render, :after, *method_names, &block
       end
-      def before_initialize(method_name)
-        set_callback :initialize, :before, method_name
+      def before_initialize(*method_names, &block)
+        set_callback :initialize, :before, *method_names, &block
       end
-      def after_initialize(method_name)
-        set_callback :initialize, :after, method_name
+      def after_initialize(*method_names, &block)
+        set_callback :initialize, :after, *method_names, &block
       end
       def bind_keyboard_close(options)
         self.keyboard_close_bindings = options

data/motion-prime/sections/form.rb

@@ -80,6 +80,14 @@ module MotionPrime
       fields.to_hash
     end
 
+    def field_values
+      values = {}
+      fields.each do |field_name, field|
+        values[field_name.to_sym] = field.value if field.input?
+      end
+      values
+    end
+
     def register_elements_from_section(section)
       self.rendered_views ||= {}
       section.elements.values.each do |element|

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

@@ -134,6 +134,14 @@ module MotionPrime
       end
     end
 
+    def value
+      raise "should be defined"
+    end
+
+    def input?
+      false
+    end
+
     def observing_errors?
       @errors_observer_options.present?
     end

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

@@ -21,6 +21,14 @@ module MotionPrime
       end
     end
 
+    def value
+      view(:input).date
+    end
+
+    def input?
+      true
+    end
+
     def dealloc
       picker = view(:input)
       picker.setDelegate nil

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

@@ -8,5 +8,13 @@ module MotionPrime
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
+
+    def value
+      view(:input).text
+    end
+
+    def input?
+      true
+    end
   end
 end

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

@@ -18,5 +18,9 @@ module MotionPrime
         form.send(options[:action]) if options[:action]
       end
     end
+
+    def value
+      view(:button).title
+    end
   end
 end

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

@@ -10,5 +10,13 @@ module MotionPrime
 
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
+
+    def value
+      view(:input).text
+    end
+
+    def input?
+      true
+    end
   end
 end

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

@@ -9,5 +9,13 @@ module MotionPrime
     element :hint, type: :label do
       options[:hint] || {}
     end
+
+    def value
+      view(:input).isOn
+    end
+
+    def input?
+      true
+    end
   end
 end

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

@@ -9,5 +9,13 @@ module MotionPrime
 
     element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
     after_render :bind_text_input
+
+    def value
+      view(:input).text
+    end
+
+    def input?
+      true
+    end
   end
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end

data/spec/helpers/models.rb

@@ -1,5 +1,6 @@
 class User < MotionPrime::Model
-  attributes :name, :age, :created_at
+  attributes :name, :age, :birthday
+  timestamp_attributes
 end
 class Plane < MotionPrime::Model
   attributes :name, :age
@@ -43,12 +44,12 @@ class CustomModule::Car < MotionPrime::Model
 end
 Car = CustomModule::Car
 
-def stub_user(name, age, created_at, id = nil)
+def stub_user(name, age, birthday, id = nil)
   user = User.new
   user.id = id || 1
   user.name = name
   user.age  = age
-  user.created_at = created_at
+  user.birthday = birthday
   user
 end
 

data/spec/models/finder_spec.rb

@@ -116,7 +116,6 @@ describe "Prime::Model Finder" do
     it "should return object by key" do
       name = "Julien"
       age = 32
-      created_at = Time.now
       user = stub_user("Julien", 32, Time.now)
       user.save
       user2 = User.find_by_key(user.key)

data/spec/models/model_spec.rb

@@ -21,11 +21,11 @@ describe MotionPrime::Model do
 
       user.info.keys.include?("name").should.be.true
       user.info.keys.include?("age").should.be.true
-      user.info.keys.include?("created_at").should.be.true
+      user.info.keys.include?("birthday").should.be.true
 
       user.info["name"].should == "Bob"
       user.info["age"].should == 10
-      user.info["created_at"].should == user.created_at
+      user.info["birthday"].should == user.birthday
 
       user.name.should == "Bob"
       user.age.should == 10
@@ -43,7 +43,7 @@ describe MotionPrime::Model do
         user = User.new({
           name: "Eddie", 
           age: 12, 
-          created_at: Time.now, 
+          birthday: Time.now, 
           gender: "m",
         }, validate_attribute_presence: true )
       }.should.raise(::MotionPrime::StoreError)
@@ -53,7 +53,7 @@ describe MotionPrime::Model do
       user = User.new({
         name: "Eddie", 
         age: 12, 
-        created_at: Time.now, 
+        birthday: Time.now, 
         gender: "m",
       })
       user.name.should == "Eddie"
@@ -64,18 +64,24 @@ describe MotionPrime::Model do
     it "create object with hash" do
       name = "Abby"
       age  = 30
-      created_at = Time.now
-      user = User.create(:name => name, :age => age, :created_at => created_at)
+      birthday = Time.now
+      user = User.create(name: name, age: age, birthday: birthday)
       user.name.should == name
       user.age.should == age
-      user.created_at.should == created_at
+      user.birthday.should == birthday
     end
 
     it "create object in their class" do
       @store.allObjectClasses.should == []
-      Organization.create(:name => "Bumblebee")
+      Organization.create(name: "Droid Labs")
       @store.allObjectClasses.should == ["Organization"]
     end
+
+    it "sets timestamp" do
+      user = User.create(name: "Bob")
+      user.created_at.present?.should.be.true
+      user.saved_at.present?.should.be.true
+    end
   end
 
   describe "#save" do
@@ -96,6 +102,17 @@ describe MotionPrime::Model do
       user2.id.present?.should.be.true
     end
 
+    it "sets timestamp" do
+      user = stub_user("Bob", 10, Time.now)
+      user.id = nil
+      user.save
+      created_at = user.created_at
+      sleep(1)
+      user.save
+      user.created_at.should == created_at
+      user.saved_at.should != created_at
+    end
+
     # per object store since NanoStore 2.5.1
     it "user per instance store to save" do
       store1 = MotionPrime::Store.create
@@ -130,7 +147,7 @@ describe MotionPrime::Model do
 
       user1 = User.find(15).first
       user1.name.should == "Bob"
-      user1.created_at.should.be.nil
+      user1.birthday.should.be.nil
     end
 
     it "create model in file store" do
@@ -141,7 +158,7 @@ describe MotionPrime::Model do
 
       user1 = User.find(15).first
       user1.name.should == "Bob"
-      user1.created_at.should.be.nil
+      user1.birthday.should.be.nil
 
       File.delete(path) rescue nil
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,174 +9,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-10 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-stump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-require
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: motion-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: sugarcube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
   name: afmotion
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rm-digest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RubyMotion apps development framework
@@ -187,9 +187,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -286,6 +286,7 @@ files:
 - motion-prime/models/_finder_mixin.rb
 - motion-prime/models/_nano_bag_mixin.rb
 - motion-prime/models/_sync_mixin.rb
+- motion-prime/models/_timestamps_mixin.rb
 - motion-prime/models/association_collection.rb
 - motion-prime/models/errors.rb
 - motion-prime/models/exceptions.rb
@@ -385,17 +386,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: RubyMotion apps development framework