activefacts-api 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc17ae7a132478e2e4b591e19adf35d79627d70b
-  data.tar.gz: b6b63e83981a4ec466aa128b94fb7cfbf1370d0e
+  metadata.gz: d98f2a57181b4caad266b2b2aee333fe9f685835
+  data.tar.gz: 8d32f6cb29ad9020d0e4ddc268bee3dc59cd7b9f
 SHA512:
-  metadata.gz: 916183df4492dab5a94c172d85f58b7f4a04f8407eb9decc301b07c8f137a5c6b3bfd4c80ce4f4d7b98e5ba9fe26d0483dd3a71b768159701b63d0c07b3a0b1e
-  data.tar.gz: 14858f846fe7c1fba970cd1b2cd6f890d21ae5247ce2107d73c49e75d919cf011814bd724e8b90ace9fdd524b262a3c83538b242137452d13eb8c0f454758323
+  metadata.gz: a1f5f6c8d57a313f4185690394f93d6ff467849c311d790f5b7cb72f2da0676a3ee81d7edaa2595bf4d9fd5389393c392465d4a673c8064740a82365c14d9fc1
+  data.tar.gz: 108dd965bb01572596358a5cca3fa7f0c9f31c279c425ccd622e0ffb926e80550b471d9e32844cd38b15a0946f21c08503511e9213784992e44237006dea3f82

data/Gemfile

@@ -1,20 +1,20 @@
 source 'https://rubygems.org'
 
-gem 'rake', '>=10.1', :group => [:development, :test]
-gem 'rbtree-pure'
+gem 'rake', '~> 10.1', :group => [:development, :test]
+gem 'rbtree-pure', '~> 0'
 
 group :development do
-  gem 'jeweler'
-  gem 'rspec', '~>2.6.0'
-  gem 'ruby-debug', :platforms => [:mri_18]
-  gem 'debugger', :platforms => [:mri_19,
+  gem 'jeweler', '~> 0'
+  gem 'rspec', '~> 2.6', '>= 2.6.0'
+  gem 'ruby-debug', '~> 0', :platforms => [:mri_18]
+  gem 'debugger', '~> 0', :platforms => [:mri_19,
     (['1.8.7', '1.9.2'].include?(RUBY_VERSION) || RUBY_PLATFORM == 'java') ? nil : :mri_20
   ].compact
-  gem 'pry', :platforms => [:jruby, :rbx]
+  gem 'pry', '~> 0', :platforms => [:jruby, :rbx]
 end
 
 group :test do
   # rcov 1.0.0 is broken for jruby, so 0.9.11 is the only one available.
-  gem 'rcov', '~>0.9.11', :platforms => [:jruby, :mri_18], :require => false
-  gem 'simplecov', '~>0.6.4', :platforms => :mri_19, :require => false
+  gem 'rcov', '~> 0.9.11', :platforms => [:jruby, :mri_18], :require => false
+  gem 'simplecov', '~> 0.6', '>= 0.6.4', :platforms => :mri_19, :require => false
 end

data/Rakefile

@@ -19,11 +19,6 @@ over the fact population.
   gem.authors = ["Clifford Heath"]
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  gem.add_development_dependency "rspec", "~> 2.3.0"
-  gem.add_development_dependency "bundler", "~> 1.0.0"
-  gem.add_development_dependency "jeweler", "~> 1.5.2"
-  # gem.add_development_dependency "rcov", ">= 0"
-  gem.add_development_dependency "rdoc", ">= 2.4.2"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.9.8
+0.9.9

data/activefacts-api.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: activefacts-api 0.9.9 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activefacts-api"
-  s.version = "0.9.8"
+  s.version = "0.9.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Clifford Heath"]
-  s.date = "2013-11-13"
+  s.date = "2014-02-14"
   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 = [
@@ -32,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/activefacts/api/date.rb",
     "lib/activefacts/api/entity.rb",
     "lib/activefacts/api/exceptions.rb",
+    "lib/activefacts/api/fact_type.rb",
     "lib/activefacts/api/guid.rb",
     "lib/activefacts/api/instance.rb",
     "lib/activefacts/api/instance_index.rb",
@@ -67,50 +70,37 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/cjheath/activefacts-api"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.5"
+  s.rubygems_version = "2.2.1"
   s.summary = "A fact-based data model DSL and API"
 
   if s.respond_to? :specification_version then
     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>, [">= 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"])
-      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"])
-      s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
+      s.add_runtime_dependency(%q<rbtree-pure>, ["~> 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", "~> 2.6"])
+      s.add_development_dependency(%q<ruby-debug>, ["~> 0"])
+      s.add_development_dependency(%q<debugger>, ["~> 0"])
+      s.add_development_dependency(%q<pry>, ["~> 0"])
     else
-      s.add_dependency(%q<rbtree-pure>, [">= 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"])
-      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"])
-      s.add_dependency(%q<rdoc>, [">= 2.4.2"])
+      s.add_dependency(%q<rbtree-pure>, ["~> 0"])
+      s.add_dependency(%q<rake>, ["~> 10.1"])
+      s.add_dependency(%q<jeweler>, ["~> 0"])
+      s.add_dependency(%q<rspec>, [">= 2.6.0", "~> 2.6"])
+      s.add_dependency(%q<ruby-debug>, ["~> 0"])
+      s.add_dependency(%q<debugger>, ["~> 0"])
+      s.add_dependency(%q<pry>, ["~> 0"])
     end
   else
-    s.add_dependency(%q<rbtree-pure>, [">= 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"])
-    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"])
-    s.add_dependency(%q<rdoc>, [">= 2.4.2"])
+    s.add_dependency(%q<rbtree-pure>, ["~> 0"])
+    s.add_dependency(%q<rake>, ["~> 10.1"])
+    s.add_dependency(%q<jeweler>, ["~> 0"])
+    s.add_dependency(%q<rspec>, [">= 2.6.0", "~> 2.6"])
+    s.add_dependency(%q<ruby-debug>, ["~> 0"])
+    s.add_dependency(%q<debugger>, ["~> 0"])
+    s.add_dependency(%q<pry>, ["~> 0"])
   end
 end
 

data/lib/activefacts/api.rb

@@ -35,6 +35,7 @@ require 'activefacts/api/vocabulary'            # A Ruby module may become a Voc
 require 'activefacts/api/instance_index'        # The index used by a constellation to record every instance
 require 'activefacts/api/constellation'         # A Constellation is a query result or fact population
 require 'activefacts/api/object_type'           # A Ruby class may become a ObjectType in a Vocabulary
+require 'activefacts/api/fact_type'             # Each role belongs to a single fact type
 require 'activefacts/api/role'                  # A ObjectType has a collection of Roles
 require 'activefacts/api/role_values'           # The container used for sets of role players in many_one's
 require 'activefacts/api/instance'              # An Instance is an instance of a ObjectType class

data/lib/activefacts/api/entity.rb

@@ -38,7 +38,7 @@ module ActiveFacts
 	    value =
 	      if key == nil
 		nil
-	      elsif role.is_unary
+	      elsif role.unary?
 		(key && true)	# Preserve nil and false
 	      else
 		role.counterpart.object_type.assert_instance(constellation, Array(key))
@@ -313,7 +313,7 @@ module ActiveFacts
 	  end.map do |role|
 	    if arg_hash.include?(n = role.name)	  # Do it this way to avoid problems where nil or false is provided
 	      value = arg_hash[n]
-	      next (value && true) if (role.is_unary)
+	      next (value && true) if (role.unary?)
 	      if value
 		klass = role.counterpart.object_type
 		value = klass.identifying_role_values(constellation, Array(value))
@@ -323,7 +323,7 @@ module ActiveFacts
 	      counterpart_class = role.counterpart && role.counterpart.object_type
 	      value = value.identifying_role_values(counterpart_class)
 	      arg_hash[n] = value # Save the value for making a new instance
-	      next value if (role.is_unary)
+	      next value if (role.unary?)
 	    else
 	      value = nil
 	    end
@@ -363,7 +363,7 @@ module ActiveFacts
 	      value =
 		if v == nil
 		  nil
-		elsif role.is_unary
+		elsif role.unary?
 		  (v && true)	# Preserve nil and false
 		else
 		  role.counterpart.object_type.assert_instance(constellation, Array(v))

data/lib/activefacts/api/fact_type.rb

@@ -0,0 +1,19 @@
+#
+#       ActiveFacts API
+#       Role class.
+#       Each accessor method created on an instance corresponds to a Role object in the instance's class.
+#       Binary fact types construct a Role at each end.
+#
+# Copyright (c) 2009 Clifford Heath. Read the LICENSE file.
+#
+module ActiveFacts
+  module API
+    class FactType
+      attr_accessor :all_role
+
+      def initialize
+	@all_role = []
+      end
+    end
+  end
+end

data/lib/activefacts/api/object_type.rb

@@ -60,7 +60,8 @@ module ActiveFacts
       # Example: maybe :is_ceo
       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))
+	fact_type = FactType.new
+        realise_role(roles[role_name] = Role.new(fact_type, self, role_name, false, true))
       end
 
       # Define a binary fact type relating this object_type to another,
@@ -169,7 +170,7 @@ module ActiveFacts
 
       # Every new role added or inherited comes through here:
       def realise_role(role) #:nodoc:
-        if (role.is_unary)
+        if (role.unary?)
           # Unary role
           define_unary_role_accessor(role)
         elsif (role.unique)
@@ -211,18 +212,15 @@ module ActiveFacts
 	if roles[role_name]
 	  raise DuplicateRoleException.new("#{name} cannot have more than one role named #{role_name}")
 	end
-        roles[role_name] = role = Role.new(self, nil, role_name, mandatory)
+	fact_type = FactType.new
+        roles[role_name] = role = Role.new(fact_type, self, role_name, mandatory, true)
 
         # There may be a forward reference here where role_name is a Symbol,
         # and the block runs later when that Symbol is bound to the object_type.
         when_bound(related, self, role_name, related_role_name) do |target, definer, role_name, related_role_name|
-          if (one_to_one)
-            target.roles[related_role_name] = role.counterpart = Role.new(target, role, related_role_name, false)
-          else
-            target.roles[related_role_name] = role.counterpart = Role.new(target, role, related_role_name, false, false)
-          end
+	  counterpart = target.roles[related_role_name] = Role.new(fact_type, target, related_role_name, false, one_to_one)
           realise_role(role)
-          target.realise_role(role.counterpart)
+          target.realise_role(counterpart)
         end
       end
 

data/lib/activefacts/api/role.rb

@@ -14,19 +14,18 @@ module ActiveFacts
     # or _one_to_one_, and the other is created on the counterpart class.
     # Each ObjectType class maintains a RoleCollection hash of the roles it plays.
     class Role
+      attr_reader   :fact_type        # The FactType to which this role belongs
       attr_reader   :object_type      # The ObjectType to which this role belongs
-      attr_reader   :is_unary
       attr_reader   :name             # The name of the role (a Symbol)
-      attr_accessor :counterpart      # All roles except unaries have a counterpart Role
       attr_reader   :unique           # Is this role played by at most one instance, or more?
       attr_reader   :mandatory        # In a valid fact population, is this role required to be played?
       attr_reader   :value_constraint # Counterpart Instances playing this role must meet this constraint
       attr_reader   :is_identifying   # Is this an identifying role for object_type?
 
-      def initialize(object_type, counterpart, name, mandatory = false, unique = true)
+      def initialize(fact_type, object_type, name, mandatory, unique)
+	@fact_type = fact_type
+	@fact_type.all_role << self
         @object_type = object_type
-        @is_unary = counterpart == TrueClass
-        @counterpart = @is_unary ? nil : counterpart
         @name = name
         @mandatory = mandatory
         @unique = unique
@@ -34,6 +33,16 @@ module ActiveFacts
         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
+      end
+
+      def counterpart
+	@counterpart ||= (@fact_type.all_role - [self])[0]
+      end
+
       # Return the name of the getter method
       def getter
         @getter ||= @name.to_sym
@@ -49,19 +58,13 @@ module ActiveFacts
         @variable ||= "@#{@name}"
       end
 
-      # Is this role a unary (created by maybe)? If so, it has no counterpart
-      def unary?
-        # N.B. A role with a forward reference looks unary until it is resolved.
-        counterpart == nil
-      end
-
       def inspect
         "<Role #{object_type.name}.#{name}>"
       end
 
       def verbalise
 	"Role #{name} of #{object_type}, " +
-	  (@is_unary ? 'unary' : (counterpart ? 'played by' + counterpart.object_type : 'undefined'))
+	  (unary? ? 'unary' : (counterpart ? 'played by' + counterpart.object_type : 'undefined'))
       end
 
     private

metadata

@@ -1,169 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbtree-pure
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: ruby-debug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+        version: 2.6.0
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: ruby-debug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.2
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: '0'
 description: |2
 
   The ActiveFacts API is a Ruby DSL for managing constellations of elementary facts.
@@ -186,6 +136,7 @@ files:
 - LICENSE.txt
 - README.rdoc
 - Rakefile
+- TODO
 - VERSION
 - activefacts-api.gemspec
 - lib/activefacts/api.rb
@@ -193,6 +144,7 @@ files:
 - lib/activefacts/api/date.rb
 - lib/activefacts/api/entity.rb
 - lib/activefacts/api/exceptions.rb
+- lib/activefacts/api/fact_type.rb
 - lib/activefacts/api/guid.rb
 - lib/activefacts/api/instance.rb
 - lib/activefacts/api/instance_index.rb
@@ -225,7 +177,6 @@ files:
 - spec/simplecov_helper.rb
 - spec/spec_helper.rb
 - spec/support/reduce_exceptions_helper.rb
-- TODO
 homepage: http://github.com/cjheath/activefacts-api
 licenses:
 - MIT
@@ -246,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A fact-based data model DSL and API