activefacts-metamodel 1.9.15 → 1.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b9d48b959018dfa2c058b3f7ff8c6f72de85be7
-  data.tar.gz: 261ec3a4ff051b8ca6792699856d5b01e04c4fed
+  metadata.gz: b1d9c5bd4adc1eb2615d7f203dbbbb7f4c55a3f7
+  data.tar.gz: 1ee14b0cb2c13872a6428838839ca5aab29fe44f
 SHA512:
-  metadata.gz: 5f72c7417352823a629b4bc78d1490b12f49569909be18197aa8466f09ec4aeebaa09884309c257f7a94aac3c26a70b463d9b0170f42e61ab1903468224c4b17
-  data.tar.gz: d19e84520214f2cadfb9787c7339119679ba8a0800e06a895d2b1d57dfb83bb65342ba2ab2b8f19cbaea05cfd9cb8d69491d90c33bc16578ce218b97d327fb9c
+  metadata.gz: c27e410c1bdae1e36295a0b55dd7dabdd8b4024267feef22f5199fb980b403abe1f6295738d7bc5fc3f83e5465a16342eaa63b346363befb70b4fcc7972640ab
+  data.tar.gz: c71a23df4be55c450debded206c214435a972a6815fc1a51fb81cee9a9e7301dac5954b9f7cf9a210349812f3f95890822bcc3bc8653f29d86be3cc71d31e4c3

data/lib/activefacts/metamodel/extensions.rb

@@ -478,9 +478,14 @@ module ActiveFacts
       attr_reader :injected_surrogate_role
 
       def is_separate
+        # Independent object types and Entity Types marked separate
         is_independent or concept.all_concept_annotation.detect{|ca| ca.mapping_annotation == 'separate'}
       end
 
+      def is_partitioned
+        false
+      end
+
       def is_static
         concept.all_concept_annotation.detect{|ca| ca.mapping_annotation == 'static'}
       end
@@ -533,13 +538,18 @@ module ActiveFacts
       end
 
       def assimilation
-        ti = identifying_type_inheritance and ti.assimilation
+        ti = all_type_inheritance_as_subtype.map(&:assimilation).compact[0]
       end
 
       def is_separate
+        # Independent Object Types, Entity Types marked separate and TypeInheritance marked not absorbed
         super || !['absorbed', nil].include?(assimilation)
       end
 
+      def is_partitioned
+        assimilation == 'partitioned'
+      end
+
       def preferred_identifier
         return @preferred_identifier if @preferred_identifier
         if fact_type

data/lib/activefacts/metamodel/version.rb

@@ -1,5 +1,5 @@
 module ActiveFacts
   module Metamodel
-    VERSION = "1.9.15"
+    VERSION = "1.9.16"
   end
 end

data/lib/activefacts/support.rb

@@ -106,8 +106,8 @@ class String
       end
     end
 
-    def snakecase
-      snakewords.join('_')
+    def snakecase joiner = '_'
+      snakewords.join(joiner)
     end
 
     def to_a

metadata

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