motion_model 0.5.1 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTY0YmQxMmY0NmY3OWZmNjQ0M2ZkMGY0YTViOWEwZTE2N2JiZjM1YQ==
+    YmQ4MDAzNDMxNzQ2MDVhOWZkMDVhNjA0M2JhMWEwMGJmZWM4NTU1MQ==
   data.tar.gz: !binary |-
-    YTU5OTViYjhmYzg5ODE0ZDUyNDM2M2QyMjNjYTNmMjZkYjM1MjJkNA==
+    M2UzM2UyYjcyY2JjOWUyMjNhZDRlZmQ1OGE0YTUzZDY5MzY2NDNmOA==
 SHA512:
   metadata.gz: !binary |-
-    ZTg2NzFmZjdiODVhNjJiODk2YzRiOWQ5OTI4ZmZlYjU2MmQ2MjY2M2I5OWY1
-    OWQzN2MyZWRiYmFjNTdmMzhlMTYwMzdkMDNkZWZjZDNmNjBhMTNhYzk5NGNh
-    M2E5MTAyYTU0MzVmYmViMjIzN2ZiZmY2ZTE5MjU3YTM5ZjRkMDE=
+    ZWUxMmM3OGU3ZWM5YzU5YTEwMzVmMWE3OWYwYmNkYzRkYzk2ZTRiM2UzZGYz
+    ZGFiYTkyYzZiNGNlMjZjNmZlYThiMjM5YzRjNjQ1MTVmYWZhMzAwNGM0NDAy
+    YjBjOWE0ZjU4NjAwNmRiMjE2OWRiNTFhNDZiZjU1OTM0NmI5ODU=
   data.tar.gz: !binary |-
-    MDI5Njc4YTVkYmZkMGY1YzkwMGJiNjI0NDM0MzdiMzQ3YjcwMDZiODBjZmQ4
-    Y2Y0MDI1Y2Q1MTZjYTI3MjJmMmYwODI5YjExMGQ3NGE1MTA0YTQ5YzBmMTEz
-    MmIyNjNhZjY1MDg0MmNlZTcwM2ZmNGYwZTljZmQyNGMxZTkzMjM=
+    ODZiYjlkNTNhM2MyODBhYTdlN2RiM2I4ZDM4YTAxNGM3ZDk3Y2E3NzBhMjE4
+    ZGZkZGFjNTcyYmRlZjRhM2ZjZjZkYjM0MGNhODdiZDc3YWEwMzIyNWI2NDli
+    OTdmYTliODZkNTQ1MmU3YWFmNzQ5ZjRlZmQyZGI1ODk3Y2ZmYjU=

data/.travis.yml

@@ -1,5 +1,7 @@
 language: objective-c
-before_install: ruby --version
+before_install:
+  - ruby --version
+  - sudo chown -R travis ~/Library/RubyMotion
 rvm:
   - "1.9.3"
 script: bundle exec rake spec

data/README.md

@@ -167,6 +167,62 @@ class Task
 end
 ```
 
+A note on defaults, you can specify a proc, block or symbol for your default if you want to get fancy. The most obvious use case for this  is that Ruby will optimize the assignment of an array so that a default of `[]` always points to the same object. Not exactly what is intended. Wrapping this in a proc causes a new array to be created. Here's an example:
+
+```
+class Foo
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+  columns  subject: { type: :array, default: ->{ [] } }
+end
+```
+
+This is not constrained to initializing arrays. You can
+initialize pretty much anything using a proc or block.
+If you are specifying a block, make sure to use begin/end
+instead of do/end because it makes Ruby happy.
+
+Here's a different example:
+
+```
+class Timely
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+  columns  ended_run_at: { type: :time, default: ->{ Time.now } }
+end
+```
+Note that this uses the "stubby proc" syntax. That is pretty much equivalent
+to:
+
+```
+columns  ended_run_at: { type: :time, default: lambda { Time.now } }
+```
+
+for the previous example.
+
+If you want to use a block, use the begin/end syntax:
+
+```
+columns  ended_run_at: { type: :time, default:
+  begin
+    Time.now
+  end
+  }
+```
+Finally, you can have the default call some class method as follows:
+
+```
+class Timely
+  include MotionModel::Model
+  include MotionModel::ArrayModelAdapter
+  columns  unique_thingie: { type: :integer, default: :randomize }
+
+  def self.randomize
+    rand 1_000_000
+  end
+end
+```
+
 You can also include the `Validatable` module to get field validation. For example:
 
 ```ruby

data/motion/date_parser.rb

@@ -1,4 +1,6 @@
 module DateParser
+  @@isoDateFormatter = nil
+
   # Parse a date string: E.g.:
   #
   # DateParser.parse_date "There is a date in here tomorrow at 9:00 AM"
@@ -6,8 +8,7 @@ module DateParser
   # => 2013-02-20 09:00:00 -0800
   def self.parse_date(date_string)
     if date_string.match(/\d{2}T\d{2}/)
-      # Discards fractional seconds.
-      date_string = date_string.split('.').first if date_string =~ /\.\d{3}Z$/
+      return fractional_date(date_string) if date_string =~ /\.\d{3}Z$/
       return Time.iso8601(date_string)
     end
 
@@ -46,6 +47,17 @@ module DateParser
     detector = NSDataDetector.dataDetectorWithTypes(NSTextCheckingTypeDate, error:error)
     matches = detector.matchesInString(date_string, options:0, range:NSMakeRange(0, date_string.length))
   end
+
+  def self.allocate_date_formatter
+    @@isoDateFormatter = NSDateFormatter.alloc.init
+    @@isoDateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ'"
+  end
+
+  def self.fractional_date(date_string)
+    allocate_date_formatter if @@isoDateFormatter.nil?
+    date = @@isoDateFormatter.dateFromString date_string
+    return date
+  end
 end
 
 

data/motion/model/model.rb

@@ -785,8 +785,40 @@ module MotionModel
     def unload_relation(col)
     end
 
+    def evaluate_default_value(column, value)
+      default = self.class.default(column)
+
+      case default
+      when NilClass
+        {column => value}
+      when Proc
+        {column => default.call}
+      when Symbol
+        {column => self.send(column)}
+      else
+        {column => default}
+      end
+    end
+
+    # issue #113. added ability to specify a proc or block
+    # for the default value. This allows for arrays to be
+    # created as unique. E.g.:
+    #
+    #     class Foo
+    #       include MotionModel::Model
+    #       include MotionModel::ArrayModelAdapter
+    #       columns  subject: { type: :array, default: ->{ [] } }
+    #     end
+    #
+    #     ...
+    #
+    # This is not constrained to initializing arrays. You can
+    # initialize pretty much anything using a proc or block.
+    # If you are specifying a block, make sure to use begin/end
+    # instead of do/end because it makes Ruby happy.
+
     def initialize_data_columns(column, value) #nodoc
-      self.attributes = {column => value || self.class.default(column)}
+      self.attributes = evaluate_default_value(column, value)
     end
 
     def column_as(col) #nodoc

data/motion/version.rb

@@ -4,5 +4,5 @@
 # or forward port their code to take advantage
 # of adapters.
 module MotionModel
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

data/spec/array_model_persistence_spec.rb

@@ -39,7 +39,6 @@ describe 'persistence' do
 
     PersistTask.serialize_to_file('test.dat')
     tasks = PersistTask.deserialize_from_file('test.dat')
-    puts tasks.inspect
     PersistTask.first.created_at.should == created_at
     PersistTask.first.updated_at.should == updated_at
   end

data/spec/date_spec.rb

@@ -74,5 +74,12 @@ describe "time conversions" do
       m.test_date.should.not.be.nil
       m.test_date.utc.to_s.should.eql '2012-04-23 18:25:43 UTC'
     end
+
+    it "does not discard fractional portion of ISO8601 dates" do
+      m = Model.new(test_date: '2012-04-23T18:25:43.511Z')
+      m.test_date.should.not.be.nil
+      m.test_date.utc.to_s.should.eql '2012-04-23 18:25:43 UTC'
+      m.test_date.utc.to_s.should.not.eql '2012-04-23 18:25:51 UTC'
+    end
   end
 end

data/spec/proc_defaults_spec.rb

@@ -0,0 +1,78 @@
+describe "proc for defaults" do
+  describe "accepts a proc or block for default" do
+    describe "accepts proc" do
+      class AcceptsProc
+        include MotionModel::Model
+        include MotionModel::ArrayModelAdapter
+        columns  subject: { type: :array, default: ->{ [] } }
+      end
+
+      before do
+        @test1 = AcceptsProc.create
+        @test2 = AcceptsProc.create
+      end
+
+      it "initializes array type using proc call" do
+        @test1.subject.should.be == @test2.subject
+      end
+    end
+
+    describe "accepts block" do
+      class AcceptsBlock
+        include MotionModel::Model
+        include MotionModel::ArrayModelAdapter
+        columns  subject: {
+          type: :array, default: begin
+            []
+          end
+        }
+      end
+
+      before do
+        @test1 = AcceptsBlock.create
+        @test2 = AcceptsBlock.create
+      end
+
+      it "initializes array type using begin/end block call" do
+        @test1.subject.should.be == @test2.subject
+      end
+    end
+
+    describe "accepts symbol" do
+      class AcceptsSym
+        include MotionModel::Model
+        include MotionModel::ArrayModelAdapter
+        columns  subject: { type: :integer, default: :randomize }
+
+        def self.randomize
+          rand 1_000_000
+        end
+      end
+
+      before do
+        @test1 = AcceptsSym.create
+        @test2 = AcceptsSym.create
+      end
+
+      it "initializes column by calling a method" do
+        @test1.subject.should.be == @test2.subject
+      end
+    end
+
+    describe "scalar defaults still work" do
+      class AcceptsScalars
+        include MotionModel::Model
+        include MotionModel::ArrayModelAdapter
+        columns  subject: { type: :integer, default: 42 }
+      end
+
+      before do
+        @test1 = AcceptsScalars.create
+      end
+
+      it "initializes column as normal" do
+        @test1.subject.should == 42
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Steve Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -55,7 +55,6 @@ files:
 - Rakefile
 - app/app_delegate.rb
 - lib/motion_model.rb
-- lib/motion_model/date_parser.rb
 - motion/adapters/array_finder_query.rb
 - motion/adapters/array_model_adapter.rb
 - motion/adapters/array_model_persistence.rb
@@ -83,6 +82,7 @@ files:
 - spec/model_hook_spec.rb
 - spec/model_spec.rb
 - spec/notification_spec.rb
+- spec/proc_defaults_spec.rb
 - spec/relation_spec.rb
 - spec/transaction_spec.rb
 - spec/validation_spec.rb
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Simple model and validation mixins for RubyMotion
@@ -123,6 +123,7 @@ test_files:
 - spec/model_hook_spec.rb
 - spec/model_spec.rb
 - spec/notification_spec.rb
+- spec/proc_defaults_spec.rb
 - spec/relation_spec.rb
 - spec/transaction_spec.rb
 - spec/validation_spec.rb

data/lib/motion_model/date_parser.rb

@@ -1,66 +0,0 @@
-module DateParser
-  # Parse a date string: E.g.:
-  #
-  # DateParser.parse_date "There is a date in here tomorrow at 9:00 AM"
-  #
-  # => 2013-02-20 09:00:00 -0800
-  def self.parse_date(date_string)
-    detect(date_string).first.date
-  end
-
-  # Parse time zone from date
-  #
-  # ateParser.parse_date "There is a date in here tomorrow at 9:00 AM EDT"
-  #
-  # Caveat: This is implemented per Apple documentation. I've never really
-  #         seen it work.
-  def self.parse_time_zone(date_string)
-    detect(date_string).first.timeZone
-  end
-
-  # Parse a date string: E.g.:
-  #
-  # SugarCube::DateParser.parse_date "You have a meeting from 9:00 AM to 3:00 PM"
-  #
-  # => 21600.0
-  #
-  # Divide by 3600.0 to get number of hours duration.
-  def self.parse_duration(date_string)
-    detect(date_string).first.send(:duration)
-  end
-
-  # Parse a date into a raw match array for further processing
-  def self.match(date_string)
-    detect(date_string)
-  end
-
-  private
-  def self.detect(date_string)
-    error = Pointer.new(:object)
-    detector = NSDataDetector.dataDetectorWithTypes(NSTextCheckingTypeDate, error:error)
-    matches = detector.matchesInString(date_string, options:0, range:NSMakeRange(0, date_string.length))
-  end
-end
-
-
-class String
-# Use NSDataDetector to parse a string containing a date
-# or duration. These can be of the form:
-#
-# "tomorrow at 7:30 PM"
-# "11.23.2013"
-# "from 7:30 to 10:00 AM"
-#
-# etc.
-  def to_date
-    DateParser.parse_date(self)
-  end
-
-  def to_timezone
-    DateParser.parse_time_zone(self)
-  end
-
-  def to_duration
-    DateParser.parse_duration(self)
-  end
-end