cdq 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTI5YzdjODkzN2VkZTA0Y2I2Mzk0YTkwMjRlMTY2M2M3ODVkNjgzMg==
+    NDQ0YWQwNGU1YWNkOWRhN2Y2YmYwY2QyMDVhNDdjYTYzYzlkNGIyNA==
   data.tar.gz: !binary |-
-    OTQ2YjViOTcxNzJlNzY5MTE4ZWZhMGJkZDZjM2YyNTVhZTMxMWMzYQ==
+    NWEyZjUyNzg2OGM0ZDMyNWQzOTE1NWRhYmY4NzY5YmYzZWM1ZTU2Nw==
 SHA512:
   metadata.gz: !binary |-
-    MDU5ZWQ3M2UyY2UzM2Q1MGI1YWIyMTdiN2JkMzBiYzMxYTdmYzc1YTk4YjYz
-    YjcxY2RkMzE0MzEyMmMzY2RhZTUxMDk1MzM2ZjBlYmU1NzY3MTc2Nzc0Mjc4
-    ZjBhZjI3MTEzNmIxNzZiNDA3ODE4ZjRhOTFiMmYzYjYwMzQ1ZDU=
+    NTA3YWIyN2IwMDUzYzIxMjVhNTI0OTkzMzNmNmQwZDgxMGZlZTc4MTNiNTI5
+    Mzg3YjczZDFlMTE5YTlkNWRhYmZkNzFjNTQ5MTdmYTM1OTk2MWU0NDJlMDlj
+    ZTU2MzY5MjNjNGQ5MzJjMTZkMjhhYTU1MDY4OTFiODAwMjE1MzY=
   data.tar.gz: !binary |-
-    M2M3OWFiOGI4OWRmYzE0ZGNjZWVlMjQ3NmRkNGJkNjA4YTRkMjRkMmM5MjZk
-    NDFjMzBhY2FjNTNhNDgzNDRjOTgxYzU5YjAzNTc4MTA2NjAwZjg5ZjE2OWU4
-    MzFhYWYwZGQ5OGI4N2JjZjMxN2Y5YWZlODFlODdiZWIxZDYwYmI=
+    ZDM4YTVkZjlhMzVhZjcyNjAzMzc4NTI5YjI4NjAyMWVlNjZmYzUwYmRmZTFh
+    MDU3YTI3YjI0N2FmMDE0MGZkMDYzYmM0NTZiY2E3MTMyYWM3NmU5ZDBmYjFk
+    ZDI1MDJhZGEwMjJkNjIwYjJkM2NjMWQxYmNhODIxMGE4ODcwNjk=

data/README.md

@@ -23,6 +23,9 @@ avoiding too much abstraction or method pollution on top of the SDK.  While it
 borrows many ideas from ActiveRecord (especially AREL), it is designed to 
 harmonize with Core Data's way of doing things first.  
 
+I am actively developing and improving CDQ (updated February 2014) so if you have
+trouble or find a bug, please open a ticket!  
+
 ### Why use a static Data Model?
 
 By using a real data model file that gets compiled and included in your bundle,

data/lib/cdq.rb

@@ -5,6 +5,8 @@ end
 
 require 'ruby-xcdm'
 
+ENV['COLUMNS'] ||= `tput cols`.strip
+
 Motion::Project::App.setup do |app|
   parent = File.join(File.dirname(__FILE__), '..')
   app.files.unshift(Dir.glob(File.join(parent, "motion/cdq/**/*.rb")))

data/lib/cdq/version.rb

@@ -1,4 +1,4 @@
 
 module CDQ
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

data/motion/cdq/model.rb

@@ -17,6 +17,32 @@ module CDQ
       !@current && @config.model_url.nil?
     end
 
+    def log(log_type = nil)
+      out =   "\n\n                MODELS"
+      out <<  "\n  Model                    |     count |"              
+      line =  "\n - - - - - - - - - - - - - | - - - - - |"
+      out << line
+
+      self.current.entities.each do |entity| 
+        out << "\n  #{entity.name.ljust(25)}|"
+        out << " #{CDQ.cdq(entity.name).count.to_s.rjust(9)} |"
+      end
+
+      out << line
+
+      entities = CDQ.cdq.models.current.entities
+      if entities && (entity_count = entities.length) && entity_count > 0
+        out << "\n#{entity_count} models"
+        out << "\n\nYou can log a model like so: #{self.current.entities.first.name}.log"
+      end
+
+      if log_type == :string
+        out
+      else
+        NSLog out
+      end
+    end
+
     private
 
     def load_model

data/motion/cdq/object.rb

@@ -41,12 +41,19 @@ module CDQ
       contexts.save(*args)
     end
 
+    def find(oid)
+      url = NSURL.URLWithString(oid)
+      object_id = stores.current.managedObjectIDForURIRepresentation(url)
+      contexts.current.existingObjectWithID(object_id, error: nil)
+    end
+
     protected
 
     def with_error_object(default, &block)
       error = Pointer.new(:object)
       result = block.call(error)
       if error[0]
+        p error[0].debugDescription
         raise "Error while fetching: #{error[0].debugDescription}"
       end
       result || default

data/motion/cdq/targeted_query.rb

@@ -153,8 +153,69 @@ module CDQ #:nodoc:
       end
     end
 
+    def log(log_type = nil)
+      out = "\n\n                              ATTRIBUTES"
+      out <<   " \n Name                 | type                | default                       |"
+      line =   " \n- - - - - - - - - - - | - - - - - - - - - - | - - - - - - - - - - - - - - - |"
+      out << line
+
+      abn = entity_description.attributesByName
+      rbn = entity_description.relationshipsByName
+
+      abn.each do |name, desc|
+        out << " \n #{name.ljust(21)}|"
+        out << " #{desc.attributeValueClassName.ljust(20)}|"
+        out << " #{desc.defaultValue.to_s.ljust(30)}|"
+      end
+
+      out << line
+      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"
+      end
+
+      if log_type == :string
+        out
+      else
+        NSLog out
+      end
+
+    rescue Exception => e
+      p e
+    end
+
     private
 
+    def oid(obj)
+      obj ? obj.objectID.URIRepresentation.absoluteString.inspect : "nil"
+    end
+
     def named_scopes
       @@named_scopes ||= {}
       @@named_scopes[@entity_description] ||= {}

data/motion/managed_object.rb

@@ -49,11 +49,11 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       cdq.scope(name, query, &block)
       if query
         self.class.send(:define_method, name) do
-          query
+          where(query)
         end
       else
         self.class.send(:define_method, name) do |*args|
-          block.call(*args)
+          where(block.call(*args))
         end
       end
     end

data/templates/init/spec/helpers/cdq.rb

@@ -0,0 +1,6 @@
+
+module Bacon
+  class Context
+    include CDQ
+  end
+end

data/templates/model/spec/models/name.rb

@@ -1,7 +1,9 @@
 describe '<%= @name_camel_case %>' do
 
   before do
-    include CDQ
+    class << self
+      include CDQ
+    end
     cdq.setup
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdq
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - infinitered
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-24 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-xcdm
@@ -73,6 +73,7 @@ files:
 - motion/cdq.rb
 - motion/managed_object.rb
 - templates/init/schemas/0001_initial.rb
+- templates/init/spec/helpers/cdq.rb
 - templates/model/app/models/name.rb
 - templates/model/spec/models/name.rb
 - vendor/cdq/ext/CoreDataQueryManagedObjectBase.m