nano-store 0.3.3 → 0.3.4

data/README.md

@@ -96,7 +96,7 @@ users = User.find(:name => { NSFEqualTo => "Ronald" })
 users = User.find(:name => { NSFEqualTo => "Ronald" }, :age => { NSFGreaterThan => 50 })
 
 # Optionally sort the result with additional hash parameters
-users = User.find({:age => { NSFGreaterThan => 10 }}, {:sort => {:age => 'DESC'}})
+users = User.find({:age => { NSFGreaterThan => 10 }}, {:sort => {:age => :desc}})
 ````
 
 ### Update

data/lib/nano_store/finder.rb

@@ -1,5 +1,9 @@
 module NanoStore
-  module FinderMethods    
+  module FinderMethods
+    def all(*args)
+      find({}, *args)
+    end
+    
     # find model by criteria
     #
     # Return array of models
@@ -30,10 +34,15 @@ module NanoStore
         raise "unexpected parameters #{arg}"
       end
       search = NSFNanoSearch.searchWithStore(self.store)
-      expressions = expressions_with_options(options)
+
+      unless options.empty?
+        expressions = expressions_with_options(options)
+        search.expressions = expressions
+      end
+      
       sort_descriptors = sort_descriptor_with_options(sort_options)
-      search.expressions = expressions
       search.sort = sort_descriptors
+      
       error_ptr = Pointer.new(:id)
       searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
@@ -69,11 +78,17 @@ module NanoStore
       else
         raise "unexpected parameters #{arg}"
       end
+      
       search = NSFNanoSearch.searchWithStore(self.store)
-      expressions = expressions_with_options(options)
+
+      unless options.empty?
+        expressions = expressions_with_options(options)
+        search.expressions = expressions
+      end
+
       sort_descriptors = sort_descriptor_with_options(sort_options)
-      search.expressions = expressions
       search.sort = sort_descriptors
+
       error_ptr = Pointer.new(:id)
       searchResults = search.searchObjectsWithReturnType(NSFReturnKeys, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
@@ -105,14 +120,16 @@ module NanoStore
       'ASC' => true,
       'DESC' => false,
       :ASC => true,
-      :DESC => false
+      :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 opt_val.is_a?(TrueClass) || opt_val.is_a?(FalseClass)
-          NSFNanoSortDescriptor.alloc.initWithAttribute(opt_key.to_s, ascending:opt_val)
-        elsif SORT_MAPPING.keys.include?(opt_val)
+        if SORT_MAPPING.keys.include?(opt_val)
           NSFNanoSortDescriptor.alloc.initWithAttribute(opt_key.to_s, ascending:SORT_MAPPING[opt_val])
         else
           raise "unsupported sort parameters: #{opt_val}"

data/lib/nano_store/model.rb

@@ -79,14 +79,6 @@ module NanoStore
     def count
       self.store.count(self)
     end
-    
-    def all
-      search = NSFNanoSearch.searchWithStore(self.store)
-      error_ptr = Pointer.new(:id)
-      searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
-      raise NanoStoreError, error_ptr[0].description if error_ptr[0]
-      searchResults.values
-    end
 
     def inherited(subclass)
       subclass.instance_variable_set(:@attributes, [])

data/lib/nano_store/version.rb

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

data/spec/finder_spec.rb

@@ -27,6 +27,7 @@ describe "Finder" do
   it "search object traditional way: supply key, operator and value" do
     users = User.find(:name, NSFEqualTo, "Bob")
     users.should.not.be.nil
+
     user = users.first
     user.should.not.be.nil
     user.name.should.be == "Bob"
@@ -67,7 +68,7 @@ describe "Finder" do
     stub_user("Zidd", 59, Time.now).save
     stub_user("Sarah", 49, Time.now).save
 
-    users = User.find({:age => { NSFGreaterThan => 1 }}, {:sort => {:age => true}})
+    users = User.find({:age => { NSFGreaterThan => 1 }}, {:sort => {:age => :asc}})
     users.size.should == 9
     user = users.first
     user.name.should.be == "Carl"
@@ -85,11 +86,31 @@ describe "Finder" do
     user.name.should.be == "Zidd"
     user.age.should.be == 59
   end
-  
 
   it "find object" do
     user = User.find(:name, NSFEqualTo, "Bob").first
     user.name.should == "Bob"
   end
   
+  it "find all objects" do
+    User.count.should == 3
+    users = User.all
+    users.size.should == 3
+  end
+  
+  it "find all objects, sorted" do
+    stub_user("Alan", 39, Time.now).save
+    stub_user("Cat", 29, Time.now).save
+    stub_user("Dan", 36, Time.now).save
+    stub_user("Ted", 18, Time.now).save
+    stub_user("Zidd", 59, Time.now).save
+    stub_user("Sarah", 49, Time.now).save
+
+    User.count.should == 9
+    users = User.all({:sort => {:age => :asc}})
+    users.size.should == 9
+    users.first.name.should == "Carl"
+  end
+  
+
 end

data/spec/model_spec.rb

@@ -82,19 +82,4 @@ describe NanoStore::Model do
     User.count.should == 0
   end
   
-  it "find all objects" do
-    user = stub_user("Bob", 10, Time.now)
-    user.save
-    
-    user2 = stub_user("Amy", 11, Time.now)
-    user2.save
-
-
-    User.count.should == 2  
-    users = User.all
-    users.size.should == 2
-    users.collect(&:key).include?(user.key)
-    users.collect(&:key).include?(user2.key)
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nano-store
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   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: &70184077832220 !ruby/object:Gem::Requirement
+  requirement: &70220199532500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70184077832220
+  version_requirements: *70220199532500
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
-  requirement: &70184077829960 !ruby/object:Gem::Requirement
+  requirement: &70220199530260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70184077829960
+  version_requirements: *70220199530260
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
-  requirement: &70184077828360 !ruby/object:Gem::Requirement
+  requirement: &70220199528680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184077828360
+  version_requirements: *70220199528680
 description: Wrapper for NanoStore, a lightweight schema-less key-value document database
   based on sqlite, for RubyMotion.
 email: