cdq 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjBhMWJiZjc1MTc0OGQyMzM4NTEwN2ZkMGIyOWQ3MTJmODdiNWZhYg==
+    ZmUwYzY4Nzg0NGQxN2E1YWE1ZTMxM2I0M2Y0NzEyMDFkNGU3ZDYwNw==
   data.tar.gz: !binary |-
-    NmE3MTQ2MjIyMmYxYTJiYzg4OTJmMDYxMjk5ZjE4YWU2YjgzMzY1Nw==
+    MzA2ZGFjODI3MzMwYTYwNDViOTQyNWFhZTljYTMyZTg5NmU4Zjc5Mg==
 SHA512:
   metadata.gz: !binary |-
-    YTBlZTY0NDE4NzIxMDY2ODcxMmUzNGMxM2M3OWFhYTExM2RjYjc1ZWI2NjRh
-    MTFiZjUyNzIwY2VlMDRmOTk3MTFmMGE2MTg0YTQ3YTljMTJlZGVkNWJkYjJm
-    NzZlZjYzYWRiODQ2OGVhNzNjNGUwOTliMDhkNzZiZDQ3YmU1YTE=
+    YzgxZGYzMjIxZjk3MTYxYThkYTVjMTllNzYyOWJhZjhjMjAyNGU3ODNlZGZm
+    ZmI4NTgzZjVjNjc5YjVmN2YxNGFjN2ZkZDllNTk0YjZiM2MwZjhiYmMzOGJi
+    YzllZDQxN2QxM2Q5ZTM4OTIxNjA4NjA2ZDM3NzQ0YmE0MWMzZWM=
   data.tar.gz: !binary |-
-    YmM1Njk2Nzg3ODBkODYxMjAxOWNlNmVkZWU3ZTg0YzNhMDBjOTQ5OTljNjcx
-    OWJiODM1MGYxOGNlODg1NGM4MzY3MzEzZjUyM2I5OTE5OGEwZGE0YmNlMjkx
-    NzkxNjlkNzIzYzQyZGYxODQxZmIyNjg2NGQwOTk1ZWJiODczYzI=
+    ZWVjZGUxNTBmYTdkNTMwMDg5NDZhZjRlMTQxYTM3NDU1YWM3YjhkZjcyOTA4
+    ZjRjNjY1YTk2NGU0NTY0YTIzY2JmZmUzMjUzNDIzMjg5NGJkYjhhMjRiZDZh
+    OWI0NDY5ZGQ4YjE4NTllODJiYzI0ZjVmMjg4NzZlZDVmY2Q5MjQ=

data/.gitignore

@@ -9,3 +9,4 @@ resources/*.storyboardc
 examples/**/*.nib
 tags
 .rbenv-version
+pkg

data/.travis.yml

@@ -0,0 +1,2 @@
+language: objective-c
+before_install: ruby --version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cdq (0.1.1)
+    cdq (0.1.2)
       motion-yaml
       ruby-xcdm (~> 0.0, >= 0.0.5)
 

data/README.md

@@ -14,15 +14,30 @@ 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
 so much.
 
+[![Dependency Status](https://gemnasium.com/infinitered/cdq.png)](https://gemnasium.com/infinitered/cdq)
+[![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)
+
 ### Why use a static Data Model?
 
 By using a real data model file that gets compiled and included in your bundle,
 you can take advantage of automatic migration, which simplifies managing your
-schema as it grows, if you can follow a few simple rules.  
+schema as it grows, if you can follow a few [simple rules](https://developer.apple.com/library/ios/documentation/cocoa/conceptual/CoreDataVersioning/Articles/vmLightweightMigration.html#//apple_ref/doc/uid/TP40004399-CH4-SW2).  
 
 ## Installing
 
-Using Bundler:
+##### Quick Start:
+
+```bash
+$ gem install cdq
+$ motion create my_app # if needed
+$ cd my_app
+$ cdq init
+```
+
+This way assumes you want to use ruby-xcdm.  Run ```cdq -h``` for list of more generators.
+
+##### Using Bundler:
 
 ```ruby
 gem 'cdq'
@@ -52,10 +67,6 @@ class AppDelegate
     true
   end
 end
-
-class TopLevel
-  include CDQ
-end
 ```
 
 That's it!  You can create specific implementation classes for your entities if

data/Rakefile

@@ -22,3 +22,7 @@ require 'ruby-xcdm'
 require 'motion-yaml'
 
 task :"build:simulator" => :"schema:build"
+task :"build:simulator" => :"schema:build"
+task :"build:simulator" => :"schema:build"
+task :"build:simulator" => :"schema:build"
+task :"build:simulator" => :"schema:build"

data/bin/cdq

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require "erb"
+require "optparse"
+require "rubygems"
+require "cdq/cli"
+
+CDQ::CommandLine.run_all
+

data/cdq.gemspec

@@ -14,5 +14,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_runtime_dependency 'ruby-xcdm', '~> 0.0', '>= 0.0.5'
   gem.add_runtime_dependency 'motion-yaml'
+  gem.executables << 'cdq'
+
   gem.version       = CDQ::VERSION
 end

data/lib/cdq.rb

@@ -3,6 +3,8 @@ unless defined?(Motion::Project::App)
   raise "This must be required from within a RubyMotion Rakefile"
 end
 
+require 'ruby-xcdm'
+
 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/cli.rb

@@ -0,0 +1,169 @@
+
+require "cdq/version"
+require "cdq/generators"
+
+module CDQ
+  class CommandLine
+    HELP_TEXT = %{Usage:
+    cdq [options] <command> [arguments]
+
+Commands:
+    cdq init                         # Add boilerplate setup to use CDQ
+    cdq create model <model>         # Create a model and associated files
+
+Options:
+    }
+
+    attr_reader :singleton_options_passed
+
+    def option_parser(help_text = HELP_TEXT)
+      OptionParser.new do |opts|
+        opts.banner = help_text
+
+        opts.on("-v", "--version", "Print Version") do
+          @singleton_options_passed = true
+          puts CDQ::VERSION
+        end
+
+        opts.on("-h", "--help", "Show this message") do
+          @singleton_options_passed = true
+          puts opts
+        end
+      end
+    end
+
+    def self.run_all
+
+      actions = { "init" => InitAction, "create" => CreateAction }
+
+      cli = self.new
+      opts = cli.option_parser
+      opts.order!
+      action = ARGV.shift
+
+      if actions[action]
+        actions[action].new.run
+      elsif !cli.singleton_options_passed
+        puts opts
+      end
+
+    end
+  end
+
+  class InitAction < CommandLine
+    HELP_TEXT = %{Usage:
+    cdq init [options]
+
+    Run inside a motion directory, it will:
+    * Add cdq and ruby-xcdm to Gemfile, if necessary
+    * Set rake to automatically run schema:build
+    * Create an initial schema file
+
+Options:
+    }
+
+    def option_parser
+      super(HELP_TEXT).tap do |opts|
+        opts.program_name = "cdq init"
+
+        opts.on("-d", "--dry-run", "Do a Dry Run") do
+          @dry_run = "dry_run"
+        end
+      end
+    end
+
+    def run
+      opts = option_parser
+      opts.order!
+
+      unless singleton_options_passed
+        CDQ::Generator.new(@dry_run).create('init')
+
+        print "  \u0394  Checking bundle for cdq... "
+        unless system('bundle show cdq')
+          print "  \u0394  Adding cdq to Gemfile... "
+          File.open("Gemfile", "at") do |gemfile|
+            gemfile.puts("gem 'cdq'")
+          end
+          puts "Done."
+        end
+
+        # print "  \u0394  Checking bundle for ruby-xcdm... "
+        # unless system('bundle show ruby-xcdm')
+        #   print "  \u0394  Adding ruby-xcdm to Gemfile... "
+        #   File.open("Gemfile", "at") do |gemfile|
+        #     gemfile.puts("gem 'ruby-xcdm'")
+        #   end
+        #   puts "Done."
+        # end
+
+        print "  \u0394  Adding schema:build hook to Rakefile... "
+        File.open("Rakefile", "at") do |rakefile|
+          rakefile.puts('task :"build:simulator" => :"schema:build"')
+        end
+        puts "Done."
+
+        puts %{
+Now open app/app_delegate.rb, and add
+
+  include CDQ
+
+at class level, and
+
+  cdq.setup
+
+wherever you want the stack to get set up, probably right before you set
+your root controller.  Edit your inital schema, create a few models, and
+you're off and running.
+        }
+
+      end
+    end
+
+  end
+
+  class CreateAction < CommandLine
+    HELP_TEXT = %{
+Usage:
+    cdq create [options] model <model>         # Create a CDQ model and associated test
+
+Options:
+    }
+
+    def option_parser
+      super(HELP_TEXT).tap do |opts|
+        opts.program_name = "cdq create"
+
+        opts.on("-d", "--dry-run", "Do a Dry Run") do
+          @dry_run = "dry_run"
+        end
+      end
+    end
+
+    def run
+      opts = option_parser
+      opts.order!
+
+      object = ARGV.shift
+
+      unless singleton_options_passed
+        case object
+        when 'model'
+          model_name = ARGV.shift
+          if model_name
+
+            #camelized = model_name.gsub(/[A-Z]/) { |m| "_#{m.downcase}" }.gsub
+            CDQ::Generator.new(@dry_run).create('model', model_name)
+          else
+            puts "Please supply a model name"
+            puts opts
+          end
+        else
+          puts "Invalid object type: #{object}"
+          puts opts
+        end
+      end
+    end
+
+  end
+end

data/lib/cdq/generators.rb

@@ -0,0 +1,82 @@
+
+
+module CDQ
+  class Generator
+    def initialize(options = nil)
+      @dry_run = true if options == 'dry_run'
+    end
+
+    def create(template, name = nil)
+      insert_from_template(template, name)
+    end
+
+    def template_path(template_name)
+      sub_path = "templates/#{template_name}/"
+
+      # First check local directory, use that if it exists
+      if Dir.exist?("#{Dir.pwd}/#{sub_path}")
+        "#{Dir.pwd}/#{sub_path}"
+      else # Then check the gem
+        begin
+          spec = Gem::Specification.find_by_name("cdq")
+          gem_root = spec.gem_dir
+          "#{gem_root}/#{sub_path}"
+        rescue Exception => e
+          puts "CDQ - could not find template directory\n"
+          nil
+        end
+      end
+    end
+
+    def insert_from_template(template_name, name = nil)
+      puts "\n     Creating #{template_name}: #{name}\n\n"
+
+      return unless (@template_path = template_path(template_name))
+      files = Dir["#{@template_path}**/*"].select {|f| !File.directory? f}
+
+      if name
+        @name = name
+        @name_camel_case = @name.split('_').map{|word| word.capitalize}.join
+      end
+
+      files.each do |template_file_path_and_name|
+        @in_app_path = File.dirname(template_file_path_and_name).gsub(@template_path, '')
+        @ext = File.extname(template_file_path_and_name)
+        @file_name = File.basename(template_file_path_and_name, @ext)
+
+        @new_file_name = @file_name.gsub('name', @name || 'name')
+        @new_file_path_name = "#{Dir.pwd}/#{@in_app_path}/#{@new_file_name}#{@ext}"
+
+        if @dry_run
+          puts "\n     Instance vars:"
+          self.instance_variables.each{|var| puts "     #{var} = #{self.instance_variable_get(var)}"}
+          puts
+        end
+
+        if Dir.exist?(@in_app_path)
+          puts "     Using existing directory: #{@in_app_path}"
+        else
+          puts "  \u0394  Creating directory: #{@in_app_path}"
+          Dir.mkdir(@in_app_path) unless @dry_run
+        end
+
+        results = load_and_parse_erb(template_file_path_and_name)
+
+        if File.exists?(@new_file_path_name)
+          puts "  X  File exists, SKIPPING: #{@new_file_path_name}"
+        else
+          puts "  \u0394  Creating file: #{@new_file_path_name}"
+          File.open(@new_file_path_name, 'w+') { |file| file.write(results) } unless @dry_run
+        end
+      end
+
+      puts "\n     Done"
+    end
+
+    def load_and_parse_erb(template_file_name_and_path)
+      template_file = File.open(template_file_name_and_path, 'r').read
+      erb = ERB.new(template_file)
+      erb.result(binding)
+    end
+  end
+end

data/lib/cdq/version.rb

@@ -1,4 +1,4 @@
 
 module CDQ
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/motion/cdq.rb

@@ -56,3 +56,7 @@ end
 class UIResponder
   include CDQ
 end
+
+class TopLevel
+  include CDQ
+end

data/motion/cdq/collection_proxy.rb

@@ -19,7 +19,7 @@ module CDQ
     def array
       @objects
     end
-    
+
     def first
       @objects.first
     end

data/motion/cdq/partial_predicate.rb

@@ -17,7 +17,7 @@ module CDQ
       :begins_with => [NSBeginsWithPredicateOperatorType],
       :ends_with => [NSEndsWithPredicateOperatorType]
     }
-      
+
     def initialize(key, scope, operation = :and)
       @key = key
       @scope = scope
@@ -25,14 +25,14 @@ module CDQ
     end
 
     OPERATORS.each do |op, (type, synonym)|
-      define_method(op) do |value, options = 0| 
+      define_method(op) do |value, options = 0|
         make_scope(type, value, options)
       end
       alias_method synonym, op if synonym
     end
 
     def between(min, max);   make_scope(NSBetweenPredicateOperatorType, [min, max]); end
-      
+
     private
 
     def make_pred(key, type, value, options = 0)

data/motion/cdq/query.rb

@@ -61,7 +61,7 @@ module CDQ
     def sort_by(key, dir = :ascending)
       if dir.to_s[0,4].downcase == 'desc'
         ascending = false
-      else 
+      else
         ascending = true
       end
 

data/motion/cdq/relationship_query.rb

@@ -20,7 +20,7 @@ module CDQ
     end
 
     # Creates a new managed object within the target relationship
-    # 
+    #
     def new(opts = {})
       super(opts).tap do |obj|
         add(obj)
@@ -28,7 +28,7 @@ module CDQ
     end
 
     # Add an existing object to the relationship
-    # 
+    #
     def add(obj)
       if @inverse_rel.isToMany
         obj.send(@inverse_rel.name).addObject(@owner)
@@ -56,7 +56,7 @@ module CDQ
         self
       end
 
-      # This works in a special way.  If we're extending a regular NSSet, it will 
+      # This works in a special way.  If we're extending a regular NSSet, it will
       # create a new method that calls allObjects.  If we're extending a NSOrderedSet,
       # the override will not work, and we get the array method already defined on
       # NSOrderedSet, which is actually exactly what we want.

data/motion/cdq/targeted_query.rb

@@ -37,7 +37,7 @@ module CDQ #:nodoc:
       end
     end
 
-    # Return all matching entities.  
+    # Return all matching entities.
     #
     # Causes execution.
     #
@@ -58,7 +58,7 @@ module CDQ #:nodoc:
 
     # Return the first entity matching the query.
     #
-    # Causes execution.  
+    # Causes execution.
     #
     def first
       limit(1).array.first
@@ -68,7 +68,7 @@ module CDQ #:nodoc:
     # <tt>length</tt> parameter is supplied, fetch a range of length <tt>length</tt>
     # starting at <tt>index</tt>
     #
-    # Causes execution.  
+    # Causes execution.
     #
     def [](index, length = nil)
       if length
@@ -81,7 +81,7 @@ module CDQ #:nodoc:
     # Iterate over each entity matched by the query.  You can also use any method from the
     # Enumerable module in the standard library that does not depend on ordering.
     #
-    # Causes execution.  
+    # Causes execution.
     #
     def each(&block)
       array.each(&block)
@@ -96,7 +96,7 @@ module CDQ #:nodoc:
       end
     end
 
-    # Create a new entity in the current context.  Accepts a hash of attributes that will be assigned to 
+    # Create a new entity in the current context.  Accepts a hash of attributes that will be assigned to
     # the newly-created entity.  Does not save the context.
     #
     def new(opts = {})
@@ -105,7 +105,7 @@ module CDQ #:nodoc:
       end
     end
 
-    # Create a new entity in the current context.  Accepts a hash of attributes that will be assigned to 
+    # Create a new entity in the current context.  Accepts a hash of attributes that will be assigned to
     # the newly-created entity.  Does not save the context.
     #
     # [TODO: Will apply validation.]
@@ -117,7 +117,7 @@ module CDQ #:nodoc:
     # Create a named scope.  The query is any valid CDQ query.
     #
     # Example:
-    #   
+    #
     # cdq('Author').scope(:first_published, cdq(:published).eq(true).sort_by(:published_at).limit(1))
     #
     # cdq('Author').first_published.first => #<Author>
@@ -135,7 +135,7 @@ module CDQ #:nodoc:
     # Override the context in which to perform this query.  This forever forces the
     # specified context for this particular query, so if you save the it for later
     # use (such as defining a scope) bear in mind that changes in the default context
-    # will have no effect when running this. 
+    # will have no effect when running this.
     #
     def in_context(context)
       clone(context: context)

data/motion/managed_object.rb

@@ -9,7 +9,7 @@
 # Class.cdq.<em>method</em>.
 #
 # Examples:
-# 
+#
 #   MyEntity.where(:name).eq("John").limit(2)
 #   MyEntity.first
 #   MyEntity.create(name: "John")
@@ -42,13 +42,13 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       cdq.models.current.entitiesByName[name]
     end
 
-    # Creates a CDQ scope, but also defines a method on the class that returns the 
+    # Creates a CDQ scope, but also defines a method on the class that returns the
     # query directly.
     #
     def scope(name, query = nil, &block)
       cdq.scope(name, query, &block)
       if query
-        self.class.send(:define_method, name) do 
+        self.class.send(:define_method, name) do
           query
         end
       else
@@ -62,7 +62,7 @@ class CDQManagedObject < CoreDataQueryManagedObjectBase
       cdq.new(*args)
     end
 
-    # Pass any unknown methods on to cdq. 
+    # Pass any unknown methods on to cdq.
     #
     def method_missing(name, *args, &block)
       cdq.send(name, *args, &block)

data/spec/cdq/module_spec.rb

@@ -26,7 +26,7 @@ module CDQ
     end
 
     it "passes through existing CDQObjects unchanged" do
-      query = CDQQuery.new 
+      query = CDQQuery.new
       cdq(query).should == query
     end
 

data/spec/cdq/partial_predicate_spec.rb

@@ -2,7 +2,7 @@
 module CDQ
   describe "CDQ Partial Predicates" do
 
-    before do 
+    before do
       @scope = CDQQuery.new
       @ppred = CDQPartialPredicate.new(:count, @scope)
     end

data/templates/init/schemas/0001_initial.rb

@@ -0,0 +1,25 @@
+
+schema "0001 initial" do
+
+  # Examples:
+  #
+  # entity "Person" do
+  #   string :name, optional: false
+  #
+  #   has_many :posts
+  # end
+  #
+  # entity "Post" do
+  #   string :title, optional: false
+  #   string :body
+  #
+  #   datetime :created_at
+  #   datetime :updated_at
+  #
+  #   has_many :replies, inverse: "Post.parent"
+  #   belongs_to :parent, inverse: "Post.replies"
+  #
+  #   belongs_to :person
+  # end
+
+end

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

@@ -0,0 +1,3 @@
+class <%= @name_camel_case %> < CDQManagedObject
+
+end

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

@@ -0,0 +1,15 @@
+describe '<%= @name_camel_case %>' do
+
+  before do
+    include CDQ
+    cdq.setup
+  end
+
+  after do
+    cdq.reset!
+  end
+
+  it 'should be a <%= @name_camel_case %> entity'
+    <%= @name_camel_case %>.entity_description.name.should == '<%= @name_camel_case %>'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdq
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - infinitered
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-xcdm
@@ -48,19 +48,24 @@ dependencies:
 description: Core Data Query for RubyMotion
 email:
 - ken@infinitered.com
-executables: []
+executables:
+- cdq
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - app/app_delegate.rb
 - app/test_models.rb
+- bin/cdq
 - cdq.gemspec
 - lib/cdq.rb
+- lib/cdq/cli.rb
+- lib/cdq/generators.rb
 - lib/cdq/version.rb
 - motion/cdq.rb
 - motion/cdq/collection_proxy.rb
@@ -95,6 +100,9 @@ files:
 - spec/cdq/targeted_query_spec.rb
 - spec/helpers/thread_helper.rb
 - spec/integration_spec.rb
+- templates/init/schemas/0001_initial.rb
+- templates/model/app/models/name.rb
+- templates/model/spec/models/name.rb
 - vendor/cdq/ext/CoreDataQueryManagedObjectBase.h
 - vendor/cdq/ext/CoreDataQueryManagedObjectBase.m
 homepage: http://github.com/infinitered/cdq