configulations 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/config/singles/first.yml

@@ -0,0 +1 @@
+name: "Leon"

data/config/singles/fourth.json

@@ -0,0 +1 @@
+{ "name": "Mike" }

data/config/singles/second.yml

@@ -0,0 +1 @@
+name: "Marc"

data/config/singles/third.js

@@ -0,0 +1 @@
+{ "name": "Felix" }

data/configulations.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{configulations}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Gersing"]
-  s.date = %q{2011-07-05}
+  s.date = %q{2011-07-06}
   s.description = %q{Auto-create configuration objects for your applications from yml and json files.}
   s.email = %q{leongersing@gmail.com}
   s.extra_rdoc_files = [
@@ -28,10 +28,15 @@ Gem::Specification.new do |s|
     "config/development.yml",
     "config/foo.json",
     "config/server.yml",
+    "config/singles/first.yml",
+    "config/singles/fourth.json",
+    "config/singles/second.yml",
+    "config/singles/third.js",
     "configulations.gemspec",
     "lib/configulations.rb",
     "lib/magic_hash.rb",
     "spec/configurator_spec.rb",
+    "spec/inclusive_spec.rb",
     "spec/magic_hash_spec.rb",
     "spec/sample_spec.rb",
     "spec/spec_helper.rb"

data/lib/configulations.rb

@@ -4,41 +4,55 @@ require 'magic_hash'
 
 class Configulations
   attr_accessor :properties
+  attr_accessor :include_pattern
 
   def initialize
+    @include_pattern = File.expand_path(".") << "/config/**/*.{yml,json}"
+    find_properties
+  end
+
+  def self.configure(&blk)
+    me = Configulations.new
+    blk.call(me)
+    me.find_properties
+    me
+  end
+
+  def find_properties
     @properties = {}
     @properties.extend(MagicHash)
 
-    find_yaml_properties
-    find_json_properties
+    Dir[@include_pattern].each do |file|
+      ext = File.extname(file)
+      base = File.basename(file, ext)
+      parser = parser_for_extname(ext)
+      @properties[base]= parser.send(:load, File.read(file))
+    end
 
     @properties.objectify
-    yield self if block_given?
-    self
   end
 
-  def find_json_properties
-    Dir[File.expand_path(".") << "/config/**/*.json"].each do |json_file|
-      @properties[File.basename(json_file, ".json")] = JSON.load(File.read(json_file))
-    end
-  end
-
-  def find_yaml_properties
-    Dir[File.expand_path(".") << "/config/**/*.yml"].each do |yaml_file|
-      @properties[File.basename(yaml_file, ".yml")] = YAML.load(File.read(yaml_file))
+  def parser_for_extname(extname)
+    if(extname =~ /\.js(?:on)?/i)
+      return JSON
+    elsif(extname =~ /\.ya?ml/i)
+      return YAML
+    else
+      raise "Only files ending in .js, .json, .yml, .yaml have parsers at the moment."
     end
   end
 
   def method_missing(message_name, *message_arguments, &optional_block)
-    result = properties.send message_name.to_sym, *message_arguments
-    return result if result
     message = message_name.to_s.strip.gsub(/-/,"_")
     if message =~ /=/
-      properties[message.gsub(/=/,"").to_sym] = message_arguments.flatten.first
+      @properties[message.gsub(/=/,"").to_sym] = message_arguments.flatten.first
       return
     elsif message =~ /\?/
-      return !!(properties[message.gsub(/\?/,"").to_sym])
+      return !!(@properties[message.gsub(/\?/,"").to_sym])
+    else
+      return @properties[message.to_sym] if @properties.has_key? message.to_sym
     end
+
     super message_name, *message_arguments, &optional_block
   end
 end

data/spec/inclusive_spec.rb

@@ -0,0 +1,40 @@
+require "spec_helper"
+
+YamlSingleConfig = Configulations.configure do |config|
+  config.include_pattern = File.expand_path(".") << "/config/singles/*.yml"
+end
+
+JsonSingleConfig = Configulations.configure do |config|
+  config.include_pattern = File.expand_path(".") << "/config/singles/*.js*"
+end
+
+SingleConfig = Configulations.configure do |config|
+  config.include_pattern = File.expand_path(".") << "/config/singles/*.*" #DANGER WILL ROBINSON!
+end
+
+describe "Inclusion" do
+  describe "yaml" do
+    it "finds first and second" do
+      YamlSingleConfig.first.name.should == "Leon"
+      YamlSingleConfig.second.name.should == "Marc"
+      lambda{ YamlSingleConfig.third }.should raise_error
+    end
+  end
+
+  describe "json" do
+    it "finds third and fourth" do
+      JsonSingleConfig.third.name.should == "Felix"
+      JsonSingleConfig.fourth.name.should == "Mike"
+      lambda{ JsonSingleConfig.first }.should raise_error
+    end
+  end
+
+  describe "mixing json and yml" do
+    it "finds eveything" do
+      SingleConfig.first.name.should == "Leon"
+      SingleConfig.second.name.should == "Marc"
+      SingleConfig.third.name.should == "Felix"
+      SingleConfig.fourth.name.should == "Mike"
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: configulations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Leon Gersing
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -04:00
+date: 2011-07-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,10 +78,15 @@ files:
 - config/development.yml
 - config/foo.json
 - config/server.yml
+- config/singles/first.yml
+- config/singles/fourth.json
+- config/singles/second.yml
+- config/singles/third.js
 - configulations.gemspec
 - lib/configulations.rb
 - lib/magic_hash.rb
 - spec/configurator_spec.rb
+- spec/inclusive_spec.rb
 - spec/magic_hash_spec.rb
 - spec/sample_spec.rb
 - spec/spec_helper.rb
@@ -99,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1173186022694134451
+      hash: 2698804338379669907
       segments: 
       - 0
       version: "0"