activefacts-rmap 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c90516da204087884d794d7a74a10d2a28b4e179
-  data.tar.gz: 6ca131f3866bb26cb487b357f28cf463a76f4427
+  metadata.gz: bf33b3400b5c538ad43e3db107ca862a29f5b1f5
+  data.tar.gz: 3eb0d4cfa5be71a688a8a41cb138601fd76f6e3d
 SHA512:
-  metadata.gz: b24c435653377dd8e767de80374fb738942c298949d15b4fd76109be7aa86386c5a08ae87d837eb78b7e901e25c7be7f49737ae9ae034fb06137061f30c8c412
-  data.tar.gz: 011ca97e825acbc4a29fdbfb53cb0eca7037bf092551fbe629944aa6249c0a04a1b79eb2fcdf0e364839d2c0f02216d1814bf3129749d7197f01d23b882b75cb
+  metadata.gz: d5358ddf562d53888ce4b9213a85e845d43b6b1947692bb8b2661b9ed30214b7c9fc2617ca589aaf674fde0715f584fdc8cba27ed4b1ece4ad68ddce60bd275a
+  data.tar.gz: 1c6170b95730f6b6c0ad08249953ea9dd2c63ea78aedabbb240b6190289d7f27d5074d11280eba6418c248e20f1f90b088ba2f75722941e55d444027f2181208

data/Rakefile

@@ -4,3 +4,20 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
+
+desc "Bump gem version patch number"
+task :bump do
+  path = File.expand_path('../lib/activefacts/rmap/version.rb', __FILE__)
+  lines = File.open(path) do |fp| fp.readlines; end
+  File.open(path, "w") do |fp|
+    fp.write(
+      lines.map do |line|
+	line.gsub(/(VERSION *= *"[0-9.]*\.)([0-9]+)"\n/) do
+	  version = "#{$1}#{$2.to_i+1}"
+	  puts "Version bumped to #{version}\""
+	  version+"\"\n"
+	end
+      end*''
+    )
+  end
+end

data/activefacts-rmap.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 
-  spec.add_runtime_dependency("activefacts-metamodel", ">= 1.8", "~> 1.8.0")
+  spec.add_runtime_dependency "activefacts-metamodel", ">= 1.8", "~> 1"
 end

data/lib/activefacts/rmap/tables.rb

@@ -53,8 +53,8 @@ module ActiveFacts
 	  return true if type.name =~ /^Auto/ || type.transaction_phase
 	  type = type.supertype
 	end
+	false
       end
-      false
     end
 
     class EntityType < DomainObjectType
@@ -87,7 +87,7 @@ module ActiveFacts
 
         # Subtypes may be partitioned or separate, in which case they're definitely tables.
         # Otherwise, if their identification is inherited from a supertype, they're definitely absorbed.
-        # If theey have separate identification, it might absorb them.
+        # If they have separate identification, it might absorb them.
         if (!supertypes.empty?)
           as_ti = all_supertype_inheritance.detect{|ti| ti.assimilation}
           @is_table = as_ti != nil
@@ -274,27 +274,21 @@ module ActiveFacts
                     object_type.references_from.reject{|ref|
                       pi_roles.include?(ref.to_role)
                     }
-                  trace :absorption, "#{object_type.name} has #{non_identifying_refs_from.size} non-identifying functional roles"
-
-=begin
-                  # This is kinda arbitrary. We need a policy for evaluating optional flips, so we can decide if they "improve" things.
-                  # The flipping that occurs below always eliminates a table by absorption, but this doesn't.
-
-                  # If all non-identifying functional roles are one-to-ones that can be flipped, do that:
-                  if non_identifying_refs_from.all? { |ref| ref.role_type == :one_one && (ref.to.is_table || ref.to.tentative) }
-                    trace :absorption, "Flipping references from #{object_type.name}" do
-                      non_identifying_refs_from.each do |ref|
-                        trace :absorption, "Flipping #{ref}"
-                        ref.flip
-                      end
-                    end
-                    non_identifying_refs_from = []
-                  end
-=end
+                  trace :absorption, "#{object_type.name} has #{non_identifying_refs_from.size} non-identifying functional roles" do
+		    non_identifying_refs_from.each do |ref|
+		      trace :absorption, "#{ref.inspect}"
+		    end
+		  end
+
+		  trace :absorption, "#{object_type.name} has #{object_type.references_to.size} references to it:" do
+		    object_type.references_to.each do |ref|
+		      trace :absorption, ref.inspect
+		    end
+		  end if object_type.references_to.size > 1
 
                   if object_type.references_to.size > 1 and
                       non_identifying_refs_from.size > 0
-                    trace :absorption, "#{object_type.name} has non-identifying functional dependencies so 3NF requires it be a table"
+                    trace :absorption, "#{object_type.name} has #{non_identifying_refs_from.size} non-identifying functional dependencies and #{object_type.references_to.size} absorption paths so 3NF requires it be a table"
                     object_type.definitely_table
                     next object_type
                   end
@@ -303,7 +297,8 @@ module ActiveFacts
                     (
                       non_identifying_refs_from.reject do |ref|
                         !ref.to or ref.to.absorbed_via == ref
-                      end+object_type.references_to
+                      end +
+		      object_type.references_to
                     ).reject do |ref|
                       next true if !ref.to.is_table or !ref.is_one_to_one
 
@@ -318,21 +313,18 @@ module ActiveFacts
 
                   # If this object can be fully absorbed, do that (might require flipping some references)
                   if absorption_paths.size > 0
-                    trace :absorption, "#{object_type.name} is fully absorbed through #{absorption_paths.inspect}"
-                    absorption_paths.each do |ref|
-                      trace :absorption, "Flipping #{ref} so #{object_type.name} can be absorbed"
-                      ref.flip if object_type == ref.from
-                    end
+                    trace :absorption, "#{object_type.name} is fully absorbed through #{absorption_paths.inspect}" do
+		      absorption_paths.each do |ref|
+			flip = object_type == ref.from
+			ref.flip if flip
+			trace :absorption, "#{object_type.name} is FULLY ABSORBED via {ref}#{flip ? ' (flipped)' : ''}"
+		      end
+		    end
                     object_type.definitely_not_table
                     next object_type
                   end
 
                   if non_identifying_refs_from.size == 0
-		    # REVISIT: This allows absorption along a non-mandatory role of a objectified fact type
-		    # and object_type.references_to.all?{|ref| ref.is_mandatory }
-#                    and (!object_type.is_a?(EntityType) ||
-#                      # REVISIT: The roles may be collectively but not individually mandatory.
-#                      object_type.references_to.detect { |ref| !ref.from_role || ref.from_role.is_mandatory })
                     trace :absorption, "#{object_type.name} is fully absorbed in #{object_type.references_to.size} places: #{object_type.references_to.map{|ref| ref.from.name}*", "}"
                     object_type.definitely_not_table
                     next object_type

data/lib/activefacts/rmap/version.rb

@@ -1,5 +1,5 @@
 module Activefacts
   module RMap
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-rmap
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,7 +67,7 @@ dependencies:
         version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -77,7 +77,7 @@ dependencies:
         version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1'
 description: Relational mapping for fact models. Part of the ActiveFacts suite.
 email:
 - clifford.heath@gmail.com