Parsistence 0.3.10 → 0.3.11

data/lib/Parsistence/Model.rb

@@ -117,7 +117,12 @@ module Parsistence
       value = value.PFObject if value.respond_to? :PFObject # unwrap object
       if has_many.include?(field.to_sym)
         relation = @PFObject.relationforKey(field)
-        return relation.addObject(value) if relations.include? field.to_sym
+        if value.nil?
+          # Can't do it
+          raise "Can't set nil for has_many relation."
+        else
+          return relation.addObject(value) if relations.include? field.to_sym
+        end
       elsif belongs_to.include?(field.to_sym)
         return setField(field, value)
       end

data/lib/Parsistence/Query.rb

@@ -1,7 +1,7 @@
 module Parsistence
   module Model
     module ClassMethods
-      QUERY_STUBS = [ :where, :first, :limit, :order, :eq, :notEq, :lt, :gt, :lte, :gte, :in ] # :limit is different
+      QUERY_STUBS = [ :where, :first, :limit, :order, :eq, :notEq, :lt, :gt, :lte, :gte, :in, :cached ] # :limit is different
 
       def fetchAll(&block)
         q = Parsistence::Query.new
@@ -51,6 +51,22 @@ module Parsistence
   class Query
     attr_accessor :klass
 
+    def self.cache_policy=(policy)
+      @@cache_policy = policy
+    end
+
+    def self.cache_policy
+      @@cache_policy ||= KPFCachePolicyIgnoreCache
+    end
+
+    def self.cache=(val)
+      if val
+        self.cache_policy = KPFCachePolicyCacheThenNetwork
+      else
+        self.cache_policy = KPFCachePolicyNetworkOnly
+      end
+    end
+
     def initialize
       @conditions = {}
       @negativeConditions = {}
@@ -79,6 +95,15 @@ module Parsistence
       else
         query = PFQuery.queryWithClassName(self.klass.to_s)
       end
+
+      if @cached == true
+        query.cachePolicy = KPFCachePolicyCacheElseNetwork
+      elsif @cached == false
+        query.cachePolicy = KPFCachePolicyNetworkOnly
+      else
+        query.cachePolicy = self.class.cache_policy if self.class.cache_policy        
+      end
+
       @includes.each do |include|
         query.includeKey(include)
       end
@@ -137,15 +162,19 @@ module Parsistence
       query
     end
 
-    # TODO: Get this working.
-    # def count(&callback)
-    #   query = createQuery
-      
-    #   myKlass = self.klass
-    #   query.countObjectsInBackgroundWithBlock (lambda { |item_count, error|
-    #     callback.call item_count, error
-    #   })
-    # end
+    def count(&callback)
+      query = createQuery
+      error = Pointer.new(:object)
+      query.countObjectsInBackgroundWithBlock lambda { |item_count, error|
+        if error
+          callback.call false
+        else
+          callback.call item_count
+        end
+      }
+
+      self
+    end
 
     def fetch(&callback)
       if @limit && @limit == 1
@@ -169,9 +198,14 @@ module Parsistence
       
       myKlass = self.klass
       query.findObjectsInBackgroundWithBlock (lambda { |items, error|
+        modelItems = []
         modelItems = items.map! { |item| myKlass.new(item) } if items
-        callback.call modelItems, error
+        callback.call(modelItems, error)  if callback.arity == 2
+        callback.call(modelItems)         if callback.arity == 1
+        callback.call                     if callback.arity == 0
       })
+
+      self
     end
 
     # @deprecated
@@ -188,8 +222,12 @@ module Parsistence
       myKlass = self.klass
       query.getFirstObjectInBackgroundWithBlock (lambda { |item, error|
         modelItem = myKlass.new(item) if item
-        callback.call modelItem, error
+        callback.call(modelItem, error)  if callback.arity == 2
+        callback.call(modelItem)         if callback.arity == 1
+        callback.call                     if callback.arity == 0
       })
+
+      self
     end
 
     # @deprecated
@@ -335,6 +373,11 @@ module Parsistence
       self
     end
 
+    def cached(val=true)
+      @cached = val
+      self
+    end
+
     # Include related object in query
     # 
     # @param [Hash] fields

data/lib/Parsistence/version.rb

@@ -1,3 +1,3 @@
 module Parsistence
-  VERSION = "0.3.10" unless defined? Parsistence::VERSION
+  VERSION = "0.3.11" unless defined? Parsistence::VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Parsistence
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies: []
 description: Your models on RubyMotion and Parse in a persistence.js style pattern.
 email: