rails_config_loader 0.1.4 → 0.1.5

data/README.md

@@ -14,28 +14,28 @@ module MainApp
 
 		# load seed file (see geo-autocomplete demo)
 		def seed
-			@seed ||= load_yaml('config/seed.yml', :dir => 'db')
+			@seed ||= load_yml :seed, :dir => 'db')
 		end
 
 		# config for the app
 		# any missing method on this is delegated to the 
 		# Hashie wrapping this loaded content
 		def config
-			@config ||= load_yaml('app.yml')
+			@config ||= load_yml :app
 		end
 
 		# auto detect load method based on filename extension
 		def app
-			@app ||= load('app.yml')
+			@app ||= load 'app.yml'
 		end
 
-		# load json
+		# load json content
 		def addresses locale = :da
 			@config ||= load_content '/data/addresses.json', :locale => get_locale(locale)
 		end
 
 		def payment_provider
-			@payment_provider ||= load_yaml('payment_gateway/quickpay.yml')
+			@payment_provider ||= load_yaml 'payment_gateway/quickpay'
 		end
 	end
 end

data/VERSION

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

data/lib/config_loader/base.rb

@@ -5,9 +5,10 @@ module ConfigLoader
   	attr_reader :locale, :path, :file_name, :ext, :file_path, :root
 
   	# will try root element if such exists
-		def initialize file_path, options = {}
+		def initialize file_path, options = {}			
 			@path 		 	= File.dirname file_path
 			@file_name 	= File.basename file_path			
+
 			name 				= parts.first.sub(/\.$/, '')
 			@ext 			 	= parts.last
 			@locale 		= options[:locale] unless blank?(options[:locale])
@@ -37,6 +38,14 @@ module ConfigLoader
 
 		protected
 
+    def parts
+      @parts ||= file_name.split(/(#{reg_ext_format})$/)
+    end
+
+    def path? file_path
+      file_path.kind_of?(String) && file_path =~ /\.#{reg_ext_format}/
+    end
+
 		def blank? obj
 			!obj || obj.empty?
 		end

data/lib/config_loader/json.rb

@@ -2,12 +2,17 @@ require 'config_loader/base'
 
 module ConfigLoader
   class Json < Base
+    def initialize file_path, options = {}
+      file_path = "#{file_path}.json" unless path?(file_path)
+      super file_path, options
+    end
+
 		def content
 			@content ||= JSON.parse file_content.read
 		end
 
-    def parts
-      @parts ||= file_name.split(/(json)$/)
+    def reg_ext_format
+      'json'
     end    
 	end
 end

data/lib/config_loader/yaml.rb

@@ -2,12 +2,20 @@ require 'config_loader/base'
 
 module ConfigLoader
   class Yaml < Base
+    def initialize file_path, options = {}
+      default_ext = options[:default_ext] || 'yml'
+      file_path = "#{file_path}.#{default_ext}" unless path?(file_path)
+      super file_path, options
+    end
+
 		def content
-			@content ||= ::YAML::load file_content
+			@content ||= ::YAML.load file_content
 		end
 
-    def parts
-      @parts ||= file_name.split(/(ya?ml$)/)
+    protected
+
+    def reg_ext_format
+      'ya?ml'
     end
 	end
 end

data/lib/rails_config_loader.rb

@@ -23,7 +23,11 @@ module ConfigLoader
 	end
 
 	def load_yaml file_path, options = {}
-		ConfigLoader::Yaml.new file_path, options = {}
+		ConfigLoader::Yaml.new file_path, options = {:default_ext => :yaml}
+	end
+
+	def load_yml file_path, options = {}
+		ConfigLoader::Yaml.new file_path, options = {:default_ext => :yml}
 	end
 
 	def load_json file_path, options = {}

data/rails_config_loader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails_config_loader"
-  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 = ["Kristian Mandrup"]
-  s.date = "2012-05-20"
+  s.date = "2012-08-06"
   s.description = "Load yaml and json config files and \n make the structures easily available for use in the app."
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "spec/config_loader/yaml_spec.rb",
     "spec/config_loader_spec.rb",
     "spec/fixtures/config/app.yml",
+    "spec/fixtures/config/enum.json",
     "spec/fixtures/config/facebook.yml",
     "spec/fixtures/config/htc.yml",
     "spec/fixtures/config/payment_gateway/quickpay.da.yml",

data/spec/config_loader/json_spec.rb

@@ -12,13 +12,23 @@ describe ConfigLoader::Json do
 
   its(:content) { should_not be_nil }
   its(:content) { should == [{"number"=>"004", "street"=>"Bøllemosegårdsvej", "city"=>"Øbro", "region"=>"København"}, {"number"=>"001", "street"=>"Bøllemosegårdsvej", "city"=>"Venners", "region"=>"København"}, {"number"=>"002", "street"=>"Havlyngbuen", "city"=>"Amager", "region"=>"København"}, {"number"=>"001", "street"=>"Havlyngbuen", "city"=>"Amager", "region"=>"København"}, {"number"=>"051", "street"=>"Hedegaardsvej", "city"=>"Engdraget", "region"=>"København"}] }
-end
 
-describe '.load' do
-  subject { addresses }
-  let(:addresses) { MainApp.config.addresses }
+  describe 'implicit json' do
+    subject { config }
+    let(:config) { ConfigLoader::Json.new(:enum) }
+
+    its(:root)   { should == nil }
+    specify { subject.as_hash.answer == 'yes' }
+  end
+
+
+  describe '.load' do
+    subject { addresses }
+    let(:addresses) { MainApp.config.addresses }
 
-  specify do
-    addresses.first.should == {"number"=>"004", "street"=>"Bøllemosegårdsvej", "city"=>"Øbro", "region"=>"København"}
+    specify do
+      addresses.first.should == {"number"=>"004", "street"=>"Bøllemosegårdsvej", "city"=>"Øbro", "region"=>"København"}
+    end
   end
 end
+

data/spec/config_loader/yaml_spec.rb

@@ -13,6 +13,14 @@ describe ConfigLoader::Yaml do
 
 	specify { subject.as_hash.domain == 'www.facebook.com' }
 
+	describe 'implicit yml' do
+		subject { config }
+		let(:config) { ConfigLoader::Yaml.new(:htc) }
+
+		its(:root) 	 { should == nil }
+		specify { subject.as_hash.domain == 'www.htc.com' }
+	end
+
 	describe 'no root' do
 		subject { config }
 		let(:config) { ConfigLoader::Yaml.new('htc.yml') }

data/spec/fixtures/config/enum.json

@@ -0,0 +1,3 @@
+{
+  "answer": "yes"
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_config_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-20 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -151,6 +151,7 @@ files:
 - spec/config_loader/yaml_spec.rb
 - spec/config_loader_spec.rb
 - spec/fixtures/config/app.yml
+- spec/fixtures/config/enum.json
 - spec/fixtures/config/facebook.yml
 - spec/fixtures/config/htc.yml
 - spec/fixtures/config/payment_gateway/quickpay.da.yml
@@ -174,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 889680361015495165
+      hash: 1155841106093705541
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: