reality-facets 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d17f63aa3fd221512dc2cf8fb3305c70a33f18df
-  data.tar.gz: 0e66691871d7376d787d10eed9bf6d84f28ed982
+  metadata.gz: eb2cf5b835141d1956e52495b6e86298c7a0bd38
+  data.tar.gz: f63d857ce9b317ae26a8272a6c31d31d8eed00cd
 SHA512:
-  metadata.gz: b39725276dde3d9d2cd95068d597525f5e9c92e9836087f8af4bdae090d642f230c8699c99b957278cc6dd4fcfc34a9088a97fd1bc9cbf6e5f8b9693aa79b3ba
-  data.tar.gz: f06caabcc236eb7899f1eac6aa95fd11535689d14eefc4a6dd337996b7dfdab85365ea0ab4c0b40b69243f4ee6e21bf9505ed8ff4301a65dfda70e64859f126f
+  metadata.gz: 19ce8a8033d1b9f83aad57e287ec49d53f2ebffb502820ec6be488949a961cc950b1b626b04b58a9af30e739553ea625eb9268696dfbc6d69ea6db5f75b53aed
+  data.tar.gz: 3162fe711a8e2b827657dd3e3bf2ce093ecece7c97724abbe532ba5b1eefe47bc3fca62422c7722215e449e61a2ecfb824c349e1e691062bcc36058eba8e1ffb

data/lib/reality/facets.rb

@@ -20,6 +20,7 @@ require 'reality/orderedhash'
 
 require 'reality/facets/core'
 require 'reality/facets/target_manager'
+require 'reality/facets/extension_manager'
 require 'reality/facets/faceted_model'
 require 'reality/facets/facet'
 require 'reality/facets/facet_container'

data/lib/reality/facets/extension_manager.rb

@@ -0,0 +1,62 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Reality #nodoc
+  module Facets #nodoc
+    class ExtensionManager
+      def initialize
+        @locked = false
+      end
+
+      # An array of modules that should be mixed in to every extension object
+      def instance_extensions
+        instance_extension_list.dup
+      end
+
+      # Add a ruby module that will be applied to all extension objects
+      def instance_extension(extension)
+        Facets.error("Attempting to define instance extension #{extension} after extension manager is locked") if locked?
+        instance_extension_list << extension
+      end
+
+      # An array of modules that should be mixed in to the singleton class of extension objects
+      def singleton_extensions
+        singleton_extension_list.dup
+      end
+
+      def singleton_extension(extension)
+        Facets.error("Attempting to define singleton extension #{extension} after extension manager is locked") if locked?
+        singleton_extension_list << extension
+      end
+
+      def lock!
+        @locked = true
+      end
+
+      def locked?
+        !!(@locked ||= nil)
+      end
+
+      private
+
+      def singleton_extension_list
+        @singleton_extensions ||= []
+      end
+
+      def instance_extension_list
+        @instance_extensions ||= []
+      end
+    end
+  end
+end

data/lib/reality/facets/facet.rb

@@ -57,6 +57,7 @@ module Reality #nodoc
       end
 
       def enhance(model_class, &block)
+        facet_container.extension_manager.lock!
         target_manager = facet_container.target_manager
         target = target_manager.target_by_model_class(model_class)
 
@@ -88,6 +89,14 @@ end
           RUBY
           @model_extension_instances[model_class] = definitions.const_get(extension_name)
 
+          facet_container.extension_manager.instance_extensions.each do |extension|
+            @model_extension_instances[model_class].class_eval { include extension }
+          end
+
+          facet_container.extension_manager.singleton_extensions.each do |extension|
+            @model_extension_instances[model_class].singleton_class.class_eval { include extension }
+          end
+
           target.extension_module.class_eval <<-RUBY
             def #{self.key}
               self.facet_#{self.key}

data/lib/reality/facets/facet_container.rb

@@ -19,18 +19,6 @@ module Reality #nodoc
         base.class_eval 'module FacetDefinitions; end'
       end
 
-      # An array of modules that should be mixed in to every extension object
-      def facet_extensions
-        facet_extension_list.dup
-      end
-
-      # Add a ruby module that will be applied to all extension objects
-      def facet_extension(extension)
-        Facets.error("Attempting to define facet extension #{extension} after facet manager is locked") if locked?
-        facet_extension_list << extension
-        target_manager.lock!
-      end
-
       def facet?(name)
         facet_by_name?(name)
       end
@@ -62,13 +50,16 @@ module Reality #nodoc
 
       def lock!
         @locked = true
-        apply_facet_extensions
       end
 
       def locked?
         !!(@locked ||= nil)
       end
 
+      def extension_manager
+        @extension_manager ||= Reality::Facets::ExtensionManager.new
+      end
+
       def target_manager
         @target_manager ||= Reality::Facets::TargetManager.new(self)
       end
@@ -166,24 +157,6 @@ module Reality #nodoc
         true
       end
 
-      def apply_facet_extensions
-        facet_extension_list.each do |extension|
-          facet_map.values.each do |facet|
-            target_manager.targets.each do |target|
-              if facet.enhanced?(target.model_class)
-                facet.enhance(target.model_class) do
-                  include extension
-                end
-              end
-            end
-          end
-        end
-      end
-
-      def facet_extension_list
-        @facet_extensions ||= []
-      end
-
       def register_facet(facet)
         target_manager.lock!
         Facets.error("Attempting to define facet #{facet.key} after facet manager is locked") if locked?

data/reality-facets.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{reality-facets}
-  s.version            = '1.6.0'
+  s.version            = '1.7.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']

data/test/facets/test_extension_manager.rb

@@ -0,0 +1,34 @@
+require File.expand_path('../../helper', __FILE__)
+
+class Reality::Facets::TestExtensionManager < Reality::TestCase
+
+  module MyExtensionModule
+  end
+
+  module MySingletonExtensionModule
+  end
+
+  def test_basic_operation
+
+    extension_manager = Reality::Facets::ExtensionManager.new
+    assert_equal false, extension_manager.locked?
+
+    assert_equal [], extension_manager.instance_extensions
+    extension_manager.instance_extension(MyExtensionModule)
+    assert_equal [MyExtensionModule], extension_manager.instance_extensions
+
+    assert_equal [], extension_manager.singleton_extensions
+    extension_manager.singleton_extension(MySingletonExtensionModule)
+    assert_equal [MySingletonExtensionModule], extension_manager.singleton_extensions
+
+    extension_manager.lock!
+
+    assert_facet_error('Attempting to define instance extension Reality::Facets::TestExtensionManager::MyExtensionModule after extension manager is locked') do
+      extension_manager.instance_extension(MyExtensionModule)
+    end
+
+    assert_facet_error('Attempting to define singleton extension Reality::Facets::TestExtensionManager::MySingletonExtensionModule after extension manager is locked') do
+      extension_manager.singleton_extension(MySingletonExtensionModule)
+    end
+  end
+end

data/test/facets/test_facet.rb

@@ -115,8 +115,13 @@ class Reality::Facets::TestFacet < Reality::TestCase
     end
   end
 
-  def test_common_extension_modules
+  module MySingletonExtensionModule
+    def blah
+      'X'
+    end
+  end
 
+  def test_common_extension_modules
     assert_equal false, TestFacetContainer.facet_by_name?(:gwt)
 
     TestFacetContainer.target_manager.target(Project2, :project)
@@ -125,9 +130,13 @@ class Reality::Facets::TestFacet < Reality::TestCase
                                              :project)
 
 
-    assert_equal [], TestFacetContainer.facet_extensions
-    TestFacetContainer.facet_extension(MyExtensionModule)
-    assert_equal [MyExtensionModule], TestFacetContainer.facet_extensions
+    assert_equal [], TestFacetContainer.extension_manager.instance_extensions
+    TestFacetContainer.extension_manager.instance_extension(MyExtensionModule)
+    assert_equal [MyExtensionModule], TestFacetContainer.extension_manager.instance_extensions
+
+    assert_equal [], TestFacetContainer.extension_manager.singleton_extensions
+    TestFacetContainer.extension_manager.singleton_extension(MySingletonExtensionModule)
+    assert_equal [MySingletonExtensionModule], TestFacetContainer.extension_manager.singleton_extensions
 
     Reality::Facets::Facet.new(TestFacetContainer, :gwt) do |f|
       f.enhance(Project2) do
@@ -146,6 +155,7 @@ class Reality::Facets::TestFacet < Reality::TestCase
     assert_equal true, project.gwt?
     assert_equal 'GwtMyProject', project.gwt.name
     assert_equal 'yo', project.gwt.hello_message
+    assert_equal 'X', project.gwt.class.blah
     assert_equal false, component.respond_to?(:gwt)
   end
 end

data/test/facets/test_facet_container.rb

@@ -39,10 +39,6 @@ class Reality::Facets::TestFacetContainer < Reality::TestCase
     assert_equal %w(gwt), TestFacetContainer.facet_keys
     assert_equal 1, TestFacetContainer.facets.size
 
-    assert_equal [], TestFacetContainer.facet_extensions
-    TestFacetContainer.facet_extension(MyExtensionModule)
-    assert_equal [MyExtensionModule], TestFacetContainer.facet_extensions
-
     assert_facet_error("Unknown facet 'gwt_rpc'") { TestFacetContainer.facet_by_name(:gwt_rpc) }
 
     assert_equal TestFacetContainer, TestFacetContainer.facet_by_name(:gwt).facet_container

data/test/helper.rb

@@ -4,6 +4,12 @@ require 'minitest/autorun'
 require 'test/unit/assertions'
 require 'reality/facets'
 
+class Reality::Facets::ExtensionManager
+  def unlock!
+    @locked = false
+  end
+end
+
 class Reality::TestCase < Minitest::Test
   include Test::Unit::Assertions
   include Reality::Logging::Assertions
@@ -14,8 +20,8 @@ class Reality::TestCase < Minitest::Test
 
       def reset
         @locked = false
+        extension_manager.unlock!
         facet_map.clear
-        facet_extension_list.clear
         target_manager.reset_targets
         TestFacetContainer::FacetDefinitions.constants.each do |constant|
           TestFacetContainer::FacetDefinitions.send(:remove_const, constant)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reality-facets
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-28 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reality-core
@@ -97,12 +97,14 @@ files:
 - Rakefile
 - lib/reality/facets.rb
 - lib/reality/facets/core.rb
+- lib/reality/facets/extension_manager.rb
 - lib/reality/facets/facet.rb
 - lib/reality/facets/facet_container.rb
 - lib/reality/facets/faceted_model.rb
 - lib/reality/facets/generators_integration.rb
 - lib/reality/facets/target_manager.rb
 - reality-facets.gemspec
+- test/facets/test_extension_manager.rb
 - test/facets/test_facet.rb
 - test/facets/test_facet_container.rb
 - test/facets/test_faceted_model.rb