rails_config_loader 0.1.2 → 0.1.4

data/README.md

@@ -31,7 +31,7 @@ module MainApp
 
 		# load json
 		def addresses locale = :da
-			@config ||= load 'data/addresses.json', :locale => get_locale(locale)
+			@config ||= load_content '/data/addresses.json', :locale => get_locale(locale)
 		end
 
 		def payment_provider

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/lib/config_loader/base.rb

@@ -8,17 +8,24 @@ module ConfigLoader
 		def initialize file_path, options = {}
 			@path 		 	= File.dirname file_path
 			@file_name 	= File.basename file_path			
-			parts 			= file_name.split(/(ya?ml$)/)
-			name 				= parts.first
+			name 				= parts.first.sub(/\.$/, '')
 			@ext 			 	= parts.last
-			@locale 		= options[:locale]
+			@locale 		= options[:locale] unless blank?(options[:locale])
 
-			@file_path 	= @locale ? File.join(@path, "#{@name}.#{@locale}.#{@ext}") : file_path
+			@file_path = file_path
 
+			unless blank? @locale
+				@file_name = [name, @locale, @ext].compact.join('.')
+				@file_path =  File.join(@path, @file_name)
+			end
+
+			@dir 				= '' if file_path[0] == '/'
 			@dir 				= options[:dir] if options[:dir]
 			@root 		 	= (options[:root] || file_name.split('.').first).to_s			
 			@root 		 	= nil unless mashie.send(@root)
 			@mashie 	 	= mashie.send(@root) if @root
+		rescue NoMethodError # if no mashie
+			@root = nil
 		end
 
 		def as_hash
@@ -30,6 +37,10 @@ module ConfigLoader
 
 		protected
 
+		def blank? obj
+			!obj || obj.empty?
+		end
+
 		def file_content
 			File.open(config_file_path)
 		end

data/lib/config_loader/json.rb

@@ -5,5 +5,9 @@ module ConfigLoader
 		def content
 			@content ||= JSON.parse file_content.read
 		end
+
+    def parts
+      @parts ||= file_name.split(/(json)$/)
+    end    
 	end
 end

data/lib/config_loader/yaml.rb

@@ -5,5 +5,9 @@ module ConfigLoader
 		def content
 			@content ||= ::YAML::load file_content
 		end
+
+    def parts
+      @parts ||= file_name.split(/(ya?ml$)/)
+    end
 	end
 end

data/lib/rails_config_loader.rb

@@ -11,7 +11,11 @@ module ConfigLoader
 		when :yml, :yaml
 			ConfigLoader::Yaml
 		end
-		loader.new file_path, options = {}
+		loader.new file_path, options
+	end
+
+	def load_content file_path, options = {}
+		load(file_path, options).content
 	end
 
 	def load_hash file_path, options = {}
@@ -25,4 +29,8 @@ module ConfigLoader
 	def load_json file_path, options = {}
 		ConfigLoader::Json.new file_path, options = {}
 	end
+
+	def load_json_content file_path, options = {}
+		load_json(file_path, options).content
+	end	
 end

data/rails_config_loader.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "rails_config_loader"
-  s.version = "0.1.2"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2012-05-09"
+  s.date = "2012-05-20"
   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 = [
@@ -31,11 +31,16 @@ Gem::Specification.new do |s|
     "lib/config_loader/yaml.rb",
     "lib/rails_config_loader.rb",
     "rails_config_loader.gemspec",
+    "spec/config_loader/delegator_spec.rb",
+    "spec/config_loader/json_spec.rb",
     "spec/config_loader/yaml_spec.rb",
+    "spec/config_loader_spec.rb",
     "spec/fixtures/config/app.yml",
     "spec/fixtures/config/facebook.yml",
     "spec/fixtures/config/htc.yml",
     "spec/fixtures/config/payment_gateway/quickpay.da.yml",
+    "spec/fixtures/config/property.yml",
+    "spec/fixtures/data/addresses.da.json",
     "spec/fixtures/db/config/seed.yml",
     "spec/spec_helper.rb",
     "spec/support/main_app.rb"

data/spec/config_loader/delegator_spec.rb

@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe 'Delegator' do
+  subject { config }
+  let(:config) { MainApp.config }
+
+  specify { subject.as_hash.name.should == 'HTC' }
+end

data/spec/config_loader/json_spec.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe ConfigLoader::Json do
+  subject { config }
+  let(:config) { ConfigLoader::Json.new '/data/addresses.json', :locale => 'da' }
+
+  its(:file_name) { should == 'addresses.da.json' }
+  its(:root)      { should be_nil }
+  its(:ext)       { should == 'json' }
+
+  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 }
+
+  specify do
+    addresses.first.should == {"number"=>"004", "street"=>"Bøllemosegårdsvej", "city"=>"Øbro", "region"=>"København"}
+  end
+end

data/spec/config_loader/yaml_spec.rb

@@ -1,15 +1,5 @@
 require 'spec_helper'
 
-module Rails
-	def self.root
-		File.join SPEC_DIR, 'fixtures'
-	end
-end
-
-class LoadMe
-	include ConfigLoader	
-end
-
 describe ConfigLoader::Yaml do
 	subject { config }
 	let(:config) { ConfigLoader::Yaml.new('facebook.yml') }
@@ -40,25 +30,11 @@ describe ConfigLoader::Yaml do
 	end
 end
 
-describe ConfigLoader do
-	subject { loadme }
-
-	let(:loadme) { LoadMe.new }
-
-	describe '.load' do
-		specify { subject.load('htc.yml').as_hash.domain.should == 'www.htc.com' }
-	end
-
-	describe '.load_hash' do
-		specify { subject.load_hash('htc.yml').domain.should == 'www.htc.com' }
-	end
-end
-
-describe 'Delegator' do
-	subject { config }
-	let(:config) { MainApp.config }
+describe '.load_hash' do
+	subject { property }
+	let(:property) { MainApp.config.property }
 
-	specify { subject.as_hash.name.should == 'HTC' }
+  specify { subject.type.house_boat.should == 'house boat' }
 end
 
 describe '.load' do

data/spec/config_loader_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe ConfigLoader do
+  subject { loadme }
+
+  let(:loadme) { LoadMe.new }
+
+  describe '.load' do
+    specify { subject.load('htc.yml').as_hash.domain.should == 'www.htc.com' }
+  end
+
+  describe '.load_hash' do
+    specify { subject.load_hash('htc.yml').domain.should == 'www.htc.com' }
+  end
+end

data/spec/fixtures/config/property.yml

@@ -0,0 +1,16 @@
+property:
+  type:
+    room: room
+    apartment: apartment
+    town_house: town house
+    independent_house: independent_house
+    office: office
+    house_boat: house boat
+  rooms:
+    one: one
+    two: two
+    three: three
+    four: four
+    five: five
+    six: six
+    seven: seven or more

data/spec/fixtures/data/addresses.da.json

@@ -0,0 +1,32 @@
+[
+  {
+    "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"
+  }
+  ]

data/spec/spec_helper.rb

@@ -3,6 +3,16 @@ require 'rails_config_loader'
 
 SPEC_DIR = File.dirname(__FILE__)
 
+module Rails
+  def self.root
+    File.join SPEC_DIR, 'fixtures'
+  end
+end
+
+class LoadMe
+  include ConfigLoader  
+end
+
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/support/main_app.rb

@@ -15,6 +15,14 @@ module MainApp
 			@seed ||= load_yaml('config/seed.yml', :dir => 'db')
 		end
 
+		def property
+			@property ||= load_hash 'property.yml'
+		end
+
+		def addresses locale = :da
+			@addresses ||= load_content '/data/addresses.json', :locale => locale
+		end
+
 		# config for the app
 		# any missing method on this is delegated to the Hashie wrapping this # loaded content
 		def config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_config_loader
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -146,11 +146,16 @@ files:
 - lib/config_loader/yaml.rb
 - lib/rails_config_loader.rb
 - rails_config_loader.gemspec
+- spec/config_loader/delegator_spec.rb
+- spec/config_loader/json_spec.rb
 - spec/config_loader/yaml_spec.rb
+- spec/config_loader_spec.rb
 - spec/fixtures/config/app.yml
 - spec/fixtures/config/facebook.yml
 - spec/fixtures/config/htc.yml
 - spec/fixtures/config/payment_gateway/quickpay.da.yml
+- spec/fixtures/config/property.yml
+- spec/fixtures/data/addresses.da.json
 - spec/fixtures/db/config/seed.yml
 - spec/spec_helper.rb
 - spec/support/main_app.rb
@@ -169,7 +174,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2060976259246285744
+      hash: 889680361015495165
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: