cdq 0.1.10 → 0.1.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YWY0OGVmY2Y5Y2UxMmNjZjI0YjcyODhmNmY0OWNhYWFkZmMwYjMzMQ==
+    MzdmYTFjN2U5ZTg1ZmExOTM3ODM3NGU0MDE3M2E3NTBmYjNmNTU5NQ==
   data.tar.gz: !binary |-
-    MTczM2QyOWI4NDczZDY1ODBlNDFjNDI0NGI1MjhjODFlNTU5Njc2Ng==
+    YTA3Nzc3YmFiZGZkNjE0Njk2NGFkNmUwOTU5OWFiZjFiNTY3Y2IzMw==
 SHA512:
   metadata.gz: !binary |-
-    MmU3ZDJjMDZkOWE3YjczYzAxZDQ2MDM5NTBiNTc0YjY2OGQ5MDQzNWY5YmM1
-    MjZlMWY1MTBlYjRjNDVjZGI2NWFlYjQ0YzliYWYwYWM2NWE3ODc0Mjc5ZmQ5
-    OWY4MDExZmEwNzYzNGJiZGUzY2EwNmE0ZTQwZTliODQ4MWU4YjM=
+    Y2FkMTlkNmNmZGRiZjc2Y2ViNjlhOTBhY2I5YjA5MDFhZGQ5YjMxYmMxMTVj
+    MWRjZGE5NmVjOGUzNzE5YWFkODhjNjAxNDVhOWEwZDQwMGVmY2E2NDVlNTVl
+    YWM2Y2EzYzU4MzA3MmY0YTliODhkNTdhYWJkNDhlYjdhNjMwYzE=
   data.tar.gz: !binary |-
-    YWY3YjliOGJiMDM1Y2JhZGZmMzQ2OGUxMDg3ODNjYzNkOWM0ODUxMGM4YzQ1
-    ZTA2N2FkNzhhODYxZTlmOGNjY2E4NzIxYjE0N2QwMjJjYmRlMzc4MWVmZWMz
-    NDBlZDhhYmMyZTI3ZTZiODllMGQ5MmJhZWIzNmJjYmRkYjgyYmU=
+    ZDM3Y2Y2MWQwZTRhYWIzMWEyZjZjZTFjMzI2MmM1ZmM0MjliYzU3YjQwYWZk
+    NDM3MTFhZDIxYzNjNmRhNmZiYTA3MzE4ZjA0YmJlOTY0MTMxNDZhMzU5Yjdk
+    MzkwYjU5OGQ1YzM3MDM3OWI2YmRhMjQ1ZjAwNTUzMmI1YjQ3NGQ=

data/README.md

@@ -9,10 +9,15 @@ XCode, or you can use [ruby-xcdm](https://github.com/infinitered/ruby-xcdm).
 [![Build Status](https://travis-ci.org/infinitered/cdq.png?branch=master)](https://travis-ci.org/infinitered/cdq)
 [![Gem Version](https://badge.fury.io/rb/cdq.png)](http://badge.fury.io/rb/cdq)
 
-## Introduction
+## Get Started
+1. [Introducing CDQ](#introducingCDQ)
+2. [Greenfield Quick Start Tutorial](https://github.com/infinitered/cdq/wiki/Greenfield-Quick-Start)
+3. [Cheat Sheet](https://github.com/infinitered/cdq/wiki/CDQ-Cheat-Sheet)
+4. [API docs](http://rubydoc.info/github/infinitered/cdq)
 
-CDQ began its life as a fork of
-[MotionData](https://github.com/alloy/MotionData), but it became obvious I
+## Introducing CDQ
+
+CDQ began its life as a fork of [MotionData](https://github.com/alloy/MotionData), but it became obvious I
 wanted to take things in a different direction, so I cut loose and ended up
 rewriting almost everything.  If you pay attention, you can still find the
 genetic traces, so thanks to @alloy for sharing his work and letting me learn
@@ -23,7 +28,7 @@ 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
+I am actively developing and improving CDQ (updated September 2014) so if you have
 trouble or find a bug, please open a ticket!
 
 ### Why use a static Data Model?
@@ -34,17 +39,6 @@ schema as it grows, if you can follow a few [simple rules](https://developer.app
 
 ## Installing
 
-### Quick Start:
-
-For brand-new apps, or just to try it out, check out the
-[Greenfield Quick Start](https://github.com/infinitered/cdq/wiki/Greenfield-Quick-Start) tutorial.
-There's also a
-[Cheat Sheet](https://github.com/infinitered/cdq/wiki/CDQ-Cheat-Sheet)
-and
-[API docs](http://rubydoc.info/github/infinitered/cdq).
-
-### Even Quicker Start:
-
 ```bash
 $ gem install cdq
 $ motion create my_app # if needed
@@ -59,7 +53,7 @@ This way assumes you want to use ruby-xcdm.  Run ```cdq -h``` for list of more g
 ```ruby
 gem 'cdq'
 ```
-
+<br />
 If you want to see bleeding-edge changes, point Bundler at the git repo:
 
 ```ruby
@@ -174,6 +168,15 @@ all the data over to your main context all at once.  CDQ makes that easy too:
   cdq.save
 ```
 
+### Reading
+
+```ruby
+  author = Author.create(name: "Le Guin", publish_count: 150, first_published: 1970)
+  author.name # => "Le Guin"
+  author.publish_count # => 150
+  author.attributes # => { "name" => "Le Guin", "publish_count" => 150, "first_published" => 1970 }
+```
+
 ### Updating
 ```ruby
   author = Author.first
@@ -204,9 +207,7 @@ All of these queries are infinitely daisy-chainable, and almost everything is
 possible to do using only chained methods, no need to drop into NSPredicate format
 strings unless you want to.
 
-Here are some examples.  See the [cheat
-sheet](https://github.com/infinitered/cdq/wiki/CDQ-Cheat-Sheet) for a complete
-list.
+Here are some examples.  **See the [cheat sheet](https://github.com/infinitered/cdq/wiki/CDQ-Cheat-Sheet) for a complete list.**
 
 ### Conditions
 
@@ -214,7 +215,8 @@ list.
   Author.where(:name).eq('Shakespeare')
   Author.where(:publish_count).gt(10)
   Author.where(name: 'Shakespeare', publish_count: 15)
-  Author.where("name LIKE '%@'", '%kesp%')
+  Author.where("name LIKE %@", '*kesp*')
+  Author.where("name LIKE %@", 'Shakespear?')
 ```
 
 ### Sorts, Limits and Offsets
@@ -332,7 +334,7 @@ enable, initialize like this:
   cdq.stores.new(iCloud: true, container: "com.your.container.id")
 ```
 
-You can also set up iCloud in your cdq.yml file. 
+You can also set up iCloud in your cdq.yml file.
 
 ## Documentation
 

data/lib/cdq.rb

@@ -14,4 +14,13 @@ Motion::Project::App.setup do |app|
   app.files.unshift(Dir.glob(File.join(parent, "motion/*.rb")))
   app.frameworks += %w{ CoreData }
   app.vendor_project(File.join(parent, 'vendor/cdq/ext'), :static)
+  if app.respond_to?(:xcdm)
+    cdqfile = File.join(app.project_dir, 'resources/cdq.yml')
+    if File.exists?(cdqfile)
+      hash = YAML.load(File.read(cdqfile))
+      if hash
+        app.xcdm.name = hash['model_name'] || hash['name']
+      end
+    end
+  end
 end

data/lib/cdq/version.rb

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

data/motion/cdq.rb

@@ -53,8 +53,10 @@ module CDQ
       if obj.isSubclassOfClass(NSManagedObject)
         entities = NSDictionary.dictionaryWithDictionary(
           @@base_object.models.current.entitiesByName)
+        entity_name = obj.name.split("::").last
+        # NOTE attempt to look up the entity
         entity_description =
-          entities[obj.name] ||
+          entities[entity_name] ||
           entities[obj.ancestors[1].name]
         if entity_description.nil?
           raise "Cannot find an entity named #{obj.name}"

data/motion/cdq/collection_proxy.rb

@@ -11,6 +11,8 @@ module CDQ
     def count
       @objects.size
     end
+    alias :length :count
+    alias :size :count
 
     def get
       @objects

data/motion/cdq/targeted_query.rb

@@ -36,6 +36,8 @@ module CDQ #:nodoc:
         context.countForFetchRequest(fetch_request, error:error)
       end
     end
+    alias :length :count
+    alias :size :count
 
     # Return all matching entities.
     #

data/motion/managed_object.rb

@@ -81,6 +81,10 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       cdq.save
     end
 
+    def attribute_names
+      self.entity_description.attributesByName.keys
+    end
+
     def cdq(obj = nil)
       if obj
         super(obj)
@@ -106,6 +110,15 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
     description
   end
 
+  # Returns a hash of attributes for the object
+  def attributes
+    h = {}
+    entity.attributesByName.each do |name, desc|
+      h[name] = send name
+    end
+    h
+  end
+
   def log(log_type = nil)
     out = "\nOID: "
     out << oid

metadata

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