RubyApp 0.0.79 → 0.0.80

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.79)
+    RubyApp (0.0.80)
       BlueCloth
       chronic
       chronic_duration
@@ -47,7 +47,7 @@ GEM
     ffi (1.0.11)
     fileutils (0.7)
       rmagick (>= 2.13.1)
-    gherkin (2.7.3)
+    gherkin (2.7.6)
       json (>= 1.4.6)
     haml (3.1.4)
     json (1.6.5)
@@ -57,8 +57,8 @@ GEM
     multi_json (1.0.4)
     nokogiri (1.5.0)
     numerizer (0.1.1)
-    r18n-core (0.4.13)
-    rack (1.4.0)
+    r18n-core (0.4.14)
+    rack (1.4.1)
     rack-test (0.6.1)
       rack (>= 1.0)
     rake (0.9.2.2)
@@ -83,7 +83,6 @@ GEM
     term-ansicolor (1.0.7)
     xpath (0.1.4)
       nokogiri (~> 1.3)
-    ya2yaml (0.30)
     yajl-ruby (1.1.0)
 
 PLATFORMS
@@ -97,4 +96,3 @@ DEPENDENCIES
   rake
   rspec
   rspec-mocks
-  ya2yaml

data/lib/ruby_app/config.yml

@@ -1,15 +1,16 @@
-ruby_app:
-  elements:
-    pages:
-      authentication:
-        open_id:
-          google_authentication_page:
-            identifier: https://www.google.com/accounts/o8/id
-            attributes:
-              email: http://schema.openid.net/contact/email
-          my_open_id_authentication_page:
-            identifier: http://myopenid.com
-          yahoo_authentication_page:
-            identifier: https://www.yahoo.com
-            attributes:
-              email: http://axschema.org/contact/email
+default:
+  ruby_app:
+    elements:
+      pages:
+        authentication:
+          open_id:
+            google_authentication_page:
+              identifier: https://www.google.com/accounts/o8/id
+              attributes:
+                email: http://schema.openid.net/contact/email
+            my_open_id_authentication_page:
+              identifier: http://myopenid.com
+            yahoo_authentication_page:
+              identifier: https://www.yahoo.com
+              attributes:
+                email: http://axschema.org/contact/email

data/lib/ruby_app/configuration.rb

@@ -26,7 +26,9 @@ module RubyApp
       def initialize(paths)
         @document = {}
         paths.each do |path|
-          @document.merge!(YAML::load(File.open(path)))
+          File.open(path, 'r') do |file|
+            @document.merge!(YAML::load(file)[ENV['RUBY_APP_CONFIGURATION'] || 'default'] || {})
+          end
         end
       end
 

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.0.79"
+  VERSION = "0.0.80"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

data/ruby_app.gemspec

@@ -38,5 +38,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rspec-mocks'
-  s.add_development_dependency 'ya2yaml'
+  #s.add_development_dependency 'ya2yaml'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 129
+  hash: 191
   prerelease: 
   segments: 
   - 0
   - 0
-  - 79
-  version: 0.0.79
+  - 80
+  version: 0.0.80
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-25 00:00:00 Z
+date: 2012-01-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -311,20 +311,6 @@ dependencies:
   type: :development
   prerelease: false
   name: rspec-mocks
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id022 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id022
-  type: :development
-  prerelease: false
-  name: ya2yaml
 description: A web application framework in Ruby
 email: 
 - frank.ficnar@gmail.com