activefacts-compositions 1.9.22 → 1.9.23

data/lib/activefacts/generator/rails/ruby_folder_generator.rb

@@ -0,0 +1,87 @@
+#
+#       ActiveFacts Rails Models Generator
+#
+# Copyright (c) 2018 Daniel Heath. Read the LICENSE file.
+#
+require 'digest/sha1'
+require 'activefacts/metamodel'
+require 'activefacts/compositions'
+require 'activefacts/generator'
+require 'activefacts/compositions/traits/rails'
+require 'fileutils'
+
+module ActiveFacts
+  module Generators
+    module Rails
+      module RubyFolderGenerator
+        HEADER = "# Auto-generated (edits will be lost) using:"
+
+        def warn *a
+          $stderr.puts *a
+        end
+
+        def generate
+          record_extant_files_to_remove
+
+          @ok = true
+          result = generate_files
+
+          warn "\# #{@composition.name} generated with errors" unless @ok
+          delete_old_generated_files if @option_output && !@option_keep
+
+          result
+        end
+
+        def record_extant_files_to_remove
+          @preexisting_files = []
+          return if @option_keep
+          @preexisting_files = extant_files || []
+        end
+
+        def delete_old_generated_files
+          remaining = []
+          cleaned = 0
+          @preexisting_files.each do |pathname|
+            if generated_file_exists(pathname) == true
+              File.unlink(pathname)
+              cleaned += 1
+            else
+              remaining << pathname
+            end
+          end
+          $stderr.puts "Cleaned up #{cleaned} old generated files" if @preexisting_files.size > 0
+          $stderr.puts "Remaining non-generated files:\n\t#{remaining*"\n\t"}" if remaining.size > 0
+        end
+
+        def generated_file_exists pathname
+          File.open(pathname, 'r') do |existing|
+            first_lines = existing.read(1024)     # Make it possible to pass over a magic charset comment
+            if first_lines.length == 0 or first_lines =~ %r{^#{Regexp.quote HEADER}}
+              return true
+            end
+          end
+          return false    # File exists, but is not generated
+        rescue Errno::ENOENT
+          return nil      # File does not exist
+        end
+
+        def create_if_ok dir, filename
+          # Create a file in the output directory, being careful not to overwrite carelessly
+          out = $stdout
+          if dir
+            FileUtils.mkdir_p(dir)
+            pathname = (dir+'/'+filename).gsub(%r{//+}, '/')
+            @preexisting_files.reject!{|f| f == pathname }    # Don't clean up this file
+            if generated_file_exists(pathname) == false
+              warn "not overwriting non-generated file #{pathname}"
+              @ok = false
+              return nil
+            end
+            out = File.open(pathname, 'w')
+          end
+          out
+        end
+      end
+    end
+  end
+end

data/lib/activefacts/generator/rails/schema.rb

@@ -15,7 +15,7 @@ module ActiveFacts
     module Rails
       class Schema
         MM = ActiveFacts::Metamodel unless const_defined?(:MM)
-        HEADER = "# Auto-generated from CQL, edits will be lost"
+        HEADER = "# Auto-generated (edits will be lost) using:"
         def self.options
           ({
             fks:              ['Boolean', "Generate foreign key definitions"],
@@ -24,7 +24,13 @@ module ActiveFacts
           })
         end
 
-        def initialize composition, options = {}
+        def self.compatibility
+          # REVISIT: We depend on the surrogate option being enabled if any PK is not Rails-friendly
+          [1, %i{relational}]   # one relational composition
+        end
+
+        def initialize constellation, composition, options = {}
+          @constellation = constellation
           @composition = composition
           @options = options
           @option_exclude_fks = [false, 'f', 'n', 'no'].include?(options.delete("fks"))
@@ -56,7 +62,8 @@ module ActiveFacts
           header =
             [
               '#',
-              "# schema.rb auto-generated for #{@composition.name}",
+              "#{HEADER}",
+              "\# #{([File.basename($0)]+ARGV)*' '}",
               '#',
               '',
               "ActiveRecord::Base.logger = Logger.new(STDOUT)",
@@ -205,11 +212,12 @@ module ActiveFacts
           end
 
           valid_parameters = MM::DataType::TypeParameters[type]
+          size_param = valid_parameters && valid_parameters.include?(:precision) ? :precision : :limit
           length_ok = valid_parameters &&
             ![MM::DataType::TYPE_Real, MM::DataType::TYPE_Integer].include?(type) &&
             (valid_parameters.include?(:length) || valid_parameters.include?(:precision))
           scale_ok = length_ok && valid_parameters.include?(:scale)
-          length_option = length_ok && options[:length] ? ", limit: #{options[:length]}" : ''
+          length_option = length_ok && options[:length] ? ", #{size_param}: #{options[:length]}" : ''
           scale_option = scale_ok && options[:scale] ? ", scale: #{options[:scale]}" : ''
           null_option = ", null: #{!options[:mandatory]}"
 

data/lib/activefacts/generator/ruby.rb

@@ -20,7 +20,11 @@ module ActiveFacts
         )
       end
 
-      def initialize composition, options = {}
+      def self.compatibility
+        [1, %i{binary}]
+      end
+
+      def initialize constellation, composition, options = {}
         super
         @scope = options.delete('scope') || ''
         @scope = @scope.split(/::/)
@@ -51,8 +55,8 @@ module ActiveFacts
       end
 
       def class_prelude(object_type, supertype)
-        global_qualifier = object_type == supertype ? '::' :''
-        "  class #{object_type.name.words.capcase}" + (supertype ? " < #{global_qualifier}#{supertype.name.words.capcase}" : '') + "\n"
+        global_qualifier = object_type == supertype ? ('::') : ''
+        "  class #{object_type.name.words.capcase}" + (supertype ? (" < #{global_qualifier}#{supertype.name.words.capcase}") : '') + "\n"
       end
 
       def class_finale(object_type)

data/lib/activefacts/generator/sql.rb

@@ -24,7 +24,8 @@ module ActiveFacts
       include Traits::SQL
       extend Traits::SQL
 
-      def initialize composition, options = {}
+      def initialize constellation, composition, options = {}
+        @constellation = constellation
         @composition = composition
         process_options options
       end

data/lib/activefacts/generator/summary.rb

@@ -9,6 +9,30 @@ require "activefacts/compositions/constraints"
 require "activefacts/generator"
 
 module ActiveFacts
+  module Generators
+    class Summary
+      def self.options
+        {
+        }
+      end
+
+      def self.compatibility
+        [1, nil]
+      end
+
+      def initialize constellation, composition, options = {}
+        @constellation = constellation
+        @composition = composition
+        @options = options
+      end
+
+      def generate
+        @composition.summary
+      end
+    end
+    publish_generator Summary, "Succinctly display the full structure of any composition"
+  end
+
   module Metamodel
     class Composition
       def summary
@@ -98,23 +122,4 @@ module ActiveFacts
       end
     end
   end
-
-  module Generators
-    class Summary
-      def self.options
-        {
-        }
-      end
-
-      def initialize composition, options = {}
-        @composition = composition
-        @options = options
-      end
-
-      def generate
-        @composition.summary
-      end
-    end
-    publish_generator Summary, "Succinctly display the full structure of any composition"
-  end
 end

data/lib/activefacts/generator/traits/sql.rb

@@ -36,6 +36,10 @@ module ActiveFacts
           }
         end
 
+        def compatibility
+          [1, %i{relational}]
+        end
+
         # The options parameter overrides any default options set by sub-traits
         def defaults_and_options options
           options

data/lib/activefacts/generator/transgen.rb

@@ -19,7 +19,13 @@ module ActiveFacts
         }
       end
 
-      def initialize composition, options = {}
+      def self.compatibility
+        # REVISIT: This should accept 2 compositions
+        [1, %i{relational}]
+      end
+  
+      def initialize constellation, composition, options = {}
+        @constellation = constellation
         @composition = composition
         @options = options
       end

data/lib/activefacts/generator/validate.rb

@@ -19,7 +19,12 @@ module ActiveFacts
         }
       end
 
-      def initialize composition, options = {}
+      def self.compatibility
+        [nil, nil]
+      end
+  
+      def initialize constellation, composition, options = {}
+        @constellation = constellation
         @composition = composition
         @options = options
       end
@@ -34,7 +39,10 @@ module ActiveFacts
           end
         end
 
-        @composition.validate(&report)
+        Array(@composition).
+        each do |c|
+          c.validate(&report)
+        end
         nil
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-compositions
 version: !ruby/object:Gem::Version
-  version: 1.9.22
+  version: 1.9.23
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-23 00:00:00.000000000 Z
+date: 2019-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10'
 - !ruby/object:Gem::Dependency
@@ -212,14 +212,24 @@ files:
 - lib/activefacts/compositions/traits/rails.rb
 - lib/activefacts/compositions/version.rb
 - lib/activefacts/generator.rb
+- lib/activefacts/generator/doc/css/glossary-print.css
+- lib/activefacts/generator/doc/css/glossary.css
 - lib/activefacts/generator/doc/css/ldm.css
+- lib/activefacts/generator/doc/css/orm2-print.css
+- lib/activefacts/generator/doc/css/orm2.css
+- lib/activefacts/generator/doc/css/reset.css
+- lib/activefacts/generator/doc/css/treetable.css
 - lib/activefacts/generator/doc/cwm.rb
 - lib/activefacts/generator/doc/glossary.rb
 - lib/activefacts/generator/doc/graphviz.rb
 - lib/activefacts/generator/doc/ldm.rb
 - lib/activefacts/generator/etl/unidex.rb
 - lib/activefacts/generator/oo.rb
+- lib/activefacts/generator/population.rb
+- lib/activefacts/generator/rails/active_admin.rb
+- lib/activefacts/generator/rails/application_record_shell.rb
 - lib/activefacts/generator/rails/models.rb
+- lib/activefacts/generator/rails/ruby_folder_generator.rb
 - lib/activefacts/generator/rails/schema.rb
 - lib/activefacts/generator/ruby.rb
 - lib/activefacts/generator/sql.rb
@@ -257,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Create and represent composite schemas, schema transforms and data transforms