cdq 0.1.9 → 0.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTZiZDlhMzI5ODBiZWVmYjYyZWViNDA4YzhhODMyZDEwOTRlOWUyYQ==
+    YWY0OGVmY2Y5Y2UxMmNjZjI0YjcyODhmNmY0OWNhYWFkZmMwYjMzMQ==
   data.tar.gz: !binary |-
-    MzBmOGI2MGQxY2RjYzFlZGNkMDdlNzg4NDc5MTAxY2QxZWIwODkzOA==
+    MTczM2QyOWI4NDczZDY1ODBlNDFjNDI0NGI1MjhjODFlNTU5Njc2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MGUxZDhiODMyYjE5NjlkMzc1YTJjMTc0Mzg2MDc4NjhhNDAxOTk5OTRhMzg3
-    MWU0NGVjODUyZDAzODNlZDlkYTllNTRhMjBmYzQ0Y2Q5ODBjYWU5MDFhNzVk
-    MzEyMGFiNDQ2ODAyNjhiODBkZWI4YmUxNWRmOWNhYzhkYzBmZmU=
+    MmU3ZDJjMDZkOWE3YjczYzAxZDQ2MDM5NTBiNTc0YjY2OGQ5MDQzNWY5YmM1
+    MjZlMWY1MTBlYjRjNDVjZGI2NWFlYjQ0YzliYWYwYWM2NWE3ODc0Mjc5ZmQ5
+    OWY4MDExZmEwNzYzNGJiZGUzY2EwNmE0ZTQwZTliODQ4MWU4YjM=
   data.tar.gz: !binary |-
-    ZjUwMmNlMzdjM2VkYjU2MWQyMzk1ZmY1ZTRiNWJiZDllYTZiZjJmM2Y0MDE1
-    NmFlMTIyZTU4M2I2ZGY4NDljOTY2NTk4MWU4NzRmZGJjMmI4NjAxNDU4YjU5
-    NDRmNDdlNDZkZDRmMjk1Mzc0OGNmMzZjZWE3OTY4MmM5M2Q5NzY=
+    YWY3YjliOGJiMDM1Y2JhZGZmMzQ2OGUxMDg3ODNjYzNkOWM0ODUxMGM4YzQ1
+    ZTA2N2FkNzhhODYxZTlmOGNjY2E4NzIxYjE0N2QwMjJjYmRlMzc4MWVmZWMz
+    NDBlZDhhYmMyZTI3ZTZiODllMGQ5MmJhZWIzNmJjYmRkYjgyYmU=

data/README.md

@@ -322,6 +322,18 @@ defining and using named scopes:
 query generator for an entity, but `cdq(:attribute)` starts a predicate for an
 attribute.
 
+## iCloud
+
+As of version 0.1.10, there is some experimental support for iCloud, written by
+@katsuyoshi.  Please try it out and let us know how it's working for you.  To
+enable, initialize like this:
+
+```ruby
+  cdq.stores.new(iCloud: true, container: "com.your.container.id")
+```
+
+You can also set up iCloud in your cdq.yml file. 
+
 ## Documentation
 
 * [API](http://rubydoc.info/github/infinitered/cdq)

data/lib/cdq.rb

@@ -4,6 +4,7 @@ unless defined?(Motion::Project::App)
 end
 
 require 'ruby-xcdm'
+require 'motion-yaml'
 
 ENV['COLUMNS'] ||= `tput cols`.strip
 

data/lib/cdq/version.rb

@@ -1,4 +1,4 @@
 
 module CDQ
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/motion/cdq.rb

@@ -51,9 +51,11 @@ module CDQ
     case obj
     when Class
       if obj.isSubclassOfClass(NSManagedObject)
+        entities = NSDictionary.dictionaryWithDictionary(
+          @@base_object.models.current.entitiesByName)
         entity_description =
-          @@base_object.models.current.entitiesByName[obj.name] ||
-          @@base_object.models.current.entitiesByName[obj.ancestors[1].name]
+          entities[obj.name] ||
+          entities[obj.ancestors[1].name]
         if entity_description.nil?
           raise "Cannot find an entity named #{obj.name}"
         end
@@ -62,7 +64,9 @@ module CDQ
         @@base_object
       end
     when String
-      entity_description = @@base_object.models.current.entitiesByName[obj]
+      entities = NSDictionary.dictionaryWithDictionary(
+        @@base_object.models.current.entitiesByName)
+      entity_description = entities[obj]
       target_class = NSClassFromString(entity_description.managedObjectClassName)
       if entity_description.nil?
         raise "Cannot find an entity named #{obj}"

data/motion/cdq/config.rb

@@ -8,10 +8,12 @@ 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)
+  #   [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.
   #
   # 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
@@ -22,27 +24,37 @@ module CDQ
   #
   class CDQConfig
 
-    attr_reader :config_file, :database_name, :database_dir, :model_name, :name
+    attr_reader :config_file, :database_name, :database_dir, :model_name, :name, :icloud, :icloud_container
 
     def initialize(config_file)
+      h = nil
       case config_file
       when String
         @config_file = config_file
+        h = nil
         if File.file?(config_file)
           h = File.open(config_file) { |f| YAML.load(f.read) }
-        else
-          h = {}
+          # If a file was consisted comments only, it may parse as an Array.
+          h = nil unless h.is_a? Hash
         end
       when Hash
         h = config_file
-      else
-        h = {}
       end
+      h ||= {}
 
-      @name = h['name'] || h[:name] || NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleDisplayName")
+      @name = h['name'] || h[:name] || NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleExecutable")
       @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
+      @icloud = begin
+        case h['icloud'] || h[:icloud]
+        when true, 1
+          true
+        else
+          false
+        end
+      end
+      @icloud_container = h['icloud_container'] || h[:icloud_container]
     end
 
     def database_url

data/motion/cdq/context.rb

@@ -1,13 +1,18 @@
-
 module CDQ
 
   class CDQContextManager
 
     BACKGROUND_SAVE_NOTIFICATION = 'com.infinitered.cdq.context.background_save_completed'
+    DID_FINISH_IMPORT_NOTIFICATION = 'com.infinitered.cdq.context.did_finish_import'
 
     def initialize(opts = {})
       @store_manager = opts[:store_manager]
     end
+    
+    def dealloc
+      NSNotificationCenter.defaultCenter.removeObserver(self) if @observed_context
+      super
+    end
 
     # Push a new context onto the stack for the current thread, making that context the
     # default. If a block is supplied, push for the duration of the block and then
@@ -66,6 +71,7 @@ module CDQ
     #
     def new(concurrency_type, &block)
       @has_been_set_up = true
+      
       context = NSManagedObjectContext.alloc.initWithConcurrencyType(concurrency_type)
       if current
         context.parentContext = current
@@ -73,7 +79,15 @@ module CDQ
         if @store_manager.invalid?
           raise "store coordinator not found. Cannot create the first context without one."
         else
-          context.persistentStoreCoordinator = @store_manager.current
+          context.mergePolicy = NSMergePolicy.alloc.initWithMergeType(NSMergeByPropertyObjectTrumpMergePolicyType)
+          context.performBlockAndWait ->{
+            coordinator = @store_manager.current
+            context.persistentStoreCoordinator = coordinator
+            #Dispatch::Queue.main.async {
+            NSNotificationCenter.defaultCenter.addObserver(self, selector:"did_finish_import:", name:NSPersistentStoreDidImportUbiquitousContentChangesNotification, object:nil)
+            @observed_context = context
+            #}
+          }
         end
       end
       push(context, &block)
@@ -82,6 +96,7 @@ module CDQ
     # Save all contexts in the stack, starting with the current and working down.
     #
     def save(options = {})
+      set_timestamps
       always_wait = options[:always_wait]
       stack.reverse.each do |context|
         if always_wait || context.concurrencyType == NSMainQueueConcurrencyType
@@ -125,6 +140,15 @@ module CDQ
       end
       true
     end
+    
+
+    def did_finish_import(notification)
+      @observed_context.performBlockAndWait ->{
+        @observed_context.mergeChangesFromContextDidSaveNotification(notification)
+        NSNotificationCenter.defaultCenter.postNotificationName(DID_FINISH_IMPORT_NOTIFICATION, object:self, userInfo:{context: @observed_context})
+      }
+    end
+
 
     private
 
@@ -189,7 +213,16 @@ module CDQ
         end
       end
     end
+    
+    def set_timestamps
+      now = Time.now
+      eos = current.insertedObjects.allObjects + current.updatedObjects.allObjects
+      eos.each do |e|
+        e.created_at ||= now if e.respond_to? :created_at=
+        e.updated_at = now if e.respond_to? :updated_at=
+      end
+    end
 
-end
+  end
 
 end

data/motion/cdq/object.rb

@@ -18,9 +18,9 @@ module CDQ
     end
 
     def reset!(opts = {})
-      @@context_manager.reset!
+      @@context_manager.reset! if @@context_manager
       @@context_manager = nil
-      @@store_manager.reset!
+      @@store_manager.reset! if @@store_manager
       @@store_manager = nil
     end
 

data/motion/cdq/store.rb

@@ -3,6 +3,8 @@ module CDQ
 
   class CDQStoreManager
 
+    STORE_DID_INITIALIZE_NOTIFICATION = 'com.infinitered.cdq.store.did_initialize'
+
     attr_writer :current
 
     def initialize(opts = {})
@@ -10,6 +12,13 @@ module CDQ
       @model_manager = opts[:model_manager]
     end
 
+    def new(opts = {})
+      @config = opts[:config] || CDQConfig.default
+      @model_manager = opts[:model_manager] || CDQ.cdq.models
+      @icloud = opts[:icloud] || opts[:iCloud] || @config.icloud
+      @icloud_container = @config.icloud_container
+    end
+
     def current
       @current ||= create_store
     end
@@ -28,27 +37,98 @@ module CDQ
       if invalid?
         raise "No model found.  Can't create a persistent store coordinator without it."
       else
-        coordinator = NSPersistentStoreCoordinator.alloc.initWithManagedObjectModel(@model_manager.current)
-        error = Pointer.new(:object)
-        options = { NSMigratePersistentStoresAutomaticallyOption => true,
-                    NSInferMappingModelAutomaticallyOption => true }
+        if @icloud
+          create_icloud_store
+        else
+          create_local_store
+        end
+      end
+    end
+
+    def create_icloud_store
+      coordinator = NSPersistentStoreCoordinator.alloc.initWithManagedObjectModel(@model_manager.current)
+
+      Dispatch::Queue.concurrent.async {
+        # get icloud first container
         url = @config.database_url
-        mkdir_p File.dirname(url.path)
-        store = coordinator.addPersistentStoreWithType(NSSQLiteStoreType,
-                                                       configuration:nil,
-                                                       URL:url,
-                                                       options:options,
-                                                       error:error)
-        if store.nil?
-          error[0].userInfo['metadata'] && error[0].userInfo['metadata'].each do |key, value|
-            NSLog "#{key}: #{value}"
+        icloud_url = NSFileManager.defaultManager.URLForUbiquityContainerIdentifier(@icloud_container)
+        if icloud_url
+          error = Pointer.new(:object)
+          icloud_url = icloud_url.URLByAppendingPathComponent("data")
+          error = Pointer.new(:object)
+          options = { NSMigratePersistentStoresAutomaticallyOption => true,
+                      NSInferMappingModelAutomaticallyOption => true,
+                      NSPersistentStoreUbiquitousContentNameKey => url.path.lastPathComponent.gsub(".", "_"),
+                      NSPersistentStoreUbiquitousContentURLKey => icloud_url,
+                    }
+          coordinator.lock
+          store = coordinator.addPersistentStoreWithType(NSSQLiteStoreType,
+                                                     configuration:nil,
+                                                     URL:url,
+                                                     options:options,
+                                                     error:error)
+          coordinator.unlock
+
+          if store.nil?
+            error[0].userInfo['metadata'] && error[0].userInfo['metadata'].each do |key, value|
+              NSLog "#{key}: #{value}"
+            end
+            raise error[0].userInfo['reason']
+          end
+
+        else
+          error = Pointer.new(:object)
+          options = { NSMigratePersistentStoresAutomaticallyOption => true,
+                      NSInferMappingModelAutomaticallyOption => true }
+          url = @config.database_url
+          mkdir_p File.dirname(url.path)
+          store = coordinator.addPersistentStoreWithType(NSSQLiteStoreType,
+                                                         configuration:nil,
+                                                         URL:url,
+                                                         options:options,
+                                                         error:error)
+          if store.nil?
+            error[0].userInfo['metadata'] && error[0].userInfo['metadata'].each do |key, value|
+              NSLog "#{key}: #{value}"
+            end
+            raise error[0].userInfo['reason']
           end
-          raise error[0].userInfo['reason']
         end
-        coordinator
+        Dispatch::Queue.main.after(0) {
+          # This block is executed in a next run loop.
+          # So the managed object context has a store coordinator in this point.
+          NSNotificationCenter.defaultCenter.postNotificationName(STORE_DID_INITIALIZE_NOTIFICATION, object:coordinator)
+        }
+      }
+      coordinator
+    end
+
+    def create_local_store
+      coordinator = NSPersistentStoreCoordinator.alloc.initWithManagedObjectModel(@model_manager.current)
+      error = Pointer.new(:object)
+      options = { NSMigratePersistentStoresAutomaticallyOption => true,
+                  NSInferMappingModelAutomaticallyOption => true }
+      url = @config.database_url
+      mkdir_p File.dirname(url.path)
+      store = coordinator.addPersistentStoreWithType(NSSQLiteStoreType,
+                                                     configuration:nil,
+                                                     URL:url,
+                                                     options:options,
+                                                     error:error)
+      if store.nil?
+        error[0].userInfo['metadata'] && error[0].userInfo['metadata'].each do |key, value|
+          NSLog "#{key}: #{value}"
+        end
+        raise error[0].userInfo['reason']
       end
+      Dispatch::Queue.main.after(0) {
+        # This block is executed in a next run loop.
+        # So the managed object context has a store coordinator in this point.
+        NSNotificationCenter.defaultCenter.postNotificationName(STORE_DID_INITIALIZE_NOTIFICATION, object:coordinator)
+      }
+      coordinator
     end
-    
+
     def mkdir_p dir
       error = Pointer.new(:object)
       m = NSFileManager.defaultManager
@@ -58,7 +138,7 @@ module CDQ
         raise error[0].localizedDescription
       end
     end
-    
+
   end
 
 end

data/motion/managed_object.rb

@@ -63,7 +63,11 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
     end
 
     def respond_to?(name)
-      super || cdq.respond_to?(name)
+      if cdq_initialized?
+        super(name) || cdq.respond_to?(name)
+      else
+        super(name)
+      end
     end
 
     def destroy_all
@@ -77,6 +81,18 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       cdq.save
     end
 
+    def cdq(obj = nil)
+      if obj
+        super(obj)
+      else
+        @cdq_object ||= super(nil)
+      end
+    end
+
+    def cdq_initialized?
+      !@cdq_object.nil?
+    end
+
   end
 
   # Register this object for destruction with the current context.  Will not

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdq
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - infinitered
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-08-08 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.6
+        version: 0.0.7
   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.6
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: motion-yaml
   requirement: !ruby/object:Gem::Requirement