cdq 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ca83058a084e81380741e9f398d491ded74fb38
-  data.tar.gz: 7a3da15d054b1de39f696cca1357d66b2586a47c
+  metadata.gz: 40687c7bb978a42e8018636e181599a5bad96e54
+  data.tar.gz: 1efc9104e3ecb1aa442c749746e7f492d9c09241
 SHA512:
-  metadata.gz: 25e10d54dede83dcc44ead98586d04260a8618cb41aff696e5c2290091adf0838a70c8d84fa6a9f802fd56c376205b5003c8137d8288dfb3c8caa65a52078fa0
-  data.tar.gz: 88dd18915e1222995a1b6334bbe72e51f182274ae327ec04d646038bd2d1b93a8c9a41da47c40d1866e0db971d36b818567a72065fb8fd620cb488a3e9808e98
+  metadata.gz: 12e4ea59094e3ab367ba9825ff4af63b269276446c5efd285d943d0fd73b8fce45853b3dada60a86b59587fa2c8878b19e50d7caae051594377b0b6c9449c1dd
+  data.tar.gz: aa8b8f842e72d1ba36b05dcc25d25109403e84493b123c1a6e56152ce1d48a1b15ebee686664f07a393dd919211563100f7c54d91731aa52ff9a2565eb2d4f37

data/README.md

@@ -153,6 +153,25 @@ operations on objects use the topmost context.  You just call `cdq.save`
 and it saves the whole stack.  Or you can get a list of all the contexts in
 order with `cdq.contexts.all` and do more precise work.
 
+To access the `cdq` object from a class method inside a class that is not a `CDQManagedObject`
+subclass, make sure to include the `CDQ` module in your class like this:
+
+```ruby
+class MyClass
+  class << self
+    include CDQ
+
+    def my_class_method
+      # Do something
+      cdq.save
+    end
+  end
+end
+
+# Elsewhere
+MyClass.my_class_method
+```
+
 Settings things up the way you want is easy.  Here's how you'd set it up for asynchronous
 saves:
 

data/lib/cdq/version.rb

@@ -1,4 +1,4 @@
 
 module CDQ
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/motion/cdq/config.rb

@@ -95,6 +95,9 @@ module CDQ
         end
     end
 
+    def self.default_config=(config_obj)
+      @default = config_obj
+    end
 
     private
 

data/motion/cdq/object.rb

@@ -24,7 +24,26 @@ module CDQ
       @@store_manager = nil
     end
 
+    # Save any data and close down the contexts and store manager.
+    # You should be able create a new CDQConfig object and run setup 
+    # again to attach to a different database.  However, you need to be sure
+    # that all activity is finished, and that any exisitng model instances
+    # have been deallocated.
+    #------------------------------------------------------------------------------
+    def close
+      save
+      @@context_manager.reset! if @@context_manager
+      @@context_manager        = nil
+      @@store_manager          = nil
+      CDQConfig.default_config = nil
+    end
+
+    # You can now pass in a CDQConfig object, which will be used instead of the
+    # one loaded from the cdq.yml file.  However, the model file is loaded during
+    # the loading of the code - so it can only be overridden using the cdq.yml.
+    #------------------------------------------------------------------------------
     def setup(opts = {})
+      CDQConfig.default_config = opts[:config] || nil
       if opts[:context]
         contexts.push(opts[:context])
         return true

data/motion/cdq/targeted_query.rb

@@ -72,6 +72,7 @@ module CDQ #:nodoc:
     # Causes execution.
     #
     def last(n = 1)
+      return nil if count == 0
       result = offset(count - n).limit(n).array
       n == 1 ? result.first : result
     end
@@ -120,21 +121,21 @@ module CDQ #:nodoc:
       end
     end
 
-    # Calculates the sum of values on a given column. 
+    # Calculates the sum of values on a given column.
     #
     #   Author.sum(:fee) # => 6.0
     def sum(column_name)
       calculate(:sum, column_name)
     end
-    
-    # Calculates the average of values on a given column. 
+
+    # Calculates the average of values on a given column.
     #
     #   Author.average(:fee) # => 2.0
     def average(column_name)
       calculate(:average, column_name)
     end
 
-    # Calculates the minimum of values on a given column. 
+    # Calculates the minimum of values on a given column.
     #
     #   Author.min(:fee) # => 1.0
     def min(column_name)
@@ -142,7 +143,7 @@ module CDQ #:nodoc:
     end
     alias :minimum :min
 
-    # Calculates the maximum of values on a given column. 
+    # Calculates the maximum of values on a given column.
     #
     #   Author.max(:fee) # => 3.0
     def max(column_name)

data/motion/managed_object.rb

@@ -155,6 +155,16 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
     end
   end
 
+  # Opt-in support for motion_print
+  def motion_print(mp, options)
+    if respond_to? :attributes
+      "OID: " + mp.colorize(oid.gsub('"',''), options[:force_color]) + "\n" + mp.l_hash(attributes, options)
+    else
+      # old colorless method, still more informative than nothing
+      log
+    end
+  end
+
   def ordered_set?(name)
     # isOrdered is returning 0/1 instead of documented BOOL
     ordered = entity.relationshipsByName[name].isOrdered

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdq
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - infinitered
@@ -9,15 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-xcdm
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
@@ -25,9 +22,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9