nano-store 0.5.0 → 0.5.1

data/CHANGELOG

@@ -1,3 +1,11 @@
+# [0.5.1](https://github.com/siuying/NanoStoreInMotion/compare/v0.5.0%E2%80%A6v0.5.1)
+
+- Update to NanoStore 2.1.6
+
+# [0.5.0](https://github.com/siuying/NanoStoreInMotion/compare/v0.4.3%E2%80%A6v0.5.0)
+
+- Add bag support in Model
+
 # [0.4.3](https://github.com/siuying/NanoStoreInMotion/compare/v0.4.2%E2%80%A6v0.4.3)
 
 - Fix bug saving bag to store

data/README.md

@@ -27,9 +27,9 @@ require 'nano-store'
 Motion::Project::App.setup do |app|
   app.name = 'myapp'
   
-  # Only needed if you have not already specifying a pods dependency
+  # Add the pod NanoStore to your project
   app.pods do
-    pod 'NanoStore', '~> 2.1.4'
+    pod 'NanoStore', '~> 2.1.8'
   end
 end
 ```

data/Rakefile

@@ -9,7 +9,7 @@ Motion::Project::App.setup do |app|
   app.redgreen_style = :full
   app.files += Dir.glob(File.join(app.project_dir, 'lib/nano_store/*.rb'))
   app.pods do
-    pod 'NanoStore', '~> 2.1.5'
+    pod 'NanoStore', '~> 2.1.8'
   end
 end
 

data/lib/nano_store.rb

@@ -15,5 +15,5 @@ Motion::Project::App.setup do |app|
   app.files.unshift(File.join(File.dirname(__FILE__), 'nano_store/finder.rb'))
 
   app.pods ||= Motion::Project::CocoaPods.new(app)
-  app.pods.pod 'NanoStore', '~> 2.1.5'
+  app.pods.pod 'NanoStore', '~> 2.1.8'
 end

data/lib/nano_store/finder.rb

@@ -142,7 +142,7 @@ module NanoStore
         expression = NSFNanoExpression.expressionWithPredicate(attribute)
         if val.is_a?(Hash)
           val.each do |operator, sub_val|
-            value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:operator, value:sub_val)
+            value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:operator, value:sub_val.to_s)
             expression.addPredicate(value, withOperator:NSFAnd)
           end
         elsif val.is_a?(Array)
@@ -150,11 +150,11 @@ module NanoStore
           expression.addPredicate(value, withOperator:NSFAnd)
 
           val.each do |sub_val|
-            value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:sub_val)
+            value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:sub_val.to_s)
             expression.addPredicate(value, withOperator:NSFOr)
           end
         else
-          value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:val)
+          value = NSFNanoPredicate.predicateWithColumn(NSFValueColumn, matching:NSFEqualTo, value:val.to_s)
           expression.addPredicate(value, withOperator:NSFAnd)
         end
         expressions << expression

data/lib/nano_store/nano_store.rb

@@ -6,11 +6,11 @@ module NanoStore
 
     case type
     when :memory
-      store = NSFNanoStore.createAndOpenStoreWithType(NSFMemoryStoreType, path:nil, error: error_ptr)
+      store = NSFNanoStore.createAndOpenStoreWithType(::NSFMemoryStoreType, path:nil, error: error_ptr)
     when :temporary, :temp
-      store = NSFNanoStore.createAndOpenStoreWithType(NSFTemporaryStoreType, path:nil, error: error_ptr)
+      store = NSFNanoStore.createAndOpenStoreWithType(::NSFTemporaryStoreType, path:nil, error: error_ptr)
     when :persistent, :file
-      store = NSFNanoStore.createAndOpenStoreWithType(NSFPersistentStoreType, path:path, error: error_ptr)
+      store = NSFNanoStore.createAndOpenStoreWithType(::NSFPersistentStoreType, path:path, error: error_ptr)
     else
       raise NanoStoreError.new("unexpected store type (#{type}), must be one of: :memory, :temporary or :persistent")
     end

data/lib/nano_store/version.rb

@@ -1,3 +1,3 @@
 module NanoStore
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/nano-store.gemspec

@@ -14,6 +14,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = NanoStore::VERSION
 
-  gem.add_dependency 'motion-cocoapods', '>= 1.2.0'
+  gem.add_dependency 'motion-cocoapods', '>= 1.2.1'
   gem.add_development_dependency 'motion-redgreen'
 end

data/spec/bag_spec.rb

@@ -14,66 +14,68 @@ describe NanoStore::Bag do
     NanoStore.shared_store = nil
   end
 
-  it "should add objects to bag" do
-    bag = Bag.bag
+  describe "#<<" do
+    it "should add objects to bag" do
+      bag = Bag.bag
 
-    # use << method to add object to bag
-    page = Page.new
-    page.text = "Hello"
-    page.index = 1
-    bag << page 
-    
-    # use + method to add object to bag
-    page = Page.new
-    page.text = "World"
-    page.index = 2
-    bag += page
+      # use << method to add object to bag
+      bag << Page.new(:text => "Hello", :index => 1) 
 
-    bag.unsaved.count.should.be == 2
-    bag.changed?.should.be.true
-    bag.save
-     
-    bag.unsaved.count.should.be == 0
-    bag.saved.count.should.be == 2
-    bag.changed?.should.be.false
+      bag.unsaved.count.should.be == 1
+      bag.changed?.should.be.true
+      bag.save
+       
+      bag.unsaved.count.should.be == 0
+      bag.saved.count.should.be == 1
+      bag.changed?.should.be.false
+    end
   end
+  
+  describe "#+" do
+    it "should add objects to bag" do
+      bag = Bag.bag
 
-  it "should delete object from bag" do
-    bag = Bag.bag
-
-    # use << method to add object to bag
-    page = Page.new
-    page.text = "Hello"
-    page.index = 1
-    bag << page
-
-    page = Page.new
-    page.text = "Foo Bar"
-    page.index = 2
-    bag << page 
+      # use + method to add object to bag
+      bag += Page.new(:text => "World", :index => 2)
 
-    bag.save
-    bag.saved.count.should.be == 2
-    bag.delete(page)
-    bag.changed?.should.be.true
-    bag.removed.count.should.be == 1
-    bag.save
-    bag.saved.count.should.be == 1
+      bag.unsaved.count.should.be == 1
+      bag.changed?.should.be.true
+      bag.save
+       
+      bag.unsaved.count.should.be == 0
+      bag.saved.count.should.be == 1
+      bag.changed?.should.be.false
+    end
   end
 
-  it "should add bag to store" do
-    before_count = NanoStore.shared_store.bags.count
+  describe "#delete" do
+    it "should delete object from bag" do
+      bag = Bag.bag
 
-    bag = Bag.bag
+      page = Page.new(:text => "Hello", :index => 1) 
+      bag << page
+      bag << Page.new(:text => "World", :index => 2)
+      bag.save
+      bag.saved.count.should.be == 2
 
-    # use << method to add object to bag
-    page = Page.new
-    page.text = "Hello"
-    page.index = 1
-    bag << page 
+      bag.delete(page)
+      bag.changed?.should.be.true
+      bag.removed.count.should.be == 1
+      bag.save
+      bag.saved.count.should.be == 1
+    end
+  end
 
-    bag.save
-    NanoStore.shared_store.bags.count.should.be == before_count + 1
+  describe "#store=" do
+    it "should store bag in a NanoStore" do
+      store = NanoStore.store
+      bag = Bag.bag
+      bag.store = store
+      bag << Page.new(:text => "1")
+      bag.save
+      store.bags.size.should == 1
+      store.bags.first.to_a.first.text.should == "1"
+    end
   end
 
   describe "#to_a" do
@@ -84,8 +86,10 @@ describe NanoStore::Bag do
 
       bag.to_a.is_a?(Array).should.be.true
       bag.to_a.size.should == 2
-      bag.to_a[0].text.should == "1"
-      bag.to_a[1].text.should == "2"
+
+      # #to_a is not ordered!
+      ["1", "2"].include?(bag.to_a[0].text).should.be.true
+      ["1", "2"].include?(bag.to_a[1].text).should.be.true
       bag.save
       bag.to_a.size.should == 2
     end

data/spec/finder_spec.rb

@@ -31,156 +31,162 @@ 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
+  describe "::create" do
+    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
+  end
+
+  describe "::find" 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"
+      user.age.should.be == 10
+    end
+
+    it "search object with simple hash" do
+      user = User.find(:name => "Carl").first
+      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
+
+      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
+      stub_user("Ronald", 29, Time.now).save
+      stub_user("Ronald", 36, Time.now).save
+      stub_user("Ronald", 39, Time.now).save
+      stub_user("Ronald", 49, Time.now).save
+      stub_user("Ronald", 59, Time.now).save
+
+      users = User.find(:name => { NSFEqualTo => "Ronald" }, :age => { NSFGreaterThan => 50 })
+      users.size.should == 1
+      user = users.first
+      user.name.should.be == "Ronald"
+      user.age.should.be == 59
+
+      users = User.find(:name => { NSFEqualTo => "Ronald" }, :age => { NSFLessThan => 30 })
+      users.size.should == 2
+      user = users.first
+      user.name.should.be == "Ronald"
+    end
+
+    it "sort search results" 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
+
+      users = User.find({:age => { NSFGreaterThan => 1 }}, {:sort => {:age => :asc}})
+      users.size.should == 9
+      user = users.first
+      user.name.should.be == "Carl"
+      user.age.should.be == 4
+      user = users.last
+      user.name.should.be == "Zidd"
+      user.age.should.be == 59
+
+      users = User.find({:age => { NSFGreaterThan => 1 }}, {:sort => {:age => 'DESC'}})
+      users.size.should == 9
+      user = users.last
+      user.name.should.be == "Carl"
+      user.age.should.be == 4
+      user = users.first
+      user.name.should.be == "Zidd"
+      user.age.should.be == 59
+    end
+
+    it "find object" do
+      users = User.find(:name, NSFEqualTo, "Bob")
+      users.size.should == 1
+
+      user = users.first
+      user.name.should == "Bob"
+      user.class.should == User
+    end
+
+    it "only return objects of the class" do
+      car = Car.create(:name => "Honda")
+      Car.find.size.should == 1
+      Car.find.first.key.should == car.key
+    end
+  end
+
+  describe "::find_by_key" do
+    it "should return object by key" do
+      name = "Julien"
+      age = 32
+      created_at = Time.now
+      user = stub_user("Julien", 32, Time.now)
+      user.save
+      user2 = User.find_by_key(user.key)
+      user2.should.not.be.nil
+      user2.key.should == user.key
+      user2.name.should == user.name
+      user2.age.should == user.age
+    end
+
+    it "should not find object by inexists key" do
+      User.find_by_key("invalid-key").should.be.nil
+    end
+  end
+
+  describe "::all" do
+    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
+
+    it "only return objects of the class" do
+      car = Car.create(:name => "Honda")
+      Car.count.should == 1
+      Car.all.size.should == 1
+      Car.all.first.key.should == car.key
+    end
+
+    it "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
-
-  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"
-    user.age.should.be == 10
-  end
-
-  it "search object with simple hash" do
-    user = User.find(:name => "Carl").first
-    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
-
-    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
-    stub_user("Ronald", 29, Time.now).save
-    stub_user("Ronald", 36, Time.now).save
-    stub_user("Ronald", 39, Time.now).save
-    stub_user("Ronald", 49, Time.now).save
-    stub_user("Ronald", 59, Time.now).save
-
-    users = User.find(:name => { NSFEqualTo => "Ronald" }, :age => { NSFGreaterThan => 50 })
-    users.size.should == 1
-    user = users.first
-    user.name.should.be == "Ronald"
-    user.age.should.be == 59
-
-    users = User.find(:name => { NSFEqualTo => "Ronald" }, :age => { NSFLessThan => 30 })
-    users.size.should == 2
-    user = users.first
-    user.name.should.be == "Ronald"
-  end
-
-  it "sort search results" 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
-
-    users = User.find({:age => { NSFGreaterThan => 1 }}, {:sort => {:age => :asc}})
-    users.size.should == 9
-    user = users.first
-    user.name.should.be == "Carl"
-    user.age.should.be == 4
-    user = users.last
-    user.name.should.be == "Zidd"
-    user.age.should.be == 59
-
-    users = User.find({:age => { NSFGreaterThan => 1 }}, {:sort => {:age => 'DESC'}})
-    users.size.should == 9
-    user = users.last
-    user.name.should.be == "Carl"
-    user.age.should.be == 4
-    user = users.first
-    user.name.should.be == "Zidd"
-    user.age.should.be == 59
-  end
-
-  it "find object" do
-    users = User.find(:name, NSFEqualTo, "Bob")
-    users.size.should == 1
-
-    user = users.first
-    user.name.should == "Bob"
-    user.class.should == User
-  end
-
-  it "find object by key" do
-    name = "Julien"
-    age = 32
-    created_at = Time.now
-    user = stub_user("Julien", 32, Time.now)
-    user.save
-    user2 = User.find_by_key(user.key)
-    user2.should.not.be.nil
-    user2.key.should == user.key
-    user2.name.should == user.name
-    user2.age.should == user.age
-  end
-
-  it "should not find object by key" do
-    User.find_by_key("invalid-key").should.be.nil
-  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
-
-  it "#all only return objects of the class" do
-    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 = 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