nano-store 0.5.2 → 0.6.0

data/{CHANGELOG → CHANGELOG.md}

@@ -1,3 +1,9 @@
+# [0.6.0](https://github.com/siuying/NanoStoreInMotion/compare/v0.5.2%E2%80%A6v0.6.0)
+
+- Update for NanoStore 2.5.3, some notable changes:
+  - accept nil and NSURL fields in model
+  - can set store per instance
+
 # [0.5.2](https://github.com/siuying/NanoStoreInMotion/compare/v0.5.1%E2%80%A6v0.5.2)
 
 - Fix load error on older version of RubyMotion (or that disabled detect_dependencies)
@@ -5,6 +11,7 @@
 # [0.5.1](https://github.com/siuying/NanoStoreInMotion/compare/v0.5.0%E2%80%A6v0.5.1)
 
 - Update to NanoStore 2.1.6
+- Convert predicate value to string, to fix type error that happen if attriutes are values other than string
 
 # [0.5.0](https://github.com/siuying/NanoStoreInMotion/compare/v0.4.3%E2%80%A6v0.5.0)
 

data/README.md

@@ -4,6 +4,10 @@ Wrapper for NanoStore, a lightweight schema-less key-value document database bas
 
 Status: Work in progress. API subject to change.
 
+Find a sample application using NanoStore [here](https://github.com/ankit8898/NanoStoreInMotion-example)
+
+How to use Blog [here](http://ankitinstinct.blogspot.in/2012/12/rubymotion-application-with.html)
+
 ## Installation
 
 Install the CocoaPods dependency manager if you haven't it already:
@@ -29,7 +33,7 @@ Motion::Project::App.setup do |app|
   
   # Add the pod NanoStore to your project
   app.pods do
-    pod 'NanoStore', '~> 2.1.8'
+    pod 'NanoStore', '~> 2.5.3'
   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.8'
+    pod 'NanoStore', '~> 2.5.3'
   end
 end
 

data/lib/nano_store.rb

@@ -16,5 +16,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.8'
+  app.pods.pod 'NanoStore', '~> 2.5.3'
 end

data/lib/nano_store/finder.rb

@@ -60,7 +60,11 @@ module NanoStore
       searchResults = search.searchObjectsWithReturnType(NSFReturnObjects, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
 
-      searchResults
+      if searchResults.is_a?(NSDictionary)
+        searchResults.values
+      else
+        searchResults
+      end
     end
 
     # find model keys by criteria
@@ -109,7 +113,11 @@ module NanoStore
       searchResults = search.searchObjectsWithReturnType(NSFReturnKeys, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
 
-      searchResults
+      if searchResults.is_a?(NSDictionary)
+        searchResults.values
+      else
+        searchResults
+      end
     end
 
     # find a model by key

data/lib/nano_store/model.rb

@@ -4,7 +4,7 @@ module NanoStore
       raise NanoStoreError, 'No store provided' unless self.class.store
 
       error_ptr = Pointer.new(:id)
-      self.class.store.addObject(self, error:error_ptr)
+      self.store.addObject(self, error:error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
       self
     end
@@ -13,10 +13,14 @@ module NanoStore
       raise NanoStoreError, 'No store provided' unless self.class.store
 
       error_ptr = Pointer.new(:id)
-      self.class.store.removeObject(self, error: error_ptr)
+      self.store.removeObject(self, error: error_ptr)
       raise NanoStoreError, error_ptr[0].description if error_ptr[0]
       self
     end
+
+    def store
+      super || self.class.store
+    end
   end
 
   module ModelClassMethods
@@ -46,11 +50,7 @@ module NanoStore
       end
 
       define_method((name + "=").to_sym) do |*args, &block|
-        if args[0].nil?
-          self.info.delete(name.to_sym)
-        else
-          self.info[name] = args[0]
-        end
+        self.info[name] = args[0]
       end
     end
     

data/lib/nano_store/version.rb

@@ -1,3 +1,3 @@
 module NanoStore
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/spec/association_spec.rb

@@ -46,12 +46,12 @@ describe "Associations" do
       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|
+      todo = Todo.find(:title => "Today Tasks").first
+      todo.should.not.be.nil
+      todo.items.is_a?(NanoStore::Bag).should == true
+      todo.items.key.should == todo.items.key
+      todo.items.size.should == 3
+      todo.items.to_a.each do |item|
         item.is_a?(TodoItem).should.be.true
       end
     end

data/spec/finder_spec.rb

@@ -43,6 +43,8 @@ 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
+      users.is_a?(Array).should.be.true
+
       user = users.first
       user.should.not.be.nil
       user.name.should.be == "Bob"

data/spec/model_spec.rb

@@ -1,5 +1,4 @@
 describe NanoStore::Model do
-  
   class User < NanoStore::Model
     attribute :name
     attribute :age
@@ -14,7 +13,7 @@ describe NanoStore::Model do
   class Listing < NanoStore::Model
     attribute :name
   end
-  
+
   def stub_user(name, age, created_at)
     user = User.new
     user.name = name
@@ -76,7 +75,29 @@ describe NanoStore::Model do
   end
 
   describe "#save" do
-    it "update objects" do
+    it "if no store set, create objects using shared store" do
+      user = stub_user("Bob", 10, Time.now)
+      user.save
+      NanoStore.shared_store.count(User).should == 1
+    end
+
+    # per object store since NanoStore 2.5.1
+    it "user per instance store to save" do 
+      store1 = NanoStore.store
+      user = stub_user("Bob", 10, Time.now)
+      user.store = store1
+      user.save
+      store1.count(User).should == 1
+
+      store2 = NanoStore.store
+      user2 = stub_user("Lee", 10, Time.now)
+      user2.store = store2
+      user2.save
+      store2.count(User).should == 1
+      store1.count(User).should == 1
+    end
+
+    it "update existing objects" do
       user = stub_user("Bob", 10, Time.now)
       user.save
 
@@ -87,6 +108,15 @@ describe NanoStore::Model do
       user2 = User.find(:name, NSFEqualTo, "Dom").first
       user2.key.should == user.key
     end
+
+    it "create with nil field" do
+      user = stub_user("Bob", 10, nil)
+      user.save
+
+      user1 = User.find(:name, NSFEqualTo, "Bob").first
+      user1.name.should == "Bob"
+      user1.created_at.should.be.nil
+    end
   end
   
   describe "#delete" do

data/spec/nano_store_spec.rb

@@ -7,6 +7,11 @@ describe NanoStore do
     NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0]
   end
 
+  after do
+    path = documents_path + "/nano.db"
+    File.delete(path) rescue nil
+  end
+
   it "create :memory store" do
     store = NanoStore.store
     store.filePath.should == ":memory:"

data/spec/spec_helper.rb

@@ -0,0 +1,14 @@
+class User < NanoStore::Model
+  attribute :name
+  attribute :age
+  attribute :created_at
+end
+
+class Plane < NanoStore::Model
+  attribute :name
+  attribute :age
+end
+
+class Listing < NanoStore::Model
+  attribute :name
+end

data/vendor/Podfile.lock

@@ -1,11 +1,11 @@
 
 PODS:
-- NanoStore (2.1.8)
+- NanoStore (2.5.3)
 
 DEPENDENCIES:
-- NanoStore (~> 2.1.8)
+- NanoStore (~> 2.5.3)
 
 SPEC CHECKSUMS:
-  NanoStore: 648b6b984d4df8ad52a1c0d049ad91b8a12a27d0
+  NanoStore: ea3eabc945dbd7d80678da2b0aed669f683d239f
 
 COCOAPODS: 0.16.0

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoBag.h

@@ -302,11 +302,16 @@
 
 /** * Returns a string representation of the bag.
  * @note Check properties savedObjects, unsavedObjects and removedObjects to find out the current state of the bag.
- * @see \link dictionaryRepresentation - (NSDictionary *)dictionaryRepresentation \endlink
  */
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the bag.
+ * @note Check properties savedObjects, unsavedObjects and removedObjects to find out the current state of the bag.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoEngine.h

@@ -537,6 +537,11 @@
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the engine.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoEngine_Private.h

@@ -30,10 +30,12 @@
 #import "NSFNanoEngine.h"
 #import "NSFNanoGlobals_Private.h"
 #import "NSFNanoResult.h"
+#import "NSFOrderedDictionary.h"
 
 /** \cond */
 
 @interface NSFNanoEngine (Private)
+- (NSFOrderedDictionary *)dictionaryDescription;
 + (NSArray *)NSFP_sharedROWIDKeywords;
 - (NSString *)NSFP_cacheMethodToString;
 - (NSString*)NSFP_nestedDescriptionWithPrefixedSpace:(NSString *)prefixedSpace;

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoExpression.h

@@ -120,6 +120,12 @@
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the expression.
+ * @note Check properties predicates and operators to find out the current state of the expression.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoExpression_Private.h

@@ -29,7 +29,7 @@
 /** \cond */
 
 @interface NSFNanoExpression (Private)
-// Just a placeholder.
+- (NSArray *)arrayDescription;
 @end
 
 /** \endcond */

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoGlobals.h

@@ -71,7 +71,11 @@ typedef enum {
     /** * Used to store NSDate elements in the format <i>yyyy-MM-dd HH:mm:ss:SSS</i>. Its string equivalent is <b>TEXT</b>. */
     NSFNanoTypeDate,
     /** * Used to store NSNumber elements. Its string equivalent is <b>REAL</b>. */
-    NSFNanoTypeNumber
+    NSFNanoTypeNumber,
+    /** * Used to store NSNull elements. Its string equivalent is <b>NULL</b>. */
+    NSFNanoTypeNULL,
+    /** * Used to store NSURL elements. Its string equivalent is <b>URL</b>. */
+    NSFNanoTypeURL
 } NSFNanoDatatype;
 
 /** * Returns the name of a NSFNanoDatatype datatype as a string. */

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoGlobals_Private.h

@@ -53,6 +53,10 @@
  
  */
 
+extern NSDictionary * safeJSONDictionaryFromDictionary (NSDictionary *dictionary);
+extern NSArray * safeJSONArrayFromArray (NSArray *array);
+extern id safeJSONObjectFromObject (id object);
+
 extern NSString * NSFStringFromMatchType (NSFMatchType aMatchType);
 
 extern void _NSFLog (NSString  *format, ...);
@@ -67,13 +71,13 @@ extern NSString * const NSFValue;
 extern NSString * const NSFDatatype;
 extern NSString * const NSFCalendarDate;
 extern NSString * const NSFObjectClass;
-extern NSString * const NSFPlist;
+extern NSString * const NSFKeyedArchive;
 extern NSString * const NSFAttribute;
 
 #pragma mark -
 
 extern NSString * const NSF_Private_NSFKeys_NSFKey;
-extern NSString * const NSF_Private_NSFKeys_NSFPlist;
+extern NSString * const NSF_Private_NSFKeys_NSFKeyedArchive;
 extern NSString * const NSF_Private_NSFValues_NSFKey;
 extern NSString * const NSF_Private_NSFValues_NSFAttribute;
 extern NSString * const NSF_Private_NSFValues_NSFValue;

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoObject.h

@@ -181,6 +181,8 @@
 
 @interface NSFNanoObject : NSObject <NSFNanoObjectProtocol, NSCopying>
 
+/** * The store where the object is saved.  */
+@property (nonatomic, weak, readonly) NSFNanoStore *store;
 /** * The UUID of the NanoObject.  */
 @property (nonatomic, copy, readonly) NSString *key;
 /** * The user-supplied information of the NanoObject.  */
@@ -304,6 +306,13 @@
 
 - (BOOL)isEqualToNanoObject:(NSFNanoObject *)otherNanoObject;
 
+/** * Saves the uncommitted changes to the document store.
+ * @param outError is used if an error occurs. May be NULL.
+ * @return YES upon success, NO otherwise.
+ */
+
+- (BOOL)saveStoreAndReturnError:(out NSError **)outError;
+
 /** * Returns a dictionary that contains the information stored in the object.
  * @note Check properties info and key to find out the current state of the object.
  * @see \link description - (NSString *)description \endlink
@@ -311,13 +320,16 @@
 
 - (NSDictionary *)dictionaryRepresentation;
 
-/** * Returns a string representation of the bag.
- * @note Check properties info and key to find out the current state of the object.
- * @see \link dictionaryRepresentation - (NSString *)dictionaryRepresentation \endlink
+/** * Returns a string representation of the nano object.
  */
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the nano object.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoObject_Private.h

@@ -30,6 +30,10 @@
 
 @interface NSFNanoObject (Private)
 - (void)_setOriginalClassString:(NSString *)theClassString;
++ (NSString *)_NSObjectToJSONString:(id)object error:(NSError **)error;
++ (NSDictionary *)_safeDictionaryFromDictionary:(NSDictionary *)dictionary;
++ (NSArray *)_safeArrayFromArray:(NSArray *)array;
++ (id)_safeObjectFromObject:(id)object;
 @end
 
 /** \endcond */

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoPredicate.h

@@ -113,11 +113,16 @@
 
 /** * Returns a string representation of the predicate.
  * @note Check properties column, match and value to find out the current state of the predicate.
- * @see \link description - (NSString *)description \endlink
  */
 
 - (NSString *)description;
 
+/** * Returns a JSON representation of the predicate.
+ * @note Check properties column, match and value to find out the current state of the predicate.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end

data/vendor/Pods/BuildHeaders/NanoStore/NSFNanoResult.h

@@ -132,6 +132,11 @@
 
 - (NSString *)description;
 
+/** Returns a JSON representation of the result.
+ */
+
+- (NSString *)JSONDescription;
+
 //@}
 
 @end