needs_resources 0.1.0 → 0.2.0

data/lib/needs_resources/required_attribute_error.rb

@@ -1,8 +1,8 @@
 module NeedsResources
   class RequiredAttributeError < StandardError
 
-    def initialize(clazz, name)
-      super "Missing resource in config file:  #{clazz} (in #{name})"
+    def initialize(obj, name)
+      super "Missing resource in config file:  #{name} (in #{obj.respond_to?(:name) ? obj.name : obj.to_s})"
     end
 
   end

data/lib/needs_resources/resource_container.rb

@@ -2,7 +2,7 @@ module NeedsResources
   module ResourceContainer
 
     def [](name)
-      resources[name] or raise MissingResourceError.new(child_resource_name name)
+      resources[name.to_sym] or raise MissingResourceError.new(child_resource_name name)
     end
 
     def child_resource_name(child_name)
@@ -14,7 +14,7 @@ module NeedsResources
     end
 
     def resources
-      @resources ||= {}.with_indifferent_access
+      @resources ||= {}
     end
 
     def resources_needed
@@ -39,4 +39,4 @@ module NeedsResources
     end
 
   end
-end
+end

data/lib/needs_resources/resource_type.rb

@@ -2,35 +2,51 @@ module NeedsResources
   module ResourceType
 
     def self.included(base)
-      children[base.name.demodulize.underscore] = base
+      children[underscore(base.name)] = base
+
       base.instance_eval do
         def attr(*names)
           options = names.last.is_a?(Hash) ? names.pop : {}
           names.flatten.each do |n|
-            attributes[n] = options.with_indifferent_access
+            attributes[n.to_sym] = options
             attr_reader n
           end
         end
 
+        def provide_top_level_instance(name=nil, args={})
+          name ||= ResourceType.underscore(self.name)
+          TopLevelResources.instance.add_default(name, args)
+        end
+
         def attributes
-          @attributes ||= {}.with_indifferent_access
+          @attributes ||= {}
         end
       end
+
       base.attr :name, :required => true
     end
 
+    def self.underscore(name)
+      name = name.to_s.dup
+      name.gsub!(/^.*::/, '')
+      name.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+      name.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+      name.tr!("-", "_")
+      name.downcase!
+      name
+    end
+
     def self.children
       @children ||= {}
     end
 
     def initialize(args={})
-      args = args.with_indifferent_access
+      args = args.dup
       self.class.attributes.each do |name, options|
-        value = args.delete(name) || options[:default]
+        value = args.delete(name.to_s) || args.delete(name.to_sym) || options[:default]
         if options[:required] && value.nil?
           raise RequiredAttributeError.new(self, name)
         end
-        value = value.with_indifferent_access if value.is_a? Hash
         instance_variable_set "@#{name}", value
       end
       args.each do |k, v|
@@ -39,4 +55,4 @@ module NeedsResources
     end
 
   end
-end
+end

data/lib/needs_resources/top_level_resources.rb

@@ -7,10 +7,18 @@ module NeedsResources
     include Singleton
     include ResourceContainer
 
+    def add_default(name, args={})
+      defaults[name.to_sym] = args
+    end
+
     private
 
+    def defaults
+      @defaults ||= {}
+    end
+
     def resources
-      @resources ||= parse(resource_config_file)
+      @resources ||= parse_resources(defaults).merge parse(resource_config_file)
     end
 
     def resource_config_file
@@ -18,21 +26,26 @@ module NeedsResources
     end
 
     def parse(file)
-      resources = {}.with_indifferent_access
-      return resources unless File.exist? file
+      return {} unless File.exist? file
 
       yaml = YAML.load_file(file)
       raise InvalidOrCorruptedResources unless yaml.is_a? Hash
 
-      yaml.each do |name, value|
+      parse_resources(yaml)
+    end
+
+    def parse_resources(hash)
+      resources = {}
+
+      hash.each do |name, value|
         prefix, type = parse_resource_name(name)
-        resources[name] = parse_resource_value(name, type, value)
+        resources[name.to_sym] = parse_resource_value(name, type, value)
 
         # Make sure both default_xyz and xyz are aliases
         if prefix == 'default_'
-          resources[type] ||= name.to_sym
+          resources[type.to_sym] ||= name.to_sym
         elsif prefix.nil?
-          resources[type] ||= "default_#{type}".to_sym
+          resources[type.to_sym] ||= "default_#{type}".to_sym
         end
       end
 
@@ -58,9 +71,13 @@ module NeedsResources
 
     def parse_resource_value(name, type, value)
       case value
-      when Symbol
+      when Symbol, String, Fixnum
         value
       when Hash
+        if value.has_key?("resources")
+          raise InvalidResourceValueError.new(name, value) unless value.is_a? Hash
+          value["resources"] = parse_resources value["resources"]
+        end
         ResourceType.children[type].new(value.merge :name => name)
       else
         raise InvalidResourceValueError.new(name, value)
@@ -82,4 +99,4 @@ module NeedsResources
     end
 
   end
-end
+end

data/lib/needs_resources/version.rb

@@ -1,3 +1,3 @@
 module NeedsResources
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/needs_resources.rb

@@ -1,6 +1,4 @@
 require 'set'
-require 'active_support'
-require 'active_support/core_ext'
 
 module NeedsResources
 
@@ -18,7 +16,7 @@ module NeedsResources
   alias :needs_resource :needs_resources
 
   def self.ensure_resources
-    if (missing = missing_resources).present?
+    if (missing = missing_resources).any?
       # TODO: maybe prompt user if missing?
       raise MissingResourceError.new(*missing)
     end
@@ -31,5 +29,5 @@ module NeedsResources
 end
 
 Dir[File.expand_path('../needs_resources/**/*.rb', __FILE__)].sort.each do |f|
-  require f
-end
+  load f
+end

data/needs_resources.gemspec

@@ -14,6 +14,4 @@ Gem::Specification.new do |gem|
   gem.name = "needs_resources"
   gem.require_paths = ["lib"]
   gem.version = NeedsResources::VERSION
-
-  gem.add_dependency('active_support', '> 2.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: needs_resources
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: '2.0'
+date: 2013-10-29 00:00:00.000000000 Z
+dependencies: []
 description: Ruby gem to provide lightweight inversion of control type resources for
   an application
 email: