squire 1.2.6 → 1.3.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NWY4ODFlMTY4YzIzYjlkNmVlNTIyYWQ2ODJkYzQ1M2UxYmU4ZjNlOQ==
-  data.tar.gz: !binary |-
-    NTZjNmZiM2JjNTY1ZjhjNmI2ZGE2YWRjZDllMjQyMjlhYzlmM2QwMg==
+SHA1:
+  metadata.gz: db2bb28316c8d01b055c02e29df0c7bd8b85c3fe
+  data.tar.gz: da3ef166ef7889ae4efb019fcdc4a6dd8ec5e82e
 SHA512:
-  metadata.gz: !binary |-
-    ZDE2ZTNlYWQwMmU2OTdjMTg1MGE5ZGI5OTJkYTcxNWRmNDcxNmJkN2UzMTdj
-    YTRkNjZkMTViZTQ3YWIyMzYxYzk4MmEzNGUwZTFhMTE3Y2MzNmUzOGQwYWYy
-    YzNmZmE2Zjc3NDU5ZDU4ZjQ4YTBhMTczOTQ5M2ZmNGJmNWZiYWM=
-  data.tar.gz: !binary |-
-    MGQ4Nzg3Yjc3Yjc4MjFjOTBmZTg0ZTM2ZTVhZjk1NzkxNWE3NGM0NGM2Y2Zk
-    MGMzMGMxMjg5Y2UwM2U5NmQ0NTQ2YzZkNjkzMjM2Nzk2ZTVhMDA1NThlNTI4
-    OTlhNWNkYzA1YjBmNGUyNzRiZjcxNDUzNzM5OTdlOThlZDM2ODY=
+  metadata.gz: 86160134e6339a2efc5b8d735194c88fc13dc0b94ea242027d742db4d8afb2420e07fba0b9da41e598f064f994bb660a8e5e19cba877b55c6bbf2c133cf7774a
+  data.tar.gz: 90b34e2fcc12c5aa2b2235b90c6341b1d52d2db261fdfa9719c5c1bcb2e1d99fd8f8823350aafc6f2a96758aa6348afc2f336d8a6f2728e31ea7e67be9b121e9

data/lib/squire/settings.rb

@@ -116,6 +116,7 @@ module Squire
 
       result
     end
+    alias :to_h to_hash
 
     ##
     # Shows string representation of settings

data/lib/squire/version.rb

@@ -1,3 +1,3 @@
 module Squire
-  VERSION = '1.2.6'
+  VERSION = '1.3.6'
 end

data/spec/spec_helper.rb

@@ -8,5 +8,9 @@ require 'squire'
 Dir[File.join(File.expand_path(File.dirname(__FILE__)), "support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+
   config.include Fixture
 end

data/spec/squire/base_spec.rb

@@ -11,7 +11,7 @@ describe Squire::Base do
     subject.squire.reload!
   end
 
-  it 'should properly setup base configuration' do
+  it 'properly sets up base configuration' do
     subject.squire.source    development: { a: 1, b: 2 }
     subject.squire.namespace :development
 
@@ -19,23 +19,23 @@ describe Squire::Base do
       config.c = 3
     end
 
-    subject.config.a.should eql(1)
-    subject.config.b.should eql(2)
-    subject.config.c.should eql(3)
+    expect(subject.config.a).to eql(1)
+    expect(subject.config.b).to  eql(2)
+    expect(subject.config.c).to eql(3)
 
-    subject.a.should eql(1)
-    subject.b.should eql(2)
-    subject.c.should eql(3)
+    expect(subject.a).to eql(1)
+    expect(subject.b).to eql(2)
+    expect(subject.c).to eql(3)
 
     expect { subject.d }.to raise_error(Squire::MissingSettingError)
   end
 
-  it 'should properly delegate keys' do
+  it 'properly delegates keys' do
     subject.squire.source    test: { a: 1, b: 2 }
     subject.squire.namespace :test
 
-    subject.a.should eql(1)
-    subject.b.should eql(2)
+    expect(subject.a).to eql(1)
+    expect(subject.b).to eql(2)
 
     expect { subject.c }.to raise_error(Squire::MissingSettingError, /Missing setting 'c' in 'test'/)
   end

data/spec/squire/configuration_spec.rb

@@ -27,81 +27,81 @@ describe Squire::Configuration do
   }
 
   describe '#source' do
-    it 'should properly set hash as source' do
+    it 'properly sets hash as source' do
       subject.source hash
 
-      subject.source.should eql(hash)
+      expect(subject.source).to eql(hash)
     end
 
-    it 'should properly set yaml sa a source' do
+    it 'properly sets yaml sa a source' do
       subject.source 'config.yml'
 
-      subject.source.should eql('config.yml')
-      subject.type.should   eql(:yml)
+      expect(subject.source).to eql('config.yml')
+      expect(subject.type).to   eql(:yml)
     end
   end
 
   describe '#namespace' do
-    it 'should properly set namespace' do
+    it 'properly sets namespace' do
       subject.source    hash
       subject.namespace :development
 
-      subject.settings.a.should  eql(1)
-      subject.namespace.should   eql(:development)
+      expect(subject.settings.a).to eql(1)
+      expect(subject.namespace).to eql(:development)
 
       expect { subject.settings.development }.to raise_exception(Squire::MissingSettingError)
     end
 
-    it 'should properly handle runtime changing of namespaces' do
+    it 'properly handles runtime changing of namespaces' do
       subject.source    hash
       subject.namespace :development
 
-      subject.settings.a.should eql(1)
+      expect(subject.settings.a).to eql(1)
 
       subject.namespace :production
 
-      subject.settings.a.should eql(3)
+      expect(subject.settings.a).to eql(3)
     end
 
-    it 'should handle base namespace overriding' do
+    it 'handles base namespace overriding' do
       subject.source    hash
       subject.namespace :development, base: :defaults
 
-      subject.settings.a.should eql(1)
-      subject.settings.nested.b.should eql(2) # from development.nested.b
-      subject.settings.nested.d.should be_false # from development.nested.d
-      subject.settings.nested.c.should eql(4) # from defaults.nested.c
+      expect(subject.settings.a).to        eql(1)
+      expect(subject.settings.nested.b).to eql(2) # from development.nested.b
+      expect(subject.settings.nested.d).to be_false # from development.nested.d
+      expect(subject.settings.nested.c).to eql(4) # from defaults.nested.c
 
       subject.source    hash
       subject.namespace :production, base: :defaults
 
-      subject.settings.a.should eql(3)
-      subject.settings.nested.b.should eql(4) # from development.nested.b
-      subject.settings.nested.d.should be_true # from development.nested.d
+      expect(subject.settings.a).to        eql(3)
+      expect(subject.settings.nested.b).to eql(4) # from development.nested.b
+      expect(subject.settings.nested.d).to be_true # from development.nested.d
     end
   end
 
   describe '#setup' do
-    let(:path) { '/path/to/file.yml'}
+    let(:path)    { '/path/to/file.yml'}
     let(:factory) { double(:factory) }
     let(:parser)  { double(:parser) }
 
-    it 'should setup basic settings from hash' do
+    it 'sets up basic settings from hash' do
       subject.source(hash)
 
-      factory.should_receive(:of).with(:hash).and_return(parser)
-      parser.should_receive(:parse).with(hash).and_return(hash)
+      expect(factory).to receive(:of).with(:hash).and_return(parser)
+      expect(parser).to receive(:parse).with(hash).and_return(hash)
 
       stub_const('Squire::Parser', factory)
 
       settings = subject.setup
 
-      settings.to_hash.should eql(hash)
+      expect(settings.to_hash).to eql(hash)
     end
 
-    it 'should setup basic settings yml' do
-      factory.should_receive(:of).with(:yml).and_return(parser)
-      parser.should_receive(:parse).with(path).and_return(hash)
+    it 'sets up basic settings yml' do
+      expect(factory).to receive(:of).with(:yml).and_return(parser)
+      expect(parser).to receive(:parse).with(path).and_return(hash)
 
       stub_const('Squire::Parser', factory)
 
@@ -109,11 +109,11 @@ describe Squire::Configuration do
 
       settings = subject.settings
 
-      settings.development.a.should        eql(1)
-      settings.development.nested.b.should eql(2)
+      expect(settings.development.a).to        eql(1)
+      expect(settings.development.nested.b).to eql(2)
     end
 
-    it 'should not setup source with unknown filetype' do
+    it 'does not set up source with unknown filetype' do
       subject.source(path, type: :bogus)
 
       expect { subject.setup }.to raise_error Squire::UndefinedParserError

data/spec/squire/core_ext/hash/deep_merge_spec.rb

@@ -5,16 +5,16 @@ describe Hash do
     let(:a) {{ a: 1, b: 2, c: 3, nested: { a: 1 }}}
     let(:b) {{ a: 1, c: 3, d: 4, nested: { a: 2, b: 3 }}}
 
-    it 'should merge hashes deeply' do
+    it 'merges hashes deeply' do
       merge = { a: 1, b: 2, c: 3, d: 4, nested: { a: 2, b: 3 }}
 
-      a.deep_merge(b).should eql(merge)
+      expect(a.deep_merge(b)).to eql(merge)
     end
 
-    it 'should merge hashes deeply with block' do
+    it 'merges hashes deeply with block' do
       merge = { a: [:a, 1, 1], b: 2, c: [:c, 3, 3], d: [:d, nil, 4], nested: { a: [:a, 1, 2], b: [:b, nil, 3] }}
 
-      (a.deep_merge(b) { |key, old, new| [key, old, new] }).should eql(merge)
+      expect(a.deep_merge(b) { |key, old, new| [key, old, new] }).to eql(merge)
     end
   end
 end

data/spec/squire/parser/hash_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 describe Squire::Parser::Hash do
   subject { Squire::Parser::Hash }
 
-  it 'should parse source hash' do
+  it 'parses source hash' do
     source = { 'a' => 1, 'b' => 2, 'nested' => { 'c' => 2} }
 
     hash = subject.parse(source)
 
-    hash.should eql(source)
+    expect(hash).to eql(source)
   end
 end

data/spec/squire/parser/yaml_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe Squire::Parser::YAML do
   subject { described_class }
 
-  it 'should parse yaml file from path' do
+  it 'parses yaml file from path' do
     hash = subject.parse(fixture('basic.yml').path)
 
-    hash.should eql(
+    expect(hash).to eql(
       'defaults' => nil,
       'development' => {
         'a' => 1,

data/spec/squire/proxy_spec.rb

@@ -13,7 +13,7 @@ describe Squire::Proxy do
 
   let(:another) { AnotherProxiedConfiguration}
 
-  it 'should properly setup proxied configuration' do
+  it 'properly sets up proxied configuration' do
     subject.squire.source    development: { a: 1, b: 2 }
     subject.squire.namespace :development
 
@@ -21,26 +21,26 @@ describe Squire::Proxy do
       config.c = 3
     end
 
-    subject.config.a.should eql(1)
-    subject.config.b.should eql(2)
-    subject.config.c.should eql(3)
+    expect(subject.config.a).to eql(1)
+    expect(subject.config.b).to eql(2)
+    expect(subject.config.c).to eql(3)
 
     expect { subject.a }.to raise_error(NoMethodError)
   end
 
-  it 'should properly setup separate proxies' do
+  it 'properly sets up separate proxies' do
     subject.squire.source    development: { a: 1, b: 2 }
     subject.squire.namespace :development
 
     another.squire.source    production: { a: 3, b: 4 }
     another.squire.namespace :production
 
-    subject.squire.namespace.should eql(:development)
-    subject.config.a.should eql(1)
-    subject.config.b.should eql(2)
+    expect(subject.squire.namespace).to eql(:development)
+    expect(subject.config.a).to eql(1)
+    expect(subject.config.b).to eql(2)
 
-    another.squire.namespace.should eql(:production)
-    another.config.a.should eql(3)
-    another.config.b.should eql(4)
+    expect(another.squire.namespace).to eql(:production)
+    expect(another.config.a).to eql(3)
+    expect(another.config.b).to eql(4)
   end
 end

data/spec/squire/settings_spec.rb

@@ -5,17 +5,17 @@ require 'spec_helper'
 describe Squire::Settings do
   subject { Squire::Settings }
 
-  it 'should define simple configuration' do
+  it 'defines simple configuration' do
     config = subject.new
 
     config.a = 1
     config.b = 2
 
-    config.a.should eql(1)
-    config.b.should eql(2)
+    expect(config.a).to eql(1)
+    expect(config.b).to eql(2)
   end
 
-  it 'should define nested configuration' do
+  it 'defines nested configuration' do
     config = subject.new
 
     config.nested do |nested|
@@ -26,11 +26,11 @@ describe Squire::Settings do
       nested.b = 2
     end
 
-    config.nested.a.should eql(1)
-    config.nested.b.should eql(2)
+    expect(config.nested.a).to eql(1)
+    expect(config.nested.b).to eql(2)
   end
 
-  it 'should check if the value is set' do
+  it 'checks if the value is set' do
     config = subject.new
 
     config.a = 1
@@ -38,13 +38,13 @@ describe Squire::Settings do
       nested.b = 2
     end
 
-    config.a?.should        be_true
-    config.nested.b?.should be_true
-    config.nested.a?.should be_false
-    config.global?.should   be_false
+    expect(config.a?).to        be_true
+    expect(config.nested.b?).to be_true
+    expect(config.nested.a?).to be_false
+    expect(config.global?).to   be_false
   end
 
-  it 'should cache value after setting' do
+  it 'caches value after setting' do
     config = subject.new
 
     config.a = 1
@@ -52,18 +52,30 @@ describe Squire::Settings do
       nested.b = 2
     end
 
-    config.should respond_to(:a)
-    config.nested.should respond_to(:b)
+    expect(config).to respond_to(:a)
+    expect(config.nested).to respond_to(:b)
   end
 
-  it 'should raise error when setting is missing' do
+  it 'raises error when setting is missing' do
     config = subject.new
 
     expect { config.a }.to raise_error(Squire::MissingSettingError, /Missing setting 'a'/)
   end
 
+  it 'behaves as plain object' do
+    config = subject.new
+
+    config.puts = 1
+    config.test do |nested|
+      nested.a = 2
+    end
+
+    expect(config.puts).to eql(1)
+    expect(config.test.a).to eql(2)
+  end
+
   describe '#to_s' do
-    it 'should convert settings to string representation' do
+    it 'converts settings to string representation' do
       config = subject.new
 
       config.a = 1
@@ -73,24 +85,24 @@ describe Squire::Settings do
         nested.c = 3
       end
 
-      config.to_s.should eql('#<Squire::Settings a=1, b=2, nested=#<Squire::Settings c=3>>')
+      expect(config.to_s).to 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
+    it 'allows 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
+      expect(config[:a]).to  eql(1)
+      expect(config['a']).to eql(1)
+      expect(config[:b]).to  be_nil
     end
   end
 
   describe '#to_hash' do
-    it 'should properly dump settings as hash' do
+    it 'properly dumps settings as hash' do
       config = subject.new
 
       config.a = 1
@@ -105,7 +117,7 @@ describe Squire::Settings do
         end
       end
 
-      config.to_hash.should eql({
+      expect(config.to_hash).to eql({
         a: 1,
         b: 2,
         nested: {
@@ -120,7 +132,7 @@ describe Squire::Settings do
   end
 
   describe '.from_hash' do
-    it 'it should parse settings from hash' do
+    it 'parses settings from hash' do
       settings = subject.from_hash({
         a: 1,
         b: 2,
@@ -133,15 +145,15 @@ describe Squire::Settings do
         }
       })
 
-      settings.a.should eql(1)
-      settings.b.should eql(2)
+      expect(settings.a).to eql(1)
+      expect(settings.b).to eql(2)
 
       settings.nested do |nested|
-        nested.c.should eql(3)
-        nested.d.should eql(4)
+        expect(nested.c).to eql(3)
+        expect(nested.d).to eql(4)
 
         nested.other do |other|
-          other.e.should eql(5)
+          expect(other.e).to eql(5)
         end
       end
     end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: squire
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.6
 platform: ruby
 authors:
 - Samuel Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -42,42 +42,42 @@ dependencies:
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Squire handles your configuration by common config DSL.
@@ -128,17 +128,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Squire handles your configuration per class/file by common config DSL and