ruby-xcdm 0.0.7 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: 8f74769db3ae3dc3469e48ac7f4170722b3dac5ece25b34b0430844f557771a4
+  data.tar.gz: 0140b6cfe2531b42ad5aed52155898b7466933f1e6ba64bfc3bc5f0ff5fa29d0
+SHA512:
+  metadata.gz: bb8a2b741578857bc5f677d388ee399c6f8951065575c7fda94ecbe25930fddca3a039fae42d3d2650d7c496c802788444f56ab0e625d0405925409f365ac064
+  data.tar.gz: d957261be44ede928b726f4ca9fde29b9c9d6aff81d1600e258c542f1e5f7d98a3598636ab9d56264e57511af0ddcba2140b8cabcee69f1d608038840861b7ca

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p392
+2.7.2

data/Gemfile

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

data/Gemfile.lock

@@ -1,17 +1,29 @@
+PATH
+  remote: .
+  specs:
+    ruby-xcdm (1.0.0)
+      activesupport (~> 4.1)
+      builder (~> 3.2)
+      plist (~> 3.1)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    ansi (1.4.3)
-    builder (3.2.0)
-    i18n (0.6.1)
-    multi_json (1.7.3)
-    plist (3.1.0)
-    rake (10.0.4)
-    turn (0.9.6)
-      ansi
+    activesupport (4.2.11.3)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.8)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.3)
+    plist (3.6.0)
+    rake (13.0.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -19,6 +31,10 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   builder
+  minitest
   plist
   rake
-  turn
+  ruby-xcdm!
+
+BUNDLED WITH
+   2.2.11

data/README.md

@@ -1,11 +1,17 @@
 # ruby-xcdm
 
-This is a tool for generating the same xcdatamodeld files that XCode
+This is a tool for generating the same xcdatamodeld files that Xcode
 does when designing a datamodel for Core Data.  It is written in pure
 ruby, but it will be of particular interest to RubyMotion developers.
-It offers the essential features that XCode does, plus a text-based
+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)
+
+ruby-xcdm is maintained by [Infinite Red](http://infinite.red), a web and mobile development company based in Portland, OR and San Francisco, CA.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -39,6 +45,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 +59,7 @@ task :"build:simulator" => :"schema:build"
 3. Run the command to generate a datamodel:
 
 ```
-  xcdm MyApplicationName schemadir datamodeldestdir
+  xcdm MyApplicationName ./schema ./resources
 ```
 
 
@@ -62,7 +75,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 +95,7 @@ All the built-in data types are supported:
 * integer16
 * integer32
 * integer64
-* decimal
+* decimal (See note below)
 * double
 * float
 * string
@@ -91,6 +104,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 +154,38 @@ 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
+You can also have symmetric one-to-one relationships via has_one:
+
+```ruby
+  entity "Person" do
+    has_one :ego
+  end
+
+  entity "Ego" do
+    has_one :person
+  end
+```
+
+Deletion rules can be easily set on relationships and the default rule is "Nullify":
+
+```ruby
+  entity "Discussion" do
+    has_many :messages, deletionRule: "Cascade"
+  end
+
+  entity "Message" do
+    belongs_to :discusion
+  end
+
+  # Example:
+  # Discussion.first.messages.count => 10
+  # Messages.count => 10
+  # Discussion.first.destroy
+  # cdq.save
+  # Messages.count => 0
+```
+
+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+)/
+        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/entity.rb

@@ -1,5 +1,5 @@
 
-require 'active_support/all'
+require 'active_support/inflector'
 require 'builder'
 
 module XCDM
@@ -140,7 +140,12 @@ module XCDM
 
     def to_xml(builder = nil)
       builder ||= Builder::XmlMarkup.new(:indent => 2)
-      options = { name: name, syncable: 'YES', representedClassName: class_name }.merge(@options)
+      options = {
+        name: name,
+        syncable: 'YES',
+        representedClassName: class_name,
+        codeGenerationType: 'class'
+      }.merge(@options)
       builder.entity(options) do |xml|
         properties.each do |property|
           xml.attribute(property)

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 = "1.0.0"
 end

data/ruby-xcdm.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '~> 2.7'
 
   spec.add_dependency "builder", "~> 3.2"
-  spec.add_dependency "activesupport", "~> 3.2"
+  spec.add_dependency "activesupport", "~> 4.1"
   spec.add_dependency "plist", "~> 3.1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "turn"
 end

data/test/entity_test.rb

@@ -1,16 +1,15 @@
-
-require 'test/unit'
+require 'minitest/autorun'
 require 'xcdm/entity'
-require 'turn'
+require 'xcdm/schema'
 require 'rexml/document'
 
 module XCDM
-  class EntityTest < Test::Unit::TestCase
+  class EntityTest < Minitest::Test
 
     attr_reader :e, :pub
 
     def setup
-      s = Schema.new("0.0.1", "4.6")
+      s = XCDM::Schema.new("0.0.1", "4.6")
       @pub ||= Entity.new(s, "Publication", abstract: true)
       @e ||= Entity.new(s, "Article", parent: "Publication")
     end
@@ -92,6 +91,13 @@ module XCDM
                       "Author", inverseName: "article", inverseEntity: "Author" }], e.relationships
     end
 
+    def test_has_one_should_not_plural
+      e.has_one 'address'
+      assert_equal [{ optional: "YES", deletionRule: "Nullify", syncable: "YES",
+                      name: "address", minCount: "1", maxCount: "1", destinationEntity:
+                      "Address", inverseName: "article", inverseEntity: "Address" }], e.relationships
+    end
+
     def test_belongs_to
       e.belongs_to 'author'
       assert_equal [{ optional: "YES", deletionRule: "Nullify", syncable: "YES",
@@ -106,6 +112,13 @@ module XCDM
                       "Author", inverseName: "article", inverseEntity: "Author" }], e.relationships
     end
 
+    def test_deletion_cascade
+      e.has_many 'authors', { deletionRule: 'Cascade'}
+      assert_equal [{ optional: "YES", deletionRule: "Cascade", syncable: "YES",
+                      name: "authors", minCount: "1", maxCount: "-1", destinationEntity:
+                      "Author", inverseName: "article", inverseEntity: "Author" }], e.relationships
+    end
+
     def test_non_inferrable_relationship_with_inverse
       e.belongs_to 'primary_author', inverse: 'Author.primary_articles'
       assert_equal [{ optional: "YES", deletionRule: "Nullify", syncable: "YES",
@@ -115,7 +128,7 @@ module XCDM
 
     def test_to_xml
       expected = REXML::Document.new %{
-<entity name="Article" representedClassName="Article" parentEntity="Publication" syncable="YES">
+<entity name="Article" codeGenerationType='class' representedClassName="Article" parentEntity="Publication" syncable="YES">
   <attribute name="body" optional="NO" attributeType="String" syncable="YES"/>
   <attribute name="length" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
   <attribute name="published" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
@@ -136,7 +149,7 @@ module XCDM
       assert_equal expected.to_s.strip, REXML::Document.new(e.to_xml).to_s.strip
 
       expected = REXML::Document.new %{
-<entity name="Publication" representedClassName="Publication" isAbstract="YES" syncable="YES">
+<entity name="Publication" representedClassName="Publication" codeGenerationType='class' isAbstract="YES" syncable="YES">
 </entity>
       }
 

data/test/fixtures/001_baseline.rb

@@ -25,7 +25,7 @@ __END__
 
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model name="" userDefinedModelVersionIdentifier="0.0.1" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="2061" systemVersion="12D78" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
-    <entity name="Article" syncable="YES">
+    <entity name="Article" syncable="YES" codeGenerationType='class'>
         <attribute name="body" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="length" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="published" optional="YES" attributeType="Boolean" syncable="YES"/>
@@ -33,7 +33,7 @@ __END__
         <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="author" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Author" inverseName="articles" inverseEntity="Article" syncable="YES"/>
     </entity>
-    <entity name="Author" syncable="YES">
+    <entity name="Author" syncable="YES" codeGenerationType='class'>
         <attribute name="fee" optional="YES" attributeType="Float" defaultValueString="0.0" syncable="YES"/>
         <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
         <relationship name="articles" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Article" inverseName="author" inverseEntity="Author" syncable="YES"/>

data/test/fixtures/Article.xcdatamodeld/Article.xcdatamodel/contents

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model name="" userDefinedModelVersionIdentifier="0.0.1" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="2061" systemVersion="12D78" minimumToolsVersion="Xcode 4.3" macOSVersion="Automatic" iOSVersion="Automatic">
-    <entity name="Article" representedClassName="Article" syncable="YES">
+    <entity codeGenerationType="class" name="Article" representedClassName="Article" syncable="YES">
         <attribute name="body" optional="NO" attributeType="String" syncable="YES"/>
         <attribute name="length" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
         <attribute name="published" optional="YES" attributeType="Boolean" defaultValueString="NO" syncable="YES"/>
@@ -8,7 +8,7 @@
         <attribute name="title" optional="NO" attributeType="String" syncable="YES"/>
         <relationship name="author" optional="YES" minCount="1" maxCount="1" deletionRule="Nullify" destinationEntity="Author" inverseName="articles" inverseEntity="Author" syncable="YES"/>
     </entity>
-    <entity name="Author" representedClassName="Author" syncable="YES">
+    <entity codeGenerationType="class" name="Author" representedClassName="Author" syncable="YES">
         <attribute name="fee" optional="YES" attributeType="Float" defaultValueString="0.0" syncable="YES"/>
         <attribute name="name" optional="NO" attributeType="String" syncable="YES"/>
         <relationship name="articles" optional="YES" minCount="1" maxCount="-1" deletionRule="Nullify" destinationEntity="Article" inverseName="author" inverseEntity="Article" syncable="YES"/>

data/test/schema_test.rb

@@ -1,11 +1,11 @@
-
-require 'test/unit'
+require 'minitest/autorun'
+require 'xcdm/entity'
 require 'xcdm/schema'
 require 'rexml/document'
-require 'active_support/all'
+require 'active_support/inflector'
 
 module XCDM
-  class SchemaTest < Test::Unit::TestCase
+  class SchemaTest < Minitest::Test
 
     def test_initialize
       s = Schema.new("0.0.1", "4.6")
@@ -26,7 +26,7 @@ module XCDM
 
       loader = Schema::Loader.new("4.6")
       schema = loader.load_file(fixture)
-      assert_not_nil schema
+      assert_equal schema.nil?, false
       assert_equal '0.0.1', schema.version
       assert_equal schema, loader.schemas.first
       assert_equal ['Article', 'Author'], schema.entities.map(&:name)

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: ruby-xcdm
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Ken Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: plist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby DSL for creating Core Data Data Model files without XCode
@@ -115,8 +102,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
+- ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -136,27 +123,25 @@ files:
 homepage: https://github.com/infinitered/ruby-xcdm
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.1.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby XCDM
 test_files:
 - test/entity_test.rb