ruby-xcdm 0.0.2 → 0.0.3

data/Rakefile

@@ -10,3 +10,5 @@ task :test do
     t.verbose = true
   end
 end
+
+task :default => :test

data/lib/ruby-xcdm.rb

@@ -1,3 +1,6 @@
+require 'xcdm/schema'
+require 'xcdm/entity'
+
 if defined?(Motion::Project::Config)
 
   namespace :schema do
@@ -13,17 +16,14 @@ if defined?(Motion::Project::Config)
     desc "Generate the xcdatamodel file"
     task :build => :clean do
       Dir.chdir App.config.project_dir
-      system("xcdm", App.config.name, "schemas", "resources")
+      runner = XCDM::Schema::Runner.new( App.config.name, "schemas", "resources")
+      App.info "Generating", "Data Model #{App.config.name}"
+      runner.load_all { |schema, file| App.info "Loading", file }
+      runner.write_all { |schema, file| App.info "Writing", file }
     end
   end
 
   task :"build:simulator" => :"schema:build"
   task :"build:device" => :"schema:build"
 
-
-else
-
-  require 'xcdm/schema'
-  require 'xcdm/entity'
-
 end

data/lib/xcdm/entity.rb

@@ -24,11 +24,12 @@ module XCDM
     }
 
 
-    attr_reader :name, :properties, :relationships
+    attr_reader :name, :properties, :relationships, :class_name
 
 
     def initialize(name, options = {})
       @name = name
+      @class_name = options[:class_name] || name
       @properties = []
       @relationships = []
     end
@@ -109,7 +110,7 @@ module XCDM
 
     def to_xml(builder = nil)
       builder ||= Builder::XmlMarkup.new(:indent => 2)
-      builder.entity(name: name, syncable: 'YES') do |xml|
+      builder.entity(name: name, syncable: 'YES', representedClassName: class_name ) do |xml|
         properties.each do |property|
           xml.attribute(property)
         end

data/lib/xcdm/schema.rb

@@ -13,8 +13,8 @@ module XCDM
       @entities = []
     end
 
-    def entity(name, &block)
-      @entities << Entity.new(name).tap { |e| e.instance_eval(&block) }
+    def entity(name, options = {}, &block)
+      @entities << Entity.new(name, options).tap { |e| e.instance_eval(&block) }
     end
 
     def to_xml(builder = nil)
@@ -78,19 +78,19 @@ module XCDM
         File.join(dir, 'contents')
       end
 
-      def load_all
+      def load_all(&block)
         Dir["#{@inpath}/*.rb"].each do |file|
           if File.file?(file)
-            puts "loading #{file}..."
-            @loader.load_file(file)
+            schema = @loader.load_file(file)
+            block.call(schema, file) if block_given?
           end
         end
       end
 
-      def write_all
+      def write_all(&block)
         @loader.schemas.each do |schema|
           filename = datamodel_file(schema.version)
-          puts "writing #{filename}"
+          block.call(schema, filename) if block_given?
           File.open(filename, "w+") do |f|
             f.write(schema.to_xml)
           end

data/lib/xcdm/version.rb

@@ -1,3 +1,3 @@
 module XCDM
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/entity_test.rb

@@ -98,7 +98,7 @@ module XCDM
 
     def test_to_xml
       expected = REXML::Document.new %{
-<entity name="Article" syncable="YES">
+<entity 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"/>

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" syncable="YES">
+    <entity 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" syncable="YES">
+    <entity 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"/>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-xcdm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder