cubus-settingslogic 2.1.1 → 2.2.0

data/.gitignore

@@ -5,4 +5,5 @@ pkg/*
 coverage/*
 doc/*
 benchmarks/*
-
+.rvmrc
+*.gem

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 2.2.0 released 2010-09-21
+
+* better stacktrace info for injected methods
+* support for numeric keys (by Ignacio Carrera)
+* tests pass on active_support 3
+* tests pass on ruby 1.9.2
+
 == 2.1.1 released 2010-05-03
 
 * removed name method due to conflict with ZenTest

data/README.rdoc

@@ -36,9 +36,9 @@ that looks like:
   end
 
 Name it Settings, name it Config, name it whatever you want. Add as many or as few as you like. A good place to put
-this file in a rails app is app/models/settings.rb
+this file in a rails app is app/models/settings.rb. Declare your namespace to Rails.env if you use per-environment
+settings. These will be merged with the settings in the default namespace.
 
-I felt adding a settings file in your app was more straightforward, less tricky, and more flexible.
 
 === 2. Create your settings
 
@@ -82,6 +82,9 @@ Using a namespace allows us to change our configuration depending on our environ
   >> Settings.awesome_setting
   => "Did you know 5 + 5 = 10?"
 
+  >> Settings.key_by_path "cool.saweet"
+  => "nested settings"
+  
 You can use these settings anywhere, for example in a model:  
 
   class Post < ActiveRecord::Base
@@ -114,32 +117,7 @@ Modifying our model example:
 This would allow you to specify a custom value for per_page just for posts, or
 to fall back to your default value if not specified.
 
-== Note on Sinatra / Capistrano / Vlad
-
-Each of these frameworks uses a +set+ convention for settings, which actually defines methods
-in the global Object namespace:
-
-  set :application, "myapp"  # does "def application" globally
-
-This can cause collisions with Settingslogic, since those methods are global. Luckily, the
-solution is to just add a call to load! in your class:
- 
-  class Settings < Settingslogic
-    source "#{Rails.root}/config/application.yml"
-    namespace Rails.env
-    load!
-  end
-
-It's probably always safest to add load! to your class, since this guarantees settings will be
-loaded at that time, rather than lazily later via method_missing.
-
-Finally, you can reload all your settings later as well:
-
-  Settings.reload!
-
-This is useful if you want to support changing your settings YAML without restarting your app.
-
 == Author
 
 Copyright (c) 2008-2010 {Ben Johnson}[http://github.com/binarylogic] of {Binary Logic}[http://www.binarylogic.com],
-released under the MIT license.  Support for optional settings and reloading by {Nate Wiger}[http://nate.wiger.org].
+released under the MIT license.  Support for optional settings and reloading by {Nate Wiger}[http://nate.wiger.org].

data/Rakefile

@@ -1,3 +1,4 @@
+# vim:fileencoding=utf-8
 require 'rubygems'
 require 'rake'
 
@@ -6,9 +7,9 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "cubus-settingslogic"
     gem.summary = "A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern."
-    gem.email = "bjohnson@binarylogic.com"
-    gem.homepage = "http://github.com/binarylogic/settingslogic"
-    gem.authors = ["Ben Johnson of Binary Logic", "Mihai Târnovan of Cubus Arts", "Gabriel Târnovan of Cubus Arts"]
+    gem.email = "mihai.tarnovan@cubus.ro"
+    gem.homepage = "http://github.com/mtarnovan/settingslogic"
+    gem.authors = ["Ben Johnson of Binary Logic", "Mihai Târnovan of Cubus Arts", "Gabriel Târnovan of Cubus Arts", "Ignacio Carrera"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 2
-:minor: 1
-:build: 
+:minor: 2
 :patch: 0
+:build: 

data/lib/settingslogic.rb

@@ -98,6 +98,11 @@ class Settingslogic < Hash
     create_accessors!
   end
 
+  def [](key)
+    # @settings.key.value or @settings[:key][:value] or @settings['key']['value']
+    super(key.to_s)
+  end
+
   # Called for dynamically-defined keys, and also the first key deferenced at the top-level, if load! is not used.
   # Otherwise, create_accessors! (called by new) will have created actual methods for each key.
   def method_missing(key, *args, &block)
@@ -110,22 +115,19 @@ class Settingslogic < Hash
   end
 
   private
-    # This handles naming collisions with Sinatra/Vlad/Capistrano. Since these use a set()
-    # helper that defines methods in Object, ANY method_missing ANYWHERE picks up the Vlad/Sinatra
-    # settings!  So settings.deploy_to title actually calls Object.deploy_to (from set :deploy_to, "host"),
-    # rather than the app_yml['deploy_to'] hash.  Jeezus.
     def create_accessors!
       self.each do |key,val|
-        # Use instance_eval/class_eval because they're actually more efficient than define_method{}
-        # http://stackoverflow.com/questions/185947/ruby-definemethod-vs-def
-        # http://bmorearty.wordpress.com/2009/01/09/fun-with-rubys-instance_eval-and-class_eval/
-        self.class.class_eval <<-EndEval
-          def #{key}
-            return @#{key} if @#{key}  # cache (performance)
-            value = fetch('#{key}')
-            @#{key} = value.is_a?(Hash) ? self.class.new(value, "'#{key}' section in #{@section}") : value
-          end
-        EndEval
+        begin
+          Kernel.Float(key.to_s) # allow numeric keys          
+        rescue ArgumentError, TypeError
+          self.class.class_eval(<<-EndEval, __FILE__, __LINE__ + 1)
+            def #{key}
+              return @#{key} if @#{key}  # cache (performance)
+              value = fetch('#{key}')
+              @#{key} = value.is_a?(Hash) ? self.class.new(value, "'#{key}' section in #{@section}") : value
+            end
+          EndEval
+        end        
       end
     end
 

data/spec/settings.yml

@@ -21,4 +21,8 @@ collides:
 default_settings4:
   haskell:
     paradigm: voodoo
-    foo: bar
+    foo: bar
+
+with_numbers:
+  12: 'hello'
+  '21': 'bye'

data/spec/settingslogic_spec.rb

@@ -54,7 +54,16 @@ describe "Settingslogic" do
     Settings4.haskell.foo.should == 'bar'
     Settings4.smalltalk.paradigm.should == 'object oriented'
   end
-  
+
+  it "should allow numeric keys" do
+    Settings.with_numbers.should == { 12 => 'hello', '21' => 'bye' }
+  end
+
+  it "should allow accessing numeric keys as string and viceversa" do
+    Settings.with_numbers[12].should == Settings.with_numbers['12']
+    Settings.with_numbers[21].should == Settings.with_numbers['21']
+  end
+
   it "should raise a helpful error message" do
     e = nil
     begin

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
 require 'spec'
 require 'rubygems'
-require 'ruby-debug' if RUBY_VERSION < '1.9'  # ruby-debug does not work on 1.9.1 yet
+require 'ruby-debug'
 require 'active_support'
+require 'active_support/core_ext/hash'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -4,24 +4,25 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 - "Mihai T\xC3\xA2rnovan of Cubus Arts"
 - "Gabriel T\xC3\xA2rnovan of Cubus Arts"
+- Ignacio Carrera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 +02:00
+date: 2010-09-21 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
 description: 
-email: bjohnson@binarylogic.com, mihai.tarnovan@cubus.ro, gabriel.tarnovan@cubus.ro
+email: mihai.tarnovan@cubus.ro
 executables: []
 
 extensions: []
@@ -44,10 +45,11 @@ files:
 - spec/settings.yml
 - spec/settings2.rb
 - spec/settings3.rb
+- spec/settings4.rb
 - spec/settingslogic_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://github.com/binarylogic/settingslogic
+homepage: http://github.com/mtarnovan/settingslogic
 licenses: []
 
 post_install_message: 
@@ -56,6 +58,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -63,6 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -72,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern.