squire 1.2.1 → 1.2.2

data/README.md

@@ -1,12 +1,9 @@
 # Squire
 
-![alt text](https://raw.github.com/smolnar/squire/master/squire.png "Source: http://www.printactivities.com/ColoringPages/Knights/Squire.html")
-
 Squire is your configuration squire thats bears your configuration for object, so you don't need to worry about bunch of settings.
 
 It's designed to support multiple formats (for now, Hash and YML) and replace [Settingslogic](https://github.com/binarylogic/settingslogic) that lacks some crutial features like default/base namespace or extensibility for another source formats.
 
-Logo is courtesy of [PrintActivities](http://www.printactivities.com/ColoringPages/Knights/Squire.html).
 
 ## Installation
 
@@ -41,6 +38,7 @@ class Elephant
     namespace 'namespace'
     ....
   end
+end
 ```
 
 After that, you can access `Elephanth.config`. For example:
@@ -107,7 +105,8 @@ Default namespace set by `base` option in `squire.namespace` is used for merging
 
 ## Statistics
 
-Run `bundle exec ruby benchmark/settings_access.rb`.
+Run `bundle exec ruby benchmark/settings_access.rb`. 
+Example uses Hash with 10 000 keys.
 
 Single access:
 ```
@@ -121,6 +120,9 @@ Squire          0.090000   0.000000   0.090000 (  0.093573)
 Settingslogic   0.060000   0.000000   0.060000 (  0.066079)
 ```
 
+First access of key in `Settingslogic` is painfully slow, as you can see. But after defining accessor, the second access
+is just a matter of miliseconds.
+
 ## Contributing
 
 1. Fork it

data/lib/squire/configuration.rb

@@ -49,7 +49,7 @@ module Squire
     def settings(&block)
       @settings ||= setup
 
-      settings = @namespace ? @settings.send(@namespace) : @settings
+      settings = @namespace ? @settings.get_value(@namespace) : @settings
 
       if block_given?
         block.arity == 0 ? settings.instance_eval(&block) : block.call(settings)

data/lib/squire/settings.rb

@@ -1,6 +1,6 @@
 module Squire
   class Settings
-    RESERVED = [:get_value, :to_hash]
+    RESERVED = [:get_value, :set_value, :define_key_accessor, :to_hash]
 
     ##
     # Creates new settings with +path+ and +parent+.
@@ -51,11 +51,9 @@ module Squire
           @children << settings
         end
 
-        block.arity == 0 ? settings.instance_eval(&block) : block.call(settings)
+        get_value(key, &block)
       elsif args.count == 1
         set_value(key, args.pop)
-
-        define_key_accessor(key)
       elsif type == '?'
         !!get_value(key)
       else
@@ -65,29 +63,41 @@ module Squire
           raise MissingSettingError.new("Missing setting in '#{key}' in '#{@path}'.")
         end
 
-        define_key_accessor(key) unless repond_to?(key)
-
         value
       end
     end
 
     ##
     # Returns a value for +key+ from settings table.
+    # Yields +value+ of +key+ if +block+ provided.
+    #
+    # == Examples:
+    #
+    #   .key do |key|
+    #     ...
+    #   end
     #
-    # Goes up in ancestor chain by +parent+ until reaches a top. So if you define settings like
-    #   settings.a = 1
-    # and ask for
-    #   settings.nested.a
-    # it returns +settings.a+.
-    def get_value(key)
-      return @table[key] unless @table[key].nil?
-      return @parent.get_value(key) if @parent
+    #   # or
+    #
+    #   .key do
+    #     ...
+    #   end
+    def get_value(key, &block)
+      value = @table[key]
+
+      if block_given?
+        block.arity == 0 ? value.instance_eval(&block) : block.call(value)
+      end
+
+      value
     end
 
     ##
     # Sets a +value+ for +key+
     def set_value(key, value)
       @table[key] = value
+
+      define_key_accessor(key)
     end
 
     ##
@@ -127,7 +137,9 @@ module Squire
     ##
     # Defines key accessor for +key+ for faster accessing of keys.
     def define_key_accessor(key)
-      define_singleton_method(key) { get_value(key) } if key =~ /\A\w+\z/
+      define_singleton_method(key) do |&block|
+        get_value(key, &block)
+      end
     end
   end
 end

data/lib/squire/version.rb

@@ -1,3 +1,3 @@
 module Squire
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/spec/squire/base_spec.rb

@@ -7,6 +7,10 @@ end
 describe Squire::Base do
   subject { Configuration }
 
+  before :each do
+    subject.squire.reload!
+  end
+
   it 'should properly setup base configuration' do
     subject.squire.source    development: { a: 1, b: 2 }
     subject.squire.namespace :development
@@ -25,4 +29,11 @@ describe Squire::Base do
 
     expect { subject.d }.to raise_error(Squire::MissingSettingError)
   end
+
+  it 'should properly delegate keys' do
+    subject.squire.source    test: { a: 1, b: 2 }
+    subject.squire.namespace :test
+
+    subject.a.should eql(1)
+  end
 end

data/spec/squire/settings_spec.rb

@@ -28,16 +28,6 @@ describe Squire::Settings do
     config.nested.b.should eql(2)
   end
 
-  it 'should fallback to parent configuration if not defined' do
-    config = subject.new
-
-    config.global = 1
-
-    config.nested { |nested| nested.a = 1 }
-
-    config.nested.global.should eql(1)
-  end
-
   it 'should check if the value is set' do
     config = subject.new
 
@@ -48,7 +38,7 @@ describe Squire::Settings do
 
     config.a?.should        be_true
     config.nested.b?.should be_true
-    config.nested.a?.should be_true
+    config.nested.a?.should be_false
     config.global?.should   be_false
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squire
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Squire handles your configuration per class/file by common config DSL and