facebook-rails-starterkit 0.1.1 → 0.1.4

data/Gemfile

@@ -1,12 +1,16 @@
 source :rubygems
 
 # Facebook
-gem 'koala', 	'~> 1.3.0'
+gem 'koala', 	'>= 1.4.0'
 gem 'hashie', '~> 1.2.0'
 gem 'joey', 	'~> 0.1.1', :git => 'git://github.com/kristianmandrup/Joey.git' # wrapper on top of koala
 
-group :development do
+group :development, :Test do
   gem "rspec", 		">= 2.8.0"
+end
+
+
+group :development do
   gem "rdoc", 		">= 3.12"
   gem "bundler", 	">= 1.1.0"
   gem "jeweler", 	">= 1.8.3"

data/Gemfile.lock

@@ -22,9 +22,9 @@ GEM
       rake
       rdoc
     json (1.6.6)
-    koala (1.3.0)
+    koala (1.4.1)
       faraday (~> 0.7.0)
-      multi_json (~> 1.0)
+      multi_json (~> 1.3.0)
     multi_json (1.3.2)
     multipart-post (1.1.5)
     rack (1.4.1)
@@ -52,7 +52,7 @@ DEPENDENCIES
   hashie (~> 1.2.0)
   jeweler (>= 1.8.3)
   joey (~> 0.1.1)!
-  koala (~> 1.3.0)
+  koala (>= 1.4.0)
   rdoc (>= 3.12)
   rspec (>= 2.8.0)
   simplecov (>= 0.5)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.4

data/facebook-rails-starterkit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "facebook-rails-starterkit"
-  s.version = "0.1.1"
+  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-04-23"
+  s.date = "2012-05-03"
   s.description = "Make it simple to get started using Facebook with Rails!"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -32,20 +32,23 @@ Gem::Specification.new do |s|
     "lib/facebook/app.rb",
     "lib/facebook/auth/devise.rb",
     "lib/facebook/graph_api.rb",
+    "spec/facebook-rails-starterkit/config_loader/yaml_spec.rb",
     "spec/facebook-rails-starterkit_spec.rb",
+    "spec/fixtures/config/facebook.yml",
+    "spec/fixtures/config/htc.yml",
     "spec/spec_helper.rb"
   ]
   s.homepage = "http://github.com/kristianmandrup/facebook-rails-starterkit"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.22"
+  s.rubygems_version = "1.8.24"
   s.summary = "Starterkit for using Facebook with Rails"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<koala>, ["~> 1.3.0"])
+      s.add_runtime_dependency(%q<koala>, [">= 1.4.0"])
       s.add_runtime_dependency(%q<hashie>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<joey>, ["~> 0.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 2.8.0"])
@@ -54,7 +57,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0.5"])
     else
-      s.add_dependency(%q<koala>, ["~> 1.3.0"])
+      s.add_dependency(%q<koala>, [">= 1.4.0"])
       s.add_dependency(%q<hashie>, ["~> 1.2.0"])
       s.add_dependency(%q<joey>, ["~> 0.1.1"])
       s.add_dependency(%q<rspec>, [">= 2.8.0"])
@@ -64,7 +67,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0.5"])
     end
   else
-    s.add_dependency(%q<koala>, ["~> 1.3.0"])
+    s.add_dependency(%q<koala>, [">= 1.4.0"])
     s.add_dependency(%q<hashie>, ["~> 1.2.0"])
     s.add_dependency(%q<joey>, ["~> 0.1.1"])
     s.add_dependency(%q<rspec>, [">= 2.8.0"])

data/lib/config_loader/yaml.rb

@@ -1,32 +1,42 @@
+require 'hashie'
+
 module ConfigLoader
   class Yaml
-		def initialize path, file_name
-			@path = path
+  	attr_reader :path, :file_name, :ext, :file_path, :root
 
-			file_name += '.yml' unless file_name =~ /\.ya?ml/
-			@file_name = file_name  
-			
-			Hashie::Mash.new yaml
+  	# will try root element if such exists
+		def initialize file_path, root = nil
+			@file_path = file_path
+			@path 		 = File.dirname file_path
+			@file_name = File.basename file_path
+			@ext 			 = file_name.split(/(ya?ml$)/).last
+			@root 		 = (root || file_name.split('.').first).to_s
+			@root 		 = nil unless mashie.send(@root)
+			@mashie 	 = mashie.send(@root) if @root
 		end
-  	
-		protected
 
-		def yaml
-			@yaml ||= YAML::load File.open(file_path)
+		def as_hash
+			@as_hash ||= mashie
 		end
 
-  	def config_path
-			@config_path ||= File.join Rails.root, 'config'
+		def as_yaml
+			@as_yaml ||= ::YAML::load File.open(config_file_path)
+		end
+  	
+		protected
+
+		def mashie
+			@mashie ||= ::Hashie::Mash.new as_yaml
 		end
 
-    def file_path
-    	@file_path = File.join config_path, path, file_name
+    def config_file_path
+    	@config_file_path ||= File.join(Rails.root.to_s, 'config', file_path)
     end
 	end
 
 	module Delegator				
 	  def method_missing(m, *args, &block)
-	  	raise 'A #config method must be defined for the LoaderDelegator to work' unless respond_to?(:config)
+	  	raise "A #config method must be defined in the container for ConfigLoader::Delegator, for it to delegate to #config: delegation attempted with #{m}" unless self.respond_to?(:config)
 	    config.send(m)
 	  end
 	end

data/spec/facebook-rails-starterkit/config_loader/yaml_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+module Rails
+	def self.root
+		File.join SPEC_DIR, 'fixtures'
+	end
+end
+
+describe ConfigLoader::Yaml do
+	subject { config }
+	let(:config) { ConfigLoader::Yaml.new('facebook.yml') }
+
+	its(:file_name) { should == 'facebook.yml' }
+	its(:root) 			{ should == 'facebook' }
+	its(:ext) 			{ should == 'yml' }
+
+	its(:as_yaml) { should_not be_nil }
+	its(:as_hash) { should be_a Hash }
+
+	specify { subject.as_hash.domain == 'www.facebook.com' }
+
+	describe 'no root' do
+		subject { config }
+		let(:config) { ConfigLoader::Yaml.new('htc.yml') }
+
+		its(:root) 	 { should == nil }
+		specify { subject.as_hash.domain == 'www.htc.com' }
+	end
+
+	describe 'specific root' do
+		subject { config }
+		let(:config) { ConfigLoader::Yaml.new('htc.yml', :root) }
+
+		its(:root) 	 { should == 'root' }
+		specify { subject.as_hash.domain == 'www.htc.dk' }
+	end
+end

data/spec/facebook-rails-starterkit_spec.rb

@@ -1,7 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 describe "FacebookRailsStarterkit" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
 end

data/spec/fixtures/config/facebook.yml

@@ -0,0 +1,3 @@
+facebook:
+  domain: www.facebook.com
+  app_id: 12345

data/spec/fixtures/config/htc.yml

@@ -0,0 +1,3 @@
+domain: www.htc.com
+root:
+  domain: www.domain.dk

data/spec/spec_helper.rb

@@ -1,11 +1,7 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'facebook-rails-starterkit'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+SPEC_DIR = File.dirname(__FILE__)
 
 RSpec.configure do |config|
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: facebook-rails-starterkit
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: koala
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,10 @@ files:
 - lib/facebook/app.rb
 - lib/facebook/auth/devise.rb
 - lib/facebook/graph_api.rb
+- spec/facebook-rails-starterkit/config_loader/yaml_spec.rb
 - spec/facebook-rails-starterkit_spec.rb
+- spec/fixtures/config/facebook.yml
+- spec/fixtures/config/htc.yml
 - spec/spec_helper.rb
 homepage: http://github.com/kristianmandrup/facebook-rails-starterkit
 licenses:
@@ -179,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1126046914443620564
+      hash: 357547551403460719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Starterkit for using Facebook with Rails