ditto 0.6.0 → 1.0

data/lib/ditto/dsl.rb

@@ -1,8 +1,13 @@
 # Define the DSL for Ditto
+# Arguably the validation logic here should be back in entity.rb
 #
 module Ditto
   module DSL
     def entity (name, version, opts, *methods)
+      unless methods.size > 0
+	src = Thread.current.backtrace[1].split(':')[0..1]
+	raise Error.new(src), "#{name}: entity missing map method!"
+      end
       Ditto::Entity.new(name,version,opts,methods)
     end
     def add (version, &block)
@@ -10,14 +15,24 @@ module Ditto
 	src = Thread.current.backtrace[1].split(':')[0..1]
 	raise Error.new(src), "add method missing block (use {} not do/end)"
       end
-      [:add, version, block]
+      [:add, check_versions(version), block]
     end
     def delete (version, &block)
       unless block
 	src = Thread.current.backtrace[1].split(':')[0..1]
 	raise Error.new(src), "delete method missing block (use {} not do/end)"
       end
-      [:delete, version, block]
+      [:delete, check_versions(version), block]
+    end
+    # Check the version hash and convert targets to Gem::Requirements
+    #
+    def check_versions version
+      begin
+	version.each {|k,v| version[k] = Gem::Requirement.new(v)}
+      rescue
+	src = $!.backtrace[9].split(':')[0..1]
+	raise Error.new(src), $!.message
+      end
     end
   end
 end

data/lib/ditto/entity.rb

@@ -37,7 +37,6 @@ module Ditto
 	raise Error.new(src), "#{name}: previously defined at #{loc.join(':')}"
       end
       raise Error.new(src), "#{name}: entity fields must be a hash!" unless fields.kind_of? Hash
-      raise Error.new(src), "#{name}: entity missing add method!" unless methods.size > 0
 
       @fields = Ditto.symbolize_keys fields
 
@@ -77,20 +76,22 @@ module Ditto
     #
     def self.load_instances f, verbose = 0
       header = nil
+      version = nil
       nent = 0
       YAML::load_documents(File.open(f)) do |doc|
 	unless header
 	  header = Ditto.symbolize_keys doc
-	  puts "header #{header.to_s}" if verbose > 2
 	  version = Gem::Version.new(header[:version])
-	  puts "version: #{version.to_s}" if verbose > 1
+	  puts (verbose > 1) ? " (version: #{version.to_s})" : ""
+	  puts "header #{header.to_s}" if verbose > 2
 	  next
 	end
+	raise Error.new(), "instance has no version header" if version.nil?
 	e = doc.flatten
-	raise Ditto::Error "Entity instance has multiple keys" if e.size != 2
+	raise Error.new(), "instance malformed" if e.size != 2
 	name = e[0].to_sym
 	fields = Ditto.symbolize_keys e[1]
-	puts "#{name}: #{fields.inspect}" if verbose > 1
+	puts "#{name}: #{fields.inspect}" if verbose > 2
 	@@instances[name][version] << fields
 	nent += 1
       end
@@ -102,8 +103,10 @@ module Ditto
     def self.load_entities filepath, verbose = 0
       puts "loading entities..." if verbose > 0
       @@instances.each_key do |name|
+	file = File.expand_path("#{name}.ditto", filepath)
+	puts "loading #{file}" if verbose > 1
 	self.load_from_file File.expand_path("#{name}.ditto", filepath)
-	puts "#{name}: #{@@entities[name].inspect}" if verbose > 1
+	puts "#{name}: #{@@entities[name].inspect}" if verbose > 2
       end
       puts "loaded #{@@entities.size} entities" if verbose > 0
     end
@@ -114,26 +117,45 @@ module Ditto
       seq = []
       @@entities.each_key { |name| self.dep_list(name, seq, []) }
       puts "dependency sequence: #{seq.inspect}" if verbose > 2
+      nsto = 0
       seq.each do |name|
 	@@instances[name].each do |version, instances|
-	  entity = self.find_entity name, version
-	  map = self.find_map entity, :add
+	  map = self.find_entity_map name, version, :add
 	  instances.each do |instance|
 	    puts "store #{name}: #{instance.inspect}" if verbose > 2
 	    map[2].call OpenStruct.new(instance)
+	    nsto += 1
 	  end
 	end
       end
+      puts "#{nsto} instances stored" if verbose > 0
     end
 
     # Given the input data version get the right entity
-    def self.find_entity name, version
-       @@entities[name].sort.first
+    # We assume all entity versions with same major work
+    # and take the highest
+    #
+    def self.find_entity_map name, dataversion, type
+      list = @@entities[name].sort{|a,b| b.version <=> a.version}
+      majorversion = dataversion.to_s.slice /^\d+\./
+      entityreq = Gem::Requirement.new("~>#{majorversion}0")
+      entity = list.find {|e| entityreq.satisfied_by? e.version }
+      raise Error.new(),"#{name}: can't find entity matching dataversion #{dataversion.to_s}" unless entity
+
+      # Search for the most recent map that matches the database
+      # datamapper objects
+
+      map = entity.methods.reverse.find do |m|
+	m[0] == type and self.check_dm_versions(m[1])
+      end
+      raise Error.new(),"#{name}: can't find #{type} map that matches current database" unless map
+      return map
     end
 
-    def self.find_map entity, type
-      entity.methods.find do |m|
-	m[0] == type and true
+    def self.check_dm_versions requirements
+      requirements.all? do |klass, req|
+	loadedver = Gem::Version.new(eval "#{klass}::VERSION")
+	req.satisfied_by?(loadedver)
       end
     end
 

data/lib/ditto/error.rb

@@ -11,7 +11,7 @@ module Ditto
     end
     def message debug=false
       msg = "#{to_s}"
-      msg += " at #{source(debug)}"
+      msg += " at #{source(debug)}" unless src.nil?
       msg += "\n#{backtrace.join("\n")}" if debug
       return msg
     end

data/lib/ditto/runner.rb

@@ -15,15 +15,16 @@ module Ditto
 	  load_files @opts.loadfiles
 	  exit
 	end
+	puts "loading instances..." if @opts.verbose > 0
 	load_files @opts.loadfiles, '.yaml'
 	raise "dittomart file must be specified!" unless @opts.dittomart
-	puts "dittomart file: #{@opts.dittomart}" if @opts.verbose > 0
+	puts "loading dittomart: #{@opts.dittomart}" if @opts.verbose > 0
 	load_files @opts.martfiles, '.dm'
 	Ditto::Entity.load_entities @opts.entitydir, @opts.verbose
 	store_data
 	return 0
       rescue Ditto::Error => de
-	STDERR.puts de.message(@opts.debug)
+	STDERR.puts "\nError: #{de.message(@opts.debug)}"
       rescue StandardError => e
 	STDERR.puts "\n#{e.class}: #{e.message}"
 	STDERR.puts e.backtrace if @opts.debug
@@ -39,7 +40,7 @@ module Ditto
       list.each do |f|
 	ext = File.extname(f)
 	next if type and ext != type
-	puts "loading #{f}" if @opts.verbose > 0
+	print "loading #{f}" if @opts.verbose > 1
 	nfiles += 1
 	case ext
 	when '.yaml'
@@ -47,6 +48,7 @@ module Ditto
 	  puts "#{nent} instances loaded" if @opts.verbose > 0
 	when '.ditto'
 	  Ditto::Entity.load_from_file f
+	  puts "" if @opts.verbose > 1
 	when '.dm'
 	  begin
 	    load File.absolute_path(f)
@@ -54,6 +56,7 @@ module Ditto
 	    loc = le.backtrace[2].split(':')
 	    puts "Error: #{le.to_s} (line #{loc[1]} in #{loc[0]})"
 	  end
+	  puts "" if @opts.verbose > 1
 	end
       end
       puts "#{nfiles} files loaded" if @opts.verbose > 0
@@ -62,8 +65,8 @@ module Ditto
     # Add the data to the database
     #
     def store_data
-      puts "Running against: #{@opts.connstring}" if @opts.verbose > 0
-      DataMapper::Logger.new(STDOUT, (@opts.verbose > 1) ? :debug : :info)
+      puts "connecting to #{@opts.connstring}" if @opts.verbose > 0
+      DataMapper::Logger.new(STDOUT, (@opts.verbose > 2) ? :debug : :info)
       DataMapper.setup(:default, @opts.connstring)
       DataMapper.finalize
       begin

data/lib/ditto/version.rb

@@ -1,3 +1,3 @@
 module Ditto
-  VERSION = '0.6.0'
+  VERSION = '1.0'
 end

data/spec/entity_spec.rb

@@ -31,13 +31,18 @@ module Ditto
       it "should identify a comma error" do
 	expect {
 	  Ditto::Entity.load_from_file("spec/fixtures/nocomma.ditto")
-	}.to raise_error Ditto::Error, /missing add/
+	}.to raise_error Ditto::Error, /missing map/
       end
       it "should identify an invalid mapping" do
 	expect {
 	  Ditto::Entity.load_from_file("spec/fixtures/badmap.ditto")
 	}.to raise_error Ditto::Error, /missing block/
       end
+      it "should identify a bad data map requirement" do
+	expect {
+	  Ditto::Entity.load_from_file("spec/fixtures/baddmrequire.ditto")
+	}.to raise_error Ditto::Error, /Illformed requirement/
+      end
       it "should parse a method typo" do
 	expect {
 	  Ditto::Entity.load_from_file("spec/fixtures/nomethod.ditto")

data/spec/fixtures/baddmrequire.ditto

@@ -0,0 +1,18 @@
+# Ditto entity definitions and mappings for currency_group
+# Bad version requirement on add map
+#
+
+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/ditto/currency_group.ditto

@@ -1,4 +1,4 @@
-# Ditto entity definitions and mappings for currency_group
+# Correct multiple version entity definition
 #
 
 entity :currency_group, '1.0.0', {
@@ -14,4 +14,19 @@ entity :currency_group, '1.0.0', {
     )
   }
 
+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:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ditto
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: '1.0'
   prerelease: 
 platform: ruby
 authors:
@@ -55,11 +55,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ditto/dsl.rb
+- lib/ditto/options.rb
 - lib/ditto/entity.rb
+- lib/ditto/version.rb
 - lib/ditto/error.rb
-- lib/ditto/options.rb
 - lib/ditto/runner.rb
-- lib/ditto/version.rb
 - lib/ditto.rb
 - bin/ditto
 - features/create_entities.feature
@@ -68,6 +68,7 @@ files:
 - features/store_entity.feature
 - features/support/hooks.rb
 - spec/entity_spec.rb
+- spec/fixtures/baddmrequire.ditto
 - spec/fixtures/badmap.ditto
 - spec/fixtures/badver.ditto
 - spec/fixtures/bigcircle.ditto
@@ -126,6 +127,7 @@ test_files:
 - features/store_entity.feature
 - features/support/hooks.rb
 - spec/entity_spec.rb
+- spec/fixtures/baddmrequire.ditto
 - spec/fixtures/badmap.ditto
 - spec/fixtures/badver.ditto
 - spec/fixtures/bigcircle.ditto