activefacts-generators 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8cf08b3a5a39113eb4e04697ee25b4f4abdb4f
-  data.tar.gz: aeed8fc142836d0d79321eff69c97b38d016dc45
+  metadata.gz: fae26b2c7cc83608173f074aaed203e14715b5a5
+  data.tar.gz: c4d0e31dc92866f042a82baebe67c0369414cb2d
 SHA512:
-  metadata.gz: 13ce57f363db35fce13e217a916d17661fcfcd6349c0345d1873d0832a45fff625a5f656eb36cd8e758fb53d93df025234feade6defd6839ce50a9d2c9069f4f
-  data.tar.gz: b3a5c20cb3b066cb77774d88e1b55d3c95053672c079decf4f7f00b79a05e5da89a0c62d46a25a0b6f2ed13c58fe2a9aa1cabcfa0c178702f220db89a59f1e15
+  metadata.gz: d2f8719f99dcb8f5b4425d46e558e9862ba0a0dc51c16ab58a67c78ba4faa0add7fc2ced31fc5a58188bc568a7b76fdfecb23892fda04261591a8c8806bc68f4
+  data.tar.gz: 930d7bc060c4d53c4913dec4510b4609dd1177cc13a005e1e13993527ee083a79e32e3f600b60b25c8381c17df72f3d016d713aacc732b40a57163151d9cd406

data/Gemfile

@@ -2,9 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-if ENV['PWD'] =~ %r{\A#{ENV['HOME']}/work}
-  $stderr.puts "Using work area gems for #{File.basename(File.dirname(__FILE__))} from activefacts-generators"
-  gem 'activefacts-api', path: '/Users/cjh/work/activefacts/api'
-  gem 'activefacts-metamodel', path: '/Users/cjh/work/activefacts/metamodel'
-  # gem 'activefacts-metamodel', git: 'git://github.com/cjheath/activefacts-metamodel.git'
+this_file = File.absolute_path(__FILE__)
+if this_file =~ %r{\A#{ENV['HOME']}}i
+  dir = File.dirname(File.dirname(this_file))
+  $stderr.puts "Using work area gems in #{dir} from activefacts-generators"
+  gem 'activefacts-api', path: dir+'/api'
+  gem 'activefacts-metamodel', path: dir+'/metamodel'
 end

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.1"
+  spec.version       = "1.8.2"
   spec.authors       = ["Clifford Heath"]
   spec.email         = ["clifford.heath@gmail.com"]
 
@@ -20,7 +20,7 @@ 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"
-  spec.add_runtime_dependency "activefacts-rmap", ">= 1.8", "~> 1"
-  spec.add_runtime_dependency "activesupport", ">= 4.2", "~> 4.2.4"
+  spec.add_runtime_dependency "activefacts-metamodel", "~> 1", ">= 1.8"
+  spec.add_runtime_dependency "activefacts-rmap", "~> 1", ">= 1.8"
+  spec.add_runtime_dependency "activesupport", "~> 4.2", "~> 4.2.4"
 end

data/css/orm2.css

@@ -0,0 +1,124 @@
+a:link, a:visited {
+  color: #8A0092; text-decoration: underline;
+}
+
+ul {
+  margin: 0px 0px 0px 2em;
+  -webkit-margin-before: 0px;
+  -webkit-margin-after: 0px;
+  -webkit-padding-start: 0px;
+  padding: 0px;
+}
+
+pre.slide {
+  background-color: #000;
+  padding: 5px;
+  display: table-cell;
+  border-style: dashed;
+  border-width: 2px;
+  border-color: #BBB;
+}
+
+span {
+  font-family: "Frutiger", sans-serif;
+}
+
+.keyword {
+  color: #0000CC;
+}
+.term, .concept {
+  /* Xcolor: #6A0072;   The color used by NORMA */
+  color: #8A0092;
+}
+.vocabulary, .object_type {
+  /* Xcolor: #6A0072;   The color used by NORMA */
+  color: #8A0092;
+}
+.linking, .copula {
+  color: #0E5400;
+}
+.literal, .value {
+  color: #FF990E;
+}
+
+dd {
+  margin-bottom: 0.5em;
+  margin-left: 60px;
+  text-indent: -20px;
+}
+
+dd ul {
+  margin-left: -80px;
+  text-indent: 80px;
+}
+
+
+.glossary-sidebar {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  right: 0px;
+  width: 240px;
+  display: block;
+  margin: 0;
+  padding: 0 16px;
+  border-right: solid #DDD 3px;
+  background: #EEE;
+}
+
+.glossary-toc {
+  position: absolute;
+  top: 0px;
+  bottom: 24px;
+  overflow: auto;
+  margin: 0;
+  padding: 0 0;
+  list-style: none;
+  font-family: Menlo, Consolas, Monaco, "Lucida Console", monospace;
+}
+
+.glossary-controls {
+  position: absolute; bottom: 0px;
+}
+
+.glossary-doc {
+  position: absolute;
+  display: block;
+  background: #FFF;
+  border-right: solid #EEE 3px;
+  font: 300 16px/1.4 "Myriad Pro", "Helvetica Neue", Helvetica, "Arial Unicode MS", Arial, sans-serif;
+  overflow: auto;
+  padding: 0 0 0 30px;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 270px;
+}
+
+.glossary-toc li {
+  margin-left: 20px;
+  text-indent: -20px;
+}
+
+.glossary-doc dl {
+  margin-bottom: 1600px;
+}
+
+.glossary-doc dd {
+  margin-bottom: 30px;
+}
+
+.glossary-constraint {
+  background: #EDC;
+}
+
+.value {
+  display: inline;
+}
+
+.keyword,
+.glossary-facttype,
+.glossary-reading {
+  display: inline;
+  XXbackground: #E8E8E8;
+}

data/lib/activefacts/generators/cql.rb

@@ -293,8 +293,9 @@ module ActiveFacts
 
           # Alternate identification of objectified fact type?
           primary_supertype = supertypes[0]
-          pi = fact_type.entity_type.preferred_identifier
-          if pi && primary_supertype && primary_supertype.preferred_identifier != pi
+          if fact_type.all_role.size > 1 and
+	      pi = fact_type.entity_type.preferred_identifier and
+	      primary_supertype && primary_supertype.preferred_identifier != pi
             puts identified_by(o, pi) + ';'
             return
           end

data/lib/activefacts/generators/diagrams/json.rb

@@ -46,6 +46,7 @@ module ActiveFacts
 	      if o.is_a?(ActiveFacts::Metamodel::EntityType) and
 		p = o.preferred_identifier and
 		(rrs = p.role_sequence.all_role_ref).size == 1 and
+		!(o.fact_type && o.fact_type.all_role.size == 1) and
 		(r = rrs.single.role).fact_type != o.fact_type and
 		r.object_type.is_a?(ActiveFacts::Metamodel::ValueType) and
 		!r.fact_type.is_a?(ActiveFacts::Metamodel::TypeInheritance)

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

@@ -210,7 +210,9 @@ module ActiveFacts
           # Here, we must find the role_ref containing the adjectives that we need for each identifier,
           # which will be attached to the uniqueness constraint on this object in the binary FT that
           # attaches that identifying role.
-          identifying_role_refs = pi.role_sequence.all_role_ref.sort_by{|role_ref| role_ref.ordinal}
+          identifying_role_refs =
+	    (o.fact_type && o.fact_type.all_role.size == 1 ? o.fact_type.preferred_reading : pi).
+	      role_sequence.all_role_ref_in_order
 
           # We need to get the adjectives for the roles from the identifying fact's preferred readings:
           identifying_facts = ([o.fact_type]+identifying_role_refs.map{|rr| rr.role.fact_type }).compact.uniq
@@ -336,6 +338,7 @@ module ActiveFacts
           return if skip_fact_type(fact_type)
 
           if (et = fact_type.entity_type) &&
+	      fact_type.all_role.size > 1 &&
               (pi = et.preferred_identifier) &&
               pi.role_sequence.all_role_ref.detect{|rr| rr.role.fact_type != fact_type }
             # trace "Dumping objectified FT #{et.name} as an entity, non-fact PI"

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

@@ -0,0 +1,132 @@
+require 'activefacts/metamodel'
+require 'activefacts/rmap'
+require 'active_support'
+require 'digest/sha1'
+
+module ActiveFacts
+  module RMap
+    def self.rails_name_trunc name
+      if name.length > 63
+        hash = Digest::SHA1.hexdigest name
+        name = name[0, 53] + '__' + hash[0, 8]
+      end
+      name
+    end
+
+    def self.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 self.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
+
+    class Column
+      def rails_name
+        RMap::rails_singular_name(name('_'))
+      end
+
+      def rails_type
+        type_name, params, constraints = *type()
+        rails_type = case type_name
+          when /^Auto ?Counter$/i
+            'serial'        # REVISIT: Need to detect surrogate ID fields and handle them correctly
+
+          when /^[Ug]uid$/i
+            'uuid'
+
+          when /^Unsigned ?Integer$/i,
+            /^Integer$/i,
+            /^Signed ?Integer$/i,
+            /^Unsigned ?Small ?Integer$/i,
+            /^Signed ?Small ?Integer$/i,
+            /^Unsigned ?Tiny ?Integer$/i
+            length = nil
+            'integer'
+
+          when /^Decimal$/i
+            'decimal'
+
+          when /^Float$/i, /^Double$/i, /^Real$/i
+            'float'
+
+          when /^Fixed ?Length ?Text$/i, /^Char$/i
+            'string'
+          when /^Variable ?Length ?Text$/i, /^String$/i
+            'string'
+          when /^Large ?Length ?Text$/i, /^Text$/i
+            'text'
+
+          when /^Date ?And ?Time$/i, /^Date ?Time$/i
+            'datetime'
+          when /^Date$/i
+            'datetime'
+          when /^Time$/i
+            'time'
+          when /^Auto ?Time ?Stamp$/i
+            'timestamp'
+
+          when /^Money$/i
+            'decimal'
+          when /^Picture ?Raw ?Data$/i, /^Image$/i, /^Variable ?Length ?Raw ?Data$/i, /^Blob$/i
+            'binary'
+          when /^BIT$/i, /^Boolean$/i
+            'boolean'
+          else
+            type_name # raise "ActiveRecord type unknown for standard type #{type}"
+          end
+        [rails_type, params[:length]]
+      end
+    end
+
+    class Index
+      def rails_name
+        column_names = columns.map{|c| c.rails_name }
+        index_name = "index_#{on.rails_name+'_on_'+column_names*'_'}"
+        RMap.rails_name_trunc index_name
+      end
+    end
+
+    class ForeignKey
+      def rails_from_association_name
+        RMap::rails_singular_name(to_name.join('_'))
+      end
+
+      def rails_to_association
+        jump = jump_reference
+        if jump.is_one_to_one
+          [ "has_one", RMap::rails_singular_name(from_name)]
+        else
+          [ "has_many", RMap::rails_plural_name(from_name)]
+        end
+      end
+    end
+  end
+
+  module Metamodel
+    class ObjectType
+      def rails_name
+        RMap::rails_plural_name(name)
+      end
+
+      def rails_singular_name
+        RMap::rails_singular_name(name)
+      end
+
+      def rails_class_name
+        ActiveSupport::Inflector.camelize(name.gsub(/\s+/, '_'))
+      end
+    end
+  end
+end

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

@@ -222,7 +222,7 @@ module ActiveFacts
 	      table_role = ref.fact_type.all_role.detect{|r| r.object_type == table}
 	      if table_role
 		remote_table = ref.to
-		while remote_table.absorbed_via
+		while remote_table && remote_table.absorbed_via
 		  absorbed_into = remote_table.absorbed_via.from
 		  remote_table = absorbed_into
 		end

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

@@ -15,7 +15,7 @@ module ActiveFacts
       def add_surrogate type_name = 'Auto Counter', suffix = 'ID'
         # Find or assert the surrogate value type
         auto_counter = vocabulary.valid_value_type_name(type_name) ||
-          constellation.ValueType(:vocabulary => vocabulary, :name => type_name, :concept => :new)
+          constellation.ValueType(:vocabulary => vocabulary, :name => type_name, :concept => [:new, :implication_rule => 'Surrogate key transform'])
 
         # Create a subtype to identify this entity type:
         vt_name = self.name + ' '+suffix

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-generators
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,47 +62,47 @@ dependencies:
   name: activefacts-metamodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activefacts-rmap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
     - - "~>"
@@ -112,7 +112,7 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
     - - "~>"
@@ -134,6 +134,7 @@ files:
 - README.md
 - Rakefile
 - activefacts-generators.gemspec
+- css/orm2.css
 - lib/activefacts/dependency_analyser.rb
 - lib/activefacts/generators/absorption.rb
 - lib/activefacts/generators/composition.rb
@@ -158,6 +159,7 @@ files:
 - lib/activefacts/generators/traits/datavault.rb
 - lib/activefacts/generators/traits/oo.rb
 - lib/activefacts/generators/traits/ordered.rb
+- lib/activefacts/generators/traits/rails.rb
 - lib/activefacts/generators/traits/ruby.rb
 - lib/activefacts/generators/traits/scala.rb
 - lib/activefacts/generators/transform/datavault.rb
@@ -183,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Code Generators for the ActiveFacts suite