needs_resources 0.4.0 → 0.5.1

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.sw[op]
 .bundle
 .config
 coverage

data/lib/needs_resources.rb

@@ -2,8 +2,12 @@ require 'set'
 
 module NeedsResources
 
+  def container
+    is_a?(ResourceContainer) ? self : TopLevelResources.instance
+  end
+
   def needs_resources(*names)
-    container = is_a?(ResourceContainer) ? self : TopLevelResources.instance
+    container = self.container
     names.flatten.each do |name|
       if is_a? Class
         define_method name, lambda { container[name] }
@@ -32,6 +36,10 @@ module NeedsResources
     TopLevelResources.instance.each(&block)
   end
 
+  def self.to_hash
+    TopLevelResources.instance.to_hash
+  end
+
 end
 
 Dir[File.expand_path('../needs_resources/**/*.rb', __FILE__)].sort.each do |f|

data/lib/needs_resources/resource_container.rb

@@ -5,6 +5,14 @@ module NeedsResources
       resources[name.to_sym] or raise MissingResourceError.new(child_resource_name name)
     end
 
+    def []=(name, hash)
+      resources.merge! TopLevelResources.instance.send(:parse_resources, name.to_sym => hash)
+    end
+
+    def has_resource?(name)
+      resources.has_key? name.to_sym
+    end
+
     def child_resource_name(child_name)
       if respond_to?(:name)
         "#{self.name}.#{child_name}"
@@ -21,6 +29,15 @@ module NeedsResources
       @resources_needed ||= Set.new
     end
 
+    def resources_hash
+      hash = {}
+      resources.sort_by { |k, v| "#{v.class}___#{k}" }.each do |k, v|
+        next if k.to_s.starts_with? 'default_'
+        hash[k.to_s] = v.respond_to?(:to_hash) ? v.to_hash : v
+      end
+      hash
+    end
+
     def missing_resources
       __missing_resources__(missing = {})
       missing.map do |k, v|

data/lib/needs_resources/resource_type.rb

@@ -8,7 +8,7 @@ module NeedsResources
         def attr(*names)
           options = names.last.is_a?(Hash) ? names.pop : {}
           names.flatten.each do |n|
-            attributes[n.to_sym] = options
+            attributes[n.to_sym] = options.dup
             attr_reader n
           end
         end
@@ -43,7 +43,7 @@ module NeedsResources
     def initialize(args={})
       args = args.dup
       self.class.attributes.each do |name, options|
-        value = args.delete(name.to_s) || args.delete(name.to_sym) || options[:default]
+        value = args.delete(name.to_s) || args.delete(name.to_sym) || options[:default].dup
         if options[:required] && value.nil?
           raise RequiredAttributeError.new(self, name)
         end
@@ -54,5 +54,18 @@ module NeedsResources
       end
     end
 
+     def to_hash
+      hash = {}
+      simple_atts = self.class.attributes.keys - [:name, :resources]
+      simple_atts.each do |a|
+        v = instance_variable_get("@#{a}")
+        hash[a.to_s] = v.respond_to?(:to_hash) ? v.to_hash : v
+      end
+      if respond_to?(:resources_hash)
+        hash.merge! "resources" => resources_hash
+      end
+      hash
+    end
+
   end
 end

data/lib/needs_resources/top_level_resources.rb

@@ -16,6 +16,8 @@ module NeedsResources
       resources.each(&block)
     end
 
+    alias :to_hash :resources_hash
+
     private
 
     def defaults
@@ -31,7 +33,7 @@ module NeedsResources
     end
 
     def parse(file)
-      return {} unless File.exist? file
+      return {} unless file && File.exist?(file)
 
       yaml = YAML.load_file(file)
       raise InvalidOrCorruptedResources unless yaml.is_a? Hash

data/lib/needs_resources/version.rb

@@ -1,3 +1,3 @@
 module NeedsResources
-  VERSION = '0.4.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: needs_resources
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-01 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies: []
 description: Ruby gem to provide lightweight inversion of control type resources for
   an application