nano-store 0.3.5 → 0.3.6

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    nano-store (0.3.2)
+    nano-store (0.3.5)
       bubble-wrap (>= 0.1.1)
-      motion-cocoapods (>= 1.0.1)
+      motion-cocoapods (>= 1.0.2)
 
 GEM
   remote: https://rubygems.org/
@@ -11,7 +11,7 @@ GEM
     bubble-wrap (0.1.1)
     cocoapods (0.5.1)
       xcodeproj (~> 0.1.0)
-    motion-cocoapods (1.0.1)
+    motion-cocoapods (1.0.2)
       cocoapods (>= 0.5.1)
     motion-redgreen (0.0.2)
     xcodeproj (0.1.0)

data/lib/nano_store/finder.rb

@@ -1,7 +1,18 @@
 module NanoStore
   module FinderMethods
     def all(*args)
-      find({}, *args)
+      if args[0].is_a?(Hash)
+        sort_options = args[0][:sort] || {}
+      else
+        sort_options = {}
+      end
+      
+      if sort_options.empty?
+        self.store.objectsOfClassNamed(self.to_s)
+      else
+        sort_descriptors = sort_descriptor_with_options(sort_options)
+        self.store.objectsOfClassNamed(self.to_s, usingSortDescriptors:sort_descriptors)
+      end
     end
     
     # find model by criteria
@@ -46,7 +57,9 @@ module NanoStore
       error_ptr = Pointer.new(:id)
       searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
-      searchResults
+      
+      # workaround until we find way to only query specific class
+      searchResults.select {|obj| obj.class == self }
     end
     
     # find model keys by criteria
@@ -90,9 +103,13 @@ module NanoStore
       search.sort = sort_descriptors
 
       error_ptr = Pointer.new(:id)
-      searchResults = search.searchObjectsWithReturnType(NSFReturnKeys, error:error_ptr)
+
+      search.attributesToBeReturned = ["NSFObjectClass", "NSFKey"]
+      searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
-      searchResults
+      
+      # workaround until we find way to only query specific class
+      searchResults.select {|obj| obj.class == self }.collect(&:key)
     end
     
     protected
@@ -101,7 +118,6 @@ module NanoStore
       options.each do |key, val|
         attribute = NSFNanoPredicate.predicateWithColumn(NSFAttributeColumn, matching:NSFEqualTo, value:key.to_s)
         expression = NSFNanoExpression.expressionWithPredicate(attribute)
-
         if val.is_a?(Hash)
           val.each do |operator, sub_val|
             value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:operator, value:sub_val)

data/lib/nano_store/model.rb

@@ -23,7 +23,7 @@ module NanoStore
       name = matched[1]
       modifier = matched[2]
 
-      if self.class.attributes.include?(name.to_sym) || name == "_id"
+      if self.class.attributes.include?(name.to_sym)
         if modifier == "="
           if args[0].nil?
             self.info.delete(name.to_sym)
@@ -84,15 +84,6 @@ module NanoStore
       subclass.instance_variable_set(:@attributes, [])
       subclass.instance_variable_set(:@store, nil)
     end
-    
-    private
-    def search_with_store(store, attribute, match, value)
-      search = NSFNanoSearch.searchWithStore(self.store)
-      search.attribute = attribute.to_s
-      search.match = match
-      search.value = value
-      search
-    end
   end
 
   class Model < NSFNanoObject

data/lib/nano_store/version.rb

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

data/nano-store.gemspec

@@ -15,6 +15,6 @@ Gem::Specification.new do |gem|
   gem.version       = NanoStore::VERSION
 
   gem.add_dependency 'bubble-wrap', '>= 0.1.1'
-  gem.add_dependency 'motion-cocoapods', '>= 1.0.1'
+  gem.add_dependency 'motion-cocoapods', '>= 1.0.2'
   gem.add_development_dependency 'motion-redgreen'
 end

data/spec/finder_spec.rb

@@ -1,4 +1,10 @@
 describe "Finder" do
+  class Car < NanoStore::Model
+    attribute :name
+    attribute :created_at
+  end
+  
+  
   def stub_user(name, age, created_at)
     user = User.new
     user.name = name
@@ -121,6 +127,19 @@ describe "Finder" do
     users.size.should == 9
     users.first.name.should == "Carl"
   end
+
+  it "#all only return objects of the class" do
+    Car.create(:name => "Honda")
+    Car.count.should == 1
+    Car.all.size.should == 1
+  end
+  
+  it "#find only return objects of the class" do
+    Car.create(:name => "Honda")
+    Car.count.should == 1
+    Car.find({}).size.should == 1
+    Car.find_keys({}).size.should == 1
+  end
   
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nano-store
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   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: &70196040194380 !ruby/object:Gem::Requirement
+  requirement: &70301664740020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70196040194380
+  version_requirements: *70301664740020
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
-  requirement: &70196040192580 !ruby/object:Gem::Requirement
+  requirement: &70301664739380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70196040192580
+  version_requirements: *70301664739380
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
-  requirement: &70196040191580 !ruby/object:Gem::Requirement
+  requirement: &70301664738860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196040191580
+  version_requirements: *70301664738860
 description: Wrapper for NanoStore, a lightweight schema-less key-value document database
   based on sqlite, for RubyMotion.
 email: