reality-facets 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb281ab73c6286e5c1a45396e041b0fc1d93970a
-  data.tar.gz: 64a10ebd482f32587978b40bdc4965534e07c028
+  metadata.gz: a0dfc8b7b3827dc8fb701309931179fa1ac10702
+  data.tar.gz: 3a3a1f3306010ba1bdc930b4bb437621960a7465
 SHA512:
-  metadata.gz: 0550cce27e866f4489e052caf535ccff1a07ebc7a492599403e0d462bffb115c3737ff81b28c5489090e72520893b4f163d4f56d33a2bcc3f540de42babdd2bc
-  data.tar.gz: c1a021e2d8ba9783fc0dbe6f5f6349e889bbad06caa639971796adac11e082800ba01b12abafc425faa28d52b6f4fd4351021b23bb0cb85935d5874966ba1f60
+  metadata.gz: 9620619a6997219813fa821d7f76bfb494b2b394cb497fdc3d74a0787ad4f8f283c73a6181d2e44192729338d2d3b4ba186948c6e2c24457e3a3c3b928af0904
+  data.tar.gz: c32dad7876933dc4dc84d643ea0a4a1900733273f0460523b48f2206e01c90c51df30d03149aef70d1a298cc223f04eaf8f9123552b9369550303e07ac4f6193

data/lib/reality/facets/facet.rb

@@ -57,9 +57,30 @@ module Reality #nodoc
 
         extension_name = "#{::Reality::Naming.pascal_case(self.key)}#{model_class.name.gsub(/^.*\:\:([^\:]+)/, '\1')}Facet"
         definitions = target_manager.container.facet_definitions
-        definitions.class_eval("class #{extension_name} < Reality.base_element(:container_key => :#{target.inverse_access_method}); end")
+        definitions.class_eval(<<-RUBY)
+class #{extension_name} < Reality.base_element(:container_key => :#{target.inverse_access_method})
+  def facet_key
+    :#{self.key}
+  end
+
+  def self.facet_key
+    :#{self.key}
+  end
+
+  def target_key
+    :#{target.key}
+  end
+
+  def self.target_key
+    :#{target.key}
+  end
+
+  def parent
+    self.#{target.inverse_access_method}
+  end
+end
+        RUBY
         extension_instance = definitions.const_get(extension_name)
-        extension_instance.class_eval("def parent; self.#{target.inverse_access_method}; end")
         extension_instance.class_eval(&block) if block_given?
 
         model_extension = target.extension_module
@@ -69,7 +90,7 @@ module Reality #nodoc
           end
 
           def facet_#{self.key}
-            raise "Attempted to access '#{self.key}' facet for model '#{model_class.name}' when facet disabled." unless #{self.key}?
+            Reality::Facets.error("Attempted to access '#{self.key}' facet for model '#{model_class.name}' when facet disabled.") unless #{self.key}?
             @facet_#{self.key} ||= #{extension_instance.name}.new(self)
           end
         RUBY
@@ -77,4 +98,3 @@ module Reality #nodoc
     end
   end
 end
-

data/lib/reality/facets/target_manager.rb

@@ -27,7 +27,7 @@ module Reality #nodoc
         @extension_module = nil
 
         if @container_key && !target_manager.target_by_key?(@container_key)
-          raise "Target '#{key}' defines container as '#{@container_key}' but no such target exists."
+          Reality::Facets.error("Target '#{key}' defines container as '#{@container_key}' but no such target exists.")
         end
 
         @target_manager.send(:register_target, self)
@@ -54,8 +54,8 @@ module Reality #nodoc
       end
 
       def apply_extension_to(object)
-        raise "Can not apply extension to model object of type #{object.class} as it is not of expected model type #{model_class.name} for target #{key}" unless object.is_a?(model_class)
-        raise "Attempted to apply extension multiple time to model object of type #{model_class.name} for target #{key}" if object.instance_variable_defined?('@facet_extension_active')
+        Reality::Facets.error("Can not apply extension to model object of type #{object.class} as it is not of expected model type #{model_class.name} for target #{key}") unless object.is_a?(model_class)
+        Reality::Facets.error("Attempted to apply extension multiple time to model object of type #{model_class.name} for target #{key}") if object.instance_variable_defined?('@facet_extension_active')
         object.class.send(:include, extension_module)
         object.instance_variable_set('@facet_container', target_manager.container)
         object.instance_variable_set('@facet_extension_active', true)
@@ -95,7 +95,7 @@ module Reality #nodoc
 
       def target_by_key(key)
         target = target_map[key.to_sym]
-        raise "Can not find target with key '#{key}'" unless target
+        Reality::Facets.error("Can not find target with key '#{key}'") unless target
         target
       end
 
@@ -103,7 +103,7 @@ module Reality #nodoc
         target_map.each do |key, target|
           return target if target.model_class == model_class
         end
-        raise "Can not find target with model class '#{model_class.name}'"
+        Reality::Facets.error("Can not find target with model class '#{model_class.name}'")
       end
 
       def apply_extension(model)
@@ -130,8 +130,8 @@ module Reality #nodoc
       private
 
       def register_target(target)
-        raise "Attempting to define target #{target.key} when targets have been locked." if (@targets_locked ||= false)
-        raise "Attempting to redefine target #{target.key}" if target_map[target.key]
+        Reality::Facets.error("Attempting to define target #{target.key} when targets have been locked.") if (@targets_locked ||= false)
+        Reality::Facets.error("Attempting to redefine target #{target.key}") if target_map[target.key]
         target_map[target.key] = target
       end
 

data/reality-facets.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = %q{reality-facets}
-  s.version            = '1.3.0'
+  s.version            = '1.4.0'
   s.platform           = Gem::Platform::RUBY
 
   s.authors            = ['Peter Donald']
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.has_rdoc           = false
   s.rdoc_options       = %w(--line-numbers --inline-source --title reality-facets)
 
-  s.add_dependency 'reality-core', '>= 1.4.0'
-  s.add_dependency 'reality-naming', '>= 1.4.0'
+  s.add_dependency 'reality-core', '>= 1.6.0'
+  s.add_dependency 'reality-naming', '>= 1.6.0'
   s.add_dependency 'reality-orderedhash', '>= 1.0.0'
 
   s.add_development_dependency(%q<minitest>, ['= 5.9.1'])

data/test/facets/test_facet.rb

@@ -63,6 +63,10 @@ class Reality::Facets::TestFacet < Reality::TestCase
     assert_equal true, project.respond_to?(:imit)
     assert_equal true, project.respond_to?(:facet_imit)
     assert_equal 'GwtMyProject', project.imit.name
+    assert_equal :imit, project.imit.facet_key
+    assert_equal :project, project.imit.target_key
+    assert_equal :imit, project.imit.class.facet_key
+    assert_equal :project, project.imit.class.target_key
 
     # These methods all test that FacetModule has been mixed in.
     assert_equal 'GwtMyProject', project.facet(:imit).name
@@ -71,6 +75,11 @@ class Reality::Facets::TestFacet < Reality::TestCase
     assert_equal [:gwt, :gwt_rpc, :imit], project.enabled_facets
     assert_equal [:gwt, :gwt_rpc, :imit], component.enabled_facets
 
+    assert_equal :imit, component.imit.facet_key
+    assert_equal :component, component.imit.target_key
+    assert_equal :imit, component.imit.class.facet_key
+    assert_equal :component, component.imit.class.target_key
+
     # Ensure there is a link back to the container using inverse_access_method
     assert_equal project, project.imit.project
     assert_equal project, project.imit.parent

data/test/facets/test_facet_container.rb

@@ -16,8 +16,8 @@ class Reality::Facets::TestFacetContainer < Reality::TestCase
     assert_equal [], TestFacetContainer.facet_keys
     assert_equal 0, TestFacetContainer.facets.size
 
-    assert_raise_message("Unknown facet 'gwt'") { TestFacetContainer.facet_by_name(:gwt) }
-    assert_raise_message("Unknown facet 'gwt_rpc'") { TestFacetContainer.facet_by_name(:gwt_rpc) }
+    assert_facet_error("Unknown facet 'gwt'") { TestFacetContainer.facet_by_name(:gwt) }
+    assert_facet_error("Unknown facet 'gwt_rpc'") { TestFacetContainer.facet_by_name(:gwt_rpc) }
 
     # Make sure we can add targets
     TestFacetContainer.target_manager.target(Component, :component)
@@ -25,7 +25,7 @@ class Reality::Facets::TestFacetContainer < Reality::TestCase
     TestFacetContainer.facet(:gwt)
 
     # targets should be locked after first facet defined
-    assert_raise_message('Attempting to define target component when targets have been locked.') do
+    assert_facet_error('Attempting to define target component when targets have been locked.') do
       TestFacetContainer.target_manager.target(Component, :component)
     end
 
@@ -36,7 +36,7 @@ class Reality::Facets::TestFacetContainer < Reality::TestCase
     assert_equal %w(gwt), TestFacetContainer.facet_keys
     assert_equal 1, TestFacetContainer.facets.size
 
-    assert_raise_message("Unknown facet 'gwt_rpc'") { TestFacetContainer.facet_by_name(:gwt_rpc) }
+    assert_facet_error("Unknown facet 'gwt_rpc'") { TestFacetContainer.facet_by_name(:gwt_rpc) }
 
     assert_equal TestFacetContainer, TestFacetContainer.facet_by_name(:gwt).facet_container
     assert_equal :gwt, TestFacetContainer.facet_by_name(:gwt).key
@@ -57,9 +57,9 @@ class Reality::Facets::TestFacetContainer < Reality::TestCase
     assert_equal [:gwt], TestFacetContainer.facet_by_name(:gwt_rpc).required_facets
     assert_equal [], TestFacetContainer.facet_by_name(:gwt_rpc).suggested_facets
 
-    assert_raise_message('Attempting to redefine facet gwt') { TestFacetContainer.facet(:gwt) }
+    assert_facet_error('Attempting to redefine facet gwt') { TestFacetContainer.facet(:gwt) }
 
-    assert_raise_message("Unknown definition form '{:x=>:y, :z=>1}'") { TestFacetContainer.facet(:x => :y, :z => 1) }
+    assert_facet_error("Unknown definition form '{:x=>:y, :z=>1}'") { TestFacetContainer.facet(:x => :y, :z => 1) }
   end
 
   def test_dependent_facets

data/test/facets/test_faceted_model.rb

@@ -87,7 +87,7 @@ class Reality::Facets::TestFacetedModel < Reality::TestCase
     assert_equal [], attribute2.enabled_facets
 
     repository.enable_facet(:imit)
-    assert_raise_message('Facet imit already enabled.') { repository.enable_facet(:imit) }
+    assert_facet_error('Facet imit already enabled.') { repository.enable_facet(:imit) }
 
     assert_equal [:json, :gwt, :gwt_rpc, :jpa, :imit], repository.enabled_facets
     assert_equal [:gwt, :gwt_rpc, :jpa, :imit], entity1.enabled_facets
@@ -136,7 +136,7 @@ class Reality::Facets::TestFacetedModel < Reality::TestCase
     assert_equal [:jpa, :json], attribute1.enabled_facets
     assert_equal [:jpa, :json], attribute2.enabled_facets
 
-    assert_raise_message('Facet json already enabled.') { repository.enable_facets!([:json]) }
+    assert_facet_error('Facet json already enabled.') { repository.enable_facets!([:json]) }
 
     # Try using brackets
     repository.disable_facets([:json, :imit])

data/test/facets/test_target_manager.rb

@@ -85,9 +85,9 @@ class Reality::Facets::TestTargetManager < Reality::TestCase
     assert_equal :prj, target1.inverse_access_method
     assert_equal 'Reality::TestCase::TestFacetContainer::FacetDefinitions::ProjectExtension', target1.extension_module.name
 
-    assert_raise_message('Attempting to redefine target project') { Reality::Facets::Target.new(target_manager, Project, :project, nil, {}) }
+    assert_facet_error('Attempting to redefine target project') { Reality::Facets::Target.new(target_manager, Project, :project, nil, {}) }
 
-    assert_raise_message("Target 'foo' defines container as 'bar' but no such target exists.") { Reality::Facets::Target.new(target_manager, Unused, :foo, :bar, {}) }
+    assert_facet_error("Target 'foo' defines container as 'bar' but no such target exists.") { Reality::Facets::Target.new(target_manager, Unused, :foo, :bar, {}) }
   end
 
   def test_target_manager_basic_operation
@@ -98,7 +98,7 @@ class Reality::Facets::TestTargetManager < Reality::TestCase
     assert_equal [], target_manager.target_keys
     assert_equal false, target_manager.target_by_key?(:project)
 
-    assert_raise_message("Can not find target with model class 'Reality::Facets::TestTargetManager::Project'") { target_manager.target_by_model_class(Project) }
+    assert_facet_error("Can not find target with model class 'Reality::Facets::TestTargetManager::Project'") { target_manager.target_by_model_class(Project) }
 
     target_manager.target(Project, :project)
 
@@ -123,7 +123,7 @@ class Reality::Facets::TestTargetManager < Reality::TestCase
     assert_equal 1, target_manager.targets_by_container(:project).size
     assert_equal :component, target_manager.targets_by_container(:project)[0].key
 
-    assert_raise_message("Can not find target with key 'foo'") { target_manager.target_by_key(:foo) }
+    assert_facet_error("Can not find target with key 'foo'") { target_manager.target_by_key(:foo) }
   end
 
   def test_apply_extension

data/test/helper.rb

@@ -6,6 +6,7 @@ require 'reality/facets'
 
 class Reality::TestCase < Minitest::Test
   include Test::Unit::Assertions
+  include Reality::Logging::Assertions
 
   module TestFacetContainer
     extend Reality::Facets::FacetContainer
@@ -24,4 +25,10 @@ class Reality::TestCase < Minitest::Test
   def setup
     TestFacetContainer.reset
   end
+
+  def assert_facet_error(expected_message, &block)
+    assert_logging_error(Reality::Facets, expected_message) do
+      yield block
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reality-facets
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Peter Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reality-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: reality-naming
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: reality-orderedhash
   requirement: !ruby/object:Gem::Requirement