squire 1.2.3 → 1.2.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODI1YmM1YTE1MjgwYmM3MmNkMWUyNDI1Mzg1ZDAxMWRmYzJmODEzNQ==
+  data.tar.gz: !binary |-
+    ZDQ3OTM0YWM5ZjkxMTM4NTBiZTdlYzkxY2ZlYjA2NzY5YWMwNjBjZA==
+SHA512:
+  metadata.gz: !binary |-
+    Njk2ODAxM2RhYTU4OTc4YmUyODIxMzhjYWI4ODc3YTRmOTdhYjQ2NGI5ZmQ3
+    NzVmMTUxMWJmNTJmMDliMmYyNmMyYmE3NjU2Nzc2YmQ1YTI0YzBmODNmZmE0
+    YzI5OTE4YjgxNmQ1Yjk5NDhlOThjZmU4YWFkOTExZjNlNTY0OTc=
+  data.tar.gz: !binary |-
+    ZDg3ZTFiN2E5OTA2MWE0Zjg5NzkyM2M1M2U5MzEyZTA0MDgzOGVlYTFlOWRj
+    NGM0YzkxYzhmZTQ2N2QyMDcyMWRjNTRmZWVjNGUyYTgyNzJkNDA0M2Q3ODQ3
+    OGFkMWRjYThiODJhNTRmYzEyZDA3NjhlYzYzMDIwODk2NDBjOTA=

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### 1.2.4
+* Fix gemspec licence (#1)
+* Use BasicObject as clean slate for Squire::Setting
+* Drop pretty strict ActiveSupport dependency to 3.0.0 or higher.
+
+  *Samuel Molnár*
+
+### 1.2.3
+* Fix issue with existing methods. Consider using BasicObject as blank slate 
+  for Squire::Settings.
+
+  *Samuel Molnár*
+
 ### 1.2.2
 * Fix issue with existing methods in Settings.
 * Add better accessor caching.

data/README.md

@@ -1,8 +1,7 @@
 # Squire
+Squire handles your configuration per class/file by common config DSL and extensible source formats.
 
-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.
+It's designed to support multiple formats (for now, Hash and YAML) and replace [Settingslogic](https://github.com/binarylogic/settingslogic) that lacks some crutial features like default/base namespace or extensibility for another source formats.
 
 
 ## Installation

data/lib/squire.rb

@@ -1,8 +1,6 @@
 require 'active_support/concern'
-require 'active_support/core_ext/hash/keys'
-# require 'active_support/core_ext/hash/deep_merge'
-require 'squire/core_ext/hash/deep_merge'
 require 'active_support/core_ext/hash/except'
+require 'squire/core_ext/hash/deep_merge'
 require 'squire/version'
 require 'squire/exceptions'
 require 'squire/parser/hash'

data/lib/squire/parser.rb

@@ -1,6 +1,6 @@
 module Squire
   module Parser
-    ## 
+    ##
     # Creates parser based on provided +type+.
     def self.of(type)
       case type

data/lib/squire/parser/hash.rb

@@ -2,7 +2,7 @@ module Squire
   module Parser
     module Hash
       def self.parse(source)
-        source.deep_symbolize_keys
+        source
       end
     end
   end

data/lib/squire/parser/yaml.rb

@@ -4,7 +4,7 @@ module Squire
   module Parser
     module YAML
       def self.parse(path)
-        ::YAML::load_file(path).deep_symbolize_keys
+        ::YAML::load_file(path)
       end
     end
   end

data/lib/squire/settings.rb

@@ -1,5 +1,7 @@
 module Squire
-  class Settings
+  class Settings < BasicObject
+    include ::Kernel
+
     RESERVED = [:get_value, :set_value, :define_key_accessor, :to_hash]
 
     ##
@@ -7,9 +9,9 @@ module Squire
     # For top level settings (usually namespace), the is no +parent+ or +path+ specified.
     def initialize(path = nil, parent = nil)
       @path     = path
-      @table    = Hash.new
+      @table    = ::Hash.new
       @parent   = parent
-      @children = Array.new
+      @children = ::Array.new
     end
 
     ##
@@ -103,7 +105,7 @@ module Squire
     ##
     # Dumps settings as hash.
     def to_hash
-      result = Hash.new
+      result = ::Hash.new
 
       @table.each do |key, value|
         if value.is_a? Settings
@@ -122,7 +124,7 @@ module Squire
       result = Settings.new
 
       hash.each_pair do |key, value|
-        if value.is_a? Hash
+        if value.is_a? ::Hash
           value = from_hash(value, result)
         end
 

data/lib/squire/version.rb

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

data/spec/squire/base_spec.rb

@@ -35,5 +35,6 @@ describe Squire::Base do
     subject.squire.namespace :test
 
     subject.a.should eql(1)
+    subject.b.should eql(2)
   end
 end

data/spec/squire/parser/hash_spec.rb

@@ -4,14 +4,10 @@ describe Squire::Parser::Hash do
   subject { Squire::Parser::Hash }
 
   it 'should parse source hash' do
-    hash = subject.parse('a' => 1, 'b' => 2, 'nested' => { 'c' => 2})
+    source = { 'a' => 1, 'b' => 2, 'nested' => { 'c' => 2} }
 
-    hash.should eql({
-      a: 1,
-      b: 2,
-      nested: {
-        c: 2
-      }
-    })
+    hash = subject.parse(source)
+
+    hash.should eql(source)
   end
 end

data/spec/squire/parser/yaml_spec.rb

@@ -7,11 +7,11 @@ describe Squire::Parser::YAML do
     hash = subject.parse(fixture('basic.yml').path)
 
     hash.should eql(
-      defaults: nil,
-      development: {
-        a: 1,
-        nested: {
-          b: 2
+      'defaults' => nil,
+      'development' => {
+        'a' => 1,
+        'nested' => {
+          'b' => 2
         }
       }
     )

data/squire.gemspec

@@ -11,18 +11,17 @@ Gem::Specification.new do |gem|
   gem.description   = 'Your configuration squire.'
   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'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'activesupport', '~> 4.0.0'
+  gem.add_dependency 'activesupport', '>= 3.0.0'
 
   gem.add_development_dependency 'rspec', '~> 2.6'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'pry-debugger'
   gem.add_development_dependency 'fuubar'
   gem.add_development_dependency 'settingslogic'
-  gem.add_development_dependency 'ruby-prof'
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: squire
 version: !ruby/object:Gem::Version
-  version: 1.2.3
-  prerelease: 
+  version: 1.2.4
 platform: ruby
 authors:
 - Samuel Molnar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-31 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-debugger
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,23 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-prof
-  requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -162,28 +119,28 @@ files:
 - squire.gemspec
 - squire.png
 homepage: https://github.com/smolnar/squire
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Squire handles your configuration per class/file by common config DSL and
   extensible source formats.
 test_files: