ruby-xcdm 0.0.7 → 0.0.8

data/Gemfile

@@ -5,6 +5,7 @@ gem 'activesupport'
 gem 'rake'
 gem 'builder'
 gem 'plist'
+gem 'ruby-xcdm', path: '.'
 
 group :test do
   gem 'turn'

data/Gemfile.lock

@@ -1,13 +1,21 @@
+PATH
+  remote: .
+  specs:
+    ruby-xcdm (0.0.8)
+      activesupport (~> 3.2)
+      builder (~> 3.2)
+      plist (~> 3.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     ansi (1.4.3)
     builder (3.2.0)
-    i18n (0.6.1)
-    multi_json (1.7.3)
+    i18n (0.6.9)
+    multi_json (1.9.2)
     plist (3.1.0)
     rake (10.0.4)
     turn (0.9.6)
@@ -21,4 +29,5 @@ DEPENDENCIES
   builder
   plist
   rake
+  ruby-xcdm!
   turn

data/README.md

@@ -6,6 +6,10 @@ ruby, but it will be of particular interest to RubyMotion developers.
 It offers the essential features that XCode does, plus a text-based
 workflow and some niceties, like automatic inverse relationships.
 
+[![Dependency Status](https://gemnasium.com/infinitered/ruby-xcdm.png)](https://gemnasium.com/infinitered/ruby-xcdm)
+[![Build Status](https://travis-ci.org/infinitered/ruby-xcdm.png?branch=master)](https://travis-ci.org/infinitered/ruby-xcdm)
+[![Gem Version](https://badge.fury.io/rb/ruby-xcdm.png)](http://badge.fury.io/rb/ruby-xcdm)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -39,6 +43,13 @@ this to your Rakefile:
 task :"build:simulator" => :"schema:build"
 ```
 
+You can override the name of the datamodel file, if you need to, using a config
+variable:
+
+```ruby
+  app.xcdm.name = "custom"
+```
+
 ## Usage (Plain Ruby)
 
 1. Make a directory to hold your schemas (a.k.a. data model in XCode parlance)
@@ -46,7 +57,7 @@ task :"build:simulator" => :"schema:build"
 3. Run the command to generate a datamodel:
 
 ```
-  xcdm MyApplicationName schemadir datamodeldestdir
+  xcdm MyApplicationName ./schema ./resources
 ```
 
 
@@ -62,7 +73,7 @@ Here's a sample schema file:
       string    :body,        optional: false
       integer32 :length
       boolean   :published,   default: false
-      datetime  :publishedAt, default: false
+      datetime  :publishedAt
       string    :title,       optional: false
 
       belongs_to :author
@@ -82,7 +93,7 @@ All the built-in data types are supported:
 * integer16
 * integer32
 * integer64
-* decimal
+* decimal (See note below)
 * double
 * float
 * string
@@ -91,6 +102,8 @@ All the built-in data types are supported:
 * binary
 * transformable
 
+NSDecimal is not well-supported in RubyMotion as of this writing.  They are converted to floats and lose precision.  HipByte is aware of the issue and intends to fix it, but until they do, you will need to use something else for storing currency.  For an example, see [here](https://github.com/skandragon/stringify_float).
+
 Inverse relationships are generated automatically.
 If the inverse relationship cannot be derived 
 from the association name, you can use the ```:inverse``` option:
@@ -139,7 +152,7 @@ scenes.  If you want more control, you can make the intermediate table yourself:
   end
 ```
 
-Core data has no equivalent of ```:through``` in ActiveRecord, so you'll
+Core Data has no equivalent of ```:through``` in ActiveRecord, so you'll
 need to handle that relation yourself.  
   
 If you need to set some of the more esoteric options on properties or

data/lib/ruby-xcdm.rb

@@ -3,12 +3,21 @@ require 'xcdm/entity'
 
 if defined?(Motion::Project::Config)
 
+  class Motion::Project::Config
+    variable :xcdm
+
+    def xcdm
+      @xcdm ||= Struct.new(:name).new(nil)
+    end
+  end
+
   if File.directory?(File.join(App.config.project_dir, "schemas"))
     namespace :schema do
 
       desc "Clear the datamodel outputs"
       task :clean do
-        files = Dir.glob(File.join(App.config.project_dir, 'resources', App.config.name) + ".{momd,xcdatamodeld}")
+        App.config.xcdm.name ||= App.config.name
+        files = Dir.glob(File.join(App.config.project_dir, 'resources', App.config.xcdm.name) + ".{momd,xcdatamodeld}")
         files.each do |f|
           rm_rf f
         end
@@ -16,14 +25,15 @@ if defined?(Motion::Project::Config)
 
       desc "Generate the xcdatamodel file"
       task :build => :clean do
+        App.config.xcdm.name ||= App.config.name
         Dir.chdir App.config.project_dir
         if `xcodebuild -version` =~ /Xcode (\d.\d+)/
           xcode_version = $1
         else
           raise "could not determine xcode version"
         end
-        runner = XCDM::Schema::Runner.new( App.config.name, "schemas", "resources", App.config.sdk_version)
-        App.info "Generating", "Data Model #{App.config.name}"
+        runner = XCDM::Schema::Runner.new( App.config.xcdm.name, "schemas", "resources", App.config.sdk_version)
+        App.info "Generating", "Data Model #{App.config.xcdm.name}"
         runner.load_all { |schema, file| App.info "Loading", file }
         runner.write_all { |schema, file| App.info "Writing", file }
       end

data/lib/xcdm/schema.rb

@@ -30,7 +30,7 @@ module XCDM
           name: "",
           userDefinedModelVersionIdentifier: version,
           type: "com.apple.IDECoreDataModeler.DataModel",
-          documentVersion: "1.0", 
+          documentVersion: "1.0",
           lastSavedToolsVersion: "3389",
           systemVersion: "12E55",
           minimumToolsVersion: "Xcode 5",
@@ -42,7 +42,7 @@ module XCDM
           name: "",
           userDefinedModelVersionIdentifier: version,
           type: "com.apple.IDECoreDataModeler.DataModel",
-          documentVersion: "1.0", 
+          documentVersion: "1.0",
           lastSavedToolsVersion: "2061",
           systemVersion: "12D78",
           minimumToolsVersion: "Xcode 4.3",
@@ -71,7 +71,7 @@ module XCDM
       def schema(version, options = {}, &block)
         xcv = options[:xcode_version] || xcode_version
         @found_schema = Schema.new(version, xcv).tap { |s| s.instance_eval(&block) }
-        @schemas << @found_schema 
+        @schemas << @found_schema
       end
 
       def load_file(file)
@@ -84,10 +84,19 @@ module XCDM
     end
 
     class Runner
-      def initialize(name, inpath, outpath, xcode_version)
+      def initialize(name, inpath, outpath, xcode_version = nil)
         @inpath = inpath
         @name = name
         @container_path = File.join(outpath, "#{name}.xcdatamodeld")
+        if !xcode_version
+          begin
+            `xcodebuild -version` =~ /(\d+\.\d+\.\d+)/
+            xcode_version = $1
+          rescue => e
+            p e
+            puts "XCode not installed?"
+          end
+        end
         @loader = Loader.new(xcode_version)
       end
 

data/lib/xcdm/version.rb

@@ -1,3 +1,3 @@
 module XCDM
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-xcdm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -146,12 +146,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2545899322055109517
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2545899322055109517
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23