activefacts-api 0.9.7 → 0.9.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: dc17ae7a132478e2e4b591e19adf35d79627d70b
+  data.tar.gz: b6b63e83981a4ec466aa128b94fb7cfbf1370d0e
+SHA512:
+  metadata.gz: 916183df4492dab5a94c172d85f58b7f4a04f8407eb9decc301b07c8f137a5c6b3bfd4c80ce4f4d7b98e5ba9fe26d0483dd3a71b768159701b63d0c07b3a0b1e
+  data.tar.gz: 14858f846fe7c1fba970cd1b2cd6f890d21ae5247ce2107d73c49e75d919cf011814bd724e8b90ace9fdd524b262a3c83538b242137452d13eb8c0f454758323

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby-18mode
   - jruby-19mode
   - rbx-18mode

data/Gemfile

@@ -1,13 +1,15 @@
 source 'https://rubygems.org'
 
-gem 'rake', :group => [:development, :test]
+gem 'rake', '>=10.1', :group => [:development, :test]
 gem 'rbtree-pure'
 
 group :development do
   gem 'jeweler'
   gem 'rspec', '~>2.6.0'
   gem 'ruby-debug', :platforms => [:mri_18]
-  gem 'debugger', :platforms => [:mri_19]
+  gem 'debugger', :platforms => [:mri_19,
+    (['1.8.7', '1.9.2'].include?(RUBY_VERSION) || RUBY_PLATFORM == 'java') ? nil : :mri_20
+  ].compact
   gem 'pry', :platforms => [:jruby, :rbx]
 end
 

data/Rakefile

@@ -42,7 +42,7 @@ end
 
 namespace :spec do
   namespace :rubies do
-    SUPPORTED_RUBIES = %w{ 1.8.7 1.9.2 1.9.3 jruby-1.7.0 rbx }
+    SUPPORTED_RUBIES = %w{ 1.9.2 1.9.3 2.0.0 jruby-1.7.0 }
 
     desc "Run Rspec tests on all supported rubies"
     task :all_tasks => [:install_gems, :exec]
@@ -56,6 +56,19 @@ namespace :spec do
     task :exec do
       sh %{ rvm #{SUPPORTED_RUBIES.join(',')} exec bundle exec rake spec }
     end
+
+    SUPPORTED_RUBIES.each do |ruby|
+      desc "Run `bundle install` on #{ruby}"
+      task :"install_gems_#{ruby}" do
+	sh %{ rvm #{ruby} exec bundle install }
+      end
+
+      desc "Run `bundle exec rake` on #{ruby}"
+      task :"exec_#{ruby}" do
+	sh %{ rvm #{ruby} exec bundle exec rake spec }
+      end
+    end
+
   end
 end
 
@@ -81,3 +94,8 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :wait do
+  print "Waiting for you to hit Enter"
+  $stdin.gets
+end

data/VERSION

@@ -1 +1 @@
-0.9.7
+0.9.8

data/activefacts-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activefacts-api"
-  s.version = "0.9.7"
+  s.version = "0.9.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath"]
-  s.date = "2013-01-29"
+  s.date = "2013-11-13"
   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 = [
@@ -68,15 +68,15 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/cjheath/activefacts-api"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "2.0.5"
   s.summary = "A fact-based data model DSL and API"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rbtree-pure>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 10.1"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
@@ -88,7 +88,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
     else
       s.add_dependency(%q<rbtree-pure>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 10.1"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
@@ -101,7 +101,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<rbtree-pure>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 10.1"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])

data/lib/activefacts/api/constellation.rb

@@ -139,8 +139,15 @@ module ActiveFacts
       # This method removes the given instance from this constellation's indexes
       # It must be called before the identifying roles get deleted or nullified.
       def deindex_instance(instance) #:nodoc:
+	last_irns = nil
+	last_irvs = instance
         ([instance.class]+instance.class.supertypes_transitive).each do |klass|
-          instances[klass].delete(instance.identifying_role_values(klass))
+	  if instance.is_a?(Entity) and last_irns != (n = klass.identifying_role_names)
+	    # Build new identifying_role_values only when the identifying_role_names change:
+	    last_irvs = instance.identifying_role_values(klass)
+	    last_irns = n
+	  end
+          instances[klass].delete(last_irvs)
         end
         # REVISIT: Need to nullify all the roles this object plays.
         # If mandatory on the counterpart side, this may/must propagate the delete (without mutual recursion!)

data/lib/activefacts/api/entity.rb

@@ -45,7 +45,9 @@ module ActiveFacts
 	      end
 
 	    begin
+	      @constellation.send(:instance_variable_set, :@suspend_duplicate_key_check, true)
 	      send(role.setter, value)
+	      @constellation.send(:instance_variable_set, :@suspend_duplicate_key_check, false)
 #	    rescue NoMethodError => e
 #	      raise settable_roles_exception(e, role_name)
 	    end
@@ -99,8 +101,8 @@ module ActiveFacts
       # When used as a hash key, the hash key of this entity instance is calculated
       # by hashing the values of its identifying roles
       def hash
-        self.class.identifying_role_names.map{|role_name|
-            instance_variable_get("@#{role_name}")
+        self.class.identifying_roles.map{|role|
+            instance_variable_get(role.variable)
           }.inject(0) { |h,v|
             h ^= v.hash
             h
@@ -391,6 +393,12 @@ module ActiveFacts
         # which is a list of roles it plays. The identification scheme may be
         # inherited from a superclass.
         def identified_by(*args) #:nodoc:
+          options = (args[-1].is_a?(Hash) ? args.pop : {})
+          options.each do |key, value|
+	    raise UnrecognisedOptionsException.new('EntityType', basename, key) unless respond_to?(key)
+            send(key, value)
+          end
+
           raise MissingIdentificationException.new(self) unless args.size > 0
 
           # Catch the case where we state the same identification as our superclass:
@@ -426,7 +434,7 @@ module ActiveFacts
 
 	def other.new_instance constellation, *args
 	  instance = allocate
-	  instance.instance_variable_set("@constellation", constellation)
+	  instance.instance_variable_set(@@constellation_variable_name ||= "@constellation", constellation)
 	  instance.send(:initialize, *args)
 	  instance
 	end

data/lib/activefacts/api/exceptions.rb

@@ -33,7 +33,7 @@ module ActiveFacts
 	  if is_single
 	    "#{object_type} has a single identifying role '#{role}' which is has_one, but must be one_to_one"
 	  else
-	    raise "#{object_type} has an identifying role '#{role}' which is one_to_one, but must be has_one"
+	    "#{object_type} has an identifying role '#{role}' which is one_to_one, but must be has_one"
 	  end
 	super msg
       end
@@ -47,7 +47,7 @@ module ActiveFacts
 
     class InvalidObjectType < SchemaException
       def initialize vocabulary, klass, reason
-	raise "A constellation over #{vocabulary.name} cannot index instances of #{klass} because it #{reason}"
+	super "A constellation over #{vocabulary.name} cannot index instances of #{klass} because it #{reason}"
       end
     end
 
@@ -59,7 +59,7 @@ module ActiveFacts
 
     class UnrecognisedOptionsException < SchemaException
       def initialize declaration, instance, option_names
-        raise "Unrecognised options on declaration of #{declaration} #{instance}: #{option_names.inspect}"
+        super "Unrecognised options on declaration of #{declaration} #{instance}: #{option_names.inspect}"
       end
     end
 

data/lib/activefacts/api/guid.rb

@@ -4,7 +4,11 @@ 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')
+    hex(16).
+      sub(
+	@@format_pattern ||= /(........)(....)(....)(....)(............)/,
+	@@format_string ||= '\1-\2-\3-\4-\5'
+      )
   end
 end
 

data/lib/activefacts/api/instance.rb

@@ -4,8 +4,6 @@
 #
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
-# Instance methods are extended into all instances, whether of value or entity types.
-#
 module ActiveFacts
   module API
     # Every Instance of a ObjectType (A Value type or an Entity type) includes the methods of this module:
@@ -36,6 +34,7 @@ module ActiveFacts
       # We need to check each superclass that has a different identification pattern
       def check_identification_change_legality(role, value)
         return unless @constellation && role.is_identifying
+	return if @constellation.send(:instance_variable_get, :@suspend_duplicate_key_check)
 
 	klasses = [self.class] + self.class.supertypes_transitive
 	last_identity = nil
@@ -83,6 +82,15 @@ module ActiveFacts
         # Now, for all roles (from this class and all supertypes), assign nil to all functional roles
         # The counterpart roles get cleared automatically.
 	klasses = [self.class]+self.class.supertypes_transitive
+
+	irvks = {}  # identifying_role_values by class
+	klasses.each do |klass|
+	  if !irvks[klass] and klass.roles.detect{|_, role| role.counterpart and !role.counterpart.unique and send(role.getter) }
+	    # We will need the identifying_role_values for this role's object_type
+	    irvks[klass] = identifying_role_values(klass)
+	  end
+	end
+
 	klasses.each do |klass|
           klass.roles.each do |role_name, role|
             next if role.unary?
@@ -94,13 +102,15 @@ module ActiveFacts
 	      i = send(role.getter)
 	      next unless i
 	      if counterpart.is_identifying && counterpart.mandatory
+		# We play a mandatory identifying role in i; so retract that (it'll clear our instance variable)
 		i.retract
 	      else
 		if (counterpart.unique)
 		  # REVISIT: This will incorrectly fail to propagate a key change for a non-mandatory role
 		  i.send(counterpart.setter, nil, false)
 		else
-		  i.send(role.counterpart.getter).update(self, nil)
+		  rv = i.send(role.counterpart.getter)
+		  rv.delete_instance(self, irvks[role.object_type])
 		end
 	      end
 	      instance_variable_set(role.variable, nil)
@@ -126,10 +136,6 @@ module ActiveFacts
         include ObjectType
         # Add Instance class methods here
       end
-
-      def self.included other #:nodoc:
-        other.send :extend, ClassMethods
-      end
     end
   end
 end

data/lib/activefacts/api/instance_index.rb

@@ -56,6 +56,7 @@ module ActiveFacts
     # arguments (where ObjectType is the object_type name you're interested in)
     #
     class InstanceIndex
+      attr_reader :sort
 
       # Should be in module ForwardableWithArityChecking
       def self.def_single_delegator(accessor, method, *expected_arities)

data/lib/activefacts/api/object_type.rb

@@ -18,7 +18,7 @@ module ActiveFacts
 
       # Each ObjectType maintains a list of the Roles it plays:
       def roles(role_name = nil)
-        unless instance_variable_defined? "@roles"  # Avoid "instance variable not defined" warning from ||=
+        unless instance_variable_defined?(@@roles_name ||= "@roles")  # Avoid "instance variable not defined" warning from ||=
           @roles = RoleCollection.new
         end
         case role_name
@@ -58,7 +58,8 @@ module ActiveFacts
       # Define a unary fact type attached to this object_type; in essence, a boolean attribute.
       #
       # Example: maybe :is_ceo
-      def maybe(role_name)
+      def maybe(role_name, options = {})
+	raise UnrecognisedOptionsException.new("role", role_name, options.keys) unless options.empty?
         realise_role(roles[role_name] = Role.new(self, TrueClass, role_name))
       end
 
@@ -319,14 +320,16 @@ module ActiveFacts
 	    impacts = analyse_impacts(role)
 	  end
 
+	  old_key = identifying_role_values(role.object_type) if old && mutual_propagation
+
 	  instance_variable_set(role_var, value)
 
 	  # Remove "self" from the old counterpart:
-	  old.send(getter = role.counterpart.getter).update(self, nil) if old && mutual_propagation
+	  old.send(getter = role.counterpart.getter).delete_instance(self, old_key) if old_key
 
 	  @constellation.when_admitted do
 	    # Add "self" into the counterpart
-	    value.send(getter ||= role.counterpart.getter).update(old, self) if value
+	    value.send(getter ||= role.counterpart.getter).add_instance(self, identifying_role_values(role.object_type)) if value
 
 	    apply_impacts(impacts) if impacts	# Propagate dependent key changes
 	  end
@@ -350,7 +353,6 @@ module ActiveFacts
       # :class => the related class (Class object or Symbol). Not allowed if role_name was a class.
       # :mandatory => true. There must be a related object for this object to be valid.
       # :counterpart => Symbol/String. The name of the counterpart role. Will be to_s.snakecase'd and maybe augmented with "all_" and/or "_as_<role_name>"
-      # :reading => "forward/reverse". Forward and reverse readings. Must include MARKERS for the player names. May include adjectives. REVISIT: define MARKERS!
       # LATER:
       # :order => :local_role OR lambda{} (for sort_by)
       # :restrict => Range or Array of Range/value or respond_to?(include?)
@@ -413,11 +415,6 @@ module ActiveFacts
 
         related_role_name = related_role_name.to_s if related_role_name = options.delete(:counterpart)
 
-        reading = options.delete(:reading)        # REVISIT: Implement verbalisation
-        role_value_constraint = options.delete(:restrict)   # REVISIT: Implement role value constraints
-
-	additional_role_options options
-
 	raise UnrecognisedOptionsException.new("role", role_name, options.keys) unless options.empty?
 
         # If you have a role "supervisor" and a sub-class "Supervisor", this'll bitch.
@@ -447,10 +444,6 @@ module ActiveFacts
         ]
       end
 
-      def additional_role_options options
-	# This is a hook for extensions to override. Any extension options should be deleted from the options hash.
-      end
-
       def when_bound(object_type, *args, &block)
         case object_type
         when Class

data/lib/activefacts/api/role_values.rb

@@ -8,6 +8,67 @@ module ActiveFacts
   module API
 
     class RoleValues  #:nodoc:
+      attr_accessor :sort
+
+      def initialize sort = false
+	@sort = !!(sort || ENV[@@af_sort_name ||= "ACTIVEFACTS_SORT"])
+        @a = @sort ? RBTree.new : []
+      end
+
+      def +(a)
+	if @sort
+	  @a.values.+(a.is_a?(RoleValues) ? [a] : a)
+	else
+	  @a.+(a.is_a?(RoleValues) ? [a] : a)
+	end
+      end
+
+      def to_a
+	@sort ? @a.values : @a
+      end
+
+      def keys
+	@sort ? @a.keys : @a
+      end
+
+      def single
+        size > 1 ? nil : to_a[0]
+      end
+
+      def form_key a
+	KeyArray.new(Array(a))
+      end
+
+      def add_instance(value, key)
+	if @sort
+	  @a[form_key(key)] = value
+	else
+	  @a << value
+	end
+      end
+
+      def delete_instance(value, key)
+	if @sort
+	  deleted = @a.delete(form_key(key))
+	else
+	  deleted = @a.delete(value)
+	end
+
+	# Test code:
+	unless deleted
+	  p @a
+	  p value
+	  debugger
+	  true
+	end
+
+      end
+
+      def verbalise
+	a = @sort ? @a.values : @a
+        "[#{a.map(&:verbalise).join(", ")}]"
+      end
+
       # Paranoia. Because of changes in the implementation, I need to catch old code that calls these delegates incorrectly
       def self.def_single_delegator(accessor, method, *expected_arities)
 	str = %{
@@ -15,12 +76,24 @@ module ActiveFacts
 	    if #{expected_arities.size == 0 ? "block" : "!block || !#{expected_arities.inspect}.include?(block.arity)" }
 	      raise ArgumentError.new("Arity mismatch on #{name}\##{method}, got \#{block ? block.arity : 'none'} want #{expected_arities.inspect} at \#{caller*"\n\t"})")
 	    end
-	    #{accessor}.__send__(:#{method}, *args, &block)
+	    if @sort
+	      #{accessor}.values.__send__(:#{method}, *args, &block)
+	    else
+	      #{accessor}.__send__(:#{method}, *args, &block)
+	    end
 	  end
 	}
 	eval(str)
       end
 
+      def include? v
+	if @sort
+	  @a.include?(form_key(v))
+	else
+	  @a.include?(v)
+	end
+      end
+
       def_single_delegator :@a, :all?, 1
       def_single_delegator :@a, :empty?
       def_single_delegator :@a, :include?
@@ -35,28 +108,6 @@ module ActiveFacts
       def_single_delegator :@a, :each, *([1] + Array(defined?(::RSpec) ? -2 : nil))
       def_single_delegator :@a, :detect, 1, *([1] + Array(defined?(::RSpec) ? -2 : nil))
       def_single_delegator :@a, :map, 1, -1
-
-      def initialize
-        @a = []
-      end
-
-      def +(a)
-        @a.+(a.is_a?(RoleValues) ? [a] : a)
-      end
-
-      def single
-        size > 1 ? nil : @a[0]
-      end
-
-      def update(old, value)
-        @a.delete(old) if old
-        @a << value if value
-      end
-
-      def verbalise
-        "[#{@a.map(&:verbalise).join(", ")}]"
-      end
     end
-
   end
 end

data/lib/activefacts/api/standard_types.rb

@@ -59,7 +59,7 @@ class Class
   # Make this Class into a ObjectType and if necessary its module into a Vocabulary.
   # The parameters are the names (Symbols) of the identifying roles.
   def identified_by *args, &b
-    raise InvalidEntityException(self) if respond_to? :value_type  # Don't make a ValueType into an EntityType
+    raise ActiveFacts::API::InvalidEntityException.new(self) if respond_to? :value_type  # Don't make a ValueType into an EntityType
 
     # The inclusion of instance methods triggers ClassMethods to be included in the class too
     include ActiveFacts::API::Entity

data/lib/activefacts/api/support.rb

@@ -7,9 +7,7 @@
 
 # Define Infinity as a constant, if it's not already defined:
 # We use this to define open-ended ranges.
-begin
-  Object.const_get("Infinity")
-rescue NameError
+unless Object.const_defined?("Infinity")
   Infinity = 1.0/0.0
 end
 

data/lib/activefacts/api/value.rb

@@ -40,7 +40,7 @@ module ActiveFacts
           # REVISIT: args could be a hash, with keys :length, :scale, :unit, :allow
           options = (args[-1].is_a?(Hash) ? args.pop : {})
           options.each do |key, value|
-	    raise UnrecognisedOptionsException.new('value_type', basename, key) unless respond_to?(key)
+	    raise UnrecognisedOptionsException.new('ValueType', basename, key) unless respond_to?(key)
             send(key, value)
           end
         end
@@ -141,7 +141,7 @@ module ActiveFacts
           class << klass
             def new_instance constellation, *args
               instance = allocate
-              instance.instance_variable_set("@constellation", constellation)
+              instance.instance_variable_set(@@constellation_variable_name ||= "@constellation", constellation)
               instance.send(:initialize, *args)
               instance
             end

data/lib/activefacts/api/vocabulary.rb

@@ -32,7 +32,7 @@ module ActiveFacts
           __bind(camel)
           c
         else
-	  if defined?(camel)
+	  if const_defined?(camel)
 	    begin
 	      const_get(camel)
 	    rescue NameError
@@ -55,11 +55,12 @@ module ActiveFacts
 
       def verbalise
         "Vocabulary #{name}:\n\t" +
-          @object_type.keys.sort.map{|object_type|
-              c = @object_type[object_type]
-              __bind(c.basename)
-              c.verbalise + "\n\t\t// Roles played: " + c.roles.verbalise
-            }*"\n\t"
+          @object_type.keys.sort.map do |object_type|
+	    c = @object_type[object_type]
+	    __bind(c.basename)
+	    c.verbalise + "\n\t\t// Roles played: " + c.roles.verbalise
+	  end.
+	  join("\n\t")
       end
 
       def __add_object_type(klass)  #:nodoc:

data/lib/activefacts/tracer.rb

@@ -18,7 +18,7 @@ module ActiveFacts
       # First time, initialise the tracing environment
       @indent = 0
       @keys = {}
-      if (e = ENV["TRACE"])
+      if (e = ENV[@@trace_name ||= "TRACE"])
         e.split(/[^_a-zA-Z0-9]/).each{|k| enable(k) }
         if @keys[:help]
           at_exit {

data/spec/constellation/constellation_spec.rb

@@ -79,19 +79,19 @@ describe "A Constellation instance" do
 
   it "should complain when accessing a non-class as a method" do
     Mod::Foo = 23
-    lambda { @constellation.Foo }.should raise_error
+    lambda { @constellation.Foo }.should raise_error(NoMethodError)
   end
 
   it "should complain when accessing a class that isn't an object type" do
     class Mod::Bar; end
-    proc { @constellation.Bar }.should raise_error
-    proc { @constellation.instances[Mod::Bar] }.should raise_error
+    proc { @constellation.Bar }.should raise_error(NoMethodError)
+    proc { @constellation.instances[Mod::Bar] }.should raise_error(ActiveFacts::API::InvalidObjectType)
   end
 
   it "should deny handling an object type defined outside the current module" do
     class ::Bar; end
-    lambda { @constellation.Bar }.should raise_error
-    lambda { @constellation.instances[Bar] }.should raise_error
+    lambda { @constellation.Bar }.should raise_error(NoMethodError)
+    lambda { @constellation.instances[Bar] }.should raise_error(ActiveFacts::API::InvalidObjectType)
   end
 
   it "should allow inspection" do
@@ -201,7 +201,7 @@ describe "A Constellation instance" do
   it "Should raise an exception with assigning a role whose referent (object type) has not yet been defined" do
     n = @constellation.Name("Fred")
     # This does not raise the "settable_roles_exception". I'm no longer sure how I did this, so I can't get coverage on this code :(
-    proc { n.undefined_role = 'foo' }.should raise_error
+    proc { n.undefined_role = 'foo' }.should raise_error(NoMethodError)
   end
 
   # Maybe not complete yet
@@ -429,7 +429,7 @@ describe "A Constellation instance" do
           has_one :thingummy, :class => Outside::Other
         end
       end
-    }.should raise_error
+    }.should raise_error(ActiveFacts::API::CrossVocabularyRoleException)
   end
 
   it "should disallow unrecognised supertypes" do
@@ -514,7 +514,7 @@ describe "A Constellation instance" do
           supertypes :name
         end
       end
-    }.should raise_error
+    }.should raise_error(ActiveFacts::API::InvalidSupertypeException)
   end
 
   it "should error on invalid :class values" do
@@ -524,7 +524,7 @@ describe "A Constellation instance" do
           has_one :Name, :class => 3
         end
       end
-    }.should raise_error
+    }.should raise_error(ArgumentError)
   end
 
   it "should error on misleading :class values" do
@@ -534,7 +534,7 @@ describe "A Constellation instance" do
           has_one :Name, :class => Extra
         end
       end
-    }.should raise_error
+    }.should raise_error(NameError)
   end
 
   it "should allow assert using an object of the same type" do
@@ -572,6 +572,6 @@ describe "A Constellation instance" do
     lambda {
       # Disallowed because it re-assigns the auto_counter_val identification value
       p.employer = [ "foo", {:auto_counter_val => :new}]
-    }.should raise_error
+    }.should raise_error(ActiveFacts::API::TypeConflictException)
   end
 end

data/spec/constellation/instance_spec.rb

@@ -364,7 +364,7 @@ describe "An instance of every type of ObjectType" do
     a = c.AutoCounterVal(:new)
     lambda {
       b = 2 + a
-    }.should raise_error
+    }.should raise_error(TypeError)
     a.assign(3)
     lambda {
       b = 2 + a
@@ -376,21 +376,21 @@ describe "An instance of every type of ObjectType" do
     c = ActiveFacts::API::Constellation.new(Mod)
     lambda {
       c.TestByInt(:int_val => nil)
-    }.should raise_error
+    }.should raise_error(ActiveFacts::API::MissingMandatoryRoleValueException)
   end
 
   it "should complain when too many identifying values are provided for an entity" do
     c = ActiveFacts::API::Constellation.new(Mod)
     lambda {
       c.TestByInt(2, 3)
-    }.should raise_error
+    }.should raise_error(ActiveFacts::API::UnexpectedIdentifyingValueException)
   end
 
   it "should complain when wrong type is used for an entity" do
     c = ActiveFacts::API::Constellation.new(Mod)
     lambda {
       c.TestByInt("Not an Int")
-    }.should raise_error
+    }.should raise_error(ArgumentError)
   end
 
   it "should handle a non-mandatory missing identifying role" do

data/spec/fact_type/roles_spec.rb

@@ -96,6 +96,35 @@ describe "Roles" do
     }.should raise_error(ActiveFacts::API::CrossVocabularyRoleException)
   end
 
+  it "should prevent usage of undefined options on a role" do
+    lambda {
+      module Mod
+        class Existing1 < String
+          value_type
+          has_one :name, :foo => :anything
+        end
+      end
+    }.should raise_error(ActiveFacts::API::UnrecognisedOptionsException)
+
+    lambda {
+      module Mod
+        class Existing1 < String
+          value_type
+          one_to_one :name, :foo => :anything
+        end
+      end
+    }.should raise_error(ActiveFacts::API::UnrecognisedOptionsException)
+
+    lambda {
+      module Mod
+        class Existing1 < String
+          value_type
+          maybe :is_broken, :foo => :anything
+        end
+      end
+    }.should raise_error(ActiveFacts::API::UnrecognisedOptionsException)
+  end
+
   it "should provide value type metadata" do
     Mod::Name.length.should == 40
     Mod::Name.scale.should == 0

data/spec/identification_scheme/identification_spec.rb

@@ -37,7 +37,7 @@ describe "An Entity Type" do
             has_one :name
           end
         end
-      end.should raise_error
+      end.should raise_error(ActiveFacts::API::InvalidIdentificationException)
     end
 
     describe "when asserted" do
@@ -84,7 +84,7 @@ describe "An Entity Type" do
       it "should fail if the new value already exists" do
         proc do
           @fly.name = 'Acme'
-        end.should raise_error
+        end.should raise_error(ActiveFacts::API::DuplicateIdentifyingValueException)
       end
 
       it "should not fail if the new value is self" do
@@ -234,7 +234,7 @@ describe "An Entity Type" do
             one_to_one :number    # Error, invalid identifier
           end
         end
-      end.should raise_error
+      end.should raise_error(ActiveFacts::API::InvalidIdentificationException)
     end
 
     describe "when asserted" do
@@ -294,7 +294,7 @@ describe "An Entity Type" do
 
       it "should fail if the new value already exists" do
         @c.Room(@b, 102)
-        lambda { @r.number = 102 }.should raise_error
+        lambda { @r.number = 102 }.should raise_error(ActiveFacts::API::DuplicateIdentifyingValueException)
       end
 
       describe "to a previously-nonexistent value" do
@@ -337,6 +337,7 @@ describe "An Entity Type" do
         end
 
         it "the old value's back-reference is set to nil" do
+          # @rn.all_room.should_not include @r
           @rn.all_room.to_a.should_not include @r
         end
 

data/spec/identification_scheme/identity_supertype_change_spec.rb

@@ -30,7 +30,7 @@ describe 'identity change on subtype' do
   end
 
   it "should fail if the value is the same" do
-    lambda { @b = @constellation.EntityB(123, 'abc') }.should raise_error
+    lambda { @b = @constellation.EntityB(123, 'abc') }.should raise_error(ActiveFacts::API::UnexpectedIdentifyingValueException)
   end
 
   context "on a deep-subtype" do
@@ -60,4 +60,4 @@ describe 'identity change on subtype' do
       @c.value_a.should == 987
     end
   end
-end
+end

data/spec/object_type/entity_type/entity_type_spec.rb

@@ -75,12 +75,12 @@ describe "Entity Type class definitions" do
     Mod::Person.roles.include?(:name).should be_true
   end
 
-  it "should fail on a ValClass" do
+  it "should fail on a ValueType" do
     lambda{
       class SomeClass < String
-        identified_by
+        identified_by :foo
       end
-    }.should raise_error
+    }.should raise_error(ActiveFacts::API::InvalidEntityException)
   end
 
   it "should return the identifying roles" do
@@ -88,15 +88,15 @@ describe "Entity Type class definitions" do
   end
 
   it "should prevent a role name from matching a object_type that exists unless that object_type is the counterpart" do
-    lambda {
-        module Mod
-          class LegalEntity
-          end
-          class Bad
-            identified_by :name
-            has_one :name, LegalEntity
-          end
-        end
-      }.should raise_error
+    proc do
+      module Mod
+	class LegalEntity
+	end
+	class Bad
+	  identified_by :name
+	  has_one :name, :class => LegalEntity
+	end
+      end
+    end.should raise_error(ActiveFacts::API::CrossVocabularyRoleException)
   end
 end

data/spec/object_type/entity_type/multipart_identification_spec.rb

@@ -38,7 +38,7 @@ describe "Multi-part identifiers" do
   end
 
   it "should sort child keys in the instance index" do
-    pending "Key sorting is not supported in this version" unless @p.all_child.respond_to? :keys
+    pending "Key sorting is not supported on this index" unless @c.Child.sort
     @c.Child.keys.should == [[[@p.parent_id], 0], [[@p.parent_id], 1], [[@p.parent_id], 2]]
     @c.Child.map{|k, c| c.position}.should == [@c0.position, @c1.position, @c2.position]
   end

data/spec/object_type/value_type/autocounter_spec.rb

@@ -47,7 +47,7 @@ describe "AutoCounter Value Type instances" do
   it "should allow prevent invalid role assignment" do
     lambda {
         @thing.thing_id = "foo"
-      }.should raise_error
+      }.should raise_error(ArgumentError)
   end
 
   it "should not allow its value to be re-assigned" do
@@ -57,7 +57,7 @@ describe "AutoCounter Value Type instances" do
     lambda {
         @thing.thing_id.assign(4)
         #@thing.thing_id.assign(@thing_id)
-      }.should raise_error
+      }.should raise_error(ArgumentError)
   end
 
   it "should allow an existing counter to be re-used" do
@@ -72,7 +72,7 @@ describe "AutoCounter Value Type instances" do
   it "should not allow a counter to be cloned" do
     lambda {
       @thing_id.clone
-    }.should raise_error
+    }.should raise_error(RuntimeError)
   end
 
   it "should allow an existing counter-identified object to be re-used" do

data/spec/object_type/value_type/guid_spec.rb

@@ -47,7 +47,7 @@ describe "Guid Value Type instances" do
   it "should allow prevent invalid role assignment" do
     lambda {
         @thing.thing_id = "foo"
-      }.should raise_error
+      }.should raise_error(ArgumentError)
   end
 
   it "should allow an existing guid to be re-used" do

data/spec/object_type/value_type/value_type_spec.rb

@@ -101,7 +101,7 @@ describe "Value Type class definitions" do
       class NameNotString
         value_type
       end
-    }.should raise_error
+    }.should raise_error(NameError)
   end
 
   it "should allow configuration of Role value through constructor using role name" do

metadata

@@ -1,68 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+  version: 0.9.8
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree-pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   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
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,55 +69,48 @@ dependencies:
 - !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
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,34 +153,24 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
-description: ! '
+description: |2
 
   The ActiveFacts API is a Ruby DSL for managing constellations of elementary facts.
-
-  Each fact is either existential (a value or an entity), characteristic (boolean)
-  or
-
-  binary relational (A rel B). Relational facts are consistently co-referenced, so
-  you
-
+  Each fact is either existential (a value or an entity), characteristic (boolean) or
+  binary relational (A rel B). Relational facts are consistently co-referenced, so you
   can traverse them efficiently in any direction. Each constellation maintains constraints
-
   over the fact population.
-
-'
 email: clifford.heath@gmail.com
 executables: []
 extensions: []
@@ -260,29 +229,25 @@ files:
 homepage: http://github.com/cjheath/activefacts-api
 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'
-      segments:
-      - 0
-      hash: -1550200325745257681
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fact-based data model DSL and API
 test_files: []