simpleconfig 1.1.2 → 1.1.3

data/Rakefile

@@ -1,8 +1,8 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 require "rubygems"
-require "rake/gempackagetask"
+require "rubygems/package_task"
 
 desc 'Default: run unit tests.'
 task :default => :test
@@ -30,20 +30,18 @@ end
 #
 spec = Gem::Specification.new do |s|
   s.name     = "simpleconfig"
-  s.version  = "1.1.2"
+  s.version  = "1.1.3"
   s.date     = "2010-09-13"
   s.summary  = "Simple object-oriented application settings for Ruby applications"
   s.email    = "luke@lukeredpath.co.uk"
   s.homepage = "http://github.com/lukeredpath/simpleconfig"
   s.description = "SimpleConfig is a plugin designed to make application-wide configuration settings (e.g. in a Rails app) easy to set and access in an object-oriented fashion."
-  s.autorequire = "simpleconfig"
   s.has_rdoc = false
   s.authors  = ["Luke Redpath"]
   s.files    = [
     "lib/simple_config.rb",
     "lib/simple_config/controller_mixin.rb",
     "lib/simple_config/utilities.rb",
-    "lib/rails_compatibility.rb",
     "lib/tasks/simple_config.rake",
     "init.rb",
     "Rakefile",
@@ -66,7 +64,7 @@ end
 #
 # To publish your gem online, install the 'gemcutter' gem; Read more
 # about that here: http://gemcutter.org/pages/gem_docs
-Rake::GemPackageTask.new(spec) do |pkg|
+Gem::PackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
 end
 

data/init.rb

@@ -1,5 +1,4 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), 'lib')
 
-require 'rails_compatibility' 
 require 'simple_config'
 require 'simple_config/controller_mixin'

data/lib/simple_config.rb

@@ -1,14 +1,5 @@
 require 'yaml'
 
-unless Object.public_method_defined?(:tap)
-  class Object
-    def tap(&block)
-      yield self
-      self
-    end
-  end
-end
-
 module SimpleConfig
 
   class << self
@@ -27,9 +18,9 @@ module SimpleConfig
     end
 
     def for(config_name, &block)
-      (@configs[config_name] ||= Config.new).tap do |config|
-        config.configure(&block) if block_given?
-      end
+      config = (@configs[config_name] ||= Config.new)
+      config.configure(&block) if block_given?
+      config
     end
   end
 
@@ -44,12 +35,15 @@ module SimpleConfig
     end
 
     def group(name, &block)
-      (@groups[name] ||= Config.new).tap do |group|
-        group.configure(&block) if block_given?
-      end
+      group = (@groups[name] ||= Config.new)
+      group.configure(&block) if block_given?
+      define_accessor(name) { group }
+      group
     end
 
     def set(key, value)
+      unset(key) if set?(key)
+      define_accessor(key) { value }
       @settings[key] = value
     end
 
@@ -71,6 +65,7 @@ module SimpleConfig
     #   exists? :bar      # => false
     #
     def unset(key)
+      singleton_class.send(:remove_method, key)
       @settings.delete(key)
     end
 
@@ -123,15 +118,18 @@ module SimpleConfig
       end
     end
 
+    def set?(key)
+      @settings.key?(key)
+    end
+
     private
-      def method_missing(method_name, *args)
-        case true
-        when @groups.key?(method_name)
-          return @groups[method_name]
-        when @settings.key?(method_name)
-          return get(method_name)
-        else
-          super(method_name, *args)
+      def define_accessor(name, &block)
+        singleton_class.class_eval { define_method(name, &block) } unless respond_to?(name)
+      end
+
+      def singleton_class
+        class << self
+          self
         end
       end
   end

data/test/simple_config_test.rb

@@ -3,41 +3,41 @@ require File.join(File.dirname(__FILE__), *%w[test_helper])
 require 'simple_config'
 
 class SimpleConfigConfigTest < Test::Unit::TestCase
-  
+
   def setup
     @config = SimpleConfig::Config.new
   end
-  
+
   def test_should_be_able_to_set_config_values
     @config.set(:var_one, 'hello world')
     assert_equal 'hello world', @config.get(:var_one)
   end
-  
+
   def test_should_be_able_to_access_settings_using_method_access
     @config.set(:foo, 'bar')
     assert_equal 'bar', @config.foo
   end
-  
+
   def test_should_raise_NoMethodError_if_setting_does_not_exist_when_using_method_access
     assert_raises(NoMethodError) { @config.some_non_existent_variable }
   end
-  
+
   def test_should_return_nil_if_setting_does_not_exist_when_using_get
     assert_nil @config.get(:some_non_existent_variable)
   end
-  
+
   def test_unset_should_delete_config_values
     @config.set(:foo, 'bar')
     assert_equal('bar', @config.foo)
     @config.unset(:foo)
     assert_raises(NoMethodError) { @config.foo }
   end
-  
+
   def test_unset_should_return_deleted_value
     @config.set(:foo, 'bar')
     assert_equal('bar', @config.unset(:foo))
   end
-  
+
   def test_exists_should_return_whether_variable_isset
     assert(!@config.exists?(:foo))
     @config.set(:foo, 'bar')
@@ -45,7 +45,7 @@ class SimpleConfigConfigTest < Test::Unit::TestCase
     @config.unset(:foo)
     assert(!@config.exists?(:foo))
   end
-  
+
   def test_exists_should_consider_empty_values_as_set
     [nil, 0, ''].each do |empty_value|
       @config.set(:foo, empty_value)
@@ -53,52 +53,64 @@ class SimpleConfigConfigTest < Test::Unit::TestCase
       assert(@config.exists?(:foo))
     end
   end
-  
+
   def test_should_return_a_new_group_as_a_separate_config
     group = @config.group(:test)
     assert_instance_of(SimpleConfig::Config, group)
     assert_not_equal @config, group
   end
-  
+
   def test_should_return_an_existing_group
     group = @config.group(:test)
     assert_equal group, @config.group(:test)
   end
-  
+
   def test_should_configure_group_with_supplied_block_when_given
     group = @config.group(:test) do
       set :group_var, 'value'
     end
     assert_equal 'value', group.group_var
   end
-  
+
+  def test_should_respond_to_methods_for_settings_and_groups
+    @config.group(:grp) { set :foo, 'bar' }
+    assert(@config.respond_to?(:grp))
+    assert(@config.grp.respond_to?(:foo))
+  end
+
+  def test_should_not_overwrite_existing_methods
+    object_id = @config.object_id
+    @config.set :object_id, 'object_id'
+    assert_equal object_id, @config.object_id
+  end
+
   def test_should_load_and_parse_external_config_as_ruby_in_context_of_config_instance
     File.stubs(:read).with('external_config.rb').returns(ruby_code = stub('ruby'))
     @config.expects(:instance_eval).with(ruby_code)
     @config.load('external_config.rb')
   end
-  
+
   def test_should_laod_and_parse_external_config_as_yaml_in_context_of_config_instance
     parser = stub('YAMLParser')
     SimpleConfig::YAMLParser.stubs(:parse_contents_of_file).with('external_config.yml').returns(parser)
     parser.expects(:parse_into).with(@config)
     @config.load('external_config.yml')
   end
-  
+
   def test_should_load_and_parse_external_config_as_yaml_if_config_file_has_full_yaml_extension
     parser = stub('YAMLParser')
     SimpleConfig::YAMLParser.expects(:parse_contents_of_file).with('external_config.yaml').returns(parser)
     parser.stubs(:parse_into)
     @config.load('external_config.yaml')
   end
-  
+
   def test_should_load_and_parse_external_config_if_file_exists_when_if_exists_is_true
     File.stubs(:read).with('external_config.rb').returns(ruby_code = stub('ruby'))
     @config.expects(:instance_eval).with(ruby_code)
     File.stubs(:exist?).with('external_config.rb').returns(true)
     @config.load('external_config.rb', :if_exists? => true)
   end
-  
+
   def test_should_not_load_and_parse_external_config_if_file_does_not_exist_when_if_exists_is_true
     @config.expects(:instance_eval).never
     File.stubs(:exist?).with('external_config.rb').returns(false)
@@ -136,7 +148,14 @@ class SimpleConfigConfigTest < Test::Unit::TestCase
     assert_equal hash, @config.test_group.to_hash
   end
 
+  def test_should_be_able_to_redefine_settings
+    @config = cascaded_test_config
+    @config.set(:test, "new-test-setting")
+    assert_equal "new-test-setting", @config.test
+  end
+
   private
+
   def cascaded_test_config
     SimpleConfig.for :simple_config_test do
       set :test, "test-setting"
@@ -148,5 +167,5 @@ class SimpleConfigConfigTest < Test::Unit::TestCase
       end
     end
   end
-    
+
 end

metadata

@@ -1,22 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: simpleconfig
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Luke Redpath
-autorequire: simpleconfig
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +01:00
-default_executable: 
+date: 2010-09-13 00:00:00 Z
 dependencies: []
 
 description: SimpleConfig is a plugin designed to make application-wide configuration settings (e.g. in a Rails app) easy to set and access in an object-oriented fashion.
@@ -31,7 +30,6 @@ files:
 - lib/simple_config.rb
 - lib/simple_config/controller_mixin.rb
 - lib/simple_config/utilities.rb
-- lib/rails_compatibility.rb
 - lib/tasks/simple_config.rake
 - init.rb
 - Rakefile
@@ -42,7 +40,6 @@ files:
 - test/simple_config_functional_test.rb
 - test/simple_config_test.rb
 - test/yaml_parser_test.rb
-has_rdoc: true
 homepage: http://github.com/lukeredpath/simpleconfig
 licenses: []
 
@@ -72,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Simple object-oriented application settings for Ruby applications

data/lib/rails_compatibility.rb

@@ -1,7 +0,0 @@
-unless Rails.respond_to?(:env)
-  Rails.instance_eval do
-    def env
-      RAILS_ENV
-    end
-  end
-end