activefacts-compositions 1.9.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21764b88dbad036917cb41736a88158dfe3a0557
-  data.tar.gz: c6e8dac27a2114b466b03e6707489280af4103ca
+  metadata.gz: 92a737c515247b8ec677c99cdfed1a550daf92e1
+  data.tar.gz: 863d201ecf700a29c68a83bb373ead97382ca6f5
 SHA512:
-  metadata.gz: 6dc9d157c1ff522b0b529d3693b35149d1d4a917648d46a909ff32a3003164fbb86decc0db1823072b51fdb513d820857d835a3946418ddb6f4ed64678677757
-  data.tar.gz: 52e636f04f8acd46418c0ab3def5bfacc99a0802714a2f07dc1cc4baf730d926ecd34a5eaa7d4cb33a42f936081290a6dbf514d7cc2822f56523bbbd2368029c
+  metadata.gz: cacf53c424c21b0764ae8e2878bf1e083f1fd7bd1ba93c7075420393ee0e34a16057688298255bb21516c40b5eb1630a632cec5c778ef745388b4065e3d6eaca
+  data.tar.gz: f179277f0ce2fc207466933f2e344260c86cf7acd995c902275787b70218aca7883f1565e7d068d30c90b76f56a66db2604dce46d49ddec82d7de4a2bb1601ed

data/bin/schema_compositor

@@ -35,14 +35,14 @@ class SchemaCompositor
       Loadable.new(path).
       enumerate.
       select do |filename|
-	begin
-	  require(pathname = path+"/"+filename)
-	  trace :loading, "Loaded #{pathname}"
-	rescue LoadError => e
-	  trace :loading, "Can't load #{pathname}: #{e.class}: #{e.message} #{e.backtrace[0]}"
-	rescue Exception => e
-	  $stderr.puts "Can't load #{pathname}: #{e.class}: #{e.message} #{e.backtrace[0]}"
-	end
+        begin
+          require(pathname = path+"/"+filename)
+          trace :loading, "Loaded #{pathname}"
+        rescue LoadError => e
+          trace :loading, "Can't load #{pathname}: #{e.class}: #{e.message} #{e.backtrace[0]}"
+        rescue Exception => e
+          $stderr.puts "Can't load #{pathname}: #{e.class}: #{e.message} #{e.backtrace[0]}"
+        end
       end
     end
   end
@@ -111,7 +111,7 @@ class SchemaCompositor
 
       # Run each generator
       @generators.each do |generator_klass, modes|
-	output = generator_klass.new(compositions, modes).generate
+        output = generator_klass.new(compositions, modes).generate
         puts output if output
       end
     end

data/lib/activefacts/compositions/datavault.rb

@@ -15,7 +15,7 @@ module ActiveFacts
         {
           reference: ['Boolean', "Emit the reference (static) tables as well. Default is to omit them"],
           datestamp: ['String', "Use this data type for date stamps"],
-          id: ['String', "Append this to data vault surrogate keys (default VID)"],
+          id: ['String', "Append this to data vault surrogate keys (default HID)"],
           hubname: ['String', "Suffix or pattern for naming hub tables. Include a + to insert the name. Default 'HUB'"],
           linkname: ['String', "Suffix or pattern for naming link tables. Include a + to insert the name. Default 'LINK'"],
           satname: ['String', "Suffix or pattern for naming satellite tables. Include a + to insert the name. Default 'SAT'"],

data/lib/activefacts/compositions/relational.rb

@@ -46,9 +46,6 @@ module ActiveFacts
           # Inject surrogate keys if the options ask for that
           inject_surrogates if @option_surrogates
 
-          # Inject load date time and record source if building staging
-          inject_all_datetime_recordsource
-
           # Remove the un-used absorption paths
           delete_reverse_absorptions
 
@@ -396,10 +393,6 @@ module ActiveFacts
         return true
       end
 
-      # This function is over-written in the Staging subclass
-      def inject_all_datetime_recordsource
-      end
-
       #
       # Datetime and recordsource functions defined here because they are used in both Staging and Datavault subclasses
       #
@@ -410,6 +403,7 @@ module ActiveFacts
           name: "Load"+datestamp_type_name,
           object_type: datestamp_type
         )
+
         # Add a load DateTime value
         recsrc_field = @constellation.ValueField(:new,
           parent: mapping,
@@ -440,7 +434,7 @@ module ActiveFacts
 
       def recordsource_type_name
         @recordsource_type_name ||= begin
-          [true, '', 'true', 'yes', nil].include?(t = @option_recordsource) ? 'RecordSource' : t
+          [true, '', 'true', 'yes', nil].include?(t = @option_recordsource) ? 'String' : t
         end
       end
 

data/lib/activefacts/compositions/staging.rb

@@ -41,6 +41,8 @@ module ActiveFacts
       def devolve_all
         # Rename composites with STG prefix
         rename_parents
+
+        inject_all_datetime_recordsource
       end
     end
 

data/lib/activefacts/compositions/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Compositions
-    VERSION = "1.9.9"
+    VERSION = "1.9.10"
   end
 end

data/lib/activefacts/generator/doc/cwm.rb

@@ -57,7 +57,7 @@ module ActiveFacts
           @options = options
           @underscore = options.has_key?("underscore") ? (options['underscore'] || '_') : ''
 
-          @vocabulary = composition.constellation.Vocabulary.values[0]      # REVISIT when importing from other vocabularies
+          @vocabulary = @composition.constellation.Vocabulary.values[0]      # REVISIT when importing from other vocabularies
         end
 
         def data_type_context

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-compositions
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.10
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-31 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler