nano-store 0.3.4 → 0.3.5

data/README.md

@@ -90,11 +90,14 @@ User.all # => [<User#1>, <User#2>]
 # find model by criteria
 users = User.find(:name, NSFEqualTo, "Bob")
 
-# or use hash
+# or use Hash
 users = User.find(:name => "Bob")
 users = User.find(:name => { NSFEqualTo => "Ronald" })
 users = User.find(:name => { NSFEqualTo => "Ronald" }, :age => { NSFGreaterThan => 50 })
 
+# or use Array for matching multiple values
+users = User.find(:name => ["Bob", "Ronald", "Ken"])
+
 # Optionally sort the result with additional hash parameters
 users = User.find({:age => { NSFGreaterThan => 10 }}, {:sort => {:age => :desc}})
 ````

data/lib/nano_store/finder.rb

@@ -107,6 +107,14 @@ module NanoStore
             value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:operator, value:sub_val)
             expression.addPredicate(value, withOperator:NSFAnd)
           end
+        elsif val.is_a?(Array)
+          value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:val.pop)
+          expression.addPredicate(value, withOperator:NSFAnd)
+
+          val.each do |sub_val|
+            value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:sub_val)
+            expression.addPredicate(value, withOperator:NSFOr)
+          end
         else
           value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:val)
           expression.addPredicate(value, withOperator:NSFAnd)
@@ -117,20 +125,14 @@ module NanoStore
     end
     
     SORT_MAPPING = {
-      'ASC' => true,
-      'DESC' => false,
-      :ASC => true,
-      :DESC => false,      
       'asc' => true,
       'desc' => false,
-      :asc => true,
-      :desc => false,
     }
     
     def sort_descriptor_with_options(options)
       sorter = options.collect do |opt_key, opt_val|
-        if SORT_MAPPING.keys.include?(opt_val)
-          NSFNanoSortDescriptor.alloc.initWithAttribute(opt_key.to_s, ascending:SORT_MAPPING[opt_val])
+        if SORT_MAPPING.keys.include?(opt_val.to_s.downcase)
+          NSFNanoSortDescriptor.alloc.initWithAttribute(opt_key.to_s, ascending:SORT_MAPPING[opt_val.to_s.downcase])
         else
           raise "unsupported sort parameters: #{opt_val}"
         end

data/lib/nano_store/version.rb

@@ -1,3 +1,3 @@
 module NanoStore
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/finder_spec.rb

@@ -39,6 +39,16 @@ describe "Finder" do
     user.name.should.be == "Carl"
     user.age.should.be == 4
   end
+  
+  it "search object with array (OR)" do
+    users = User.find(:name => ["Carl", "Amy"])
+    users.size.should == 2
+
+    users.collect(&:name).include?("Carl").should == true
+    users.collect(&:name).include?("Amy").should == true
+    users.collect(&:name).include?("Bob").should == false
+  end
+  
 
   it "search object with multiple parameters" do
     stub_user("Ronald", 18, Time.now).save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nano-store
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
-  requirement: &70220199532500 !ruby/object:Gem::Requirement
+  requirement: &70196040194380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220199532500
+  version_requirements: *70196040194380
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
-  requirement: &70220199530260 !ruby/object:Gem::Requirement
+  requirement: &70196040192580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70220199530260
+  version_requirements: *70196040192580
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
-  requirement: &70220199528680 !ruby/object:Gem::Requirement
+  requirement: &70196040191580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70220199528680
+  version_requirements: *70196040191580
 description: Wrapper for NanoStore, a lightweight schema-less key-value document database
   based on sqlite, for RubyMotion.
 email: