activefacts-metamodel 1.9.17 → 1.9.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add6e3c8d9f09f1d7c92e94658e9b3a53c937edb
-  data.tar.gz: dadcd30c0c2c04178dd53d811e384521dbe1bb3e
+  metadata.gz: 1a9c5fec87ace6e0757e0266aa42d21ec7208d78
+  data.tar.gz: 432d7942772ab7c7eda0a4c93e9369e3f9ef044a
 SHA512:
-  metadata.gz: c614110af45ddc88a5181c70ae6b26e04db2d69e10fc07515420942fd70756c34150f615ef3acb4ca99856298f5b6aab64831180d1d22654963074826168b5d9
-  data.tar.gz: ad3a1fb187d7885d8c5264e6ffe62d8ae26b462d36a06194f88a4d663c63a190818a6c7c02ff81864db41847dfc453ba8c267d376c71bad0cf2881d89bc9e1ba
+  metadata.gz: 8876140eafbbd5eb1f67653cab2c5b0233acd1d8f3cae8e79bb6f766085664349f0cc1fcd730adfa5059889b2ded423d3dd686b5e7039ca4e176039211c8b366
+  data.tar.gz: 4dd4b1fad6303b5d98abbb703bde756ecdcd756d7b00edf5c76c9d7afec108ad5db569f3bdfcf6129f894ad449f1a39b6f1e0aabc3d11f5c7337b00d5853a48c

data/lib/activefacts/metamodel/datatypes.rb

@@ -196,12 +196,10 @@ module ActiveFacts
 
         when SurrogateKey
           [ context.surrogate_type,
-            if in_primary_index and !in_foreign_key
-              {auto_assign: "commit"}
-            else
-              {}
-            end.
-            merge!({mandatory: path_mandatory})
+            {
+              auto_assign: ((in_primary_index && !in_foreign_key) ? "commit" : nil),
+              mandatory: path_mandatory
+            }
           ]
 
         when ValidFrom
@@ -240,7 +238,7 @@ module ActiveFacts
           [ vt.name,
             (length ? {length: length} : {}).
             merge!(scale ? {scale: scale} : {}).
-            merge!({ auto_assign: (in_primary_index and !in_foreign_key and is_auto_assigned) }).
+            merge!(is_auto_assigned ? { auto_assign: (in_primary_index and !in_foreign_key)} : {}).
             merge!({mandatory: path_mandatory}).
             merge!(value_constraint ? {value_constraint: value_constraint} : {})
           ]

data/lib/activefacts/metamodel/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Metamodel
-    VERSION = "1.9.17"
+    VERSION = "1.9.18"
   end
 end

data/lib/activefacts/support.rb

@@ -89,7 +89,7 @@ class String
       count = 0
       map do |word|
         if (count += 1) == 1
-          word
+          word.downcase   # The camel has his head down
         else
           word[0].upcase+word[1..-1].downcase
         end
@@ -110,6 +110,16 @@ class String
       snakewords.join(joiner)
     end
 
+    def shoutwords
+      map do |word|
+        word.upcase
+      end
+    end
+
+    def shoutcase joiner = '_'
+      shoutwords.join(joiner)
+    end
+
     def to_a
       self
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activefacts-metamodel
 version: !ruby/object:Gem::Version
-  version: 1.9.17
+  version: 1.9.18
 platform: ruby
 authors:
 - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler