activefacts-api 1.9.2 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d49215e86ffa0e5ff4c3c4245834dbe57bca2b69
-  data.tar.gz: ffe190be92cd81ceef91f4204ef27d5f7fd0f414
+  metadata.gz: 36cc46a9af5dba1464033268c79c38e5c5e16747
+  data.tar.gz: 5561297083e7779574968c3bf395f509602c1f2c
 SHA512:
-  metadata.gz: 9be5b953f3e71c05c1f7211ce09fb0c5e21f69b3c519ea58aeaa76323b29ddd82bbb5e3269328b55f41f1d1c75dfd74738a93e01ec4b21b55f1fe00303d992d0
-  data.tar.gz: 769cc83b2198f25f2867a8104e8feaa4fa1b88e51df38a4766c5ba6fd802e1826d4fad47da3cfefec05cddd679417f4e51b885fc728a114d3be9f43d9b8a0241
+  metadata.gz: e4bab7cf55c08efb17d68ae45da684dc9daf7d13606ba236170bc7e82abb69b04576997f33287730fe082df097867859fa0442200ab71bec7ce74c330b0037c0
+  data.tar.gz: d9e52ec5cb6e4527c2c7c2cfd9f4f47476430a786d13deb74c211f1f3ed37edb02503860bc53e52a115a171a6538623c5b9cbf9babbede1bc40caf0a136edaef

data/activefacts-api.gemspec

@@ -32,7 +32,7 @@ over the fact population.
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
 
   spec.add_runtime_dependency 'rbtree-pure', [">= 0.1.1", "~> 0"]
-  spec.add_runtime_dependency 'tracing', ["~> 2"]
+  spec.add_runtime_dependency 'tracing', ["~> 2", ">= 2.0.4"]
 
   spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/activefacts/api/constellation.rb

@@ -255,7 +255,7 @@ module ActiveFacts
 	      end
 	      value = attrs[role_name]
 	    else
-	      value = attrs[role_name] || instance.send(role.getter)
+	      value = attrs.include?(role_name) ? attrs[role_name] : instance.send(role.getter)
 	    end
 	    hash[role_name] = value if value != nil
 	    hash

data/lib/activefacts/api/instance_index.rb

@@ -78,9 +78,9 @@ 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, -1
-      def_single_delegator :@hash, :detect, 1
+      def_single_delegator :@hash, :each, -1, 1, 2, -3
+      def_single_delegator :@hash, :map, -1, 1, 2, -3
+      def_single_delegator :@hash, :detect, -1, 1
       def_single_delegator :@hash, :values
       def_single_delegator :@hash, :keys
 

data/lib/activefacts/api/role_values.rb

@@ -34,8 +34,9 @@ module ActiveFacts
 
       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.
-	  key = form_key(Array(a))
 	  @a[key]
 	else
 	  # Slow: Search the array for an element having the matching key:
@@ -127,20 +128,21 @@ module ActiveFacts
 	end
       end
 
-      def_single_delegator :@a, :all?, 1
+      # Arity of -1 is needed when a block is passed using to_proc, e.g. map(&:some_method).
+      def_single_delegator :@a, :all?, -1, 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, :select, -1, 1
+      def_single_delegator :@a, :reject, -1, 1
       def_single_delegator :@a, :size
-      def_single_delegator :@a, :sort_by, 1, -1
+      def_single_delegator :@a, :sort_by, -1, 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_single_delegator :@a, :each, *([-1, 1] + Array(defined?(::RSpec) ? -2 : nil))
+      def_single_delegator :@a, :detect, 1, *([-1, 1] + Array(defined?(::RSpec) ? -2 : nil))
+      def_single_delegator :@a, :map, -1, 1
     end
   end
 end

data/lib/activefacts/api/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module API
-    VERSION = "1.9.2"
+    VERSION = "1.9.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-api
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.9.4
 platform: ruby
 authors:
 - Clifford Heath
@@ -37,6 +37,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,6 +47,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement