nano-store 0.4.3 → 0.5.0

data/.gitignore

@@ -1,6 +1,7 @@
 Gemfile.lock
 .rake_tasks~
 vendor/*/build-*
+vendor/*/.build
 vendor/Pods/Pods.xcodeproj/project.pbxproj
 pkg/*
 .repl_history

data/CHANGELOG

@@ -0,0 +1,40 @@
+# [0.4.3](https://github.com/siuying/NanoStoreInMotion/compare/v0.4.2%E2%80%A6v0.4.3)
+
+- Fix bug saving bag to store
+
+# [0.4.2](https://github.com/siuying/NanoStoreInMotion/compare/v0.4.1%E2%80%A6v0.4.2)
+
+- Supports hashes with string keys in model initializer
+
+# [0.4.1](https://github.com/siuying/NanoStoreInMotion/compare/v0.4.0%E2%80%A6v0.4.1)
+
+- Fix bug when nil is inserted in field
+
+# [0.4.0](https://github.com/siuying/NanoStoreInMotion/compare/v0.3.14%E2%80%A6v0.4.0)
+
+- Use define_method in model instead of method_missing hacks (as rubymotion support define_method now)
+
+# [0.3.13](https://github.com/siuying/NanoStoreInMotion/compare/v0.3.12%E2%80%A6v0.3.13)
+
+- Add find_by_key
+- Fix NameError when there's exception in store extension
+- Update motion-cocoapods and bubble-wrap
+
+# [0.3.12](https://github.com/siuying/NanoStoreInMotion/compare/v0.3.11%E2%80%A6v0.3.12)
+
+- Update NanoStore pods to 2.1.4
+
+# [0.3.0 - 0.3.11](https://github.com/siuying/NanoStoreInMotion/compare/v0.3.0%E2%80%A6v0.3.11)
+
+- Fix crash on find_keys
+- Fix finder
+- Updated to NanoStore 2.1.3
+- Add bulk delete
+- Fix bug that #find and #all returning objects of any classes
+- Add support array as parameter of finder (OR)
+- Add sort to all finder
+- Improved finder: now support specify multiple criteria with Array and Hash, as well as using hash for equality
+
+# 0.2.3
+
+- Initial gem release

data/README.md

@@ -170,6 +170,31 @@ bag.save
 bags = store.bags
 ```
 
+### Association
+
+Use ```bag``` to declare a Bag that associated with a Model. 
+
+````ruby
+
+class User < NanoStore::Model
+  attribute :name
+  attribute :age
+  attribute :created_at
+  bag :cars
+end
+
+class Car < NanoStore::Model
+  attribute :name
+  attribute :age
+end
+
+user = User.new(:name => "Peter", :age => 20, :created_at => Time.now)
+user.cars << Car.new(:name => "Mini", :age => 0)
+user.save
+
+user.cars # => #<NanoStore::Bag:0x7411410> 
+````
+
 ## Performance Tips
 
 NanoStore by defaults saves every object to disk one by one. To speed up inserts and edited objects, increase NSFNanoStore's ```saveInterval``` property.

data/Rakefile

@@ -2,7 +2,6 @@ require "bundler/gem_tasks"
 $:.unshift("/Library/RubyMotion/lib")
 require 'motion/project'
 require 'motion-cocoapods'
-require 'bubble-wrap'
 require 'motion-redgreen'
 
 Motion::Project::App.setup do |app|

data/lib/nano_store/association.rb

@@ -0,0 +1,51 @@
+module NanoStore
+  module AssociationClassMethods
+    def bag(name)
+      define_method(name) do |*args, &block|
+        return _bags[name] if _bags[name]
+
+        bag_key = self.info[name]
+        if bag_key.nil?
+          bag = Bag.bag
+          self.info[name] = bag.key
+        else
+          bag = self.class.store.bagsWithKeysInArray([bag_key]).first
+        end
+
+        _bags[name] = bag
+
+        bag
+      end
+
+      define_method((name + "=").to_sym) do |*args, &block|
+        bag = self.send(name)
+        case args[0]
+        when Bag
+          bag.clear
+          bag += args[0].saved.values
+        when Array
+          bag.clear
+          bag += args[0]
+        else
+          raise NanoStoreError, "Unexpected type assigned to bags, must be an Array or NanoStore::Bag, now: #{args[0].class}"
+        end
+        bag
+      end
+    end
+  end
+
+  module AssociationInstanceMethods
+    def _bags
+      @_bags ||= {}
+    end
+
+    def save
+      _bags.values.each do |bag|
+        bag.store = self.class.store
+        bag.save
+      end
+      super
+    end
+  end
+  
+end

data/lib/nano_store/bag.rb

@@ -1,9 +1,16 @@
 module NanoStore
-  class Bag < NSFNanoBag
-    ## Accessors
-    alias_method :saved, :savedObjects
-    alias_method :unsaved, :unsavedObjects
-    alias_method :removed, :removedObjects
+  module BagInstanceMethods
+    def self.included(base)
+      base.class_eval do
+        alias_method :saved, :savedObjects
+        alias_method :unsaved, :unsavedObjects
+        alias_method :removed, :removedObjects
+        alias_method :size, :count
+        alias_method :clear, :removeAllObjects
+        alias_method :inflate, :inflateBag
+        alias_method :deflate, :deflateBag
+      end
+    end
 
     def originalClassString
       'NSFNanoBag'
@@ -13,6 +20,10 @@ module NanoStore
       self.hasUnsavedChanges
     end
 
+    def to_a
+      self.savedObjects.values + self.unsavedObjects.values
+    end
+
     ## Adding and Removing Objects
     
     # Add an object to bag
@@ -24,9 +35,6 @@ module NanoStore
       self
     end
 
-    # Clear the bag - remove all objects
-    alias_method :clear, :removeAllObjects
-
     # Add an object or array of objects to bag
     # Return the bag
     def +(object_or_array)
@@ -58,7 +66,7 @@ module NanoStore
       self
     end
     
-    # Add an object or array of objects to bag
+    # Remove an object or array of objects from bag
     # Return the bag
     def -(object_or_array)
       error_ptr = Pointer.new(:id)
@@ -72,8 +80,13 @@ module NanoStore
     end
     
     ## Saving, Reloading and Undoing
-    
+
+    def store=(store)
+      store.addObject(self, error:nil)
+    end
+
     def save
+      self.store = NanoStore.shared_store unless self.store
       error_ptr = Pointer.new(:id)
       result = self.saveAndReturnError(error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
@@ -93,10 +106,11 @@ module NanoStore
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
       result
     end
-    
-    ## Inflating and Deflating
-
-    alias_method :inflate, :inflateBag
-    alias_method :deflate, :deflateBag
   end
+
+  Bag = ::NSFNanoBag
+end
+
+class NSFNanoBag
+  include NanoStore::BagInstanceMethods
 end

data/lib/nano_store/model.rb

@@ -39,7 +39,7 @@ module NanoStore
     end
 
     def attribute(name)
-      @attributes << name
+      attributes << name
 
       define_method(name) do |*args, &block|
         self.info[name]
@@ -55,7 +55,7 @@ module NanoStore
     end
     
     def attributes
-      @attributes
+      @attributes ||= []
     end
 
     def store
@@ -77,16 +77,15 @@ module NanoStore
       keys = find_keys(*args)
       self.store.delete_keys(keys)
     end
-
-    def inherited(subclass)
-      subclass.instance_variable_set(:@attributes, [])
-      subclass.instance_variable_set(:@store, nil)
-    end
   end
 
   class Model < NSFNanoObject
     include ModelInstanceMethods
     extend ModelClassMethods
     extend ::NanoStore::FinderMethods
+
+    include AssociationInstanceMethods
+    extend AssociationClassMethods
   end
+
 end

data/lib/nano_store/version.rb

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

data/nano-store.gemspec

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

data/spec/association_spec.rb

@@ -0,0 +1,59 @@
+describe "Associations" do
+  class Todo < NanoStore::Model
+    attribute :title
+    bag :items
+  end
+
+  class TodoItem < NanoStore::Model
+    attribute :completed
+    attribute :text
+  end
+  
+  before do
+    NanoStore.shared_store = NanoStore.store
+  end
+  
+  after do
+    NanoStore.shared_store = nil
+  end
+
+  describe "#bag" do
+    it "adds a reader to the class" do
+      todo = Todo.create(:title => "Today Tasks")
+      todo.items.is_a?(NanoStore::Bag).should == true
+      todo.items.size.should == 0
+    end
+
+    it "adds a writer to the class that can take an array" do
+      todo = Todo.create(:title => "Today Tasks")
+      todo.items = [TodoItem.new(:text => "Hi"), TodoItem.new(:text => "Foo"), TodoItem.new(:text => "Bar")]
+      todo.items.is_a?(NanoStore::Bag).should == true
+      todo.items.size.should == 3
+    end
+
+    it "adds a writer to the class that can take a Bag" do
+      todo = Todo.create(:title => "Today Tasks")
+      todo.items = NanoStore::Bag.bag
+      todo.items.is_a?(NanoStore::Bag).should == true
+      todo.items.size.should == 0
+    end
+  end
+
+  describe "#save" do
+    it "save a model also save associated fields" do
+      todo = Todo.create(:title => "Today Tasks")
+      todo.items = [TodoItem.new(:text => "Hi"), TodoItem.new(:text => "Foo"), TodoItem.new(:text => "Bar")]
+      todo.items.is_a?(NanoStore::Bag).should == true
+      todo.save
+
+      todo2 = Todo.find(:title => "Today Tasks").first
+      todo2.should.not.be.nil
+      todo2.items.is_a?(NSFNanoBag).should == true
+      todo2.items.key.should == todo.items.key
+      todo2.items.size.should == 3
+      todo2.items.to_a.each do |item|
+        item.is_a?(TodoItem).should.be.true
+      end
+    end
+  end
+end

data/spec/bag_spec.rb

@@ -16,7 +16,6 @@ describe NanoStore::Bag do
 
   it "should add objects to bag" do
     bag = Bag.bag
-    NanoStore.shared_store.addObject(bag, error:nil)
 
     # use << method to add object to bag
     page = Page.new
@@ -41,7 +40,6 @@ describe NanoStore::Bag do
 
   it "should delete object from bag" do
     bag = Bag.bag
-    NanoStore.shared_store.addObject(bag, error:nil)
 
     # use << method to add object to bag
     page = Page.new
@@ -67,7 +65,6 @@ describe NanoStore::Bag do
     before_count = NanoStore.shared_store.bags.count
 
     bag = Bag.bag
-    NanoStore.shared_store.addObject(bag, error:nil)
 
     # use << method to add object to bag
     page = Page.new
@@ -78,4 +75,19 @@ describe NanoStore::Bag do
     bag.save
     NanoStore.shared_store.bags.count.should.be == before_count + 1
   end
+
+  describe "#to_a" do
+    it "convert a bag to array" do
+      bag = Bag.bag
+      bag << Page.new(:text => "1", :index => 1) 
+      bag << Page.new(:text => "2", :index => 2) 
+
+      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"
+      bag.save
+      bag.to_a.size.should == 2
+    end
+  end
 end

data/spec/model_spec.rb

@@ -10,6 +10,10 @@ describe NanoStore::Model do
     attribute :name
     attribute :age
   end
+
+  class Listing < NanoStore::Model
+    attribute :name
+  end
   
   def stub_user(name, age, created_at)
     user = User.new
@@ -115,5 +119,15 @@ describe NanoStore::Model do
     Plane.count.should == 1
   end
   
+  # see github issue #15 
+  # https://github.com/siuying/NanoStoreInMotion/issues/15
+  it "should handle some class name with conflicts" do
+    listing = Listing.new
+    listing.name = "A"
+    listing.save
+
+    Listing.count.should == 1
+    Listing.all.size.should == 1
+  end
   
 end

data/spec/nano_store_spec.rb

@@ -3,6 +3,10 @@ describe NanoStore do
     attribute :name
   end
 
+  def documents_path
+    NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0]
+  end
+
   it "create :memory store" do
     store = NanoStore.store
     store.filePath.should == ":memory:"
@@ -12,11 +16,11 @@ describe NanoStore do
   end
   
   it "create :persistent store" do
-    path = App.documents_path + "/nano.db"
+    path = documents_path + "/nano.db"
     store = NanoStore.store :persistent, path
     store.filePath.should == path    
 
-    path = App.documents_path + "/nano.db"
+    path = documents_path + "/nano.db"
     store = NanoStore.store :file, path
     store.filePath.should == path
   end

data/vendor/Podfile.lock

@@ -8,4 +8,4 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   NanoStore: 440272829dfe13db7f1c68de74fc3562475463fe
 
-COCOAPODS: 0.15.2
+COCOAPODS: 0.16.0

data/vendor/Pods/Pods-resources.sh

@@ -11,6 +11,10 @@ install_resource()
       echo "ibtool --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}"
       ibtool --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename $1 .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}"
       ;;
+    *.framework)
+      echo "rsync -rp ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      rsync -rp "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
+      ;;
     *)
       echo "cp -R ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
       cp -R "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"

data/vendor/Pods/Pods.xcconfig

@@ -1,7 +1,7 @@
-PODS_ROOT = ${SRCROOT}/Pods
-PODS_HEADERS_SEARCH_PATHS = ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}
 ALWAYS_SEARCH_USER_PATHS = YES
 OTHER_LDFLAGS = -ObjC -lsqlite3
 HEADER_SEARCH_PATHS = ${PODS_HEADERS_SEARCH_PATHS}
+PODS_ROOT = ${SRCROOT}/Pods
 PODS_BUILD_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/BuildHeaders" "${PODS_ROOT}/BuildHeaders/NanoStore"
-PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/NanoStore"
+PODS_PUBLIC_HEADERS_SEARCH_PATHS = "${PODS_ROOT}/Headers" "${PODS_ROOT}/Headers/NanoStore"
+PODS_HEADERS_SEARCH_PATHS = ${PODS_PUBLIC_HEADERS_SEARCH_PATHS}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nano-store
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bubble-wrap
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.1.4
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +54,7 @@ files:
 - .gitignore
 - .gitmodules
 - .rvmrc
+- CHANGELOG
 - Gemfile
 - LICENSE
 - README.md
@@ -77,6 +62,7 @@ files:
 - app/app_delegate.rb
 - lib/nano-store.rb
 - lib/nano_store.rb
+- lib/nano_store/association.rb
 - lib/nano_store/bag.rb
 - lib/nano_store/finder.rb
 - lib/nano_store/model.rb
@@ -85,6 +71,7 @@ files:
 - lib/nano_store/version.rb
 - nano-store.gemspec
 - resources/.gitignore
+- spec/association_spec.rb
 - spec/bag_spec.rb
 - spec/finder_spec.rb
 - spec/model_spec.rb
@@ -188,12 +175,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1759206666722295826
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1759206666722295826
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -202,6 +195,7 @@ specification_version: 3
 summary: Wrapper for NanoStore, a lightweight schema-less key-value document database
   based on sqlite, for RubyMotion.
 test_files:
+- spec/association_spec.rb
 - spec/bag_spec.rb
 - spec/finder_spec.rb
 - spec/model_spec.rb