activefacts-generators 1.8.2 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fae26b2c7cc83608173f074aaed203e14715b5a5
-  data.tar.gz: c4d0e31dc92866f042a82baebe67c0369414cb2d
+  metadata.gz: 18414a4533151ffe192e7ae375366327595faf25
+  data.tar.gz: 6d31af89a93cfa0d63edf126cacb3df917770cd3
 SHA512:
-  metadata.gz: d2f8719f99dcb8f5b4425d46e558e9862ba0a0dc51c16ab58a67c78ba4faa0add7fc2ced31fc5a58188bc568a7b76fdfecb23892fda04261591a8c8806bc68f4
-  data.tar.gz: 930d7bc060c4d53c4913dec4510b4609dd1177cc13a005e1e13993527ee083a79e32e3f600b60b25c8381c17df72f3d016d713aacc732b40a57163151d9cd406
+  metadata.gz: 314a64ec5dcf991328ef3ffcc1fdb18b5f99673bb1c27695d0e9f796ac922c26b0acb94517c146401dbb08d3e6adbc965c6e44b43ce13e22d0bbf8cf021a2b50
+  data.tar.gz: 0ed72bc6312ef1eae1059d5a93f530b056f9cec1ea7b690eaa93f1e6933be4dc4376cf2175f82846e8cf6dd49972714402ce3c539d76a1b828baffd915335905

data/activefacts-generators.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "activefacts-generators"
-  spec.version       = "1.8.2"
+  spec.version       = "1.8.3"
   spec.authors       = ["Clifford Heath"]
   spec.email         = ["clifford.heath@gmail.com"]
 
@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 1.10", "~> 1.10.6"
+  spec.add_development_dependency "bundler", ">= 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.3"
 

data/lib/activefacts/generators/helpers/rails.rb

@@ -2,29 +2,29 @@ module ActiveFacts
   module Generators
     module Rails
       module Helpers
-	def rails_plural_name name
-	  # Crunch spaces and pluralise the first part, all in snake_case
-	  name.pop if name.is_a?(Array) and name.last == []
-	  name = name[0]*'_' if name.is_a?(Array) and name.size == 1
-	  if name.is_a?(Array)
-	    name = ActiveSupport::Inflector.tableize((name[0]*'_').gsub(/\s+/, '_')) +
-	      '_' +
-	      ActiveSupport::Inflector.underscore((name[1..-1].flatten*'_').gsub(/\s+/, '_'))
-	  else
-	    ActiveSupport::Inflector.tableize(name.gsub(/\s+/, '_'))
-	  end
-	end
-
-	def rails_singular_name name
-	  # Crunch spaces and convert to snake_case
-	  name = name.flatten*'_' if name.is_a?(Array)
-	  ActiveSupport::Inflector.underscore(name.gsub(/\s+/, '_'))
-	end
-
-	def rails_class_name name
-	  name = name*'_' if name.is_a?(Array)
-	  ActiveSupport::Inflector.camelize(name.gsub(/\s+/, '_'))
-	end
+        def rails_plural_name name
+          # Crunch spaces and pluralise the first part, all in snake_case
+          name.pop if name.is_a?(Array) and name.last == []
+          name = name[0]*'_' if name.is_a?(Array) and name.size == 1
+          if name.is_a?(Array)
+            name = ActiveSupport::Inflector.tableize((name[0]*'_').gsub(/\s+/, '_')) +
+              '_' +
+              ActiveSupport::Inflector.underscore((name[1..-1].flatten*'_').gsub(/\s+/, '_'))
+          else
+            ActiveSupport::Inflector.tableize(name.gsub(/\s+/, '_'))
+          end
+        end
+
+        def rails_singular_name name
+          # Crunch spaces and convert to snake_case
+          name = name.flatten*'_' if name.is_a?(Array)
+          ActiveSupport::Inflector.underscore(name.gsub(/\s+/, '_'))
+        end
+
+        def rails_class_name name
+          name = name*'_' if name.is_a?(Array)
+          ActiveSupport::Inflector.camelize(name.gsub(/\s+/, '_'))
+        end
 
       end
     end
@@ -40,16 +40,16 @@ module ActiveFacts
       include Generate::Rails::Helpers
 
       def rails_from_association_name
-	rails_singular_name(to_name.join('_'))
+        rails_singular_name(to_name.join('_'))
       end
 
       def rails_to_association
-	jump = jump_reference
-	if jump.is_one_to_one
-	  [ "has_one", rails_singular_name(from_name)]
-	else
-	  [ "has_many", rails_plural_name(from_name)]
-	end
+        jump = jump_reference
+        if jump.is_one_to_one
+          [ "has_one", rails_singular_name(from_name)]
+        else
+          [ "has_many", rails_plural_name(from_name)]
+        end
       end
 
     end

data/lib/activefacts/generators/rails/models.rb

@@ -19,212 +19,212 @@ module ActiveFacts
     module Rails
       # Generate Rails models for the vocabulary
       # Invoke as
-      #   afgen --rails/schema[=options] <file>.cql
+      #   afgen --rails/models[=options] <file>.cql
       class Models
 
-	HEADER = "# Auto-generated from CQL, edits will be lost"
+        HEADER = "# Auto-generated from CQL, edits will be lost"
 
       private
 
-	def initialize(vocabulary, *options)
-	  @vocabulary = vocabulary
-	  @vocabulary = @vocabulary.Vocabulary.values[0] if ActiveFacts::API::Constellation === @vocabulary
-	  help if options.include? "help"
-	  options.delete_if { |option| @output = $1 if option =~ /^output=(.*)/ }
-	  @concern = nil
-	  options.delete_if { |option| @concern = $1 if option =~ /^concern=(.*)/ }
-	  @validations = true
-	  options.delete_if { |option| @validations = eval($1) if option =~ /^validation=(.*)/ }
-	end
-
-	def help
-	  @helping = true
-	  warn %Q{Options for --rails/schema:
-	output=dir		Overwrite model files into this output directory
-	concern=name		Namespace for the concerns
-	validation=false	Disable generation of validations
+        def initialize(vocabulary, *options)
+          @vocabulary = vocabulary
+          @vocabulary = @vocabulary.Vocabulary.values[0] if ActiveFacts::API::Constellation === @vocabulary
+          help if options.include? "help"
+          options.delete_if { |option| @output = $1 if option =~ /^output=(.*)/ }
+          @concern = nil
+          options.delete_if { |option| @concern = $1 if option =~ /^concern=(.*)/ }
+          @validations = true
+          options.delete_if { |option| @validations = eval($1) if option =~ /^validation=(.*)/ }
+        end
+
+        def help
+          @helping = true
+          warn %Q{Options for --rails/schema:
+        output=dir              Overwrite model files into this output directory
+        concern=name            Namespace for the concerns
+        validation=false        Disable generation of validations
 }
-	end
+        end
 
-	def warn *a
-	  $stderr.puts *a
-	end
+        def warn *a
+          $stderr.puts *a
+        end
 
-	def puts s
-	  @out.puts s
-	end
+        def puts s
+          @out.puts s
+        end
 
       public
-	def generate(out = $>)      #:nodoc:
-	  return if @helping
-	  @out = out
-	  list_extant_files if @output
-
-	  # Populate all foreignkeys first:
-	  @vocabulary.tables.each { |table| table.foreign_keys }
-	  ok = true
-	  @vocabulary.tables.each do |table|
-	    ok &= generate_table(table)
-	  end
-	  $stderr.puts "\# #{@vocabulary.name} generated with errors" unless ok
-	  delete_old_generated_files if @output
-	  ok
-	end
-
-	def list_extant_files
-	  @preexisting_files = Dir[@output+'/*.rb']
-	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{^#{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 filename
-	  # Create a file in the output directory, being careful not to overwrite carelessly
-	  if @output
-	    pathname = (@output+'/'+filename).gsub(%r{//+}, '/')
-	    @preexisting_files.reject!{|f| f == pathname }    # Don't clean up this file
-	    if generated_file_exists(pathname) == false
-	      $stderr.puts "not overwriting non-generated file #{pathname}"
-	      @individual_file = nil
-	      return
-	    end
-	    @individual_file = @out = File.open(pathname, 'w')
-	    puts "#{HEADER}"
-	  end
-	  true
-	end
-
-	def to_associations table
-	  # belongs_to Associations
-	  table.foreign_keys.map do |fk|
-	    association_name = fk.rails_from_association_name
-
-	    if association_name != fk.to.rails_singular_name
-	      # A different class_name is implied, emit an explicit one:
-	      class_name = ", :class_name => '#{fk.to.rails_class_name}'"
-	    end
-	    foreign_key = ", :foreign_key => :#{fk.from_columns[0].rails_name}"
-	    if foreign_key == fk.to.rails_singular_name+'_id'
-	      # See lib/active_record/reflection.rb, method #derive_foreign_key
-	      foreign_key = ''
-	    end
-
-	    %Q{
+        def generate(out = $>)      #:nodoc:
+          return if @helping
+          @out = out
+          list_extant_files if @output
+
+          # Populate all foreignkeys first:
+          @vocabulary.tables.each { |table| table.foreign_keys }
+          ok = true
+          @vocabulary.tables.each do |table|
+            ok &= generate_table(table)
+          end
+          warn "\# #{@vocabulary.name} generated with errors" unless ok
+          delete_old_generated_files if @output
+          ok
+        end
+
+        def list_extant_files
+          @preexisting_files = Dir[@output+'/*.rb']
+        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{^#{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 filename
+          # Create a file in the output directory, being careful not to overwrite carelessly
+          if @output
+            pathname = (@output+'/'+filename).gsub(%r{//+}, '/')
+            @preexisting_files.reject!{|f| f == pathname }    # Don't clean up this file
+            if generated_file_exists(pathname) == false
+              $stderr.puts "not overwriting non-generated file #{pathname}"
+              @individual_file = nil
+              return
+            end
+            @individual_file = @out = File.open(pathname, 'w')
+            puts "#{HEADER}"
+          end
+          true
+        end
+
+        def to_associations table
+          # belongs_to Associations
+          table.foreign_keys.map do |fk|
+            association_name = fk.rails_from_association_name
+
+            if association_name != fk.to.rails_singular_name
+              # A different class_name is implied, emit an explicit one:
+              class_name = ", :class_name => '#{fk.to.rails_class_name}'"
+            end
+            foreign_key = ", :foreign_key => :#{fk.from_columns[0].rails_name}"
+            if foreign_key == fk.to.rails_singular_name+'_id'
+              # See lib/active_record/reflection.rb, method #derive_foreign_key
+              foreign_key = ''
+            end
+
+            %Q{
     \# #{fk.verbalised_path}
     belongs_to :#{association_name}#{class_name}#{foreign_key}}
-	  end
-	end
-
-	def from_associations table
-	  # has_one/has_many Associations
-	  table.foreign_keys_to.sort_by{|fk| fk.describe}.map do |fk|
-	    # Get the jump reference
-
-	    if fk.from_columns.size > 1
-	      raise "Can't emit Rails associations for multi-part foreign key with #{fk.references.inspect}. Did you mean to use --transform/surrogate"
-	    end
-
-	    association_type, association_name = *fk.rails_to_association
-
-	    ref = fk.jump_reference
-	    [
-	      "\n    \# #{fk.verbalised_path(true)}" +
-	      "\n" +
-		%Q{    #{association_type} :#{association_name}} +
-		%Q{, :class_name => '#{fk.from.rails_class_name}'} +
-		%Q{, :foreign_key => :#{fk.from_columns[0].rails_name}} +
-		%Q{, :dependent => :destroy}
-	    ] +
-	      # If ref.from is a join table, we can emit a has_many :through for each other key
-	      # REVISIT Could alternately do this for all belongs_to's in ref.from
-	      if ref.from.identifier_columns.length > 1
-		ref.from.identifier_columns.map do |ic|
-		  next nil if ic.references[0] == ref or	# Skip the back-reference
-		    ic.references[0].is_unary		# or use rails_plural_name(ic.references[0].to_names) ?
-		  # This far association name needs to be augmented for its role name
-		  far_association_name = ic.references[0].to.rails_name
-		  %Q{    has_many :#{far_association_name}, :through => :#{association_name}} # \# via #{ic.name}}
-		end
-	      else
-		[]
-	      end
-	  end.flatten.compact
-	end
-
-	def column_constraints table
-	  return [] unless @validations
-	  ccs =
-	    table.columns.map do |column|
-	      name = column.rails_name
-	      column.is_mandatory &&
-		!column.is_auto_assigned && !column.is_auto_timestamp ? [
-		"    validates :#{name}, :presence => true"
-	      ] : []
-	    end.flatten
-	  ccs.unshift("") unless ccs.empty?
-	  ccs
-	end
-
-	def model_body table
-	  %Q{module #{table.rails_class_name}
+          end
+        end
+
+        def from_associations table
+          # has_one/has_many Associations
+          table.foreign_keys_to.sort_by{|fk| fk.describe}.map do |fk|
+            # Get the jump reference
+
+            if fk.from_columns.size > 1
+              raise "Can't emit Rails associations for multi-part foreign key with #{fk.references.inspect}. Did you mean to use --transform/surrogate"
+            end
+
+            association_type, association_name = *fk.rails_to_association
+
+            ref = fk.jump_reference
+            [
+              "\n    \# #{fk.verbalised_path(true)}" +
+              "\n" +
+                %Q{    #{association_type} :#{association_name}} +
+                %Q{, :class_name => '#{fk.from.rails_class_name}'} +
+                %Q{, :foreign_key => :#{fk.from_columns[0].rails_name}} +
+                %Q{, :dependent => :destroy}
+            ] +
+              # If ref.from is a join table, we can emit a has_many :through for each other key
+              # REVISIT Could alternately do this for all belongs_to's in ref.from
+              if ref.from.identifier_columns.length > 1
+                ref.from.identifier_columns.map do |ic|
+                  next nil if ic.references[0] == ref or        # Skip the back-reference
+                    ic.references[0].is_unary           # or use rails_plural_name(ic.references[0].to_names) ?
+                  # This far association name needs to be augmented for its role name
+                  far_association_name = ic.references[0].to.rails_name
+                  %Q{    has_many :#{far_association_name}, :through => :#{association_name}} # \# via #{ic.name}}
+                end
+              else
+                []
+              end
+          end.flatten.compact
+        end
+
+        def column_constraints table
+          return [] unless @validations
+          ccs =
+            table.columns.map do |column|
+              name = column.rails_name
+              column.is_mandatory &&
+                !column.is_auto_assigned && !column.is_auto_timestamp ? [
+                "    validates :#{name}, :presence => true"
+              ] : []
+            end.flatten
+          ccs.unshift("") unless ccs.empty?
+          ccs
+        end
+
+        def model_body table
+          %Q{module #{table.rails_class_name}
   extend ActiveSupport::Concern
   included do} +
-	    (table.identifier_columns.length == 1 ? %Q{
+            (table.identifier_columns.length == 1 ? %Q{
     self.primary_key = '#{table.identifier_columns[0].rails_name}'
 } : ''
-	    ) +
-
-	    (
-	      to_associations(table) +
-	      from_associations(table) +
-	      column_constraints(table)
-	    ) * "\n" +
-	    %Q{
+            ) +
+
+            (
+              to_associations(table) +
+              from_associations(table) +
+              column_constraints(table)
+            ) * "\n" +
+            %Q{
   end
 end
 }
-	end
+        end
 
-	def generate_table table
-	  old_out = @out
-	  filename = table.rails_singular_name+'.rb'
+        def generate_table table
+          old_out = @out
+          filename = table.rails_singular_name+'.rb'
 
-	  return unless create_if_ok filename
+          return unless create_if_ok filename
 
-	  puts "\n"
-	  puts "module #{@concern}" if @concern
-	  puts model_body(table).gsub(/^./, @concern ? '  \0' : '\0')
-	  puts 'end' if @concern
+          puts "\n"
+          puts "module #{@concern}" if @concern
+          puts model_body(table).gsub(/^./, @concern ? '  \0' : '\0')
+          puts 'end' if @concern
 
-	  true	  # We succeeded
-	ensure
-	  @out = old_out
-	  @individual_file.close if @individual_file
-	end
+          true    # We succeeded
+        ensure
+          @out = old_out
+          @individual_file.close if @individual_file
+        end
 
       end
     end
@@ -233,12 +233,12 @@ end
   module RMap
     class Column
       def is_auto_timestamp
-	case name('_')
-	when /\A(created|updated)_(at|on)\Z/i
-	  true
-	else
-	  false
-	end
+        case name('_')
+        when /\A(created|updated)_(at|on)\Z/i
+          true
+        else
+          false
+        end
       end
     end
   end

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

@@ -17,197 +17,197 @@ module ActiveFacts
       #   afgen --rails/schema[=options] <file>.cql
       class SchemaRb
       private
-	include RMap
-
-	def initialize(vocabulary, *options)
-	  @vocabulary = vocabulary
-	  @vocabulary = @vocabulary.Vocabulary.values[0] if ActiveFacts::API::Constellation === @vocabulary
-	  help if options.include? "help"
-	  @exclude_fks = options.include? "exclude_fks"
-	  @include_comments = options.include? "include_comments"
-	  @closed_world = options.include? "closed_world"
-	end
-
-	def help
-	  @helping = true
-	  warn %Q{Options for --rails/schema:
-	exclude_fks		Don't generate foreign key definitions for use with Rails 4 or the foreigner gem
-	include_comments	Generate a comment for each column showing the absorption path
-	closed_world		Set this if your DBMS only allows one null in a unique index (MS SQL)
+        include RMap
+
+        def initialize(vocabulary, *options)
+          @vocabulary = vocabulary
+          @vocabulary = @vocabulary.Vocabulary.values[0] if ActiveFacts::API::Constellation === @vocabulary
+          help if options.include? "help"
+          @exclude_fks = options.include? "exclude_fks"
+          @include_comments = options.include? "include_comments"
+          @closed_world = options.include? "closed_world"
+        end
+
+        def help
+          @helping = true
+          warn %Q{Options for --rails/schema:
+        exclude_fks             Don't generate foreign key definitions for use with Rails 4 or the foreigner gem
+        include_comments        Generate a comment for each column showing the absorption path
+        closed_world            Set this if your DBMS only allows one null in a unique index (MS SQL)
 }
-	end
+        end
 
-	def warn *a
-	  $stderr.puts *a
-	end
+        def warn *a
+          $stderr.puts *a
+        end
 
-	def puts s
-	  @out.puts s
-	end
+        def puts s
+          @out.puts s
+        end
 
       public
 
-	# We sort the columns here, not in the rmap layer, because it affects
-	# the ordering of columns in an index :-(.
-	def sorted_columns table, pk, fk_columns
-	  table.columns.sort_by do |column|
-	    [ # Emit columns alphabetically, but PK first, then FKs, then others
-	      case
-	      when i = pk.index(column)
-		i
-	      when fk_columns.include?(column)
-		pk.size+1
-	      else
-		pk.size+2
-	      end,
-	      column.rails_name
-	    ]
-	  end
-	end
-
-	def generate_column table, pk, column
-	  name = column.rails_name
-	  type, params, constraints = *column.type
-	  length = params[:length]
-	  length &&= length.to_i
-	  scale = params[:scale]
-	  scale &&= scale.to_i
-	  rails_type, length = *column.rails_type
+        # We sort the columns here, not in the rmap layer, because it affects
+        # the ordering of columns in an index :-(.
+        def sorted_columns table, pk, fk_columns
+          table.columns.sort_by do |column|
+            [ # Emit columns alphabetically, but PK first, then FKs, then others
+              case
+              when i = pk.index(column)
+                i
+              when fk_columns.include?(column)
+                pk.size+1
+              else
+                pk.size+2
+              end,
+              column.rails_name
+            ]
+          end
+        end
+
+        def generate_column table, pk, column
+          name = column.rails_name
+          type, params, constraints = *column.type
+          length = params[:length]
+          length &&= length.to_i
+          scale = params[:scale]
+          scale &&= scale.to_i
+          rails_type, length = *column.rails_type
  
-	  length_name = rails_type == 'decimal' ? 'precision' : 'limit'
-	  length_option = length ? ", :#{length_name} => #{length}" : ''
-	  scale_option = scale ? ", :scale => #{scale}" : ''
-
-	  comment = column.comment
-	  null_option = ", :null => #{!column.is_mandatory}"
-	  if pk.size == 1 && pk[0] == column
-	    case rails_type
-	    when 'serial'
-	      rails_type = "primary_key"
-	    when 'uuid'
-	      rails_type = "uuid, :default => 'gen_random_uuid()', :primary_key => true"
-	    end
-	  else
-	    case rails_type
-	    when 'serial'
-	      rails_type = 'integer'	    # An integer foreign key
-	    end
-	  end
-
-	  (@include_comments ? ["    \# #{comment}"] : []) +
-	  [
-	    %Q{    t.column "#{name}", :#{rails_type}#{length_option}#{scale_option}#{null_option}}
-	  ]
-	end
-
-	def generate_columns table, pk, fk_columns
-	  sc = sorted_columns(table, pk, fk_columns)
-	  lines = sc.map do |column|
-	    generate_column table, pk, column
-	  end
-	  lines.flatten
-	end
-
-	def generate_table table, foreign_keys
-	  ar_table_name = table.rails_name
-
-	  pk = table.identifier_columns
-	  if pk[0].is_auto_assigned
-	    identity_column = pk[0]
-	    warn "Warning: redundant column(s) after #{identity_column.name} in primary key of #{ar_table_name}" if pk.size > 1
-	  end
-
-	  # Get the list of references that give rise to foreign keys:
-	  fk_refs = table.references_from.select{|ref| ref.is_simple_reference }
-
-	  # Get the list of columns that embody the foreign keys:
-	  fk_columns = table.columns.select do |column|
-	    column.references[0].is_simple_reference
-	  end
-
-	  # Detect if this table is a join table.
-	  # Join tables have multi-part primary keys that are made up only of foreign keys
-	  is_join_table = pk.length > 1 and
-	    !pk.detect do |pk_column|
-	      !fk_columns.include?(pk_column)
-	    end
-	  warn "Warning: #{table.name} has a multi-part primary key" if pk.length > 1 and !is_join_table
-
-	  puts %Q{  create_table "#{ar_table_name}", :id => false, :force => true do |t|}
-
-	  columns = generate_columns table, pk, fk_columns
-
-	  unless @exclude_fks
-	    table.foreign_keys.each do |fk|
-	      from_columns = fk.from_columns.map{|column| column.rails_name}
-	      to_columns = fk.to_columns.map{|column| column.rails_name}
-
-	      foreign_keys.concat(
-		if (from_columns.length == 1)
-		  index_name = RMap.rails_name_trunc('index_'+fk.from.rails_name+'_on_'+from_columns[0])
-		  [
-		    "    add_foreign_key :#{fk.from.rails_name}, :#{fk.to.rails_name}, :column => :#{from_columns[0]}, :primary_key => :#{to_columns[0]}, :on_delete => :cascade"
-		  ]+
-		  Array(
-		    # Index it non-uniquely only if it's not unique already:
-		    fk.jump_reference.to_role.is_unique ? nil :
-		      "    add_index :#{fk.from.rails_name}, [:#{from_columns[0]}], :unique => false, :name => :#{index_name}"
-		  )
-		else
-		  # This probably isn't going to work without Dr Nic's CPK gem:
-		  [
-		    "    add_foreign_key :#{fk.to.rails_name}, :#{fk.from.rails_name}, :column => [:#{from_columns.join(':, ')}], :primary_key => [:#{to_columns.join(':, ')}], :on_delete => :cascade"
-		  ]
-		end
-	      )
-	    end
-	  end
-
-	  indices = table.indices
-	  index_text = []
-	  indices.each do |index|
-	    next if index.is_primary && index.columns.size == 1	  # We've handled this already
-
-	    index_name = index.rails_name
-
-	    unique = !index.columns.detect{|column| !column.is_mandatory} and !@closed_world
-	    index_text << %Q{  add_index "#{ar_table_name}", ["#{index.columns.map{|c| c.rails_name}*'", "'}"], :name => :#{index_name}#{
-	      unique ? ", :unique => true" : ''
-	    }}
-	  end
-
-	  puts columns.join("\n")
-	  puts "  end\n\n"
-
-	  puts index_text.join("\n")
-	  puts "\n" unless index_text.empty?
-	end
-
-	def generate(out = $>)      #:nodoc:
-	  return if @helping
-	  @out = out
-
-	  foreign_keys = []
-
-	  # If we get index names that need to be truncated, add a counter to ensure uniqueness
-	  dup_id = 0
-
-	  puts "#\n# schema.rb auto-generated using ActiveFacts for #{@vocabulary.name} on #{Date.today}\n#\n\n"
-	  puts "ActiveRecord::Base.logger = Logger.new(STDOUT)\n"
-	  puts "ActiveRecord::Schema.define(:version => #{Time.now.strftime('%Y%m%d%H%M%S')}) do"
-	  puts "  enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')\n"
-
-	  @vocabulary.tables.each do |table|
-	    generate_table table, foreign_keys
-	  end
-
-	  unless @exclude_fks
-	    puts '  unless ENV["EXCLUDE_FKS"]'
-	    puts foreign_keys.join("\n")
-	    puts '  end'
-	  end
-	  puts "end"
-	end
+          length_name = rails_type == 'decimal' ? 'precision' : 'limit'
+          length_option = length ? ", #{length_name}: #{length}" : ''
+          scale_option = scale ? ", scale: #{scale}" : ''
+
+          comment = column.comment
+          null_option = ", null: #{!column.is_mandatory}"
+          if pk.size == 1 && pk[0] == column
+            case rails_type
+            when 'serial'
+              rails_type = "primary_key"
+            when 'uuid'
+              rails_type = "uuid, default: 'gen_random_uuid()', primary_key: true"
+            end
+          else
+            case rails_type
+            when 'serial'
+              rails_type = 'integer'        # An integer foreign key
+            end
+          end
+
+          (@include_comments ? ["    \# #{comment}"] : []) +
+          [
+            %Q{    t.column "#{name}", :#{rails_type}#{length_option}#{scale_option}#{null_option}}
+          ]
+        end
+
+        def generate_columns table, pk, fk_columns
+          sc = sorted_columns(table, pk, fk_columns)
+          lines = sc.map do |column|
+            generate_column table, pk, column
+          end
+          lines.flatten
+        end
+
+        def generate_table table, foreign_keys
+          ar_table_name = table.rails_name
+
+          pk = table.identifier_columns
+          if pk[0].is_auto_assigned
+            identity_column = pk[0]
+            warn "Warning: redundant column(s) after #{identity_column.name} in primary key of #{ar_table_name}" if pk.size > 1
+          end
+
+          # Get the list of references that give rise to foreign keys:
+          fk_refs = table.references_from.select{|ref| ref.is_simple_reference }
+
+          # Get the list of columns that embody the foreign keys:
+          fk_columns = table.columns.select do |column|
+            column.references[0].is_simple_reference
+          end
+
+          # Detect if this table is a join table.
+          # Join tables have multi-part primary keys that are made up only of foreign keys
+          is_join_table = pk.length > 1 and
+            !pk.detect do |pk_column|
+              !fk_columns.include?(pk_column)
+            end
+          warn "Warning: #{table.name} has a multi-part primary key" if pk.length > 1 and !is_join_table
+
+          puts %Q{  create_table "#{ar_table_name}", id: false, force: true do |t|}
+
+          columns = generate_columns table, pk, fk_columns
+
+          unless @exclude_fks
+            table.foreign_keys.each do |fk|
+              from_columns = fk.from_columns.map{|column| column.rails_name}
+              to_columns = fk.to_columns.map{|column| column.rails_name}
+
+              foreign_keys.concat(
+                if (from_columns.length == 1)
+                  index_name = RMap.rails_name_trunc('index_'+fk.from.rails_name+'_on_'+from_columns[0])
+                  [
+                    "    add_foreign_key :#{fk.from.rails_name}, :#{fk.to.rails_name}, column: :#{from_columns[0]}, primary_key: :#{to_columns[0]}, on_delete: :cascade"
+                  ]+
+                  Array(
+                    # Index it non-uniquely only if it's not unique already:
+                    fk.jump_reference.to_role.is_unique ? nil :
+                      "    add_index :#{fk.from.rails_name}, [:#{from_columns[0]}], unique: false, name: :#{index_name}"
+                  )
+                else
+                  # This probably isn't going to work without Dr Nic's CPK gem:
+                  [
+                    "    add_foreign_key :#{fk.to.rails_name}, :#{fk.from.rails_name}, column: [:#{from_columns.join(':, ')}], primary_key: [:#{to_columns.join(':, ')}], on_delete: :cascade"
+                  ]
+                end
+              )
+            end
+          end
+
+          indices = table.indices
+          index_text = []
+          indices.each do |index|
+            next if index.is_primary && index.columns.size == 1   # We've handled this already
+
+            index_name = index.rails_name
+
+            unique = !index.columns.detect{|column| !column.is_mandatory} and !@closed_world
+            index_text << %Q{  add_index "#{ar_table_name}", ["#{index.columns.map{|c| c.rails_name}*'", "'}"], name: :#{index_name}#{
+              unique ? ", unique: true" : ''
+            }}
+          end
+
+          puts columns.join("\n")
+          puts "  end\n\n"
+
+          puts index_text.join("\n")
+          puts "\n" unless index_text.empty?
+        end
+
+        def generate(out = $>)      #:nodoc:
+          return if @helping
+          @out = out
+
+          foreign_keys = []
+
+          # If we get index names that need to be truncated, add a counter to ensure uniqueness
+          dup_id = 0
+
+          puts "#\n# schema.rb auto-generated using ActiveFacts for #{@vocabulary.name} on #{Date.today}\n#\n\n"
+          puts "ActiveRecord::Base.logger = Logger.new(STDOUT)\n"
+          puts "ActiveRecord::Schema.define(version: #{Time.now.strftime('%Y%m%d%H%M%S')}) do"
+          puts "  enable_extension 'pgcrypto' unless extension_enabled?('pgcrypto')\n"
+
+          @vocabulary.tables.each do |table|
+            generate_table table, foreign_keys
+          end
+
+          unless @exclude_fks
+            puts '  unless ENV["EXCLUDE_FKS"]'
+            puts foreign_keys.join("\n")
+            puts '  end'
+          end
+          puts "end"
+        end
 
       end
     end

data/lib/activefacts/generators/transform/datavault.rb

@@ -195,6 +195,9 @@ module ActiveFacts
 	    :fact_type => ref.fact_type,
 	    :concept => :new
 	  )
+
+	  # REVISIT: Objectifying requires creation of LinkFactTypes.
+
 	  @link_tables << et
 	end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-generators
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.10.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement