activefacts-api 1.9.5 → 1.9.6

data/lib/activefacts/api/role_values.rb

@@ -12,48 +12,48 @@ module ActiveFacts
       attr_accessor :sort
       attr_accessor :index_roles
       def object_type
-	@role.object_type
+        @role.object_type
       end
 
       def initialize role, excluded_role = nil
-	@role = role
-	# Can't control sorting from the constructor API: @sort = sort == nil ? API::sorted : !!sort
-	@sort = API::sorted
-	@excluded_role = excluded_role
+        @role = role
+        # Can't control sorting from the constructor API: @sort = sort == nil ? API::sorted : !!sort
+        @sort = API::sorted
+        @excluded_role = excluded_role
         @a = @sort ? RBTree.new : []
-	(@index_roles = role.object_type.identifying_roles.dup).delete_at(@excluded_role) if @excluded_role
+        (@index_roles = role.object_type.identifying_roles.dup).delete_at(@excluded_role) if @excluded_role
       end
 
       def +(a)
-	if @sort
-	  @a.values.+(a.is_a?(RoleValues) ? [a] : a)
-	else
-	  @a.+(a.is_a?(RoleValues) ? [a] : a)
-	end
+        if @sort
+          @a.values.+(a.is_a?(RoleValues) ? [a] : a)
+        else
+          @a.+(a.is_a?(RoleValues) ? [a] : a)
+        end
       end
 
       def [](*a)
-	if @sort
-	  #puts "Indexing #{object_type.name}.#{role.name} using #{a.inspect}:\n\t" + caller*"\n\t" + "\n\t---\n"
-	  key = form_key(a.map{|a| a.respond_to?(:identifying_role_values) ? a.identifying_role_values : a})
-	  # REVISIT: Consider whether to return an array when a partial key is provided.
-	  @a[key]
-	else
-	  # Slow: Search the array for an element having the matching key:
-	  @a.detect{|e| index_values(e) == a}
-	end
+        if @sort
+          #puts "Indexing #{object_type.name}.#{role.name} using #{a.inspect}:\n\t" + caller*"\n\t" + "\n\t---\n"
+          key = form_key(a.map{|a| a.respond_to?(:identifying_role_values) ? a.identifying_role_values : a})
+          # REVISIT: Consider whether to return an array when a partial key is provided.
+          @a[key]
+        else
+          # Slow: Search the array for an element having the matching key:
+          @a.detect{|e| index_values(e) == a}
+        end
       end
 
       def to_a
-	@sort ? @a.values : @a
+        @sort ? @a.values : @a
       end
 
       def to_ary
-	to_a
+        to_a
       end
 
       def keys
-	@sort ? @a.keys : @a
+        @sort ? @a.keys : @a
       end
 
       def single
@@ -61,71 +61,71 @@ module ActiveFacts
       end
 
       def form_key a
-	a = Array(a)
-	if @index_roles && @index_roles.size != a.size
-	  raise "Incorrectly-sized key #{a.inspect}. Index roles are #{@index_roles.map(&:name).inspect}"
-	end
-	KeyArray.new(a)
+        a = Array(a)
+        if @index_roles && @index_roles.size != a.size
+          raise "Incorrectly-sized key #{a.inspect}. Index roles are #{@index_roles.map(&:name).inspect}"
+        end
+        KeyArray.new(a)
       end
 
       def index_values object
-	if @index_roles
-	  @index_roles.map{|r|
-	    role_value = object.send(r.name)
-	    role_value.identifying_role_values((c = r.counterpart) ? c.object_type : role_value.class)
-	  }
-	else
-	  object.identifying_role_values
-	end
+        if @index_roles
+          @index_roles.map{|r|
+            role_value = object.send(r.name)
+            role_value.identifying_role_values((c = r.counterpart) ? c.object_type : role_value.class)
+          }
+        else
+          object.identifying_role_values
+        end
       end
 
       def add_instance(value, key)
-	if @sort
-	  # Exclude the excluded role, if any:
-	  (key = key.dup).delete_at(@excluded_role) if @excluded_role
-	  @a[form_key(key)] = value
-	  # Old slow way:  @a[form_key(index_values(value))] = value
-	else
-	  @a << value
-	end
+        if @sort
+          # Exclude the excluded role, if any:
+          (key = key.dup).delete_at(@excluded_role) if @excluded_role
+          @a[form_key(key)] = value
+          # Old slow way:  @a[form_key(index_values(value))] = value
+        else
+          @a << value
+        end
       end
 
       def delete_instance(value, key)
-	if @sort
-	  deleted = @a.delete(form_key(key))
-	else
-	  deleted = @a.delete(value)  # Slow: it has to search the array
-	end
+        if @sort
+          deleted = @a.delete(form_key(key))
+        else
+          deleted = @a.delete(value)  # Slow: it has to search the array
+        end
       end
 
       def verbalise
-	a = @sort ? @a.values : @a
+        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 = %{
-	  def #{method}(*args, &block)
-	    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
-	    if @sort
-	      #{accessor}.values.__send__(:#{method}, *args, &block)
-	    else
-	      #{accessor}.__send__(:#{method}, *args, &block)
-	    end
-	  end
-	}
-	eval(str)
+        str = %{
+          def #{method}(*args, &block)
+            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
+            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
+        if @sort
+          @a.include?(form_key(v))
+        else
+          @a.include?(v)
+        end
       end
 
       # Arity of -1 is needed when a block is passed using to_proc, e.g. map(&:some_method).

data/lib/activefacts/api/standard_types.rb

@@ -16,7 +16,7 @@ module ActiveFacts
     # Adapter module to add value_type to all potential value classes
     module ValueClass #:nodoc:
       def value_type *args, &block #:nodoc:
-	# The inclusion of instance methods triggers ClassMethods to be included in the class too
+        # The inclusion of instance methods triggers ClassMethods to be included in the class too
         include ActiveFacts::API::Value
         value_type(*args, &block)
       end

data/lib/activefacts/api/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module API
-    VERSION = "1.9.5"
+    VERSION = "1.9.6"
   end
 end

data/lib/activefacts/api/vocabulary.rb

@@ -32,8 +32,14 @@ module ActiveFacts
           __bind(camel)
           c
         else
-	  klass = const_get(camel) rescue nil	# NameError if undefined
-	  klass && klass.modspace == self ? klass : nil
+          if constants.include?(camel.to_sym)
+            if klass = const_get(camel) and !klass.respond_to?(:vocabulary)
+              raise CrossVocabularyRoleException.new(name, self)
+            end
+            klass
+          else
+            nil
+          end
         end
       end
 
@@ -49,11 +55,11 @@ module ActiveFacts
       def verbalise
         "Vocabulary #{name}:\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.all_role.verbalise
-	  end.
-	  join("\n\t")
+            c = @object_type[object_type]
+            __bind(c.basename)
+            c.verbalise + "\n\t\t// Roles played: " + c.all_role.verbalise
+          end.
+          join("\n\t")
       end
 
       def __add_object_type(klass)  #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Clifford Heath