squire 1.2.4 → 1.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODI1YmM1YTE1MjgwYmM3MmNkMWUyNDI1Mzg1ZDAxMWRmYzJmODEzNQ==
+    MDJkODhmYWNjYmIyYzNkNTUwN2RmNTNjZDFjYmY3Mzk0MDIwYjU3NA==
   data.tar.gz: !binary |-
-    ZDQ3OTM0YWM5ZjkxMTM4NTBiZTdlYzkxY2ZlYjA2NzY5YWMwNjBjZA==
+    ODgxZTg2YzhjOWEyYTExMTI1YzdkZDgzODg4OTRkZTZmNGI5OGI5Nw==
 SHA512:
   metadata.gz: !binary |-
-    Njk2ODAxM2RhYTU4OTc4YmUyODIxMzhjYWI4ODc3YTRmOTdhYjQ2NGI5ZmQ3
-    NzVmMTUxMWJmNTJmMDliMmYyNmMyYmE3NjU2Nzc2YmQ1YTI0YzBmODNmZmE0
-    YzI5OTE4YjgxNmQ1Yjk5NDhlOThjZmU4YWFkOTExZjNlNTY0OTc=
+    OGRhNWMwNjgzZDljYjA3MmFlZTg3YmY1YmM0Nzk3ZDMxMjU2OGRjMmE0OWY0
+    YTY2MzZjN2RjNWYyNTA4NWZmODdiMjZkZTkxODk4OWZkMTRjMmMxYWNhMmQz
+    ZjJjZjQ2Y2Y3YWVmZmFjZTk0OWEwNTlhZDljODRkOWVmZGEyNGY=
   data.tar.gz: !binary |-
-    ZDg3ZTFiN2E5OTA2MWE0Zjg5NzkyM2M1M2U5MzEyZTA0MDgzOGVlYTFlOWRj
-    NGM0YzkxYzhmZTQ2N2QyMDcyMWRjNTRmZWVjNGUyYTgyNzJkNDA0M2Q3ODQ3
-    OGFkMWRjYThiODJhNTRmYzEyZDA3NjhlYzYzMDIwODk2NDBjOTA=
+    ZmRlMWNjYjAzOTFmMTBlMDQ0NWIzODQwZTMyOTEyMGUzODFiOTA5MTU3Y2I2
+    MDQyNjZmY2MwZWZkN2U3OGMwZWRhMWY5OTM4MjI2ZTk0NWU1MTVhZDA3OTYx
+    YTEyNDYwMjAxZTFiMWQ3MDNhZDUzZTUwMDNjN2FkYzZkNGJmZDQ=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 1.2.5
+* Use HashWithIndifferentAccess for accessing parser result
+* Add better string representation of Squire::Settings
+
+  *Samuel Molnár*
+
 ### 1.2.4
 * Fix gemspec licence (#1)
 * Use BasicObject as clean slate for Squire::Setting

data/lib/squire/configuration.rb

@@ -71,7 +71,7 @@ module Squire
 
       parser = Squire::Parser.of(@type)
 
-      hash = parser.parse(source)
+      hash = parser.parse(source).with_indifferent_access
 
       if base_namespace
         hash.except(base_namespace).each do |key, values|

data/lib/squire/settings.rb

@@ -1,8 +1,6 @@
 module Squire
-  class Settings < BasicObject
-    include ::Kernel
-
-    RESERVED = [:get_value, :set_value, :define_key_accessor, :to_hash]
+  class Settings
+    RESERVED = [:get_value, :set_value, :define_key_accessor, :to_hash, :to_s, :[]]
 
     ##
     # Creates new settings with +path+ and +parent+.
@@ -62,7 +60,7 @@ module Squire
         value = get_value(key)
 
         if value.nil?
-          raise MissingSettingError.new("Missing setting in '#{key}' in '#{@path}'.")
+          raise MissingSettingError.new("Missing setting '#{key}' in '#{@path}'.")
         end
 
         value
@@ -85,6 +83,7 @@ module Squire
     #     ...
     #   end
     def get_value(key, &block)
+      key   = key.to_sym
       value = @table[key]
 
       if block_given?
@@ -118,17 +117,29 @@ module Squire
       result
     end
 
+    ##
+    # Shows string representation of settings
+    def to_s
+      "#<#{self.class.name} #{@table.map { |key, value| "#{key}=#{value}"}.join(', ')}>"
+    end
+
+    ##
+    # Access +key+ from table directly
+    def [](key)
+      get_value(key)
+    end
+
     ##
     # Loads new settings from provided +hash+.
     def self.from_hash(hash, parent = nil)
-      result = Settings.new
+      result = Settings.new(parent)
 
       hash.each_pair do |key, value|
         if value.is_a? ::Hash
-          value = from_hash(value, result)
+          value = from_hash(value, key)
         end
 
-        result.set_value(key, value)
+        result.set_value(key.to_sym, value)
       end
 
       result

data/lib/squire/version.rb

@@ -1,3 +1,3 @@
 module Squire
-  VERSION = '1.2.4'
+  VERSION = '1.2.5'
 end

data/lib/squire.rb

@@ -1,5 +1,6 @@
 require 'active_support/concern'
 require 'active_support/core_ext/hash/except'
+require 'active_support/core_ext/hash/indifferent_access'
 require 'squire/core_ext/hash/deep_merge'
 require 'squire/version'
 require 'squire/exceptions'

data/spec/squire/base_spec.rb

@@ -36,5 +36,7 @@ describe Squire::Base do
 
     subject.a.should eql(1)
     subject.b.should eql(2)
+
+    expect { subject.c }.to raise_error(Squire::MissingSettingError, /Missing setting 'c' in 'test'/)
   end
 end

data/spec/squire/settings_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+# :TODO: Refactor redundant usage of subject
+
 describe Squire::Settings do
   subject { Squire::Settings }
 
@@ -57,7 +59,34 @@ describe Squire::Settings do
   it 'should raise error when setting is missing' do
     config = subject.new
 
-    expect { config.a }.to raise_error(Squire::MissingSettingError)
+    expect { config.a }.to raise_error(Squire::MissingSettingError, /Missing setting 'a'/)
+  end
+
+  describe '#to_s' do
+    it 'should convert settings to string representation' do
+      config = subject.new
+
+      config.a = 1
+      config.b = 2
+
+      config.nested do |nested|
+        nested.c = 3
+      end
+
+      config.to_s.should eql('#<Squire::Settings a=1, b=2, nested=#<Squire::Settings c=3>>')
+    end
+  end
+
+  describe '#[]' do
+    it 'should allow accesing keys in hash manner' do
+      config = subject.new
+
+      config.a = 1
+
+      config[:a].should  eql(1)
+      config['a'].should eql(1)
+      config[:b].should  be_nil
+    end
   end
 
   describe '#to_hash' do

data/squire.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.version       = Squire::VERSION
   gem.authors       = ['Samuel Molnar']
   gem.email         = ['molnar.samuel@gmail.com']
-  gem.description   = 'Your configuration squire.'
+  gem.description   = 'Squire handles your configuration by common config DSL.'
   gem.summary       = 'Squire handles your configuration per class/file by common config DSL and extensible source formats.'
   gem.homepage      = 'https://github.com/smolnar/squire'
   gem.license       = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squire
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Samuel Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,7 +80,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Your configuration squire.
+description: Squire handles your configuration by common config DSL.
 email:
 - molnar.samuel@gmail.com
 executables: []