radiospiel-app 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/app/app/config.rb

@@ -12,7 +12,8 @@ module App
     def self.read(path)
       return unless File.exist?(path)
       App.logger.info "Reading configuration from #{path}"
-      yaml = File.read(path)
+      erb = File.read(path)
+      yaml = ERB.new(erb).result(binding)
       YAML.load(yaml) || {}
     end
     

data/lib/core-extensions/array_ext.rb

@@ -0,0 +1,5 @@
+class Array
+  def extract_options!
+    last.is_a?(Hash) ? pop : {}
+  end
+end

data/radiospiel-app.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospiel-app"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
-  s.date = "2012-04-03"
+  s.date = "2012-04-04"
   s.description = "Some basics that your application could benefit from."
   s.email = "eno@open-lab.org"
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/app/app/config.rb",
     "lib/app/app/logger.rb",
     "lib/app/app/root.rb",
+    "lib/core-extensions/array_ext.rb",
     "lib/core-extensions/benchmark-logger.rb",
     "lib/core-extensions/cgi_ext.rb",
     "lib/core-extensions/hash_ext.rb",
@@ -46,6 +47,7 @@ Gem::Specification.new do |s|
     "radiospiel-app.gemspec",
     "script/watchr",
     "test/app_test.rb",
+    "test/array_ext_test.rb",
     "test/cache_test.rb",
     "test/cgi_ext_test.rb",
     "test/config.yml",

data/test/array_ext_test.rb

@@ -0,0 +1,37 @@
+# encoding: utf-8
+
+require 'helper'
+
+class ArrayExtTest < Test::Unit::TestCase
+  def test_extract_options
+    array = [ 1, 2, 3 ]
+    options = array.extract_options!
+    assert_equal({}, options)
+    assert_equal([1,2,3], array)
+
+    array = [ ]
+    options = array.extract_options!
+    assert_equal({}, options)
+    assert_equal([], array)
+
+    array = [ 1, 2, 3, {} ]
+    options = array.extract_options!
+    assert_equal({}, options)
+    assert_equal([1,2,3], array)
+
+    array = [ {} ]
+    options = array.extract_options!
+    assert_equal({}, options)
+    assert_equal([], array)
+
+    array = [ 1, 2, 3, { 1 => 2 } ]
+    options = array.extract_options!
+    assert_equal({ 1 => 2 }, options)
+    assert_equal([1,2,3], array)
+
+    array = [ { 1 => 2 } ]
+    options = array.extract_options!
+    assert_equal({ 1 => 2 }, options)
+    assert_equal([], array)
+  end
+end

data/test/config.yml

@@ -1,7 +1,8 @@
 default:
   abc: "abc"
   dummy: "dummy"
-
+  erbed: <%= "test" %>
+  
 test:
   abc: "def"
 

data/test/config_test.rb

@@ -4,7 +4,7 @@ class TestConfig < Test::Unit::TestCase
   def test_read_from_test_config
     App.root = File.dirname __FILE__
   
-    expected = {"abc"=>"def", "dummy"=>"dummy"}
+    expected = {"abc"=>"def", "dummy"=>"dummy", "erbed"=> "test" }
     assert_equal(expected, App.config)
 
     assert_equal("def", App.config[:abc])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospiel-app
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70363188637140 !ruby/object:Gem::Requirement
+  requirement: &70155980894640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363188637140
+  version_requirements: *70155980894640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70363188636460 !ruby/object:Gem::Requirement
+  requirement: &70155980894040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363188636460
+  version_requirements: *70155980894040
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70363188635680 !ruby/object:Gem::Requirement
+  requirement: &70155980893340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363188635680
+  version_requirements: *70155980893340
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70363188634580 !ruby/object:Gem::Requirement
+  requirement: &70155980892600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363188634580
+  version_requirements: *70155980892600
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70363188619980 !ruby/object:Gem::Requirement
+  requirement: &70155980891880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70363188619980
+  version_requirements: *70155980891880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70363188618960 !ruby/object:Gem::Requirement
+  requirement: &70155980891060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188618960
+  version_requirements: *70155980891060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70363188617680 !ruby/object:Gem::Requirement
+  requirement: &70155980890540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188617680
+  version_requirements: *70155980890540
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70363188616400 !ruby/object:Gem::Requirement
+  requirement: &70155980889880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188616400
+  version_requirements: *70155980889880
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70363188615300 !ruby/object:Gem::Requirement
+  requirement: &70155980889380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188615300
+  version_requirements: *70155980889380
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70363188614400 !ruby/object:Gem::Requirement
+  requirement: &70155980888820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188614400
+  version_requirements: *70155980888820
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70363188613240 !ruby/object:Gem::Requirement
+  requirement: &70155980888240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188613240
+  version_requirements: *70155980888240
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70363188612380 !ruby/object:Gem::Requirement
+  requirement: &70155980887640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70363188612380
+  version_requirements: *70155980887640
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -167,6 +167,7 @@ files:
 - lib/app/app/config.rb
 - lib/app/app/logger.rb
 - lib/app/app/root.rb
+- lib/core-extensions/array_ext.rb
 - lib/core-extensions/benchmark-logger.rb
 - lib/core-extensions/cgi_ext.rb
 - lib/core-extensions/hash_ext.rb
@@ -180,6 +181,7 @@ files:
 - radiospiel-app.gemspec
 - script/watchr
 - test/app_test.rb
+- test/array_ext_test.rb
 - test/cache_test.rb
 - test/cgi_ext_test.rb
 - test/config.yml
@@ -205,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1143350558901751465
+      hash: 256226923119998611
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: