cdq 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4159aee06a7a17669675f80c482c0cef41c456
-  data.tar.gz: 73c3f008cffa0e014230287e8e21bd751f9dca5d
+  metadata.gz: 4ca83058a084e81380741e9f398d491ded74fb38
+  data.tar.gz: 7a3da15d054b1de39f696cca1357d66b2586a47c
 SHA512:
-  metadata.gz: 21ce21b6ac607663ad50317d5a1de945984bdc509c8c521e385c3fdaad119b6e3aea286d4150b46ca9dfcc44f52e09996ba28b24df1270116332123b929b7639
-  data.tar.gz: 495a1bf8692bf6c45762e78698870065ab4bb8df01a32185b46ff6d2b1bf1a65fea8652543fbd1f585a273941571a00daa43cc08562d3c720cfdf24f16f8a647
+  metadata.gz: 25e10d54dede83dcc44ead98586d04260a8618cb41aff696e5c2290091adf0838a70c8d84fa6a9f802fd56c376205b5003c8137d8288dfb3c8caa65a52078fa0
+  data.tar.gz: 88dd18915e1222995a1b6334bbe72e51f182274ae327ec04d646038bd2d1b93a8c9a41da47c40d1866e0db971d36b818567a72065fb8fd620cb488a3e9808e98

data/README.md

@@ -117,6 +117,25 @@ app root, and they are versioned for automatic migrations, and this is what they
 
 Ruby-xcdm translates these files straight into the XML format that Xcode uses for datamodels.
 
+### Boolean Values
+
+Since CoreData stores boolean values as an `NSNumber`, cdq provides helper
+methods to allow you to get the boolean value of the property. Take the `Article`
+model from above with the `boolean`:`published`. If you call `published` directly
+you'll get the `NSNumber` `0` or `1`. If you call `published?` you'll get a
+boolean `true` or `false`
+
+```ruby
+article_1 = Article.create(published: true)
+article_2 = Article.create(published: false)
+
+article_1.published # => 1
+article_2.published # => 0
+
+article_1.published? # => true
+article_2.published? # => false
+```
+
 ## Context Management
 
 Managing NSManagedObjectContext objects in Core Data can be tricky, especially
@@ -191,6 +210,8 @@ all the data over to your main context all at once.  CDQ makes that easy too:
   cdq.save
 ```
 
+**NOTE** Custom class methods will have to `include CDQ` in order to have access to the `cdq` object. If you're calling `cdq` from a class method, you also have to `extend CDQ`.
+
 ### Deleting
 ```ruby
   author = Author.first
@@ -249,6 +270,16 @@ Here are some examples.  **See the [cheat sheet](https://github.com/infinitered/
   Author.where(:name).contains("Emily").and(cdq(:pub_count).gt(100).or.lt(10))
 ```
 
+### Calculations
+
+```ruby
+  Author.sum(:fee)
+  Author.average(:fee)
+  Author.min(:fee)
+  Author.max(:fee)
+  Author.where(:name).eq("Emily").sum(:fee)
+```
+
 ### Fetching
 
 Like ActiveRecord, CDQ will not run a fetch until you actually request specific
@@ -256,6 +287,7 @@ objects.  There are several methods for getting at the data:
 
  * `array`
  * `first`
+ * `last`
  * `each`
  * `[]`
  * `map`
@@ -355,3 +387,12 @@ You can also set up iCloud in your cdq.yml file.
 * There are no explicit validations (but you can define them on your data model)
 * Lifecycle Callbacks or Observers
 
+## Tips
+
+If you need, you could watch SQL statements by setting the following launch argument through `args` environment variable:
+
+```
+$ rake args='-com.apple.CoreData.SQLDebug 3'
+```
+
+`com.apple.CoreData.SQLDebug` takes a value between 1 and 3; the higher the value, the more verbose the output.

data/lib/cdq/version.rb

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

data/motion/cdq/collection_proxy.rb

@@ -22,8 +22,12 @@ module CDQ
       @objects
     end
 
-    def first
-      @objects.first
+    def first(n = 1)
+      n == 1 ? @objects.first : @objects.first(n)
+    end
+
+    def last(n = 1)
+      n == 1 ? @objects.last : @objects.last(n)
     end
 
   end

data/motion/cdq/config.rb

@@ -8,12 +8,14 @@ module CDQ
   # model file.  This file is named <tt>cdq.yml</tt> and must be found at the
   # root of your resources directory.  It supports the following top-level keys:
   #
-  #   [name]              The root name for both database and model
-  #   [database_dir]      The root name for the database directory (NSDocumentDirectory or NSApplicationSupportDirectory)
-  #   [database_name]     The root name for the database file (relative to the database_dir)
-  #   [model_name]        The root name for the model file (relative to the bundle directory)
-  #   [icloud]            If it's true, CDQ works with iCloud.
-  #   [icloud_container]  Set id of iCloud container if you use iCloud. If it's nil, use first container listed in the com.apple.developer.ubiquity-container-identifiers entitlement array.
+  #   [name]                      The root name for both database and model
+  #   [database_dir]              The root name for the database directory (NSDocumentDirectory or NSApplicationSupportDirectory)
+  #   [database_name]             The root name for the database file (relative to the database_dir)
+  #   [model_name]                The root name for the model file (relative to the bundle directory)
+  #   [app_group_id]              The app group id set in iTunes member center (group.com.mycompany.myapp)
+  #   [app_group_container_uuid]  WORKAROUND: The app group's UUID for iOS Simulator 8.1 which doesn't return an app group container path from the id
+  #   [icloud]                    If it's true, CDQ works with iCloud.
+  #   [icloud_container]          Set id of iCloud container if you use iCloud. If it's nil, use first container listed in the com.apple.developer.ubiquity-container-identifiers entitlement array.
   #
   # Using the config file is not necessary.  If you do not include it, the bundle display name
   # will be used.  For most people with a new app, this is what you want to do, especially if
@@ -24,7 +26,7 @@ module CDQ
   #
   class CDQConfig
 
-    attr_reader :config_file, :database_name, :database_dir, :model_name, :name, :icloud, :icloud_container
+    attr_reader :config_file, :database_name, :database_dir, :model_name, :name, :icloud, :icloud_container, :app_group_id, :app_group_container_uuid
 
     def initialize(config_file)
       h = nil
@@ -46,6 +48,8 @@ module CDQ
       @database_dir = search_directory_for h['database_dir'] || h[:database_dir]
       @database_name = h['database_name'] || h[:database_name] || name
       @model_name = h['model_name'] || h[:model_name] || name
+      @app_group_id = h['app_group_id'] || h[:app_group_id]
+      @app_group_container_uuid = h['app_group_container_uuid'] || h[:app_group_container_uuid]
       @icloud = begin
         case h['icloud'] || h[:icloud]
         when true, 1
@@ -56,9 +60,14 @@ module CDQ
       end
       @icloud_container = h['icloud_container'] || h[:icloud_container]
     end
-
+    
     def database_url
-      dir = NSSearchPathForDirectoriesInDomains(database_dir, NSUserDomainMask, true).last
+      if app_group_id.nil?
+        dir = NSSearchPathForDirectoriesInDomains(database_dir, NSUserDomainMask, true).last
+      else
+        dir = app_group_container
+      end
+
       path = File.join(dir, database_name + '.sqlite')
       NSURL.fileURLWithPath(path)
     end
@@ -67,6 +76,17 @@ module CDQ
       NSBundle.mainBundle.URLForResource(model_name, withExtension: "momd");
     end
 
+    def app_group_container
+      if (UIDevice.currentDevice.model =~ /simulator/i).nil?  # device
+        dir = NSFileManager.defaultManager.containerURLForSecurityApplicationGroupIdentifier(app_group_id).path
+      elsif ! app_group_container_uuid.nil?   # simulator with app group uuid workaround
+        dev_container = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true).last.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent.stringByDeletingLastPathComponent
+        dir = dev_container.stringByAppendingPathComponent("Shared").stringByAppendingPathComponent("AppGroup").stringByAppendingPathComponent(app_group_container_uuid)
+      else   # simulator no workaround, fallback to default dir
+        dir = NSSearchPathForDirectoriesInDomains(database_dir, NSUserDomainMask, true).last
+      end
+    end
+
     def self.default
       @default ||=
         begin

data/motion/cdq/relationship_query.rb

@@ -4,9 +4,9 @@ module CDQ
   class CDQRelationshipQuery < CDQTargetedQuery
 
     def initialize(owner, name, set = nil, opts = {})
-      @owner = owner
+      @owner = owner ? WeakRef.new(owner) : nil
       @relationship_name = name
-      @set = set
+      @set = set ? WeakRef.new(set) : nil
       relationship = owner.entity.relationshipsByName[name]
       if relationship.isToMany
         if @owner.ordered_set?(name)
@@ -20,12 +20,16 @@ module CDQ
       target_class = constantize(entity_description.managedObjectClassName)
       super(entity_description, target_class, opts)
       if @inverse_rel.isToMany
-        @predicate = self.where(@inverse_rel.name.to_sym).contains(@owner).predicate
+        @predicate = self.where(@inverse_rel.name.to_sym).contains(owner).predicate
       else
         @predicate = self.where(@inverse_rel.name.to_sym => @owner).predicate
       end
     end
 
+    def dealloc
+      super
+    end
+
     # Creates a new managed object within the target relationship
     #
     def new(opts = {})
@@ -47,6 +51,10 @@ module CDQ
       @set.removeObject obj
     end
 
+    def remove_all
+      @set.removeAllObjects
+    end
+
     def self.extend_set(set, owner, name)
       set.extend SetExt
       set.extend Enumerable
@@ -72,8 +80,12 @@ module CDQ
         self.allObjects
       end
 
-      def first
-        array.first
+      def first(n = 1)
+        n == 1 ? array.first : array.first(n)
+      end
+
+      def last(n = 1)
+        n == 1 ? array.last : array.last(n)
       end
 
       # duplicating a lot of common methods because it's way faster than using method_missing

data/motion/cdq/targeted_query.rb

@@ -62,8 +62,18 @@ module CDQ #:nodoc:
     #
     # Causes execution.
     #
-    def first
-      limit(1).array.first
+    def first(n = 1)
+      result = limit(n).array
+      n == 1 ? result.first : result
+    end
+
+    # Return the last entity matching the query.
+    #
+    # Causes execution.
+    #
+    def last(n = 1)
+      result = offset(count - n).limit(n).array
+      n == 1 ? result.first : result
     end
 
     # Fetch a single entity from the query by index.  If the optional
@@ -89,6 +99,57 @@ module CDQ #:nodoc:
       array.each(*args, &block)
     end
 
+    # Calculation method based on core data aggregate functions.
+    def calculate(operation, column_name)
+      raise("No context has been set.  Probably need to run cdq.setup") unless context
+      raise("Cannot find attribute #{column_name} while calculating #{operation}") unless @entity_description.attributesByName[column_name.to_s]
+      desc_name = operation.to_s + '_of_' + column_name.to_s
+      fr = fetch_request.tap do |req|
+        req.propertiesToFetch = [
+          NSExpressionDescription.alloc.init.tap do |desc|
+            desc.name = desc_name
+            desc.expression = NSExpression.expressionForFunction(operation.to_s + ':', arguments: [ NSExpression.expressionForKeyPath(column_name.to_s) ])
+            desc.expressionResultType = @entity_description.attributesByName[column_name.to_s].attributeType
+          end
+        ]
+        req.resultType = NSDictionaryResultType
+      end
+      with_error_object([]) do |error|
+        r = context.executeFetchRequest(fr, error:error)
+        r.first[desc_name]
+      end
+    end
+
+    # 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. 
+    #
+    #   Author.average(:fee) # => 2.0
+    def average(column_name)
+      calculate(:average, column_name)
+    end
+
+    # Calculates the minimum of values on a given column. 
+    #
+    #   Author.min(:fee) # => 1.0
+    def min(column_name)
+      calculate(:min, column_name)
+    end
+    alias :minimum :min
+
+    # Calculates the maximum of values on a given column. 
+    #
+    #   Author.max(:fee) # => 3.0
+    def max(column_name)
+      calculate(:max, column_name)
+    end
+    alias :maximum :max
+
     # Returns the fully-contstructed fetch request, which can be executed outside of CDQ.
     #
     def fetch_request

data/motion/managed_object.rb

@@ -42,11 +42,11 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
     def scope(name, query = nil, &block)
       cdq.scope(name, query, &block)
       if query
-        self.class.send(:define_method, name) do
+        define_method(name) do
           where(query)
         end
       else
-        self.class.send(:define_method, name) do |*args|
+        define_method(name) do |*args|
           where(block.call(*args))
         end
       end
@@ -174,6 +174,15 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
     objectID.URIRepresentation.absoluteString.inspect
   end
 
+  def method_missing(name, *args, &block)
+    if name[-1] == "?"
+      property_name = name[0...-1]
+      if entity.propertiesByName[property_name] && entity.propertiesByName[property_name].attributeType == NSBooleanAttributeType
+        send(property_name) == 1 ? true : false
+      end
+    end
+  end
+
   protected
 
   # Called from method that's dynamically added from

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdq
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - infinitered
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-xcdm
@@ -20,7 +20,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '0.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: motion-yaml
   requirement: !ruby/object:Gem::Requirement