itamae-default_attributes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c6d0e201cbff0a51d265c0bad1fa2eab1765254
-  data.tar.gz: 8c33106007c1aa876f5f0643273e755a2884b755
+  metadata.gz: 957c6c9b309794648a67895b28dcdf1c62bf5a5b
+  data.tar.gz: fc5135ff3747da90969cc17d27e3f548a98cdd34
 SHA512:
-  metadata.gz: 16095246a9af8e905bd544233153c49cb226f72595a9361f175fef40fef142483ea5f72a6096cf9c86f2c395a630992e374856cfbb86590bec2d8353a9098311
-  data.tar.gz: 6fa61553abc0d612f622a172557f2f43f96c18d671b17b70dddc3ecbb45f059c9fb4130e86209443164f4553e97982a13828b0f8ec47ac06d72d65d09e33c1a2
+  metadata.gz: e558c319411b5ec1fbfe8722e6d6cdc64571de499b1f8443c76d6f2c5cac15338ff1b95732e04d3bfd1a70e0c134a56984b8bbbabd84b49d4bd72bc80e350c4d
+  data.tar.gz: 70624f1f52d9245149d9e16ae23b40eb25f0dd00332cd3d1be586847237e1c7d06430e00be2f205b6fc12db83ca28e095755be9b6e0a2186c1c5711c40ad0f0f

data/lib/itamae/default_attributes.rb

@@ -2,13 +2,12 @@ require "itamae/default_attributes/version"
 
 module Itamae
   module DefaultAttributes
-    def self.loaded_paths
-      @loaded_paths ||= []
-    end
   end
 end
 
-require "itamae/default_attributes/eval_context"
+require "itamae/default_attributes/attributes_loader"
 require "itamae/default_attributes/extension"
 
+require "itamae/recipe"
+
 Itamae::Recipe.send(:prepend, Itamae::DefaultAttributes::Extension)

data/lib/itamae/default_attributes/attributes_loader.rb

@@ -0,0 +1,36 @@
+module Itamae
+  module DefaultAttributes
+    class AttributesLoader
+      class << self
+        def loaded?(path)
+          loaded_paths.include?(path)
+        end
+
+        def loaded_paths
+          @loaded_paths ||= []
+        end
+      end
+
+      attr_reader :recipe, :path
+
+      def initialize(recipe, path)
+        @recipe = recipe
+        @path = path
+      end
+
+      def load
+        return if self.class.loaded?(path)
+        return unless File.exist?(path)
+
+        instance_eval(File.read(path), path, 1)
+        self.class.loaded_paths << path
+      end
+
+      private
+
+      def attributes(attributes_hash)
+        recipe.runner.node.reverse_merge!(attributes_hash)
+      end
+    end
+  end
+end

data/lib/itamae/default_attributes/extension.rb

@@ -2,15 +2,13 @@ module Itamae
   module DefaultAttributes
     module Extension
       def load(vars = {})
-        load_default_attributes
+        attributes_loader.load
         super
       end
 
-      def load_default_attributes
-        return if Itamae::DefaultAttributes.loaded_paths.include?(attributes_path)
-        context = Itamae::DefaultAttributes::EvalContext.new
-        context.instance_eval(File.read(attributes_path), attributes_path, 1)
-        Itamae::DefaultAttributes.loaded_paths << attributes_path
+      def attributes_loader
+        @attributes_loader ||=
+          Itamae::DefaultAttributes::AttributesLoader.new(self, attributes_path)
       end
 
       def attributes_path

data/lib/itamae/default_attributes/version.rb

@@ -1,5 +1,5 @@
 module Itamae
   module DefaultAttributes
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae-default_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - nownabe
@@ -69,7 +69,7 @@ files:
 - bin/setup
 - itamae-default_attributes.gemspec
 - lib/itamae/default_attributes.rb
-- lib/itamae/default_attributes/eval_context.rb
+- lib/itamae/default_attributes/attributes_loader.rb
 - lib/itamae/default_attributes/extension.rb
 - lib/itamae/default_attributes/version.rb
 homepage: https://github.com/nownabe/itamae-default_attributes

data/lib/itamae/default_attributes/eval_context.rb

@@ -1,15 +0,0 @@
-module Itamae
-  module DefaultAttributes
-    class EvalContext
-      attr_reader :recipe
-
-      def initialize(recipe)
-        @recipe = recipe
-      end
-
-      def attributes(attributes_hash)
-        recipe.runner.node.reverse_merge!(attributes_hash)
-      end
-    end
-  end
-end