confstruct 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b51b8e9d7f488bed54703d187e607525d612b6f
-  data.tar.gz: fa9d173751758a9350b44688501860000b72e3ab
+  metadata.gz: bced56b3d2b053a15f99a5fa1847c3dff09c79d2
+  data.tar.gz: 3bc0eda95a143b8d243f863d1a7e6ec0cb29034d
 SHA512:
-  metadata.gz: c2172c939d94291dce4f89a051058ad7b0efd73d1aee1c3860f03ed1fa6f5501368cfd31423e014a9bcc8be82a52f6e9c6a76271ed927f1cc85469ff907947c2
-  data.tar.gz: a12c4f850463b5c1549364575d63bffc667ac4ba47d45e9f1ab094e0581c8edf69aa869bc0b4e5ab333f9042dc8d5a81201fb8d89ff0e1379f7bd0c0a56198bc
+  metadata.gz: 7229c6f8ecede1d20e3a52d40f495d381c24983ca801595da1c6c9e9ac02a13be8c95e1623bf3fabebbb22d62da42dc36eea239345f4e5f8928ecb43684456ca
+  data.tar.gz: 1dea2b2f0b4b9bc05330361974442e5e40765aafa30a6bcc825aebad3c56fd3915e3ff0de182f1ef9be04a431925c0e0604b570687b3250c174de40e729c38ad

data/.travis.yml

@@ -1,7 +1,10 @@
+sudo: false
 language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
   - 2.1.1
+  - 2.2.1
   - jruby-19mode
+  - jruby-9000

data/confstruct.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake", ">=0.8.7"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "rdoc"
-  s.add_development_dependency "rspec", "~> 2.0"
+  s.add_development_dependency "rspec", "~> 2.99"
   s.add_development_dependency "yard"
   
 end

data/lib/confstruct.rb

@@ -4,5 +4,5 @@ module Confstruct
   autoload :HashWithStructAccess, 'confstruct/hash_with_struct_access'
   autoload :Configuration, 'confstruct/configuration'
   
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/confstruct/hash_with_struct_access.rb

@@ -122,6 +122,14 @@ module Confstruct
       end
       return val
     end
+
+    def self.structurize hash
+      result = hash
+      if result.is_a?(Hash) and not result.is_a?(HashWithStructAccess)
+        result = HashWithStructAccess.new(result)
+      end
+      result
+    end
     
     def method_missing sym, *args, &block
       name = sym.to_s.chomp('=').to_sym
@@ -134,7 +142,7 @@ module Confstruct
           raise TypeError, "Cannot #add! to a #{self[name].class}"
         end
         if args.length > 0
-          local_args = args.collect { |a| structurize! a }
+          local_args = args.collect { |a| self.class.structurize a }
           result = self[name].push *local_args
         elsif block_given?
           result = HashWithStructAccess.new

data/spec/confstruct/configuration_spec.rb

@@ -4,16 +4,16 @@ describe Confstruct::Configuration do
 
   it "should initialize empty" do
     conf = Confstruct::Configuration.new
-    conf.is_a?(Hash).should be_true
-    conf.is_a?(Confstruct::Configuration).should be_true
+    conf.is_a?(Hash).should be_truthy
+    conf.is_a?(Confstruct::Configuration).should be_truthy
     conf.should == {}
   end
   
   it "should initialize properly from a nested hash with string keys" do
     x = { 'a' => { 'b' => 'c' } }
     conf = Confstruct::Configuration.new(x)
-    conf.is_a?(Hash).should be_true
-    conf.is_a?(Confstruct::Configuration).should be_true
+    conf.is_a?(Hash).should be_truthy
+    conf.is_a?(Confstruct::Configuration).should be_truthy
     conf[:a][:b].should == 'c'
     conf['a']['b'].should == 'c'
     conf.a.b.should == 'c'
@@ -137,7 +137,7 @@ describe Confstruct::Configuration do
     end
     
     it "should call #after_config! when configuration is complete" do
-      postconfigurator = RSpec::Mocks::Mock.new('after_config!')
+      postconfigurator = double('after_config!')
       postconfigurator.should_receive(:configured!).once.with(@config)
       def @config.after_config! obj
         obj.project.should == 'other-project'

data/spec/confstruct/hash_with_struct_access_spec.rb

@@ -4,8 +4,8 @@ describe Confstruct::HashWithStructAccess do
   
   it "should initialize empty" do
     hwsa = Confstruct::HashWithStructAccess.new
-    hwsa.is_a?(Hash).should be_true
-    hwsa.is_a?(Confstruct::HashWithStructAccess).should be_true
+    hwsa.is_a?(Hash).should be_truthy
+    hwsa.is_a?(Confstruct::HashWithStructAccess).should be_truthy
     hwsa.should == {}
   end
   
@@ -72,8 +72,8 @@ describe Confstruct::HashWithStructAccess do
     end
     
     it "should properly respond to #has?" do
-      @hwsa.has?('github.url').should be_true
-      @hwsa.has?('github.foo.bar.baz').should be_false
+      @hwsa.has?('github.url').should be_truthy
+      @hwsa.has?('github.foo.bar.baz').should be_falsey
     end
     
     it "should properly respond to #lookup!" do
@@ -204,9 +204,9 @@ describe Confstruct::HashWithStructAccess do
     end
     
     it "should only evaluate Confstruct::Deferred procs" do
-      @hwsa.github.regular_proc.is_a?(Proc).should be_true
-      @hwsa.github.upcase_url.is_a?(Proc).should be_false
-      @hwsa.github.reverse_url.is_a?(Proc).should be_false
+      @hwsa.github.regular_proc.is_a?(Proc).should be_truthy
+      @hwsa.github.upcase_url.is_a?(Proc).should be_falsey
+      @hwsa.github.reverse_url.is_a?(Proc).should be_falsey
     end
     
     it "should instance_eval the proc with no params" do
@@ -233,9 +233,9 @@ describe Confstruct::HashWithStructAccess do
         defproc deferred! { reverse_url + upcase_url }
         regproc Kernel.lambda { reverse_url + upcase_url }
       end
-      @hwsa.github.defproc.is_a?(Proc).should be_false
+      @hwsa.github.defproc.is_a?(Proc).should be_falsey
       @hwsa.github.defproc.should == @hwsa.github.reverse_url + @hwsa.github.upcase_url
-      @hwsa.github.regproc.is_a?(Proc).should be_true
+      @hwsa.github.regproc.is_a?(Proc).should be_truthy
     end
     
     it "should handle i18n translations" do
@@ -269,7 +269,7 @@ describe Confstruct::HashWithStructAccess do
     end
 
     it "should gracefully handle being extended" do
-      pending %{probably won't fix due to the unpredictable way ActiveSupport injects #presence()}
+      skip %{probably won't fix due to the unpredictable way ActiveSupport injects #presence()}
       @hwsa.a.b.presence.should be_a Confstruct::HashWithStructAccess
     end
   end

data/spec/confstruct/utils_spec.rb

@@ -1,8 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Kernel.eval_or_yield" do
-  before :all do
-    @obj = RSpec::Mocks::Mock.new('obj')
+  before :each do
+    @obj = double('obj')
   end
   
   it "should instance_eval when the block takes no params" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: confstruct
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-25 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple, hash/struct-based configuration object