poise 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce32a02691e577d78fdb616e77459374be22c38e
-  data.tar.gz: ec4202a5df8a244c184703d2988230d354880ce4
+  metadata.gz: 5906280e0c3c8e0555e6a255dad854a6a68f2d11
+  data.tar.gz: 611ffdede3b4f1021e18d88299172aea3239890d
 SHA512:
-  metadata.gz: 10fe7f8a415002492e2b6f93b91712eedb809ba839b86a51d882b7c486f82e046a9ab5a3a0d3351f8b5033149dabf5ef37235f1c0991889cba00f61a559d3f07
-  data.tar.gz: 63401d09fd30969b8fe2415a45ac5061972191bdcf2366ea943b71604345567f5e53df3106e75dad2b455e61833eff6a28f343d436bdcdd12bd18b4b924e4ed6
+  metadata.gz: 075e7d9b3aecce2cc748430ca9bca6e3a33b3db88aa63701fb42269b1254b4f2e7915843bbafb85c239729d1b2c23b6bc775db7bc297435b9555f7a77f31b2d3
+  data.tar.gz: f1aa2c2a67df267725169799a924df19f2f16f3927b2ec492b891886eff5aff00be251a5bbbe23d4421e146a902fe687ae936c17257a6ee469d7fecb2343b714

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v2.2.3
+
+* Add `ancestor_send` utility method for use in other helpers.
+* Improve subresource support for use in mixins.
+
 ## v2.2.2
 
 * Fix 2.2.1 for older versions of Chef.

data/lib/poise/helpers/subresources/child.rb

@@ -57,6 +57,10 @@ module Poise
         #   @param val [String, Hash, Chef::Resource] Parent resource to set.
         #   @return [Chef::Resource, nil]
         def parent(*args)
+          # Lie about this method if the parent type is true.
+          if self.class.parent_type == true
+            raise NoMethodError.new("undefined method `parent' for #{self}")
+          end
           _parent(:parent, self.class.parent_type, self.class.parent_optional, self.class.parent_auto, *args)
         end
 
@@ -91,7 +95,7 @@ module Poise
               parent = nil
             else
               if val.is_a?(String) && !val.include?('[')
-                raise Poise::Error.new('Cannot use a string parent without defining a parent type') if parent_type == Chef::Resource
+                raise Poise::Error.new("Cannot use a string #{name} without defining a parent type") if parent_type == Chef::Resource
                 val = "#{parent_type.resource_name}[#{val}]"
               end
               if val.is_a?(String) || val.is_a?(Hash)
@@ -112,7 +116,7 @@ module Poise
               parent = Poise::Helpers::Subresources::DefaultContainers.find(parent_type, run_context)
             end
             # Can't find a valid parent, if it wasn't optional raise an error.
-            raise Poise::Error.new("No parent found for #{self}") unless parent || parent_optional
+            raise Poise::Error.new("No #{name} found for #{self}") unless parent || parent_optional
             parent_ref = ParentRef.new(parent)
           else
             parent = parent_ref.resource
@@ -134,9 +138,10 @@ module Poise
           def parent_type(type=nil)
             if type
               raise Poise::Error.new("Parent type must be a class, symbol, or true, got #{type.inspect}") unless type.is_a?(Class) || type.is_a?(Symbol) || type == true
-              @parent_type = type
+              # Setting to true shouldn't actually do anything if a type was already set.
+              @parent_type = type unless type == true && !@parent_type.nil?
             end
-            @parent_type || (superclass.respond_to?(:parent_type) ? superclass.parent_type : Chef::Resource)
+            @parent_type || Poise::Utils.ancestor_send(self, :parent_type, default: Chef::Resource)
           end
 
           # @overload parent_optional()
@@ -151,7 +156,7 @@ module Poise
               @parent_optional = val
             end
             if @parent_optional.nil?
-              superclass.respond_to?(:parent_optional) ? superclass.parent_optional : false
+              Poise::Utils.ancestor_send(self, :parent_optional, default: false)
             else
               @parent_optional
             end
@@ -169,7 +174,7 @@ module Poise
               @parent_auto = val
             end
             if @parent_auto.nil?
-              superclass.respond_to?(:parent_auto) ? superclass.parent_auto : true
+              Poise::Utils.ancestor_send(self, :parent_auto, default: true)
             else
               @parent_auto
             end

data/lib/poise/utils.rb

@@ -66,5 +66,34 @@ module Poise
       # Sort the items by matching path length, pick the name attached to the longest.
       possibles.sort_by{|key, value| key.length }.last[1]
     end
+
+    # Try to find an ancestor to call a method on.
+    #
+    # @since 2.2.3
+    # @param obj [Object] Self from the caller.
+    # @param msg [Symbol] Method to try to call.
+    # @param args [Array<Object>] Method arguments.
+    # @param default [Object] Default return value if no valid ancestor exists.
+    # @return [Object]
+    # @example
+    #   val = @val || Poise::Utils.ancestor_send(self, :val)
+    def ancestor_send(obj, msg, *args, default: nil)
+      # Class is a subclass of Module, if we get something else use its class.
+      obj = obj.class unless obj.is_a?(Module)
+      ancestors = []
+      if obj.respond_to?(:superclass)
+        # Check the superclass first if present.
+        ancestors << obj.superclass
+      end
+      # Make sure we don't check obj itself.
+      ancestors.concat(obj.ancestors.drop(1))
+      ancestor = ancestors.find {|mod| mod.respond_to?(msg) }
+      if ancestor
+        ancestor.send(msg, *args)
+      else
+        default
+      end
+    end
+
   end
 end

data/lib/poise/version.rb

@@ -16,5 +16,5 @@
 
 
 module Poise
-  VERSION = '2.2.2'
+  VERSION = '2.2.3'
 end

data/test/spec/helpers/notifying_block_spec.rb

@@ -146,12 +146,16 @@ describe Poise::Helpers::NotifyingBlock do
     recipe(subject: false) do
       node.run_state[:things] = []
       poise_test 'test'
+      ruby_block 'copy' do
+        block do
+          node.run_state[:things_copy] = node.run_state[:things].dup
+        end
+      end
     end
-    subject { chef_run.node.run_state[:things] }
+    subject { chef_run.node.run_state }
+
+    its([:things]) { is_expected.to eq %w{two one} }
+    its([:things_copy]) { is_expected.to eq %w{two} }
 
-    # The important test.
-    it { is_expected.to include 'one' }
-    # Sanity check for my harness.
-    it { is_expected.to include 'two' }
   end # /describe delayed notifications
 end

data/test/spec/helpers/subresources/child_spec.rb

@@ -200,6 +200,20 @@ describe Poise::Helpers::Subresources::Child do
 
       it { is_expected.to run_poise_test('test').with(parent: nil) }
     end # context with an optional parent but then unset
+
+    context 'with a parent type of true' do
+      resource(:poise_test) do
+        include described_class
+        parent_type true
+      end
+      recipe do
+        poise_test 'test' do
+          parent 'test'
+        end
+      end
+
+      it { expect { subject }.to raise_error NoMethodError }
+    end # /context with a parent type of true
   end # /describe #parent
 
   describe '.parent_type' do
@@ -250,6 +264,30 @@ describe Poise::Helpers::Subresources::Child do
         expect { resource(:poise_test).parent_type('invalid') }.to raise_error Poise::Error
       end
     end # /context set to an invalid value
+
+    context 'set directly and then set to true' do
+      resource(:poise_test) do
+        include described_class
+        parent_type String
+        parent_type true
+      end
+
+      it { is_expected.to eq String }
+    end # /context set directly and then set to true
+
+    context 'set via a mixin' do
+      # Various scoping shenanigans.
+      described = described_class
+      test_mod = Module.new do
+        include described
+        parent_type :something
+      end
+      resource(:poise_test) do
+        include test_mod
+      end
+
+      it { is_expected.to eq :something }
+    end
   end # /describe .parent_type
 
   describe '.parent_optional' do

data/test/spec/utils_spec.rb

@@ -131,4 +131,68 @@ describe Poise::Utils do
       it { is_expected.to eq 'halite_cookbook_other' }
     end # /context with a Halite cookbook on a nested prefix
   end # /describe .find_cookbook_name
+
+  describe '.ancestor_send' do
+    let(:mod_parent) do
+      Module.new do
+        class_methods = Module.new do
+          def poise_test_val(val=nil)
+            if val
+              @poise_test_val = val
+            end
+            @poise_test_val || Poise::Utils.ancestor_send(self, :poise_test_val)
+          end
+
+          define_method(:included) do |klass|
+            super(klass)
+            klass.extend(class_methods)
+          end
+        end
+
+        extend class_methods
+      end
+    end
+
+    context 'using the parent module in class' do
+      subject do
+        mod = mod_parent
+        Class.new do
+          include mod
+          poise_test_val(:test)
+        end
+      end
+
+      its(:poise_test_val) { is_expected.to eq :test }
+    end # /context using the parent module in class
+
+    context 'using the parent module in an intermediary module' do
+      let(:mod_child) do
+        parent = mod_parent
+        Module.new do
+          include parent
+          poise_test_val(:child)
+        end
+      end
+
+      subject do
+        mod = mod_child
+        Class.new do
+          include mod
+        end
+      end
+
+      its(:poise_test_val) { is_expected.to eq :child }
+    end # /context using the parent module in an intermediary module
+
+    context 'with no value set' do
+      subject do
+        mod = mod_parent
+        Class.new do
+          include mod
+        end
+      end
+
+      its(:poise_test_val) { is_expected.to be_nil }
+    end # /context with no value set
+  end # /describe .ancestor_send
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-18 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite