motion_model 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4d3bdf11fc759be47d10723d1f84ddae0e43fb
-  data.tar.gz: 2624cbb78924e42b3c2d1e008f2c4e75f2427598
+  metadata.gz: 1f8aff0f64a66b3acc96dc5b3bc3539cb9ce7414
+  data.tar.gz: 8297cac822d64df7c823e6aeab801c54657c217c
 SHA512:
-  metadata.gz: 8e77f43b0997215ae37c366d2a5eb8f69c27cebe40bc5902dcd0c07c219d9a2e31120c0bb7da6859d530779f934c034e98819351696649dbb7c691d9c4dd6627
-  data.tar.gz: 45029f00583ddbb5e839d5ba173c0228d8e4ddad0bb87773c4adf92c761df3949ad79679fe0c9c21e4c30ff7ab46bb85454606584624efccc22b875ee8c9558a
+  metadata.gz: b01dc4562a81064f0ade25f402f3bc50c84d9cb91a9132b3497ea844ee2e6f29c141259888f495794ddf11e8bc6694dc30f456607455b7a60c2c19b25822dc48
+  data.tar.gz: dfee05ac135e297256a9476c9f7b83c6e0bfd0ccc2646a4557338a7c1f882898100c17f4653cba221880d4d7c9d3d445c15f0308ffd8474096d634476f536432

data/.travis.yml

@@ -2,6 +2,24 @@ language: objective-c
 before_install:
   - ruby --version
   - sudo chown -R travis ~/Library/RubyMotion
-rvm:
-  - "1.9.3"
-script: bundle exec rake spec
+  - sudo motion update
+install:
+  - ruby -S bundle install
+# rvm:
+#   - "1.9.3"
+script:
+  - bundle install
+  - bundle exec rake clean
+  - bundle exec rake spec
+
+# before_install:
+#     - (ruby --version)
+#     - sudo chown -R travis ~/Library/RubyMotion
+#     - mkdir -p ~/Library/RubyMotion/build
+#     - sudo motion update
+# script:
+#     - bundle install
+#     - bundle exec rake clean
+#     - bundle exec rake spec
+#     - bundle exec rake clean
+#     - bundle exec rake spec osx=true

data/Gemfile.lock

@@ -3,7 +3,6 @@ GEM
   specs:
     bubble-wrap (1.4.0)
     motion-stump (0.3.0)
-    rake (10.1.0)
 
 PLATFORMS
   ruby
@@ -11,4 +10,3 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap
   motion-stump (~> 0.2)
-  rake

data/README.md

@@ -10,7 +10,7 @@ data validation and actually quite a bit more.
 File                 | Module                    | Description
 ---------------------|---------------------------|------------------------------------
 **ext.rb**           | N/A                       | Core Extensions that provide a few Rails-like niceties. Nothing new here, moving on...
-**model.rb**         | MotionModel::Model        | You should read about it in "[What MotionModel Can Do](#what-motionmodel-can-do)". Model is the raison d'etre and the centerpiece of MotionModel.
+**model.rb**         | MotionModel::Model        | You should read about it in "[What Model Can Do](#what-model-can-do)". Model is the raison d'etre and the centerpiece of MotionModel.
 **validatable.rb**   | MotionModel::Validatable  | Provides a basic validation framework for any arbitrary class. You can also create custom validations to suit your app's unique needs.
 **input_helpers**    | MotionModel::InputHelpers | Helps hook a collection up to a data form, populate the form, and retrieve the data afterwards. Note: *MotionModel supports Formotion for input handling as well as these input helpers*.
 **formotion.rb**     | MotionModel::Formotion    | Provides an interface between MotionModel and Formotion
@@ -21,7 +21,7 @@ you like with it. See the LICENSE file in this project.
 
 * [Getting Going](#getting-going)
 * [Bugs, Features, and Issues, Oh My!](#bugs-features-and-issues-oh-my)
-* [What MotionModel Can Do](#what-motionmodel-can-do)
+* [What Model Can Do](#what-model-can-do)
 * [Model Data Types](#model-data-types)
 * [Validation Methods](#validation-methods)
 * [Model Instances and Unique IDs](#model-instances-and-unique-ids)
@@ -274,65 +274,6 @@ Currently supported types are:
 You are really not encouraged to stuff big things in your models, which is why a blob type
 is not implemented. The smaller your data, the less overhead involved in saving/loading.
 
-### User Defined Types
-
-*New as of 0.6*: THIS FEATURE IS EXPERIMENTAL. You can use a class name instead of the
-symbols to specify your types. Thus, you can choose more complex types in much the same
-way as you might in a NOSQL database. Consider these examples:
-
-```ruby
-class Address
-  include MotionModel::Model
-  include MotionModel::ArrayModelAdapter
-  columns street:     String,
-          city:       String,
-          state:      String,
-          zip:        Integer
-end
-
-class Person
-  include MotionModel::Model
-  include MotionModel::ArrayModelAdapter
-
-  columns   name:     String,
-            address:  Address
-end
-```
-
-You can now use this `Person` class as follows:
-
-```ruby
-p = Person.find(:name).eq('Laurent').first
-p.address.country = 'Belgium'
-p.save
-```
-
-> **Note** Address includes all the MotionModel goodness. That is so that any class that embeds it can also persist it. You may be able to get away with defining `encodeWithCoder(coder)` and `initWithCoder(coder)` -- it's your choice, but not currently supported.
-
-### Native Ruby Types
-
-You can also use native Ruby types (limited to those supported by RubyMotion so no `DateTime`):
-
-```ruby
-class Person
-  include MotionModel::Model
-  include MotionModel::ArrayModelAdapter
-
-  columns   name:     String,
-            address:  Hash
-end
-```
-
-and you can use the class as follows:
-
-```ruby
-Person.create(name: 'Miss Piggy', address: {street: '111 Swine Ave', city: 'Muppetville', state: 'IN'})
-```
-
-etc.
-
-> Special note: This is a bleeding edge feature as of 0.6, and because of the semantics of copying in Ruby, there are some deep copy situations that may cause objects to be copied or updated incompletely. These should create 100% reproducible bugs in your code so they should not sneak up on you. Nevertheless, understand that the guarantee is a shallow copy. Tests show that an array inside a class copies properly. YMMV.
-
 ### Special Columns
 
 The two column names, `created_at` and `updated_at` will be adjusted automatically if they
@@ -445,72 +386,73 @@ Using MotionModel
 
     You can implement some aggregate functions using map/reduce:
 
-```ruby
-  @task.all.map{|task| task.number_of_items}.reduce(:+)                # implements sum
-  @task.all.map{|task| task.number_of_items}.reduce(:+) / @task.count  #implements average
-```
+    ```ruby
+      @task.all.map{|task| task.number_of_items}.reduce(:+)                # implements sum
+      @task.all.map{|task| task.number_of_items}.reduce(:+) / @task.count  #implements average
+    ```
 
 * Serialization is part of MotionModel. So, in your `AppDelegate` you might do something like this:
 
-  ```ruby
-    @tasks = Task.deserialize_from_file('tasks.dat')
-  ```
+    ```ruby
+      @tasks = Task.deserialize_from_file('tasks.dat')
+    ```
 
-  and of course on the "save" side:
+    and of course on the "save" side:
 
-  ```ruby
-    Task.serialize_to_file('tasks.dat')
-  end
-  ```
-  After the first serialize or deserialize, your model will remember the file
-  name so you can call these methods without the filename argument.
+    ```ruby
+      Task.serialize_to_file('tasks.dat')
+    ```
+    After the first serialize or deserialize, your model will remember the file
+    name so you can call these methods without the filename argument.
 
-  Implementation note: that the this serialization of any arbitrarily complex set of relations
-  is automatically handled by `NSCoder` provided you conform to the coding
-  protocol (which MotionModel does). When you declare your columns, `MotionModel` understands how to
-  serialize your data so you need take no specific action.
+    Implementation note: that the this serialization of any arbitrarily complex set of relations
+    is automatically handled by `NSCoder` provided you conform to the coding
+    protocol (which MotionModel does). When you declare your columns, `MotionModel` understands how to
+    serialize your data so you need take no specific action.
 
-  **Warning**: As of this release, persistence will serialize only one
-  model at a time and not your entire data store.
+    Persistence will serialize only one
+    model at a time and not your entire data store.
+    This is to allow you to decide what data is
+    serialized when.
 
   * Relations
 
-  ```ruby
-  class Task
-    include MotionModel::Model
-    include MotionModel::ArrayModelAdapter
-    columns     :name => :string
-    has_many    :assignees
-  end
+    ```ruby
+    class Task
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns     :name => :string
+      has_many    :assignees
+    end
 
-  class Assignee
-    include MotionModel::Model
-    include MotionModel::ArrayModelAdapter
-    columns     :assignee_name => :string
-    belongs_to  :task
-  end
+    class Assignee
+      include MotionModel::Model
+      include MotionModel::ArrayModelAdapter
+      columns     :assignee_name => :string
+      belongs_to  :task
+    end
 
-  # Create a task, then create an assignee as a
-  # related object on that task
-  a_task = Task.create(:name => "Walk the Dog")
-  a_task.assignees.create(:assignee_name => "Howard")
+    # Create a task, then create an assignee as a
+    # related object on that task
+    a_task = Task.create(:name => "Walk the Dog")
+    a_task.assignees.create(:assignee_name => "Howard")
 
-  # See? It works.
-  a_task.assignees.assignee_name      # => "Howard"
-  Task.first.assignees.assignee_name  # => "Howard"
+    # See? It works.
+    a_task.assignees.assignee_name      # => "Howard"
+    Task.first.assignees.assignee_name  # => "Howard"
 
-  # Create another assignee but don't save
-  # Add to assignees collection. Both objects
-  # are saved.
-  another_assignee = Assignee.new(:name => "Douglas")
-  a_task.assignees << another_assignee  # adds to relation and saves both objects
+    # Create another assignee but don't save
+    # Add to assignees collection. Both objects
+    # are saved.
+    another_assignee = Assignee.new(:name => "Douglas")
+    a_task.assignees << another_assignee  # adds to relation and saves both objects
 
-  # The count of assignees accurately reflects current state
-  a_task.assignees.count              # => 2
+    # The count of assignees accurately reflects current state
+    a_task.assignees.count              # => 2
 
-  # And backreference access through belongs_to works.
-  Assignee.first.task.name            # => "Walk the Dog"
-  ```
+    # And backreference access through belongs_to works.
+    Assignee.first.task.name            # => "Walk the Dog"
+    ```
 
 There are four ways to delete objects from your data store:
 

data/motion/adapters/array_finder_query.rb

@@ -97,7 +97,7 @@ module MotionModel
     # see `eq` for notes on case sensitivity.
     def gt(query_string, options = {:case_sensitive => false})
       do_comparison(query_string, options) do |comparator, item|
-        comparator > item
+        comparator < item
       end
     end
     alias_method :>, :gt
@@ -108,7 +108,7 @@ module MotionModel
     # see `eq` for notes on case sensitivity.
     def lt(query_string, options = {:case_sensitive => false})
       do_comparison(query_string, options) do |comparator, item|
-        comparator < item
+        comparator > item
       end
     end
     alias_method :<, :lt
@@ -119,7 +119,7 @@ module MotionModel
     # see `eq` for notes on case sensitivity.
     def gte(query_string, options = {:case_sensitive => false})
       do_comparison(query_string, options) do |comparator, item|
-        comparator >= item
+        comparator <= item
       end
     end
     alias_method :>=, :gte
@@ -130,7 +130,7 @@ module MotionModel
     # see `eq` for notes on case sensitivity.
     def lte(query_string, options = {:case_sensitive => false})
       do_comparison(query_string, options) do |comparator, item|
-        comparator <= item
+        comparator >= item
       end
     end
     alias_method :<=, :lte

data/motion/model/model_casts.rb

@@ -44,7 +44,7 @@ module MotionModel
       String(arg)
     end
 
-    def cast_to_arbitrary_class(arg, klass)
+    def cast_to_arbitrary_class(arg)
       # This little oddity is because a number of built-in
       # Ruby classes cannot be dup'ed. Not only that, they
       # respond_to?(:dup) but raise an exception when you
@@ -59,13 +59,6 @@ module MotionModel
 
       return arg if arg.respond_to?(:motion_model?)
 
-      # Another case is where there is a predefined cast rule
-      # on the type declared as a class level method motion_model_cast:
-
-      if klass.respond_to?(:motion_model_cast)
-        return klass.send(:motion_model_cast, arg)
-      end
-
       # But if it is not a MotionModel, we either need to dup
       # it (for most cases), or just assign it (for built-in
       # types like Integer, Fixnum, Float, NilClass, etc.)
@@ -92,11 +85,10 @@ module MotionModel
       when :text then cast_to_string(arg)
       when :array then cast_to_array(arg)
       when :hash then cast_to_hash(arg)
-      when Class then cast_to_arbitrary_class(arg, column_type(column_name))
+      when Class then cast_to_arbitrary_class(arg)
       else
         raise ArgumentError.new("type #{column_name} : #{column_type(column_name)} is not possible to cast.")
       end
     end
   end
 end
-

data/motion/version.rb

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

data/spec/date_spec.rb

@@ -1,8 +1,8 @@
 describe "time conversions" do
-  it "NSDate and Time should agreee on minutes since epoch" do
+  it "NSDate and Time should agree on minutes since epoch" do
     t = Time.new
     d = NSDate.dateWithTimeIntervalSince1970(t.to_f)
-    t.to_f.should == d.timeIntervalSince1970
+    (t.to_f - d.timeIntervalSince1970).abs.should. < 0.001
   end
 
   it "Parsing '3/18/12 @ 7:00 PM' With Natural Language should work right" do

data/spec/finder_spec.rb

@@ -132,6 +132,34 @@ describe 'finders' do
     it 'should returns last element' do
       Task.last.should.is_a Task
     end
+    
+    describe 'comparison finders' do
+      
+      it 'returns elements with id greater than 5' do
+        tasks = Task.where(:id).gt(5).all
+        tasks.length.should.equal(5)
+        tasks.reject{|t| [6,7,8,9,10].include?(t.id)}.should.be.empty
+      end
+      
+      it 'returns elements with id greater than or equal to 7' do
+        tasks = Task.where(:id).gte(7).all
+        tasks.length.should.equal(4)
+        tasks.reject{|t| [7,8,9,10].include?(t.id)}.should.be.empty
+      end
+      
+      it 'returns elements with id less than 5' do
+        tasks = Task.where(:id).lt(5).all
+        tasks.length.should.equal(4)
+        tasks.reject{|t| [1,2,3,4].include?(t.id)}.should.be.empty
+      end
+      
+      it 'returns elements with id less than or equal to 3' do
+        tasks = Task.where(:id).lte(3).all
+        tasks.length.should.equal(3)
+        tasks.reject{|t| [1,2,3].include?(t.id)}.should.be.empty
+      end
+      
+    end
       
     describe 'block-style finders' do
       before do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion_model
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Steve Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap