reality-facets 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f23339993cae2804cb73979adf965189ab5cbe37
-  data.tar.gz: 70a5504ae8d6988cb6074bd6afdf32747ab21335
+  metadata.gz: aaee53f948adda58251e2f3ed1f9baba8bf9c0fb
+  data.tar.gz: 39e3c353a2b61b59112f1864366238e526266511
 SHA512:
-  metadata.gz: ad45c2f079f665cd67328bb204052187d15f8c23215726f609193502c4510bea1b23c73f22e77e4018f976fb72484c679c2e370d122b928716f09dd5c419e8e0
-  data.tar.gz: d0701c1806a08070ef1de14144449bd9350c3ae5209b18a52d9fdffdbd199767aea986d4eea5db01c5acc99f9539bc1764e6942bf1b17f20590766a12c35ea53
+  metadata.gz: f4bd237fe33ec7553bf813dbd25e8b1295597fa166378798c3b20c09a9ee32dd8168f0ec2c3f68f6c4a03d9e2deeb766354f49e46602d7b31a74aeb704802ab2
+  data.tar.gz: 5c7c1be235ed4455bbdc9bfd92e50df41d7fb8a9e159284da00f677b4012ae494b18971b120d22a84b8ef46498fa80538e4b9a9d4419b38df49d70ae4e1bc74a

data/lib/reality/facets/facet_container.rb

@@ -56,6 +56,23 @@ module Reality #nodoc
         self.const_get(:FacetDefinitions)
       end
 
+      def dependent_facets(*facet_keys)
+        facet_keys = facet_keys[0] if facet_keys.size == 1 && facet_keys[0].is_a?(Array)
+        to_process = facet_keys.dup
+        results = []
+        until to_process.empty?
+          facet_key = to_process.pop
+          results << facet_key
+          facet = facet_by_name(facet_key)
+          facet.required_facets.each do |required_facet_key|
+            if !results.include?(required_facet_key) && !to_process.include?(required_facet_key)
+              to_process << required_facet_key
+            end
+          end
+        end
+        results
+      end
+
       def activate_facet(object, facet_key)
         return if object.facet_enabled?(facet_key)
 

data/lib/reality/facets/faceted_model.rb

@@ -71,9 +71,10 @@ module Reality #nodoc
         end
       end
 
-      def disable_facets_not_in(keys)
+      def disable_facets_not_in(*keys)
         keys = keys[0] if keys.size == 1 && keys[0].is_a?(Array)
-        (self.enabled_facets - keys).each do |facet_key|
+        facets_to_disable = self.enabled_facets - facet_container.dependent_facets(keys)
+        facets_to_disable.each do |facet_key|
           self.disable_facet(facet_key) if self.facet_enabled?(facet_key)
         end
       end

data/reality-facets.gemspec

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

data/test/facets/test_facet_container.rb

@@ -61,4 +61,16 @@ class Reality::Facets::TestFacetContainer < Reality::TestCase
 
     assert_raise_message("Unknown definition form '{:x=>:y, :z=>1}'") { TestFacetContainer.facet(:x => :y, :z => 1) }
   end
+
+  def test_dependent_facets
+    TestFacetContainer.facet(:gwt)
+    TestFacetContainer.facet(:gwt_rpc => [:gwt])
+    TestFacetContainer.facet(:imit => [:gwt_rpc, :jpa])
+    TestFacetContainer.facet(:ee)
+    TestFacetContainer.facet(:jpa => [:ee])
+
+    assert_equal [:gwt], TestFacetContainer.dependent_facets(:gwt)
+    assert_equal [:imit, :jpa, :ee, :gwt_rpc, :gwt].sort, TestFacetContainer.dependent_facets(:imit).sort
+    assert_equal [:jpa, :ee].sort, TestFacetContainer.dependent_facets(:jpa).sort
+  end
 end

data/test/facets/test_faceted_model.rb

@@ -167,6 +167,18 @@ class Reality::Facets::TestFacetedModel < Reality::TestCase
     assert_equal [:gwt, :gwt_rpc, :jpa, :imit, :json], entity2.enabled_facets
     assert_equal [:jpa, :gwt, :gwt_rpc, :imit, :json], attribute1.enabled_facets
     assert_equal [:jpa, :gwt, :gwt_rpc, :imit, :json], attribute2.enabled_facets
+
+    attribute2.disable_facets_not_in(:json)
+
+    assert_equal [:json], attribute2.enabled_facets
+
+    attribute1.disable_facets_not_in([:imit])
+
+    assert_equal [:gwt, :gwt_rpc, :imit], attribute1.enabled_facets
+
+    entity2.disable_facets_not_in([:gwt_rpc, :jpa])
+
+    assert_equal [:gwt, :gwt_rpc, :jpa], entity2.enabled_facets
   end
 
   def test_extension_point

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reality-facets
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Peter Donald