cdq 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTVmOGNjMzAwMmQzYTdjMDMyYjViYWU2MGEzYTc1MTdiNGJiMzM4OA==
+    YTZiZDlhMzI5ODBiZWVmYjYyZWViNDA4YzhhODMyZDEwOTRlOWUyYQ==
   data.tar.gz: !binary |-
-    ZjRmYzhkNDk1MmI1ZWFiODg1YTkzNmUwMTZmNGU5NTVhYzFiOWE3YQ==
+    MzBmOGI2MGQxY2RjYzFlZGNkMDdlNzg4NDc5MTAxY2QxZWIwODkzOA==
 SHA512:
   metadata.gz: !binary |-
-    NDliNjIxOWQxMTMzODA2NTcxMmQxMTQ0Zjg3NGI2OTA4YTczZTkwZTdmN2Rm
-    MzViMGM3ZDRhZTU1MDliN2E3ZDQ4YTJiMmRhNzZmNjlhOWM2MTI3NzJlYmIz
-    ZDRkNzEzMDhiNTZjZTg3MGFhMmE4MGU3MjRlMDNlY2FjZTgzNzk=
+    MGUxZDhiODMyYjE5NjlkMzc1YTJjMTc0Mzg2MDc4NjhhNDAxOTk5OTRhMzg3
+    MWU0NGVjODUyZDAzODNlZDlkYTllNTRhMjBmYzQ0Y2Q5ODBjYWU5MDFhNzVk
+    MzEyMGFiNDQ2ODAyNjhiODBkZWI4YmUxNWRmOWNhYzhkYzBmZmU=
   data.tar.gz: !binary |-
-    NGZiYTcyYjlkNjU0ZWZjZDk1Y2MyODBhN2JlNDg5ZDc3ZDU0Y2I4ZjgwNjUx
-    NTM1MmMwNTlmZTNlMWE1ZGIyNWFmNjI3YTVmNjk5NGI0NDFlZWVlNzc4MmI1
-    YjQ5ZDVmMzI0MTUzNTdhOTdlZjMxNjQ5OGM2NDIwOTJlMDczNDc=
+    ZjUwMmNlMzdjM2VkYjU2MWQyMzk1ZmY1ZTRiNWJiZDllYTZiZjJmM2Y0MDE1
+    NmFlMTIyZTU4M2I2ZGY4NDljOTY2NTk4MWU4NzRmZGJjMmI4NjAxNDU4YjU5
+    NDRmNDdlNDZkZDRmMjk1Mzc0OGNmMzZjZWE3OTY4MmM5M2Q5NzY=

data/lib/cdq/generators.rb

@@ -1,4 +1,5 @@
 
+require 'fileutils'
 
 module CDQ
   class Generator
@@ -57,7 +58,7 @@ module CDQ
           puts "     Using existing directory: #{@in_app_path}"
         else
           puts "  \u0394  Creating directory: #{@in_app_path}"
-          Dir.mkdir(@in_app_path) unless @dry_run
+          FileUtils.mkdir_p(@in_app_path) unless @dry_run
         end
 
         results = load_and_parse_erb(template_file_path_and_name)

data/lib/cdq/version.rb

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

data/motion/cdq.rb

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

data/motion/cdq/config.rb

@@ -9,7 +9,8 @@ module CDQ
   # root of your resources directory.  It supports the following top-level keys:
   #
   #   [name]          The root name for both database and model
-  #   [database_name] The root name for the database file (relative to the documents directory)
+  #   [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)
   #
   # Using the config file is not necessary.  If you do not include it, the bundle display name
@@ -21,7 +22,7 @@ module CDQ
   #
   class CDQConfig
 
-    attr_reader :config_file, :database_name, :model_name, :name
+    attr_reader :config_file, :database_name, :database_dir, :model_name, :name
 
     def initialize(config_file)
       case config_file
@@ -39,12 +40,13 @@ module CDQ
       end
 
       @name = h['name'] || h[:name] || NSBundle.mainBundle.objectForInfoDictionaryKey("CFBundleDisplayName")
+      @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
     end
 
     def database_url
-      dir = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true).last
+      dir = NSSearchPathForDirectoriesInDomains(database_dir, NSUserDomainMask, true).last
       path = File.join(dir, database_name + '.sqlite')
       NSURL.fileURLWithPath(path)
     end
@@ -60,6 +62,20 @@ module CDQ
           new(cf_file)
         end
     end
+
+
+    private
+
+      def search_directory_for dir_name
+        supported_dirs = {
+          "NSDocumentDirectory" => NSDocumentDirectory,
+          :NSDocumentDirectory => NSDocumentDirectory,
+          "NSApplicationSupportDirectory" => NSApplicationSupportDirectory,
+          :NSApplicationSupportDirectory => NSApplicationSupportDirectory,
+        }
+        supported_dirs[dir_name] || NSDocumentDirectory
+      end
+
   end
 
 end

data/motion/cdq/relationship_query.rb

@@ -6,8 +6,15 @@ module CDQ
     def initialize(owner, name, set = nil, opts = {})
       @owner = owner
       @relationship_name = name
-      @set = set || @owner.send(name)
+      @set = set
       relationship = owner.entity.relationshipsByName[name]
+      if relationship.isToMany
+        if @owner.ordered_set?(name)
+          @set ||= @owner.mutableOrderedSetValueForKey(name)
+        else
+          @set ||= @owner.mutableSetValueForKey(name)
+        end
+      end
       @inverse_rel = relationship.inverseRelationship
       entity_description = relationship.destinationEntity
       target_class = constantize(entity_description.managedObjectClassName)
@@ -30,15 +37,16 @@ module CDQ
     # Add an existing object to the relationship
     #
     def add(obj)
-      if @inverse_rel.isToMany
-        obj.send(@inverse_rel.name).addObject(@owner)
-      else
-        obj.send("#{@inverse_rel.name}=", @owner)
-      end
       @set.addObject obj
     end
     alias_method :<<, :add
 
+    # Remove objects from the relationship
+    #
+    def remove(obj)
+      @set.removeObject obj
+    end
+
     def self.extend_set(set, owner, name)
       set.extend SetExt
       set.extend Enumerable
@@ -87,6 +95,10 @@ module CDQ
         @__query__.new(opts)
       end
 
+      def remove(opts = {})
+        @__query__.remove(opts)
+      end
+
       def where(*args)
         @__query__.where(*args)
       end

data/motion/cdq/store.rb

@@ -33,6 +33,7 @@ module CDQ
         options = { NSMigratePersistentStoresAutomaticallyOption => true,
                     NSInferMappingModelAutomaticallyOption => true }
         url = @config.database_url
+        mkdir_p File.dirname(url.path)
         store = coordinator.addPersistentStoreWithType(NSSQLiteStoreType,
                                                        configuration:nil,
                                                        URL:url,
@@ -47,6 +48,17 @@ module CDQ
         coordinator
       end
     end
+    
+    def mkdir_p dir
+      error = Pointer.new(:object)
+      m = NSFileManager.defaultManager
+      r = m.createDirectoryAtPath dir, withIntermediateDirectories:true, attributes:nil, error:error
+      unless r
+        NSLog "#{error[0].localizedDescription}"
+        raise error[0].localizedDescription
+      end
+    end
+    
   end
 
 end

data/motion/cdq/targeted_query.rb

@@ -83,8 +83,8 @@ module CDQ #:nodoc:
     #
     # Causes execution.
     #
-    def each(&block)
-      array.each(&block)
+    def each(*args, &block)
+      array.each(*args, &block)
     end
 
     # Returns the fully-contstructed fetch request, which can be executed outside of CDQ.
@@ -159,10 +159,7 @@ module CDQ #:nodoc:
       line =   " \n- - - - - - - - - - - | - - - - - - - - - - | - - - - - - - - - - - - - - - |"
       out << line
 
-      abn = entity_description.attributesByName
-      rbn = entity_description.relationshipsByName
-
-      abn.each do |name, desc|
+      entity_description.attributesByName.each do |name, desc|
         out << " \n #{name.ljust(21)}|"
         out << " #{desc.attributeValueClassName.ljust(20)}|"
         out << " #{desc.defaultValue.to_s.ljust(30)}|"
@@ -172,32 +169,7 @@ module CDQ #:nodoc:
       out << "\n\n"
 
       self.each do |o|
-        out << "OID: "
-        out << oid(o)
-        out << "\n"
-
-        awidth = abn.keys.map(&:length).max
-        rwidth = rbn.keys.map(&:length).max
-        width = [awidth, rwidth].max
-
-        abn.each do |name, desc|
-          out << "  #{name.ljust(width)} : "
-          out << o.send(name).inspect[0,95 - width]
-          out << "\n"
-        end
-        rbn.each do |name, desc|
-          rel = CDQRelationshipQuery.new(o, name)
-          if desc.isToMany
-            out << "  #{name.ljust(width)} : "
-            out << rel.count.to_s
-            out << ' (count)'
-          else
-            out << "  #{name.ljust(width)} : "
-            out << oid(rel.first)
-          end
-          out << "\n"
-        end
-        out << "\n"
+        out << o.log(:string)
       end
 
       if log_type == :string
@@ -205,15 +177,12 @@ module CDQ #:nodoc:
       else
         NSLog out
       end
-
-    rescue Exception => e
-      p e
     end
 
     private
 
     def oid(obj)
-      obj ? obj.objectID.URIRepresentation.absoluteString.inspect : "nil"
+      obj ? obj.oid : "nil"
     end
 
     def named_scopes

data/motion/managed_object.rb

@@ -36,12 +36,6 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       end
     end
 
-    # Shortcut to look up the entity description for this class
-    #
-    def entity_description
-      cdq.models.current.entitiesByName[name]
-    end
-
     # Creates a CDQ scope, but also defines a method on the class that returns the
     # query directly.
     #
@@ -68,10 +62,21 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       cdq.send(name, *args, &block)
     end
 
-    def responds_to?(name)
+    def respond_to?(name)
       super || cdq.respond_to?(name)
     end
 
+    def destroy_all
+      self.all.array.each do |instance|
+        instance.destroy
+      end
+    end
+
+    def destroy_all!
+      destroy_all
+      cdq.save
+    end
+
   end
 
   # Register this object for destruction with the current context.  Will not
@@ -85,14 +90,70 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
     description
   end
 
+  def log(log_type = nil)
+    out = "\nOID: "
+    out << oid
+    out << "\n"
+
+    atts = entity.attributesByName
+    rels = entity.relationshipsByName
+
+    width = (atts.keys.map(&:length) + rels.keys.map(&:length)).max || 0
+
+    atts.each do |name, desc|
+      out << "  #{name.ljust(width)} : "
+      out << send(name).inspect[0,95 - width]
+      out << "\n"
+    end
+
+    rels.each do |name, desc|
+      rel = CDQRelationshipQuery.new(self, name, nil, context: managedObjectContext)
+      if desc.isToMany
+        out << "  #{name.ljust(width)} : "
+        out << rel.count.to_s
+        out << ' (count)'
+      else
+        out << "  #{name.ljust(width)} : "
+        out << (rel.first && rel.first.oid || "nil")
+      end
+    end
+    out << "\n"
+
+    if log_type == :string
+      out
+    else
+      NSLog out
+    end
+  end
+
+  def ordered_set?(name)
+    # isOrdered is returning 0/1 instead of documented BOOL
+    ordered = entity.relationshipsByName[name].isOrdered
+    return true if ordered == true || ordered == 1
+    return false if ordered == false || ordered == 0
+  end
+
+  def set_to_extend(name)
+    if ordered_set?(name)
+      mutableOrderedSetValueForKey(name)
+    else
+      mutableSetValueForKey(name)
+    end
+  end
+
+  def oid
+    objectID.URIRepresentation.absoluteString.inspect
+  end
+
   protected
 
   # Called from method that's dynamically added from
   # +[CoreDataManagedObjectBase defineRelationshipMethod:]
   def relationshipByName(name)
     willAccessValueForKey(name)
-    set = CDQRelationshipQuery.extend_set(primitiveValueForKey(name), self, name)
+    set = CDQRelationshipQuery.extend_set(set_to_extend(name), self, name)
     didAccessValueForKey(name)
     set
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdq
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - infinitered
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-xcdm