activefacts-api 1.7.0 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80ac6cfb494e2b05728351858aa283a569caa5b
-  data.tar.gz: d5abea27b67b2501f16819de68c5716350423940
+  metadata.gz: 3bea91791db9be24a0d7dbb300fd657c4945bd9c
+  data.tar.gz: b81af550504897b814940f439a046741718fc880
 SHA512:
-  metadata.gz: 63bcb8b0e4b562ed566ea33f286469d11ba5ddce18f59cb58b66e45d5b78d94bc0643c171b8375d6d6a5d10d19aec7a5678cd42d15ab657aa53519fe05c13005
-  data.tar.gz: 8a0768e8cfe086e62ada27b327e1b9a049c4825efd0fdb925a9f6ccc85ef3873ba06a79a757ee27014bb13a86adfe6e9c4ec2374d3395f56988193523bd2f5ee
+  metadata.gz: 21fca201df25802d84e33b537cc6afafd761c5b35ea8904b5ea74336ed4727e0384abec38b8ef179817a3ff5c7eb929b4037c2c31ebde21d2bd8f4166b5e67d9
+  data.tar.gz: b007443b14e1030ac500a59b667d94599ccaee429da3f242f42dff66d03c7fe315f46609f462898e6b3b9245d31a55979a11dff78276a3e11daea70705baf0c4

data/VERSION

@@ -1 +1 @@
-1.7.0
+1.7.1

data/lib/activefacts/api/instance_index.rb

@@ -79,7 +79,7 @@ module ActiveFacts
       def_single_delegator :@hash, :size
       def_single_delegator :@hash, :empty?
       def_single_delegator :@hash, :each, 1, 2, -3
-      def_single_delegator :@hash, :map, 1, 2, -3
+      def_single_delegator :@hash, :map, 1, 2, -3, -1
       def_single_delegator :@hash, :detect, 1
       def_single_delegator :@hash, :values
       def_single_delegator :@hash, :keys

data/lib/activefacts/api/role.rb

@@ -22,35 +22,35 @@ module ActiveFacts
       attr_reader   :value_constraint # Counterpart Instances playing this role must meet this constraint
 
       def is_identifying # Is this an identifying role for object_type?
-	return @is_identifying unless @is_identifying == nil
+        return @is_identifying unless @is_identifying == nil
         @is_identifying = !!(@object_type.is_entity_type && @object_type.identifying_role_names.include?(@name))
       end
 
       def initialize(fact_type, object_type, role_name, mandatory, unique, restrict = nil)
-	@fact_type = fact_type
-	@fact_type.all_role << self
+        @fact_type = fact_type
+        @fact_type.all_role << self
         @object_type = object_type
         @name = role_name
         @mandatory = mandatory
         @unique = unique
-	@value_constraint = restrict
-	object_type.add_role(self)
+        @value_constraint = restrict
+        object_type.add_role(self)
         associate_role(@object_type)
       end
 
       # Is this role a unary (created by maybe)?
       def unary?
         # N.B. A role with a forward reference looks unary until it is resolved.
-	@fact_type.all_role.size == 1
+        @fact_type.all_role.size == 1
       end
 
       def make_mandatory
-	# Sometimes a role has already been defined from the other end
-	@mandatory = true
+        # Sometimes a role has already been defined from the other end
+        @mandatory = true
       end
 
       def counterpart
-	@counterpart ||= (@fact_type.all_role - [self])[0]
+        @counterpart ||= (@fact_type.all_role - [self])[0]
       end
 
       # Return the name of the getter method
@@ -73,8 +73,8 @@ module ActiveFacts
       end
 
       def verbalise
-	"Role #{name} of #{object_type}, " +
-	  (unary? ? 'unary' : (counterpart ? 'played by' + counterpart.object_type : 'undefined'))
+        "Role #{name} of #{object_type}, " +
+          (unary? ? 'unary' : (counterpart ? 'played by' + counterpart.object_type : 'undefined'))
       end
 
     private

data/lib/activefacts/api/value.rb

@@ -28,22 +28,22 @@ module ActiveFacts
 
       # A value is its own key, unless it's a delegate for a raw value
       def identifying_role_values(klass = nil) #:nodoc:
-	# The identifying role value for the supertype of a value type is always the same as for the subtype
-	respond_to?(:__getobj__) ? __getobj__ : self
+        # The identifying role value for the supertype of a value type is always the same as for the subtype
+        respond_to?(:__getobj__) ? __getobj__ : self
       end
 
       def plays_no_role
-	# REVISIT: Some Value Types are independent, and so must always be regarded as playing a role
-	self.class.all_role.all? do |n, role|
-	  case
-	  when role.fact_type.is_a?(ActiveFacts::API::TypeInheritanceFactType)
-	    true  # No need to consider subtyping/supertyping roles here
-	  when role.unique
-	    send(role.getter) == nil
-	  else
-	    send(role.getter).empty?
-	  end
-	end
+        # REVISIT: Some Value Types are independent, and so must always be regarded as playing a role
+        self.class.all_role.all? do |n, role|
+          case
+          when role.fact_type.is_a?(ActiveFacts::API::TypeInheritanceFactType)
+            true  # No need to consider subtyping/supertyping roles here
+          when role.unique
+            send(role.getter) == nil
+          else
+            send(role.getter).empty?
+          end
+        end
       end
 
       # All ValueType classes include the methods defined here
@@ -53,7 +53,7 @@ module ActiveFacts
         def value_type *args, &block #:nodoc:
           options = (args[-1].is_a?(Hash) ? args.pop : {})
           options.each do |key, value|
-	    raise UnrecognisedOptionsException.new('ValueType', basename, key) unless respond_to?(key)
+            raise UnrecognisedOptionsException.new('ValueType', basename, key) unless respond_to?(key)
             send(key, value)
           end
         end
@@ -84,49 +84,49 @@ module ActiveFacts
         end
 
         def identifying_role_values(constellation, args)   #:nodoc:
-	  # Normalise positional arguments into an arguments hash (this changes the passed parameter)
-	  arg_hash = args[-1].is_a?(Hash) ? args.pop : {}
+          # Normalise positional arguments into an arguments hash (this changes the passed parameter)
+          arg_hash = args[-1].is_a?(Hash) ? args.pop : {}
 
           # If a single arg is already the correct class or a subclass,
-	  # use it directly, otherwise create one.
-	  # This appears to be the only way to handle e.g. Date correctly
+          # use it directly, otherwise create one.
+          # This appears to be the only way to handle e.g. Date correctly
           unless args.size == 1 and instance = args[0] and instance.is_a?(self)
-	    instance = new_instance(constellation, *args)
+            instance = new_instance(constellation, *args)
           end
-	  args.replace([arg_hash])
-	  instance.identifying_role_values(self)
+          args.replace([arg_hash])
+          instance.identifying_role_values(self)
         end
 
-	def assert_instance(constellation, args)
-	  new_identifier = args == [:new]
-	  key = identifying_role_values(constellation, args)
-	  # args are now normalized to an array containing a single Hash element
-	  arg_hash = args[0]
-
-	  if new_identifier
-	    instance = key  # AutoCounter is its own key
-	  else
-	    instance_index = constellation.instances[self]
-	    unless instance = constellation.has_candidate(self, key) || instance_index[key]
-	      instance = new_instance(constellation, key)
-	      constellation.candidate(instance)
-	    end
-	  end
-
-	  # Assign any extra roles that may have been passed.
+        def assert_instance(constellation, args)
+          new_identifier = args == [:new]
+          key = identifying_role_values(constellation, args)
+          # args are now normalized to an array containing a single Hash element
+          arg_hash = args[0]
+
+          if new_identifier
+            instance = key  # AutoCounter is its own key
+          else
+            instance_index = constellation.instances[self]
+            unless instance = constellation.has_candidate(self, key) || instance_index[key]
+              instance = new_instance(constellation, key)
+              constellation.candidate(instance)
+            end
+          end
+
+          # Assign any extra roles that may have been passed.
           # These assignments only take effect after the candidate object have been asserted.
           # An exception here means the object is asserted but the role not assigned.
-	  arg_hash.each do |k, v|
-	    constellation.when_admitted {
-	      instance.send(:"#{k}=", v)
-	    }
-	  end
+          arg_hash.each do |k, v|
+            constellation.when_admitted {
+              instance.send(:"#{k}=", v)
+            }
+          end
 
-	  instance
-	end
+          instance
+        end
 
         def index_instance(constellation, instance) #:nodoc:
-	  # Index the instance in the constellation's InstanceIndex for this class:
+          # Index the instance in the constellation's InstanceIndex for this class:
           instances = constellation.instances[self]
           key = instance.identifying_role_values(self)
           instances[key] = instance
@@ -142,7 +142,7 @@ module ActiveFacts
         def inherited(other)  #:nodoc:
           # Copy the type parameters here, etc?
           other.send :realise_supertypes, self
-	  TypeInheritanceFactType.new(self, other)
+          TypeInheritanceFactType.new(self, other)
           vocabulary.__add_object_type(other)
           super
         end

data/lib/activefacts/tracer.rb

@@ -167,6 +167,8 @@ module ActiveFacts
 
 	  def initialize *args, &b
 	    send(:firstaid_initialize, *args, &b)
+	    return if NoMethodError === self && message =~ /^undefined method `to_ary' for \#<Gem::Specification/
+	    return if LoadError == self
 	    puts "Stopped due to #{self.class}: #{message} at "+caller*"\n\t"
 	    debugger
 	    true # Stopped in Exception constructor

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.1
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree-pure