activefacts-api 0.9.2 → 0.9.3

data/.travis.yml

@@ -6,4 +6,4 @@ rvm:
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode
-  - rbx-19mode
+  - rbx-19mode

data/Gemfile

@@ -5,6 +5,9 @@ gem 'rake', :group => [:development, :test]
 group :development do
   gem 'jeweler'
   gem 'rspec', '~>2.6.0'
+  gem 'ruby-debug', :platforms => [:mri_18]
+  gem 'debugger', :platforms => [:mri_19]
+  gem 'pry', :platforms => [:jruby, :rbx]
 end
 
 group :test do

data/Rakefile

@@ -31,22 +31,41 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 require 'rdoc/task'
 
+gem "rspec", :require => "spec/rake/spectask"
+
 task :default => :spec
 
 desc "Run Rspec tests"
-RSpec::Core::RakeTask.new(:spec)
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = %w{-f d}
+end
+
+namespace :spec do
+  namespace :rubies do
+    SUPPORTED_RUBIES = %w{ 1.8.7 1.9.2 1.9.3 jruby-1.7.0 rbx }
+
+    desc "Run Rspec tests on all supported rubies"
+    task :all_tasks => [:install_gems, :exec]
+
+    desc "Run `bundle install` on all rubies"
+    task :install_gems do
+      sh %{ rvm #{SUPPORTED_RUBIES.join(',')} exec bundle install }
+    end
+
+    desc "Run `bundle exec rake` on all rubies"
+    task :exec do
+      sh %{ rvm #{SUPPORTED_RUBIES.join(',')} exec bundle exec rake spec }
+    end
+  end
+end
 
 desc "Run RSpec tests and produce coverage files (results viewable in coverage/index.html)"
 RSpec::Core::RakeTask.new(:coverage) do |spec|
   if RUBY_VERSION < '1.9'
-    spec.rcov_opts = [
-        '--exclude', 'spec',
-        '--exclude', 'lib/activefacts/tracer.rb',
-        '--exclude', 'gem/*'
-      ]
+    spec.rcov_opts = %{ --exclude spec --exclude lib/activefacts/tracer.rb --exclude gem/* }
     spec.rcov = true
   else
-    spec.rspec_opts = ['--require', 'simplecov_helper']
+    spec.rspec_opts = %w{ --require simplecov_helper }
   end
 end
 

data/VERSION

@@ -1 +1 @@
-0.9.2
+0.9.3

data/activefacts-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activefacts-api"
-  s.version = "0.9.2"
+  s.version = "0.9.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath"]
-  s.date = "2012-10-17"
+  s.date = "2012-11-01"
   s.description = "\nThe ActiveFacts API is a Ruby DSL for managing constellations of elementary facts.\nEach fact is either existential (a value or an entity), characteristic (boolean) or\nbinary relational (A rel B). Relational facts are consistently co-referenced, so you\ncan traverse them efficiently in any direction. Each constellation maintains constraints\nover the fact population.\n"
   s.email = "clifford.heath@gmail.com"
   s.extra_rdoc_files = [
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/activefacts/api/constellation.rb",
     "lib/activefacts/api/entity.rb",
     "lib/activefacts/api/exceptions.rb",
+    "lib/activefacts/api/guid.rb",
     "lib/activefacts/api/instance.rb",
     "lib/activefacts/api/instance_index.rb",
     "lib/activefacts/api/numeric.rb",
@@ -54,6 +55,8 @@ Gem::Specification.new do |s|
     "spec/object_type/entity_type/entity_type_spec.rb",
     "spec/object_type/entity_type/multipart_identification_spec.rb",
     "spec/object_type/value_type/autocounter_spec.rb",
+    "spec/object_type/value_type/date_time_spec.rb",
+    "spec/object_type/value_type/guid_spec.rb",
     "spec/object_type/value_type/numeric_spec.rb",
     "spec/object_type/value_type/value_type_spec.rb",
     "spec/simplecov_helper.rb",
@@ -72,6 +75,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_development_dependency(%q<debugger>, [">= 0"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -80,6 +86,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
+      s.add_dependency(%q<debugger>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -89,6 +98,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
+    s.add_dependency(%q<debugger>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])

data/lib/activefacts/api/constellation.rb

@@ -43,7 +43,9 @@ module ActiveFacts
       def initialize(vocabulary)
         @vocabulary = vocabulary
         @instances = Hash.new do |h,k|
-          raise "A constellation over #{@vocabulary.name} can only index instances of object_types in that vocabulary, not #{k.inspect}" unless k.is_a?(Class) and k.modspace == vocabulary
+          unless k.is_a?(Class) and k.modspace == vocabulary
+            raise "A constellation over #{@vocabulary.name} can only index instances of classes in that vocabulary, not #{k.inspect}"
+          end
           h[k] = InstanceIndex.new(self, k)
         end
       end
@@ -66,27 +68,6 @@ module ActiveFacts
         self
       end
 
-=begin
-      def assert *args
-        case
-        when args.size >= 1
-          args.each do |arg|
-            assert arg
-          end
-        when args[0].is_a?(Hash)
-          args[0].each do |key, value|
-            klass_name = key.is_a?(Symbol) ? key.to_s.camelcase : key.to_s
-            klass = vocabulary.const_get(klass_name)
-            send(klass_name).assert(*Array(value))
-          end
-        else
-          args.each do |arg|
-            assert(arg)
-          end
-        end
-      end
-=end
-
       # Constellations verbalise all members of all classes in alphabetical order, showing
       # non-identifying role values as well
       def verbalise
@@ -137,8 +118,8 @@ module ActiveFacts
       # With no parameters, return the collection of all instances of that object_type.
       # With parameters, assert an instance of the object_type identified by the values passed as args.
       def method_missing(m, *args, &b)
-        if klass = @vocabulary.const_get(m) and klass.is_a?(Class) and klass.respond_to?(:assert_instance)
-
+        klass = @vocabulary.const_get(m)
+        if klass and klass.is_a?(Class) and klass.respond_to?(:assert_instance)
           (class << self; self; end).
             send(:define_method, sym = m.to_sym) do |*args|
               instance_index = @instances[klass]

data/lib/activefacts/api/entity.rb

@@ -58,10 +58,41 @@ module ActiveFacts
         # Assign the identifying roles in order. Any other roles will be assigned by our caller
         klass.identifying_role_names.zip(args).each do |role_name, value|
           role = self.class.roles(role_name)
-          send(role.setter, value)
+          begin
+            send(role.setter, value)
+          rescue NoMethodError => e
+            raise settable_roles_exception(e, role_name)
+          end
         end
       end
 
+      def settable_roles_exception e, role_name
+        n = e.class.new(
+          "#{self.class} has no setter for #{role_name}.\n" +
+          "Settable roles are #{settable_roles*', '}.\n" +
+          (if self.class.vocabulary.delayed.empty?
+            ''
+          else
+            "This could be because the following expected object types are still not defined: #{self.class.vocabulary.delayed.keys.sort*', '}\n"
+          end
+          )
+        )
+        n.set_backtrace(e.backtrace)
+        n
+      end
+
+      def settable_roles
+        ([self.class]+self.class.supertypes_transitive).
+          map do |k|
+            k.roles.
+              map do |name, role|
+                role.unique ? name : nil
+              end.
+              compact
+            end.
+          flatten
+      end
+
       def inspect #:nodoc:
         inc = constellation ? " in #{constellation.inspect}" : ""
         # REVISIT: Where there are one-to-one roles, this cycles
@@ -196,7 +227,7 @@ module ActiveFacts
             end
             if arg == nil # But not false
               if role.mandatory
-                raise "You must provide a #{role.counterpart.object_type.name} to identify a #{basename}"
+                raise MissingMandatoryRoleValueException.new(self, role)
               end
             else
               role.counterpart_object_type.identifying_role_values(*arg)
@@ -246,13 +277,17 @@ module ActiveFacts
                 elsif !arg
                   value = role_key = nil
                 else
+=begin
+# REVISIT; These next few lines are bogus; they generate TypeError exceptions which are caught and ignored
+# A new approach will follow shortly which won't @create_instances that won't be needed
                   if role.counterpart.object_type.is_entity_type
                     add = !constellation.send(role.counterpart.object_type.basename.to_sym).include?([arg])
                   else
                     add = !constellation.send(role.counterpart.object_type.basename.to_sym).include?(arg)
                   end
+=end
                   value, role_key = role.counterpart.object_type.assert_instance(constellation, Array(arg))
-                  @created_instances << [role.counterpart, value] if add
+#                  @created_instances << [role.counterpart, value] if add
                 end
                 key << role_key
                 value

data/lib/activefacts/api/exceptions.rb

@@ -6,7 +6,34 @@
 
 module ActiveFacts
   module API
-    class DuplicateIdentifyingValueException < StandardError
+    class ActiveFactsException < StandardError
+    end
+
+    class ActiveFactsSchemaException < ActiveFactsException
+    end
+
+    class ActiveFactsRuntimeException < ActiveFactsException
+    end
+
+    class CrossVocabularyRoleException < ActiveFactsSchemaException
+      def initialize klass, vocabulary
+        super "#{klass} must be an object type in #{vocabulary.name}"
+      end
+    end
+
+    class RoleNotDefinedException < ActiveFactsRuntimeException
+      def initialize klass, role_name
+        super "Role #{klass.basename}.#{role_name} is not defined"
+      end
+    end
+
+    class MissingMandatoryRoleValueException < ActiveFactsRuntimeException
+      def initialize klass, role
+        super "A #{role.counterpart.object_type.basename} is required to satisfy the #{role.name.inspect} role of #{klass.basename}"
+      end
+    end
+
+    class DuplicateIdentifyingValueException < ActiveFactsRuntimeException
       def initialize(desc)
         super("Illegal attempt to assert #{desc[:class].basename} having identifying value" +
               " (#{desc[:role].name} is #{desc[:value].verbalise})," +

data/lib/activefacts/api/guid.rb

@@ -0,0 +1,57 @@
+require 'delegate'
+require 'date'
+require 'securerandom'
+
+unless defined? SecureRandom.uuid
+  # I think this only applies to 1.8.6 (and JRuby/Rubinius in 1.8 mode) now:
+  def SecureRandom.uuid
+    hex(16).sub(/(........)(....)(....)(....)(............)/,'\1-\2-\3-\4-\5')
+  end
+end
+
+# The Guid class is what it says on the packet, but you can assert a :new one.
+class Guid
+  def initialize(i = :new)
+    if i == :new
+      @value = SecureRandom.uuid.freeze
+    elsif (v = i.to_s).length == 36 and !(v !~ /[^0-9a-f]/i)
+      @value = v.clone.freeze
+    else
+      raise "Illegal non-Guid value #{i.inspect} given for Guid"
+    end
+  end
+
+  def to_s
+    @value
+  end
+
+  # if the value is unassigned, it equal?(:new).
+  def equal? value
+    @value == value
+  end
+
+  def inspect
+    "\#<Guid #{@value}>"
+  end
+
+  def hash                              #:nodoc:
+    @value.hash
+  end
+
+  def eql?(o)                           #:nodoc:
+    to_s.eql?(o.to_s)
+  end
+
+#  def self.inherited(other)             #:nodoc:
+#    def other.identifying_role_values(*args)
+#      return nil if args == [:new]  # A new object has no identifying_role_values
+#      if args.size == 1
+#        return args[0] if args[0].is_a?(AutoCounter)
+#        return args[0].send(self.basename.snakecase.to_sym) if args[0].respond_to?(self.basename.snakecase.to_sym)
+#      end
+#      return new(*args)
+#    end
+#    super
+#  end
+
+end

data/lib/activefacts/api/instance_index.rb

@@ -44,7 +44,17 @@ module ActiveFacts
         if args.size == 1 && args[0].is_a?(@klass)
           key = args[0].identifying_role_values
         else
-          key = @klass.identifying_role_values(*args) rescue nil
+          begin
+            key = @klass.identifying_role_values(*args)
+          rescue TypeError => e
+            # This happens (and should not) during assert_instance when checking
+            # for new asserts of identifying values that might get rolled back
+            # when the assert fails (for example because of an implied subtyping change)
+            key = nil
+          rescue ActiveFactsRuntimeException => e
+            # This is currently only known to happen during a retract()
+            key = nil
+          end
         end
 
         @hash[key]

data/lib/activefacts/api/numeric.rb

@@ -100,6 +100,7 @@ class ::Date
     elsif (a.size == 1 && a[0].is_a?(String))
       parse(a[0])
     else
+      a = [] if a == [nil]
       civil(*a, &b)
     end
   end

data/lib/activefacts/api/object_type.rb

@@ -29,13 +29,17 @@ module ActiveFacts
           unless role = @roles[role_name.to_sym]
             role = nil
             supertypes.each do |supertype|
-                r = supertype.roles(role_name) rescue nil
-                next unless r
-                role = r
+                begin
+                  role = supertype.roles(role_name)
+                rescue RoleNotDefinedException
+                  next
+                end
                 break
               end
           end
-          raise "Role #{basename}.#{role_name} is not defined" unless role
+          unless role
+            raise RoleNotDefinedException.new(self, role_name)
+          end
           role
         else
           nil
@@ -132,7 +136,7 @@ module ActiveFacts
             # REVISIT: Need to check all superclass roles recursively, unless we hit a common supertype
             realise_supertypes(object_type, all_supertypes)
           end
-          [(superclass.vocabulary && superclass rescue nil), *@supertypes].compact
+          [(superclass.respond_to?(:vocabulary) ? superclass : nil), *@supertypes].compact
         end
       end
 
@@ -140,12 +144,12 @@ module ActiveFacts
       def supertypes_transitive
         class_eval do
           supertypes = []
-          supertypes << superclass if Module === (superclass.vocabulary rescue nil)
+          v = superclass.respond_to?(:vocabulary) ? superclass.vocabulary : nil
+          supertypes << superclass if v.kind_of?(Module)
           supertypes += (@supertypes ||= [])
           sts = supertypes.inject([]) do |a, t|
             next if a.include?(t)
-            a += [t]
-            a += t.supertypes_transitive rescue []
+            a += [t] + t.supertypes_transitive
           end.uniq
           sts # The local variable unconfuses rcov
         end
@@ -236,7 +240,7 @@ module ActiveFacts
         class_eval do
           define_method role.getter do |*a|
             raise "Parameters passed to #{self.class.name}\##{role.name}" if a.size > 0
-            instance_variable_get(role.variable) rescue nil
+            instance_variable_get(role.variable)
           end
         end
       end
@@ -247,7 +251,7 @@ module ActiveFacts
         class_eval do
           define_method role.setter do |value|
 
-            old = instance_variable_get(role.variable) rescue nil
+            old = instance_variable_get(role.variable)
             return true if old.equal?(value)         # Occurs when another instance having the same value is assigned
 
             value = role.adapt(@constellation, value) if value
@@ -288,7 +292,7 @@ module ActiveFacts
             role_var = role.variable
 
             # Get old value, and jump out early if it's unchanged:
-            old = instance_variable_get(role_var) rescue nil
+            old = instance_variable_get(role_var)
             return value if old.equal?(value)         # Occurs during one_to_one assignment, for example
 
             value = role.adapt(constellation, value) if value
@@ -324,10 +328,9 @@ module ActiveFacts
       def define_many_to_one_accessor(role)
         class_eval do
           define_method role.getter do
-            unless (r = instance_variable_get(role_var = role.variable) rescue nil)
-              r = instance_variable_set(role_var, RoleValues.new)
-            end
-            r
+            role_var = role.variable
+            instance_variable_get(role_var) or
+              instance_variable_set(role_var, RoleValues.new)
           end
         end
       end
@@ -388,10 +391,12 @@ module ActiveFacts
         end
 
         # resolve the Symbol to a Class now if possible:
-        resolved = vocabulary.object_type(related) rescue nil
+        resolved = vocabulary.object_type(related)
         related = resolved if resolved
         if related.is_a?(Class)
-          raise "#{related} must be an object type in #{vocabulary.name}" unless related.respond_to?(:vocabulary) and related.vocabulary == self.vocabulary
+          unless related.respond_to?(:vocabulary) and related.vocabulary == self.vocabulary
+            raise CrossVocabularyRoleException.new(related, vocabulary)
+          end
         end
 
         if options.delete(:mandatory) == true

data/lib/activefacts/api/role.rb

@@ -101,7 +101,7 @@ module ActiveFacts
         role = self
         klass.class_eval do
           role_accessor_name = "#{role.name}_role"
-          unless (method(role_accessor_name) rescue nil)
+          unless respond_to?(role_accessor_name)
             (class << self; self; end).
               send(:define_method, role_accessor_name) do
                 role

data/lib/activefacts/api/standard_types.rb

@@ -9,6 +9,7 @@
 #
 require 'date'
 require 'activefacts/api/numeric'
+require 'activefacts/api/guid'
 
 module ActiveFacts
   module API
@@ -23,7 +24,7 @@ module ActiveFacts
 end
 # Add the methods that convert our classes into ObjectType types:
 
-ValueClasses = [String, Date, DateTime, Time, Int, Real, AutoCounter, Decimal]
+ValueClasses = [String, Date, DateTime, Time, Int, Real, AutoCounter, Decimal, Guid]
 ValueClasses.each{|c|
     c.send :extend, ActiveFacts::API::ValueClass
   }

data/lib/activefacts/api/support.rb

@@ -9,7 +9,7 @@
 # We use this to define open-ended ranges.
 begin
   Object.const_get("Infinity")
-rescue
+rescue NameError
   Infinity = 1.0/0.0
 end
 

data/lib/activefacts/api/vocabulary.rb

@@ -21,7 +21,9 @@ module ActiveFacts
         return @object_type unless name
 
         if name.is_a? Class
-          raise "#{name} must be an object type in #{self.name}" unless name.vocabulary == self
+          unless name.respond_to?(:vocabulary) and name.vocabulary == self
+            raise CrossVocabularyRoleException.new(name, self)
+          end
           return name
         end
 
@@ -31,7 +33,7 @@ module ActiveFacts
           c
         else
           begin
-            const_get("#{self.name}::#{camel}")
+            const_get(camel)
           rescue NameError
             nil
           end
@@ -64,22 +66,26 @@ module ActiveFacts
       end
 
       def __delay(object_type_name, args, &block) #:nodoc:
-        @delayed ||= Hash.new { |h,k| h[k] = [] }
-        @delayed[object_type_name] << [args, block]
+        delayed[object_type_name] << [args, block]
       end
 
       # __bind raises an error if the named class doesn't exist yet.
       def __bind(object_type_name)  #:nodoc:
         object_type = const_get(object_type_name)
-        if (@delayed && @delayed.include?(object_type_name))
-          d = @delayed[object_type_name]
+        if (delayed.include?(object_type_name))
+          d = delayed[object_type_name]
           d.each{|(a,b)|
               b.call(object_type, *a)
             }
-          @delayed.delete(object_type_name)
+          delayed.delete(object_type_name)
         end
       end
 
+      def delayed
+        @delayed ||= Hash.new { |h,k| h[k] = [] }
+        @delayed
+      end
+
     end
   end
 end

data/lib/activefacts/tracer.rb

@@ -26,14 +26,26 @@ module ActiveFacts
           }
         end
         if @keys[:debug]
-          ['pry', 'debugger', 'ruby-debug'].each do |debugger|
+          errors = []
+          success = false
+          [ENV["DEBUG_PREFERENCE"]].compact+
+          [
+            'pry',
+            'debugger',
+            'ruby-debug'
+          ].each do |debugger|
             begin
               require debugger
               puts "Loaded "+debugger
+              success = true
               break
-            rescue LoadError
+            rescue LoadError => e
+              errors << e
             end
           end
+          unless success
+            puts "Can't load any debugger, failed on:\n#{errors.inspect}"
+          end
           ::Debugger.start rescue nil
         end
       end

data/spec/constellation/constellation_spec.rb

@@ -8,7 +8,7 @@ describe "A Constellation instance" do
     Object.send :remove_const, :Mod if Object.const_defined?("Mod")
     module Mod
       @base_types = [
-          Int, Real, AutoCounter, String, Date, DateTime
+          Int, Real, AutoCounter, String, Date, DateTime, Decimal, Guid
         ]
 
       # Create a value type and a subtype of that value type for each base type:

data/spec/constellation/instance_spec.rb

@@ -9,7 +9,7 @@ describe "An instance of every type of ObjectType" do
     module Mod
       # These are the base value types we're going to test:
       @base_types = [
-          Int, Real, AutoCounter, String, Date, DateTime, Decimal
+          Int, Real, AutoCounter, String, Date, DateTime, Decimal, Guid
         ]
 
       # Construct the names of the roles they play:
@@ -74,7 +74,13 @@ describe "An instance of every type of ObjectType" do
             one_to_one :test_by_#{base_type.name.snakecase}
           end
         END
-        Mod.module_eval code
+
+        begin
+          Mod.module_eval code
+        rescue Exception => e
+          puts "Failure: #{e}"
+          puts "Failed on: <<END\n#{code}\nEND"
+        end
       end
     end
 
@@ -87,6 +93,7 @@ describe "An instance of every type of ObjectType" do
     @date = [2008, 04, 19]
     @date_time = [2008, 04, 19, 10, 28, 14]
     @decimal = BigDecimal.new('98765432109876543210')
+    @guid = '01234567-89ab-cdef-0123-456789abcdef'
 
     # Value Type instances
     @int_value = Mod::IntVal.new(1)
@@ -101,6 +108,7 @@ describe "An instance of every type of ObjectType" do
     @date_time_value = Mod::DateTimeVal.new d # 2008, 04, 20, 10, 28, 14
     # This next isn't in the same pattern; it makes a Decimal from a BigDecimal rather than a String (coverage reasons)
     @decimal_value = Mod::DecimalVal.new(BigDecimal.new('98765432109876543210'))
+    @guid_value = Mod::GuidVal.new(:new)
 
     # Value SubType instances
     @int_sub_value = Mod::IntSubVal.new(4)
@@ -112,6 +120,7 @@ describe "An instance of every type of ObjectType" do
     @date_time_sub_value = Mod::DateTimeSubVal.new(::DateTime.civil(2008, 04, 26, 10, 28, 14))
     # This next isn't in the same pattern; it makes a Decimal from a BigNum rather than a String (coverage reasons)
     @decimal_sub_value = Mod::DecimalSubVal.new(98765432109876543210)
+    @guid_sub_value = Mod::GuidSubVal.new(:new)
 
     # Entities identified by Value Type, SubType and Entity-by-value-type instances
     @test_by_int = Mod::TestByInt.new(2)
@@ -125,6 +134,7 @@ describe "An instance of every type of ObjectType" do
     @test_by_date_time = Mod::TestByDateTime.new([[2008,04,28,10,28,15]])
     #@test_by_date_time = Mod::TestByDateTime.new(DateTime.new(2008,04,28,10,28,15))
     @test_by_decimal = Mod::TestByDecimal.new('98765432109876543210')
+    @test_by_guid = Mod::TestByGuid.new('01234567-89ab-cdef-0123-456789abcdef')
 
     @test_by_int_sub = Mod::TestByIntSub.new(2)
     @test_by_real_sub = Mod::TestByRealSub.new(5.0)
@@ -134,6 +144,7 @@ describe "An instance of every type of ObjectType" do
     @test_by_date_sub = Mod::TestByDateSub.new(Date.new(2008,04,27))
     @test_by_date_time_sub = Mod::TestByDateTimeSub.new(2008,04,29,10,28,15)
     @test_by_decimal_sub = Mod::TestByDecimalSub.new('98765432109876543210')
+    @test_by_guid_sub = Mod::TestByGuidSub.new('01234567-89ab-cdef-0123-456789abcdef')
 
     @test_by_int_entity = Mod::TestByIntEntity.new(@test_by_int)
     @test_by_real_entity = Mod::TestByRealEntity.new(@test_by_real)
@@ -143,6 +154,7 @@ describe "An instance of every type of ObjectType" do
     @test_by_date_entity = Mod::TestByDateEntity.new(@test_by_date)
     @test_by_date_time_entity = Mod::TestByDateTimeEntity.new(@test_by_date_time)
     @test_by_decimal_entity = Mod::TestByDecimalEntity.new(@test_by_decimal)
+    @test_by_guid_entity = Mod::TestByGuidEntity.new(@test_by_guid)
 
     # Entity subtypes
     @test_sub_by_int = Mod::TestSubByInt.new(2)
@@ -153,45 +165,54 @@ describe "An instance of every type of ObjectType" do
     @test_sub_by_date = Mod::TestSubByDate.new(Date.new(2008,04,28))
     @test_sub_by_date_time = Mod::TestSubByDateTime.new(2008,04,28,10,28,15)
     @test_sub_by_decimal = Mod::TestSubByDecimal.new('98765432109876543210')
+    @test_sub_by_guid = Mod::TestSubByGuid.new('01234567-89ab-cdef-0123-456789abcdef')
 
     # These arrays get zipped together in various ways. Keep them aligned.
     @values = [
         @int, @real, @auto_counter, @new_auto_counter,
-        @string, @date, @date_time, @decimal
+        @string, @date, @date_time, @decimal, @guid
       ]
     @classes = [
         Int, Real, AutoCounter, AutoCounter,
-        String, Date, DateTime, Decimal
+        String, Date, DateTime, Decimal, Guid
       ]
     @value_types = [
         Mod::IntVal, Mod::RealVal, Mod::AutoCounterVal, Mod::AutoCounterVal,
         Mod::StringVal, Mod::DateVal, Mod::DateTimeVal, Mod::DecimalVal,
+        Mod::GuidVal,
         Mod::IntSubVal, Mod::RealSubVal, Mod::AutoCounterSubVal, Mod::AutoCounterSubVal,
         Mod::StringSubVal, Mod::DateSubVal, Mod::DateTimeSubVal, Mod::DecimalSubVal,
+        Mod::GuidSubVal,
         ]
     @value_instances = [
         @int_value, @real_value, @auto_counter_value, @new_auto_counter_value,
-        @string_value, @date_value, @date_time_value, @decimal_value,
+        @string_value, @date_value, @date_time_value, @decimal_value, @guid_value,
         @int_sub_value, @real_sub_value, @auto_counter_sub_value, @auto_counter_sub_value_new,
-        @string_sub_value, @date_sub_value, @date_time_sub_value, @decimal_sub_value,
+        @string_sub_value, @date_sub_value, @date_time_sub_value, @decimal_sub_value, @guid_sub_value,
         @int_value, @real_value, @auto_counter_value, @new_auto_counter_value,
-        @string_value, @date_value, @date_time_value, @decimal_value,
+        @string_value, @date_value, @date_time_value, @decimal_value, @guid_value,
       ]
     @entity_types = [
         Mod::TestByInt, Mod::TestByReal, Mod::TestByAutoCounter, Mod::TestByAutoCounter,
         Mod::TestByString, Mod::TestByDate, Mod::TestByDateTime, Mod::TestByDecimal,
+        Mod::TestByGuid,
         Mod::TestByIntSub, Mod::TestByRealSub, Mod::TestByAutoCounterSub, Mod::TestByAutoCounterSub,
         Mod::TestByStringSub, Mod::TestByDateSub, Mod::TestByDateTimeSub, Mod::TestByDecimalSub,
+        Mod::TestByGuidSub,
         Mod::TestSubByInt, Mod::TestSubByReal, Mod::TestSubByAutoCounter, Mod::TestSubByAutoCounter,
         Mod::TestSubByString, Mod::TestSubByDate, Mod::TestSubByDateTime, Mod::TestByDecimalEntity,
+        Mod::TestByGuidEntity,
       ]
     @entities = [
         @test_by_int, @test_by_real, @test_by_auto_counter, @test_by_auto_counter_new,
         @test_by_string, @test_by_date, @test_by_date_time, @test_by_decimal,
+        @test_by_guid,
         @test_by_int_sub, @test_by_real_sub, @test_by_auto_counter_sub, @test_by_auto_counter_new_sub,
         @test_by_string_sub, @test_by_date_sub, @test_by_date_time_sub, @test_by_decimal_sub,
+        @test_by_guid_sub,
         @test_sub_by_int, @test_sub_by_real, @test_sub_by_auto_counter, @test_sub_by_auto_counter_new,
         @test_sub_by_string, @test_sub_by_date, @test_sub_by_date_time, @test_sub_by_decimal,
+        @test_sub_by_guid,
       ]
     @entities_by_entity = [
         @test_by_int_entity,
@@ -202,28 +223,35 @@ describe "An instance of every type of ObjectType" do
         @test_by_date_entity,
         @test_by_date_time_entity,
         @test_by_decimal_entity,
+        @test_by_guid_entity,
       ]
     @entities_by_entity_types = [
         Mod::TestByIntEntity, Mod::TestByRealEntity, Mod::TestByAutoCounterEntity, Mod::TestByAutoCounterEntity,
         Mod::TestByStringEntity, Mod::TestByDateEntity, Mod::TestByDateTimeEntity, Mod::TestByDecimalEntity,
+        Mod::TestByGuidEntity,
       ]
     @test_role_names = [
         :int_value, :real_value, :auto_counter_value, :auto_counter_value,
         :string_value, :date_value, :date_time_value, :decimal_value,
+        :guid_value,
         :int_sub_value, :real_sub_value, :auto_counter_sub_value, :auto_counter_sub_value,
         :string_sub_value, :date_sub_value, :date_time_sub_value, :decimal_sub_value,
+        :guid_sub_value,
         :int_value, :real_value, :auto_counter_value, :auto_counter_value,
         :string_value, :date_value, :date_time_value, :decimal_value,
+        :guid_value,
       ]
     @role_values = [
         3, 4.0, 5, 6,
         "three", Date.new(2008,4,21), DateTime.new(2008,4,22,10,28,16),
-        '98765432109876543210'
+        '98765432109876543210',
+        '01234567-89ab-cdef-0123-456789abcdef'
       ]
     @role_alternate_values = [
         4, 5.0, 6, 7,
         "four", Date.new(2009,4,21), DateTime.new(2009,4,22,10,28,16),
-        '98765432109876543211'
+        '98765432109876543211',
+        '01234567-89ab-cdef-0123-456789abcdef'
       ]
     @subtype_role_instances = [
         Mod::IntSubVal.new(6), Mod::RealSubVal.new(6.0),
@@ -231,6 +259,7 @@ describe "An instance of every type of ObjectType" do
         Mod::StringSubVal.new("seven"),
         Mod::DateSubVal.new(2008,4,29), Mod::DateTimeSubVal.new(2008,4,30,10,28,16),
         Mod::DecimalSubVal.new('98765432109876543210'),
+        Mod::DecimalSubVal.new('01234567-89ab-cdef-0123-456789abcdef'),
       ]
   end
 

data/spec/fact_type/role_values_spec.rb

@@ -3,9 +3,9 @@
 # Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
 #
 
-VALUE_TYPES = Int, Real, AutoCounter, String, Date, DateTime, Decimal
-RAW_VALUES = [2, 3.0, 4, "5", Date.new(2008, 04, 20), DateTime.new(2008, 04, 20, 10, 28, 14)]
-ALT_VALUES = [3, 4.0, 5, "6", Date.new(2009, 04, 20), DateTime.new(2009, 04, 20, 10, 28, 14)]
+VALUE_TYPES = Int, Real, AutoCounter, String, Date, DateTime, Decimal, Guid
+RAW_VALUES = [2, 3.0, 4, "5", Date.new(2008, 04, 20), DateTime.new(2008, 04, 20, 10, 28, 14), '43210.98765', '01234567-89ab-cdef-0123-456789abcdef']
+ALT_VALUES = [3, 4.0, 5, "6", Date.new(2009, 04, 20), DateTime.new(2009, 04, 20, 10, 28, 14), '56789.01234', 'fedcba987654-3210-fedc-ba98-76543210']
 VALUE_SUB_FOR_VALUE = {}
 VALUES_FOR_TYPE = VALUE_TYPES.zip(RAW_VALUES, ALT_VALUES).inject({}) do |h, (vt, v1, v2)|
     next h unless v1 and v2
@@ -186,7 +186,7 @@ describe "Object type role values" do
         it "should allow nullifying and reassigning a #{object_type_name} entity's identifying role value" do
           object = @constellation.send(object_type_name, *object_identifying_parameters(object_type_name, values[0]))
           object.class.identifying_roles.each do |identifying_role|
-            next if identifying_role.name == :counter
+            next if [:counter, :id_guid_val].include?(identifying_role.name)
             assigned = object.send(:"#{identifying_role.name}=", nil)
             assigned.should be_nil
             object.send(:"#{identifying_role.name}=", values[1])

data/spec/fact_type/roles_spec.rb

@@ -54,6 +54,48 @@ describe "Roles" do
     role.counterpart.object_type.should == Mod::Name
   end
 
+  it "should prevent association of a role name with an object_type from the wrong module" do
+    lambda {
+      module Mod2
+        class Unrelated
+        end
+      end
+
+      module Mod
+        class Existing1 < String
+          value_type
+          has_one :unrelated, :class => Mod2::Unrelated
+        end
+      end
+    }.should raise_error(ActiveFacts::API::CrossVocabularyRoleException)
+  end
+
+  it "should prevent association of a role name with a non-object_type" do
+    lambda {
+      module Mod
+        class NonObject
+        end
+        class Existing1 < String
+          value_type
+          has_one :non_object, :class => NonObject
+        end
+      end
+    }.should raise_error(ActiveFacts::API::CrossVocabularyRoleException)
+  end
+
+  it "should prevent association of a role name with an implied non-object_type" do
+    lambda {
+      module Mod
+        class NonObject
+        end
+        class Existing1 < String
+          value_type
+          has_one :non_object
+        end
+      end
+    }.should raise_error(ActiveFacts::API::CrossVocabularyRoleException)
+  end
+
   it "should provide value type metadata" do
     Mod::Name.length.should == 40
     Mod::Name.scale.should == 0

data/spec/identification_scheme/identity_change_spec.rb

@@ -67,6 +67,7 @@ describe "identity" do
         @p2.should be_nil
         @c1.Name.values.should =~ [@juliar, @tony]
         @c1.Name.keys.should =~ [@juliar, @tony]
+        pending "This functionality was poorly implemented and has been temporarily switched off"
         @c1.TFN.keys.should =~ [123]
         @c1.Person.values.should =~ [@p1, @p3]
         @c1.Person.keys.should =~ [[@juliar],[@tony]]

data/spec/object_type/value_type/date_time_spec.rb

@@ -0,0 +1,38 @@
+#
+# ActiveFacts tests: Value instances in the Runtime API
+# Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
+#
+require 'activefacts/api'
+
+describe Date do
+  it "should construct with no arguments" do
+    proc {
+      @d = Date.new()
+    }.should_not raise_error
+    @d.year.should == -4712
+  end
+
+  it "should construct with a nil argument" do
+    proc {
+      @d = Date.new(nil)
+    }.should_not raise_error
+    @d.year.should == -4712
+  end
+
+  it "should construct with a full arguments" do
+    proc {
+      @d = Date.civil(2012, 10, 31)
+    }.should_not raise_error
+    @d.to_s.should == "2012-10-31"
+  end
+
+=begin
+  it "should be encodable in JSON" do
+    proc {
+      @d = Date.new(2012, 10, 31)
+      @d.to_json.should == "REVISIT"
+    }.should_not raise_error
+  end
+=end
+
+end

data/spec/object_type/value_type/guid_spec.rb

@@ -0,0 +1,71 @@
+#
+# ActiveFacts tests: Value instances in the Runtime API
+# Copyright (c) 2008 Clifford Heath. Read the LICENSE file.
+#
+
+describe "Guid Value Type instances" do
+  before :each do
+    Object.send :remove_const, :Mod if Object.const_defined?("Mod")
+    module Mod
+      class ThingId < Guid
+        value_type
+      end
+      class Thing
+        identified_by :thing_id
+        one_to_one :thing_id
+      end
+      class Ordinal < Int
+        value_type
+      end
+      class ThingFacet
+        identified_by :thing, :ordinal
+        has_one :thing
+        has_one :ordinal
+      end
+    end
+    @constellation = ActiveFacts::API::Constellation.new(Mod)
+    @thing = Mod::Thing.new(:new)
+    @thing_id = Mod::ThingId.new
+  end
+
+  it "should respond to verbalise" do
+    @thing_id.respond_to?(:verbalise).should be_true
+  end
+
+  it "should verbalise correctly" do
+    @thing_id.verbalise.should =~ /ThingId '[-0-9a-f]{36}'/i
+  end
+
+  it "should respond to constellation" do
+    @thing_id.respond_to?(:constellation).should be_true
+  end
+
+  it "should respond to its roles" do
+    @thing_id.respond_to?(:thing).should be_true
+  end
+
+  it "should allow prevent invalid role assignment" do
+    lambda {
+        @thing.thing_id = "foo"
+      }.should raise_error
+  end
+
+  it "should allow an existing guid to be re-used" do
+    @new_thing = Mod::Thing.new(@thing_id)
+    @new_thing.thing_id.should == @thing_id
+  end
+
+  it "should return the ValueType in response to .class()" do
+    @thing_id.class.vocabulary.should == Mod
+  end
+
+  it "should allow an existing guid-identified object to be re-used" do
+    thing = @constellation.Thing(:new)
+    facets = []
+    facets << @constellation.ThingFacet(thing, 0)
+    facets << @constellation.ThingFacet(thing, 1)
+    facets[0].thing.should be_eql(facets[1].thing)
+    facets[0].thing.thing_id.should be_eql(facets[1].thing.thing_id)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
+- !ruby/object:Gem::Dependency
+  name: ruby-debug
+  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: debugger
+  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: pry
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +207,7 @@ files:
 - lib/activefacts/api/constellation.rb
 - lib/activefacts/api/entity.rb
 - lib/activefacts/api/exceptions.rb
+- lib/activefacts/api/guid.rb
 - lib/activefacts/api/instance.rb
 - lib/activefacts/api/instance_index.rb
 - lib/activefacts/api/numeric.rb
@@ -182,6 +231,8 @@ files:
 - spec/object_type/entity_type/entity_type_spec.rb
 - spec/object_type/entity_type/multipart_identification_spec.rb
 - spec/object_type/value_type/autocounter_spec.rb
+- spec/object_type/value_type/date_time_spec.rb
+- spec/object_type/value_type/guid_spec.rb
 - spec/object_type/value_type/numeric_spec.rb
 - spec/object_type/value_type/value_type_spec.rb
 - spec/simplecov_helper.rb
@@ -202,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2189448494771312824
+      hash: 1877620921052571193
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: