nano-store 0.3.10 → 0.3.11

data/.gitignore

@@ -1,3 +1,4 @@
+.rake_tasks~
 vendor/*/build-*
 vendor/Pods/Pods.xcodeproj/project.pbxproj
 pkg/*

data/Rakefile

@@ -7,10 +7,10 @@ require 'motion-redgreen'
 
 Motion::Project::App.setup do |app|
   app.name = 'NanoStoreDemo'
-
+  app.redgreen_style = :full
   app.files += Dir.glob(File.join(app.project_dir, 'lib/nano_store/*.rb'))
   app.pods do
-    dependency 'NanoStore', '~> 2.1.1'
+    dependency 'NanoStore', '~> 2.1.4'
   end
 end
 

data/lib/nano_store/finder.rb

@@ -41,26 +41,26 @@ module NanoStore
         else
           sort_options = {}
         end
+      elsif arg.empty?
+        options = {}
+        sort_options = {}
       else
         raise "unexpected parameters #{arg}"
       end
       search = NSFNanoSearch.searchWithStore(self.store)
 
-      unless options.empty?
-        expressions = expressions_with_options(options)
-        search.expressions = expressions
-      end
+      expressions = expressions_with_options(options)
+      search.expressions = expressions
       
       sort_descriptors = sort_descriptor_with_options(sort_options)
       search.sort = sort_descriptors
-      search.filterClass = self.object_class_name
+      search.filterClass = self.bare_class_name
 
       error_ptr = Pointer.new(:id)
       searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
 
-      # workaround to filter class until nanostore implement class filter
-      searchResults.select {|r| r.class.to_s == self.to_s }
+      searchResults
     end
     
     # find model keys by criteria
@@ -83,48 +83,43 @@ module NanoStore
         end
       elsif arg[0] && arg[1] && arg[2]
         # standard way to find
-        options = {arg[0] => {arg[1] => arg[2]}}        
+        options = {arg[0] => {arg[1] => arg[2]}}
         if arg[4] && arg[4].is_a?(Hash)
           sort_options = arg[4][:sort] || {}
         else
           sort_options = {}
         end
+      elsif arg.empty?
+        options = {}
+        sort_options = {}
       else
         raise "unexpected parameters #{arg}"
       end
       
       search = NSFNanoSearch.searchWithStore(self.store)
 
-      unless options.empty?
-        expressions = expressions_with_options(options)
-        search.expressions = expressions
-      end
+      expressions = expressions_with_options(options)
+      search.expressions = expressions
 
       sort_descriptors = sort_descriptor_with_options(sort_options)
       search.sort = sort_descriptors
-      search.filterClass = self.object_class_name
+      search.filterClass = self.bare_class_name
 
       error_ptr = Pointer.new(:id)
-
-      search.attributesToBeReturned = ["NSFObjectClass", "NSFKey"]
-      searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
+      searchResults = search.searchObjectsWithReturnType(NSFReturnKeys, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
-      
-      # workaround to filter class until nanostore implement class filter
-      searchResults.select {|r| r.class.to_s == self.to_s }.collect(&:key)
+
+      searchResults
     end
     
     def bare_class_name
-      self.to_s.split("::").last.capitalize
-    end
-
-    def object_class_name
-      "k#{bare_class_name}"
+      self.to_s.split("::").last
     end
     
     private
     def expressions_with_options(options)
       expressions = []
+      
       options.each do |key, val|
         attribute = NSFNanoPredicate.predicateWithColumn(NSFAttributeColumn, matching:NSFEqualTo, value:key.to_s)
         expression = NSFNanoExpression.expressionWithPredicate(attribute)

data/lib/nano_store/version.rb

@@ -1,3 +1,3 @@
 module NanoStore
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/spec/finder_spec.rb

@@ -31,10 +31,15 @@ describe "Finder" do
     user3.save
   end
   
+  it "create object in their class" do
+    NanoStore.shared_store.allObjectClasses.should == ["User"]
+    Car.create(:name => "Bob")
+    NanoStore.shared_store.allObjectClasses.sort.should == ["User", "Car"].sort
+  end
+  
   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"
@@ -46,7 +51,16 @@ describe "Finder" do
     user.name.should.be == "Carl"
     user.age.should.be == 4
   end
-  
+
+  it "search object with simple hash with two class" do
+    Car.create(:name => "Carl")
+    users = User.find(:name => "Carl")
+    users.size.should.be == 1
+    user = users.first
+    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
@@ -105,8 +119,12 @@ describe "Finder" do
   end
 
   it "find object" do
-    user = User.find(:name, NSFEqualTo, "Bob").first
+    users = User.find(:name, NSFEqualTo, "Bob")
+    users.size.should == 1
+
+    user = users.first
     user.name.should == "Bob"
+    user.class.should == User
   end
   
   it "find all objects" do
@@ -130,17 +148,22 @@ describe "Finder" do
   end
 
   it "#all only return objects of the class" do
-    Car.create(:name => "Honda")
+    car = Car.create(:name => "Honda")
     Car.count.should == 1
     Car.all.size.should == 1
+    Car.all.first.key.should == car.key
   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
+    car = Car.create(:name => "Honda")
+    Car.find.size.should == 1
+    Car.find.first.key.should == car.key
+  end
+
+  it "#find_keys only return objects of the class" do
+    car = Car.create(:name => "Honda")
+    Car.find_keys.size.should == 1
+    Car.find_keys.first.should == car.key
   end
-  
 
 end

data/spec/model_spec.rb

@@ -5,6 +5,11 @@ describe NanoStore::Model do
     attribute :age
     attribute :created_at
   end
+
+  class Plane < NanoStore::Model
+    attribute :name
+    attribute :age
+  end
   
   def stub_user(name, age, created_at)
     user = User.new
@@ -92,10 +97,16 @@ describe NanoStore::Model do
 
     user = stub_user("Kyu", 14, Time.now)
     user.save
+    
+    plane = Plane.create(:name => "A730", :age => 20)
 
     User.count.should == 3
     User.delete({:age => {NSFGreaterThan => 10}})
     User.count.should == 1
+
+    User.delete({})
+    User.count.should == 0
+    Plane.count.should == 1
   end
   
   

data/vendor/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - NanoStore (2.1.1)
+  - NanoStore (2.1.4)
 
 DEPENDENCIES:
-  - NanoStore (~> 2.1.1)
+  - NanoStore (~> 2.1.4)

data/vendor/Pods/NanoStore/Classes/Public/NSFNanoSearch.m

@@ -419,13 +419,25 @@
     
     switch (aDateMatch) {
         case NSFBeforeDate:
-            theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ < '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+            if (self.filterClass.length > 0) {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ < '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
+            } else {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ < '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+            }
             break;
         case NSFOnDate:
-            theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ = '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+            if (self.filterClass.length > 0) {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ = '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
+            } else {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ = '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+            }
             break;
         case NSFAfterDate:
-            theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ > '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+            if (self.filterClass.length > 0) {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE (NSFObjectClass = '%@') AND %@ > '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, self.filterClass, NSFCalendarDate, normalizedDateString];
+            } else {
+                theSQLStatement = [[NSString alloc]initWithFormat:@"SELECT %@, %@, %@ FROM %@ WHERE %@ > '%@'", NSFKey, NSFPlist, NSFObjectClass, NSFKeys, NSFCalendarDate, normalizedDateString];
+            }
             break;
     }
     
@@ -582,6 +594,10 @@
         } else {
             theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
         }
+    } else {
+        if (self.filterClass.length > 0) {
+            theSQLStatement = [NSString stringWithFormat:@"SELECT (NSFKEY) FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKEY IN (%@)", self.filterClass, theSQLStatement];
+        }
     }
     
     return theSQLStatement;
@@ -594,21 +610,30 @@
     NSMutableString *parentheses = [NSMutableString new];
     NSFReturnType returnType = returnedObjectType;
 
-    for (i = 0; i < count; i++) {
-        NSFNanoExpression *expression = [someExpressions objectAtIndex:i];
-        NSMutableString *theSQL = nil;;
-        
-        if (NSFReturnObjects == returnType)
-            theSQL = [[NSMutableString alloc]initWithFormat:@"SELECT NSFKEY FROM NSFValues WHERE %@", [expression description]];
-        else
-            theSQL = [[NSMutableString alloc]initWithFormat:@"SELECT DISTINCT (NSFKEY) FROM NSFValues WHERE %@", [expression description]];
-        
-        if ((count > 1) && (i < count-1)) {
-            [theSQL appendString:@" AND NSFKEY IN ("];
-            [parentheses appendString:@")"];
+    if (count == 0) {
+        if (NSFReturnObjects == returnType) {
+            [sqlComponents addObject:@"SELECT NSFKEY FROM NSFValues"];
+        } else {
+            [sqlComponents addObject:@"SELECT DISTINCT (NSFKEY) FROM NSFValues"];
+        }
+    } else {
+        for (i = 0; i < count; i++) {
+            NSFNanoExpression *expression = [someExpressions objectAtIndex:i];
+            NSMutableString *theSQL = nil;;
+            
+            if (NSFReturnObjects == returnType) {
+                theSQL = [[NSMutableString alloc]initWithFormat:@"SELECT NSFKEY FROM NSFValues WHERE %@", [expression description]];
+            } else {
+                theSQL = [[NSMutableString alloc]initWithFormat:@"SELECT DISTINCT (NSFKEY) FROM NSFValues WHERE %@", [expression description]];
+            }
+            
+            if ((count > 1) && (i < count-1)) {
+                [theSQL appendString:@" AND NSFKEY IN ("];
+                [parentheses appendString:@")"];
+            }
+            
+            [sqlComponents addObject:theSQL];
         }
-        
-        [sqlComponents addObject:theSQL];
     }
     
     if ([parentheses length] > 0)
@@ -616,8 +641,17 @@
     
     NSString *theValue = [sqlComponents componentsJoinedByString:@""];
     
-    if (NSFReturnObjects == returnType)
-        theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theValue];
+    if (NSFReturnObjects == returnType) {
+        if (self.filterClass.length > 0) {
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theValue];
+        } else {
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theValue];   
+        }
+    } else {
+        if (self.filterClass.length > 0) {
+            theValue = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey) FROM NSFKeys WHERE (NSFObjectClass = '%@') AND NSFKey IN (%@)", self.filterClass, theValue];
+        }
+    }
     
     return theValue;
 }
@@ -634,6 +668,7 @@
     NSMutableString *theSQLStatement = [NSMutableString stringWithString:@"SELECT DISTINCT (NSFKEY) FROM NSFValues WHERE NSFKey IN ("];
     [theSQLStatement appendString:[preparedKeys componentsJoinedByString:@","]];
     [theSQLStatement appendString:@")"];
+    
     theSQLStatement = [NSString stringWithFormat:@"SELECT DISTINCT (NSFKey),NSFPlist,NSFObjectClass FROM NSFKeys WHERE NSFKey IN (%@)", theSQLStatement];
     
     return theSQLStatement;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nano-store
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
-  requirement: &70355674794300 !ruby/object:Gem::Requirement
+  requirement: &70222531211820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70355674794300
+  version_requirements: *70222531211820
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
-  requirement: &70355674793680 !ruby/object:Gem::Requirement
+  requirement: &70222531210900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70355674793680
+  version_requirements: *70222531210900
 - !ruby/object:Gem::Dependency
   name: motion-redgreen
-  requirement: &70355674793260 !ruby/object:Gem::Requirement
+  requirement: &70222531209960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70355674793260
+  version_requirements: *70222531209960
 description: Wrapper for NanoStore, a lightweight schema-less key-value document database
   based on sqlite, for RubyMotion.
 email: