confiture 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.4
+
+- fixing https://github.com/phoet/confiture/issues/1
+
 ## 0.1.3
 
 - raising an error when using config before initialization

data/README.md

@@ -32,13 +32,13 @@ Rails style initializer (config/initializers/asin.rb):
 
 YAML style configuration:
 
-    Your::Configuration.configure :yaml => 'config/some.yml'
+    Your::Configuration.configure yaml: 'config/some.yml'
 
 Inline style configuration:
 
-    Your::Configuration.configure :secret => 'your-secret', :key => 'your-key'
+    Your::Configuration.configure secret: 'your-secret', key: 'your-key'
     # or
-    client.configure :secret => 'your-secret', :key => 'your-key'
+    client.configure secret: 'your-secret', key: 'your-key'
 
 ## License
 

data/lib/confiture/configuration.rb

@@ -39,13 +39,13 @@ module Confiture
       #
       # You may pass options as a hash as well:
       #
-      #   Confiture::Configuration.configure :secret => 'your-secret', :key => 'your-key'
+      #   Confiture::Configuration.configure secret: 'your-secret', key: 'your-key'
       #
       # Or configure everything using YAML:
       #
-      #   Confiture::Configuration.configure :yaml => 'config/asin.yml'
+      #   Confiture::Configuration.configure yaml: 'config/asin.yml'
       #
-      #   Confiture::Configuration.configure :yaml => 'config/asin.yml' do |config, yml|
+      #   Confiture::Configuration.configure yaml: 'config/asin.yml' do |config, yml|
       #     config.key = yml[Rails.env]['key']
       #   end
       #
@@ -53,7 +53,7 @@ module Confiture
       #
       # [yaml|yml] path to a yaml file with configuration
       #
-      def configure(options={},reset=false)
+      def configure(options = {}, reset = false)
         init_config(reset)
         if yml_path = options[:yaml] || options[:yml]
           yml = File.open(yml_path) { |file| YAML.load(file) }
@@ -77,10 +77,11 @@ module Confiture
       # Run a block of code with temporary configuration.
       #
       def with_config(options={})
-        current_data = data
-        configure(options, true)
+        self.current_data = data
+        configure(options)
+        yield
       ensure
-        self.data = current_data
+        self.current_data = nil
       end
 
       # Resets configuration to defaults
@@ -130,11 +131,20 @@ module Confiture
       private
 
       def data
-        Thread.current[:confiture]
+        current_data || @data
       end
 
       def data=(data)
-        Thread.current[:confiture] = data
+        @data = data
+      end
+
+      def current_data
+        Thread.current["__confiture_#{self}"]
+      end
+
+      def current_data=(data)
+        data = Data.new(data.options) unless data.nil?
+        Thread.current["__confiture_#{self}"] = data
       end
 
       def init_config(force=false)
@@ -144,13 +154,15 @@ module Confiture
       end
 
       def method_missing(meth, *args)
-        meth = "#{meth}"
-        if meth =~ /.+=/ && args.size == 1
-          key = meth[0..-2].to_sym
+        key = "#{meth}"
+        if respond_to?(meth)
+          super
+        elsif key =~ /.+=/ && args.size == 1
+          key = key[0..-2].to_sym
           validate_key!(key)
           data.options[key] = args.last
         elsif args.size == 0
-          key = meth.to_sym
+          key = key.to_sym
           validate_key!(key)
           data.options[key]
         else

data/lib/confiture/version.rb

@@ -1,3 +1,3 @@
 module Confiture
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/rakefile.rb

@@ -8,4 +8,4 @@ RSpec::Core::RakeTask.new do |t|
   t.pattern = 'spec/**/*_spec.rb'
 end
 
-task :default => :spec
+task default: :spec

data/spec/configuration_spec.rb

@@ -17,13 +17,13 @@ module Confiture
 
   class Default
     include Confiture::Configuration
-    confiture_defaults(:key => 'value')
+    confiture_defaults(key: 'value')
   end
 
   describe Confiture do
     context "reset" do
       it "should reset the configuration" do
-        Config.configure(:key => "value").tap do |config|
+        Config.configure(key: "value").tap do |config|
           config.key.should eql("value")
           config.reset!
           config.key.should be_nil
@@ -49,7 +49,7 @@ module Confiture
 
       it "should restore defaults" do
         Default.configure.key.should eql('value')
-        Default.configure(:key => 'bla').key.should eql('bla')
+        Default.configure(key: 'bla').key.should eql('bla')
         Default.reset!
         Default.configure.key.should eql('value')
       end
@@ -85,14 +85,14 @@ module Confiture
       end
 
       it "should read configuration from yml" do
-        Config.configure(:yaml => 'spec/config.yml').tap do |config|
+        Config.configure(yaml: 'spec/config.yml').tap do |config|
           config.secret.should eql('secret_yml')
           config.key.should eql('key_yml')
         end
       end
 
       it "should read configuration from yml with block" do
-        conf = Config.configure :yaml => 'spec/config.yml' do |config, yml|
+        conf = Config.configure yaml: 'spec/config.yml' do |config, yml|
           config.secret = nil
           config.key = yml['secret']
         end
@@ -103,13 +103,49 @@ module Confiture
 
     context "with_config" do
       it "should have a config on a per block basis" do
-        Config.configure(:key => "value").tap do |config|
-          config.with_config(:key => "bla") do
-            Config.key.should eql("bla")
-          end
+        Config.configure(key: "value")
+        Config.key.should eql("value")
+        Config.with_config(key: "bla") do
+          Config.key.should eql("bla")
         end
         Config.key.should eql("value")
       end
     end
+
+    context "scoping" do
+      it "should scope to the configuration class" do
+        mapping = {
+          Config  => "bla",
+          Valid   => "nups",
+          Allowed => "blupp",
+          Default => "nups",
+        }
+        mapping.each do |clazz, value|
+          clazz.reset!
+          clazz.configure(key: value)
+        end
+        mapping.each do |clazz, value|
+          clazz.key.should eql(value)
+        end
+      end
+
+      it "should allow threads to override configuration" do
+        Config.reset!
+        Config.configure(key: "nups")
+        t = Thread.new do
+          Config.key.should eql("nups")
+          Thread.stop
+          Config.key.should eql("nups")
+        end
+        sleep 0.1 while t.status != 'sleep'
+        Config.with_config(key: "dups") do
+          Config.key.should eql("dups")
+          t.run
+          t.join
+          Config.key.should eql("dups")
+        end
+        Config.key.should eql("nups")
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: confiture
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake