activefacts-api 0.9.6 → 0.9.7

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
   - jruby-19mode
   - rbx-18mode
   - rbx-19mode
+env:
+  - ACTIVEFACTS_DEFAULT=yes
+  - ACTIVEFACTS_SORT=true

data/Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rake', :group => [:development, :test]
+gem 'rbtree-pure'
 
 group :development do
   gem 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.9.7

data/activefacts-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "activefacts-api"
-  s.version = "0.9.6"
+  s.version = "0.9.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Clifford Heath"]
-  s.date = "2013-01-22"
+  s.date = "2013-01-29"
   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 = [
@@ -75,6 +75,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     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<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
@@ -86,6 +87,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       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<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2.6.0"])
@@ -98,6 +100,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, [">= 2.4.2"])
     end
   else
+    s.add_dependency(%q<rbtree-pure>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2.6.0"])

data/lib/activefacts/api/constellation.rb

@@ -55,7 +55,7 @@ module ActiveFacts
 	    if reason = invalid_object_type(k)
 	      raise InvalidObjectType.new(@vocabulary, k, reason)
 	    end
-	    h[k] = InstanceIndex.new(self, k)
+	    h[k] = InstanceIndex.new(self, k, !!(@options[:sort] || ENV['ACTIVEFACTS_SORT']))
 	  end
       end
 
@@ -111,8 +111,9 @@ module ActiveFacts
       end
 
       # Create a new empty Constellation over the given Vocabulary
-      def initialize(vocabulary)
+      def initialize(vocabulary, options = {})
         @vocabulary = vocabulary
+	@options = options
       end
 
       def assert(klass, *args)

data/lib/activefacts/api/entity.rb

@@ -132,8 +132,8 @@ module ActiveFacts
         klass.identifying_roles.map do |role|
           value = send(role.name)
 	  counterpart_class = role.counterpart && role.counterpart.object_type
-          value.identifying_role_values(counterpart_class)
-        end
+	  value.identifying_role_values(counterpart_class)
+	end
       end
 
       # Identifying role values in a hash form.

data/lib/activefacts/api/guid.rb

@@ -45,4 +45,8 @@ class Guid
     to_s.eql?(o.to_s)
   end
 
+  def <=>(o)				#:nodoc:
+    to_s.<=>(o.to_s)
+  end
+
 end

data/lib/activefacts/api/instance_index.rb

@@ -4,46 +4,123 @@
 #
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
-require 'forwardable'
+require 'rbtree'
 
 module ActiveFacts
   module API
+    class KeyArray < Array
+      def initialize(a)
+	super(
+	  a.map do |e|
+	    if e.is_a?(Array) && e.class != self.class
+	      KeyArray.new(e)
+	    elsif e.eql?(nil)
+	      []
+	    else
+	      e
+	    end
+	  end
+	)
+      end
+
+      def inspect
+	"KeyArray"+super
+      end
+
+      def <=>(other)
+	unless other.is_a?(Array)	# Any kind of Array, not just KeyArray
+	  return 1
+	end
+
+	0.upto(size-1) do |i|
+	  diff = ((s = self[i]) <=> (o = other[i]) rescue nil)
+	  case diff
+	  when 0	# Same value, whether exactly the same class or not
+	    next
+	  when nil	# Non-comparable values
+	    return -1 if s == nil	# Ensure that nil values come before other values
+	    return 1 if o == nil
+	    diff = s.class.name <=> o.class.name  # Otherwise just ensure stable sorting
+	    return diff if diff != 0
+	  else
+	    return diff
+	  end
+	end
+	0
+      end
+    end
+
     #
     # Each Constellation maintains an InstanceIndex for each ObjectType in its Vocabulary.
     # The InstanceIndex object is returned when you call @constellation.ObjectType with no
     # arguments (where ObjectType is the object_type name you're interested in)
     #
     class InstanceIndex
-      extend Forwardable
-      def_delegators :@hash, :size, :empty?, :each, :map,
-                     :detect, :values, :keys, :detect, :delete
 
-      def initialize(constellation, klass)
+      # Should be in module ForwardableWithArityChecking
+      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
+	    #{accessor}.__send__(:#{method}, *args, &block)
+	  end
+	}
+	eval(str)
+      end
+
+      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, :detect, 1
+      def_single_delegator :@hash, :values
+      def_single_delegator :@hash, :keys
+
+      def initialize(constellation, klass, sort)
         @constellation = constellation
         @klass = klass
-        @hash = {}
+	@sort = sort
+        @hash = sort ? RBTree.new : {}
       end
 
       def inspect
         "<InstanceIndex for #{@klass.name} in #{@constellation.inspect}>"
       end
 
+      def delete(k)
+	@hash.delete(@sort ? form_key(k) : k)
+      end
+
       def detect &b
         r = @hash.detect &b
         r ? r[1] : nil
       end
 
       def []=(key, value)   #:nodoc:
-        @hash[key] = value
+        @hash[@sort ? form_key(key) : key] = value
       end
 
       def [](key)
-        @hash[key]
+	@hash[@sort ? form_key(key) : key]
+      end
+
+      def refresh_key(old_key)
+        value = @hash.delete(@sort ? form_key(old_key) : old_key)
+        new_key = value.identifying_role_values(@klass)
+        @hash[@sort ? form_key(new_key) : new_key] = value if value
       end
 
-      def refresh_key(key)
-        value = @hash.delete(key)
-        @hash[value.identifying_role_values(@klass)] = value if value
+      def form_key key
+	case key
+	when Array
+	  KeyArray.new(key)
+	when nil
+	  []
+	else
+	  key
+	end
       end
     end
   end

data/lib/activefacts/api/numeric.rb

@@ -191,6 +191,18 @@ class AutoCounter
     to_s.eql?(o.to_s)
   end
 
+  def <=>(o)				#:nodoc:
+    if self.defined? && !o == [] && o.defined?
+      if (c = (self.class <=> o.class.name)) != 0
+	return c
+      else
+	return to_i <=> o.to_i
+      end
+    else
+      to_s.<=>(o.to_s)
+    end
+  end
+
   def identifying_role_values klass = nil
     self
   end

data/lib/activefacts/api/role_values.rb

@@ -4,16 +4,37 @@
 #
 # Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
 #
-require 'forwardable'
-
 module ActiveFacts
   module API
 
     class RoleValues  #:nodoc:
-      include Enumerable
-      extend Forwardable
+      # 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
+	    #{accessor}.__send__(:#{method}, *args, &block)
+	  end
+	}
+	eval(str)
+      end
 
-      def_delegators :@a, :each, :size, :empty?, :-
+      def_single_delegator :@a, :all?, 1
+      def_single_delegator :@a, :empty?
+      def_single_delegator :@a, :include?
+      def_single_delegator :@a, :inject, 2
+      def_single_delegator :@a, :select, 1
+      def_single_delegator :@a, :reject, 1
+      def_single_delegator :@a, :size
+      def_single_delegator :@a, :sort_by, 1
+      def_single_delegator :@a, :to_a
+      def_single_delegator :@a, :-
+      # These delegators allow a negative arity in RSpec because the tests test it (to make sure the code doesn't pass too many args)
+      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 = []

data/spec/constellation/constellation_spec.rb

@@ -289,7 +289,7 @@ describe "A Constellation instance" do
     it "should support each" do
       baz = @constellation.Name("baz")
       count = 0
-      @constellation.Name.each { |rv| count += 1 }
+      @constellation.Name.each { |k, v| count += 1 }
       count.should == 1
     end
 

data/spec/identification_scheme/identification_spec.rb

@@ -260,7 +260,7 @@ describe "An Entity Type" do
       end
 
       it "should be found in the constellation using the value" do
-        @c.Room[[@b.identifying_role_values, @rn]].should == @r
+        @c.Room[[@b.identifying_role_values, @rn.identifying_role_values]].should == @r
         @c.Room[[@b.identifying_role_values, 101]].should == @r
         @c.Room[[['Mackay'], 101]].should == @r
       end

metadata

@@ -1,190 +1,215 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activefacts-api
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.9.7
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 6
-  version: 0.9.6
 platform: ruby
-authors: 
+authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-01-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
+date: 2013-01-29 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'
   type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
   type: :development
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.6.0
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: ruby-debug
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: debugger
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: pry
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 4
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.4.2
-  version_requirements: *id010
-description: |
-  
+description: ! '
+
   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: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 - TODO
-files: 
+files:
 - .document
 - .rspec
 - .travis.yml
@@ -233,37 +258,31 @@ files:
 - spec/support/reduce_exceptions_helper.rb
 - TODO
 homepage: http://github.com/cjheath/activefacts-api
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1550200325745257681
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A fact-based data model DSL and API
 test_files: []
-