ditto 0.5.0 → 0.6.0

data/spec/fixtures/dot.ditto

@@ -0,0 +1,17 @@
+# Ditto entity definitions and mappings for dot
+# A circular dependency with bigcircle
+#
+
+entity :dot, '1.0.0', {
+    code:	    [ :mandatory, :unique ],
+    description:    nil,
+    bigcircle:	    :related
+  },
+  add(Dot: '~>1.0') { |ditto|
+    Dot.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :bigcircle => ditto.bigcircle
+    )
+  }
+# vim: set ft=ruby:

data/spec/fixtures/dupversion.ditto

@@ -0,0 +1,32 @@
+# Duplicate version entity definition file
+#
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :continent => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=2.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :continent => ditto.continent,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/spec/fixtures/good.ditto

@@ -0,0 +1,17 @@
+# Correct simple ditto entity definition file
+#
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/spec/fixtures/multiversion.ditto

@@ -0,0 +1,32 @@
+# Correct multiple version entity definition
+#
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+entity :currency_group, '2.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :continent => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=2.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :continent => ditto.continent,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/spec/fixtures/nocomma.ditto

@@ -0,0 +1,16 @@
+# Missing add method (due to lack of comma)
+#
+entity :currency_group, '1.a.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  }
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/spec/fixtures/nomethod.ditto

@@ -0,0 +1,18 @@
+# Missing method error in a ditto file
+#
+zarg
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/spec/fixtures/random.ditto

@@ -0,0 +1,17 @@
+# Ditto entity definitions and mappings for random
+# contains a missing relation
+#
+
+entity :random, '1.0.0', {
+    code:	    [ :mandatory, :unique ],
+    description:    nil,
+    stealth:	    :related
+  },
+  add(Random: '~>1.0') { |ditto|
+    Random.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :stealth => ditto.stealth
+    )
+  }
+# vim: set ft=ruby:

data/spec/fixtures/syntax.ditto

@@ -0,0 +1,19 @@
+# Syntax error in a ditto file
+#
+
+---+++
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/spec/options_spec.rb

@@ -1,75 +1,93 @@
 require_relative '../lib/ditto/options'
+require 'fileutils'
+require 'tmpdir'
 
 module Ditto
   describe Options do
+    before(:all) do
+      @tempdir = Dir.tmpdir
+      @file1 = "#{@tempdir}/file1"
+      @file2 = "#{@tempdir}/file2"
+      FileUtils.touch [@file1, @file2]
+#      ENV.delete 'DITTO_MART'
+    end
+    after(:all) do
+      FileUtils.rm_f [@file1, @file2]
+    end
     context "specifying no options" do
       it "should return defaults" do
-	opts = Ditto::Options.instance
-	opts.parse([])
+	opts = Ditto::Options.new([])
 	opts.connstring.should == Ditto::Options::DEFAULTS[:connstring]
-	opts.modelpath.should == Ditto::Options::DEFAULTS[:modelpath]
+	opts.dittomart.should == Ditto::Options::DEFAULTS[:dittomart]
+	opts.entitydir.should == Ditto::Options::DEFAULTS[:entitydir]
 	opts.verbose.should == 0
 	opts.debug.should be_false
 	opts.droptables.should be_false
-	opts.loadpaths.size.should == 0
+	opts.loadfiles.size.should == 0
       end
       it "should return single path" do
-	opts = Ditto::Options.instance.parse(["testfile"])
+	opts = Ditto::Options.new([@file1])
 	opts.connstring.should == Ditto::Options::DEFAULTS[:connstring]
-	opts.modelpath.should == Ditto::Options::DEFAULTS[:modelpath]
+	opts.dittomart.should == Ditto::Options::DEFAULTS[:dittomart]
 	opts.verbose.should == 0
 	opts.debug.should be_false
 	opts.droptables.should be_false
-	opts.loadpaths.should == ["testfile"]
+	opts.loadfiles.should == [@file1]
       end
     end
-    context "specifying a model path" do
+    context "specifying a dittomart" do
       it "should return it" do
-	mpath = "spec"
-	opts = Ditto::Options.instance.parse(["-m", "#{mpath}", "afile"])
-	opts.modelpath.should == mpath
+	opts = Ditto::Options.new(["-m", @file1])
+	opts.dittomart.should == @file1
       end
     end
-    context "specifying a model path that doesn't exist" do
+    context "specifying a dittomart that doesn't exist" do
       it "should fail" do
-	mpath = "zz/zz/zz/zz"
 	expect {
-	  opts = Ditto::Options.instance.parse(["-m", "#{mpath}", "afile"])
-	}.to raise_error(RuntimeError, "Modelpath #{mpath} does not exist!")
+	  opts = Ditto::Options.new(["-m", "zz/zz/zz"])
+	}.to raise_error(Errno::ENOENT)
+      end
+    end
+    context "not specifying a dittomart" do
+      it "should default to the environment" do
+	pending "Can't work out how to set ENV within an rspec test"
+	ENV['DITTO_MART'] = @file1
+	opts = Ditto::Options.new([@file2])
+	opts.dittomart.should == @file1
       end
     end
     context "specifying a connection string" do
       it "should return it" do
 	mydb = "username/password@//myserver:1521/my.service.com"
-	opts = Ditto::Options.instance.parse(["-c", "#{mydb}", "afile"])
+	opts = Ditto::Options.new(["-c", "#{mydb}"])
 	opts.connstring.should == mydb
       end
     end
-    context "specifying paths and no connection string" do
-      it "should return the paths" do
-	opts = Ditto::Options.instance.parse(["file1", "path1"])
-	opts.loadpaths.should == ["file1", "path1"]
+    context "specifying files and no connection string" do
+      it "should return the files" do
+	opts = Ditto::Options.new([@file1, @file2])
+	opts.loadfiles.should == [@file1, @file2]
       end
     end
     context "specifying files and a connection string" do
       it "should return the files" do
-	opts = Ditto::Options.instance.parse(["-c", "u/p@//serv:1521/mydb", "file1", "path1"])
-	opts.loadpaths.should == ["file1", "path1"]
+	opts = Ditto::Options.new(["-c", "u/p@//serv:1521/mydb", @file1, @file2])
+	opts.loadfiles.should == [@file1, @file2]
       end
     end
     context "specifying droptables" do
       it "should set the options" do
-	opts = Ditto::Options.instance.parse(["--droptables", "file1", "path1"])
+	opts = Ditto::Options.new(["--droptables"])
 	opts.droptables.should be_true
       end
     end
     context "specifying verbose" do
       it "should set verbose flag" do
-	opts = Ditto::Options.instance.parse(["-v", "file1"])
+	opts = Ditto::Options.new(["-v"])
 	opts.verbose.should == 1
       end
       it "should set verbose flag twice" do
-	opts = Ditto::Options.instance.parse(["-vv", "file1"])
+	opts = Ditto::Options.new(["-vv"])
 	opts.verbose.should == 2
       end
     end

data/test/data/simple_object.xml

@@ -0,0 +1,23 @@
+---------------------------------------- DEFINITIONS ----------------------------------------
+<object_classes>
+<object name='currency'>
+	<property name='code' mandatory='Y' is_key='Y' />
+	<property name='description'/>
+	<property name='exchange_rate' mandatory='Y' />
+	<property name='is_designated'/>
+	<relation name='currency_group' relation_object='currency_group' relation_type='unique'/>
+</object>
+<object name='currency_group'>
+	<property name='code' mandatory='Y' is_key='Y'/>
+	<property name='description'/>
+	<property name='is_commodity'/>
+</object>
+</object_classes>
+
+---------------------------------------- DATA ----------------------------------------
+<object_instances>
+<currency code ='GBP' description='Great Britain Pound' exchange_rate='1.5' is_designated='false'>
+	<currency_group code='Europe' />
+</currency>
+<currency_group code='Europe' description='European countries' is_commodity='false'/>
+</object_instances>

data/test/data/simple_object.yaml

@@ -0,0 +1,39 @@
+# This format has multiple YAML documents:
+# The first contains version info, date and author etc.
+# The subsequent are hashes, each being an entity with key the entity name
+# Note that strings are used as keys and not symbols for user clarity
+#
+version: 1.0.0
+date:    2012-10-13
+author:  Nick Townsend
+---
+currency_group:
+  code: Americas
+  description: The Americas
+  is_commodity: true
+---
+currency:
+  code: USD
+  description: United States Dollar
+  exchange_rate: 1.0
+  is_designated: false
+  currency_group: Americas
+---
+currency_group:
+  code: Europe
+  description: European Countries
+  is_commodity: false
+---
+currency:
+  code: GBP
+  description: Pounds Sterling
+  exchange_rate: 1.5
+  is_designated: false
+  currency_group: Europe
+---
+currency:
+  code: EUR
+  description: Euro
+  exchange_rate: 1.2
+  is_designated: false
+  currency_group: Europe

data/test/ditto/currency.ditto

@@ -0,0 +1,30 @@
+# Ditto entity definitions and mappings for currency
+#
+
+entity :currency, '1.0.0', {
+    code:	    [ :mandatory, :unique ],
+    description:    nil,
+    exchange_rate:  :mandatory,
+    is_designated:  nil,
+    currency_group: :related
+  },
+  add(Currency: '~>1.0', CurrencyGroup: '~>1.0') { |ditto|
+    cg = CurrencyGroup.get(ditto.currency_group)
+    cg.currencies.create(
+      :code	=> ditto.code,
+      :description => ditto.description,
+      :exchange_rate => ditto.exchange_rate,
+      :is_designated => ditto.is_designated
+    )
+  }
+  add(Currency: '~>2.0', CurrencyGroup: '~>2.0') { |ditto|
+    cg = CurrencyGroup.get(ditto.currency_group)
+    cg.currencies.create(
+      :code	=> ditto.code,
+      :description => ditto.description,
+      :index => 'ghost',
+      :exchange_rate => ditto.exchange_rate,
+      :is_designated => ditto.is_designated
+    )
+  }
+# vim: set ft=ruby:

data/test/ditto/currency_group.ditto

@@ -0,0 +1,17 @@
+# Ditto entity definitions and mappings for currency_group
+#
+
+entity :currency_group, '1.0.0', {
+    :code => [ :mandatory, :unique ],
+    :description => nil,
+    :is_commodity => nil
+  },
+  add(CurrencyGroup: '=1.0.0') { |ditto|
+    CurrencyGroup.create(
+      :code => ditto.code,
+      :description => ditto.description,
+      :is_commodity => ditto.is_commodity
+    )
+  }
+
+# vim: set ft=ruby:

data/test/dm/currency-1.0.0.dm

@@ -0,0 +1,13 @@
+# This class encapsulates the existing Currency database
+#
+class Currency
+  VERSION = '1.0.0'
+  include DataMapper::Resource
+
+  property  :code,	      String,	:key => true
+  property  :description,     Text,	:required => true, :lazy => false
+  property  :exchange_rate,   Float,	:default => 0.0
+  property  :is_designated,   Boolean,	:default => false
+
+  belongs_to :currency_group
+end

data/test/dm/currency_group-1.0.0.dm

@@ -0,0 +1,10 @@
+# This class encapsulates the existing Currency Group database
+#
+class CurrencyGroup
+  VERSION = '1.0.0'
+  include DataMapper::Resource
+  property  :code,	  String,   :key => true
+  property  :description, Text,	    :required => true, :lazy => false
+  property  :is_commodity,Boolean,  :default => false
+  has n, :currencies
+end

data/test/dm/datamart-1.0

@@ -0,0 +1,7 @@
+# This is a test file
+
+currency-1.0.0.dm
+
+@nested
+
+currency_group-1.0.0.dm