docile 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26bbfaa73e52625cc4514cb00b33aa05a6f96e03
-  data.tar.gz: a21ef74c095e1b57ba04ec04307eb10fb9f37b5e
+  metadata.gz: 10cb56eaa668d186cedb1bab3bdda31a84ef4f13
+  data.tar.gz: 19a69dac94f84a2976212184093cc3a26df2c05c
 SHA512:
-  metadata.gz: de5fdc2a0fe2d0dd5e4e488fe9b9cd1fe24f4537fc9be596a628e5e264422bfc4fd109a8b1ee7195ee38f93e357f7edeb68101028a1912470a88abf9b4cd2268
-  data.tar.gz: 005701bbad8fa30ad46c0ea377cbc23b20492356d35c7745285dd93976cb0c85088ff83beb51deb93dc05e2cad570bf2880dd1dd3cec8df157c7de9d9e080124
+  metadata.gz: af34a724f7dc51c9d539c4bdca6e0bb711ead40b9487434eb3dc6b8a06444dea5e258262dc6d4032e5ea3c2fe66c0b58e594f350b5a7ecd2bad7fc947c904904
+  data.tar.gz: 1df5d786c840df1e52b6809a6e884d0a916662278a1dd7a625e41508e15c92990c920b6c99a30af82dd233b20b880504f5f2707e201019ee9a809598b75a0369

data/.gitignore

@@ -6,3 +6,4 @@ pkg
 doc
 .yardoc
 coverage
+vendor

data/.travis.yml

@@ -1,13 +1,8 @@
 language: ruby
-bundler_args: --without development
-# NOTE (2013-12-30): Temporary workaround for Rubygems-Bundler
-#   incompatibility on Travis CI for 1.8 builds, see also:
-#   * https://github.com/rubygems/rubygems/pull/763
-#   * https://github.com/freerange/mocha/commit/66bab2a8f4e7cd8734bf88e6f32157c0d5153125
-before_install:
-  - gem update --system 2.1.11
-  - gem --version
+cache: bundler
 rvm:
+  - 2.1.2
+  - 2.1.1
   - 2.1.0
   - 2.0.0
   - 1.9.3
@@ -16,4 +11,4 @@ rvm:
   - ree
   - jruby-18mode
   - jruby-19mode
-  - rbx-2.2.0
+  - rbx-2

data/Gemfile

@@ -2,16 +2,3 @@ source 'https://rubygems.org'
 
 # Specify gem's dependencies in docile.gemspec
 gemspec
-
-# Explicitly require test gems for Travis CI, since we're excluding dev dependencies
-group :test do
-  gem 'rake', '~> 0.9.2'
-  gem 'rspec', '~> 2.11.0'
-  gem 'mime-types', '~> 1.25.1'
-  gem 'coveralls', :require => false
-
-  platform :rbx do
-    gem 'rubysl'            # Since 2.2.0, Rubinius needs Ruby standard lib as gem
-    gem 'rubinius-coverage' # Coverage tooling for SimpleCov on Rubinius
-  end
-end

data/HISTORY.md

@@ -1,8 +1,20 @@
 # HISTORY
 
+## [v1.1.4 (Jun 11, 2014)](http://github.com/ms-ati/docile/compare/v1.1.3...v1.1.4)
+
+  - Special thanks to Ken Dreyer  (@ktdreyer):
+    - make simplecov/coveralls optional for running tests \[[33834852c7](https://github.com/ms-ati/docile/commit/33834852c7849912b97e109e8c5c193579cc5e98)\]
+    - update URL in gemspec \[[174e654a07](https://github.com/ms-ati/docile/commit/174e654a075c8350b3411b212cfb409bc605348a)\]
+
+## [v1.1.3 (Feb 4, 2014)](http://github.com/ms-ati/docile/compare/v1.1.2...v1.1.3)
+
+  - Special thanks to Alexey Vasiliev (@le0pard):
+    - fix problem to catch NoMethodError from non receiver object
+    - upgrade rspec format to new "expect" syntax
+
 ## [v1.1.2 (Jan 10, 2014)](http://github.com/ms-ati/docile/compare/v1.1.1...v1.1.2)
 
-  - remove unnecessarily nested proxy objects (thanks @Ajedi32!
+  - remove unnecessarily nested proxy objects (thanks @Ajedi32)!
   - documentation updates and corrections
 
 ## [v1.1.1 (Nov 26, 2013)](http://github.com/ms-ati/docile/compare/v1.1.0...v1.1.1)

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012-2013 Marc Siegel
+Copyright (c) 2012-2014 Marc Siegel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,6 +4,7 @@
 [![Dependency Status](https://gemnasium.com/ms-ati/docile.png)](https://gemnasium.com/ms-ati/docile)
 [![Code Climate](https://codeclimate.com/github/ms-ati/docile.png)](https://codeclimate.com/github/ms-ati/docile)
 [![Coverage Status](https://coveralls.io/repos/ms-ati/docile/badge.png)](https://coveralls.io/r/ms-ati/docile)
+[![Inline docs](http://inch-ci.org/github/ms-ati/docile.png)](http://inch-ci.org/github/ms-ati/docile)
 [![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/ms-ati/docile/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
 
 Ruby makes it possible to create very expressive **Domain Specific
@@ -214,7 +215,9 @@ $ gem install docile
 
 ## Status
 
-Works on [all ruby versions since 1.8.7](https://github.com/ms-ati/docile/blob/master/.travis.yml).
+Works on [all ruby versions since 1.8.7](https://github.com/ms-ati/docile/blob/master/.travis.yml), or so Travis CI [tells us](https://travis-ci.org/ms-ati/docile).
+
+Used by some pretty cool gems to implement their DSLs, notably including [SimpleCov](https://github.com/colszowka/simplecov). Keep an eye out for new gems using Docile at the [Ruby Toolbox](https://www.ruby-toolbox.com/projects/docile).
 
 ## Note on Patches/Pull Requests
 
@@ -229,8 +232,10 @@ Works on [all ruby versions since 1.8.7](https://github.com/ms-ati/docile/blob/m
       commit by itself I can ignore when I pull)
   * Send me a pull request. Bonus points for topic branches.
 
-## Copyright
+## Copyright & License
+
+Copyright (c) 2012-2014 Marc Siegel.
 
-Copyright (c) 2012-2013 Marc Siegel. See LICENSE for details.
+Licensed under the [MIT License](http://choosealicense.com/licenses/mit/), see [LICENSE](LICENSE) for details.
 
 

data/docile.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = Docile::VERSION
   s.authors     = ['Marc Siegel']
   s.email       = %w(msiegel@usainnov.com)
-  s.homepage    = 'http://ms-ati.github.com/docile/'
+  s.homepage    = 'https://ms-ati.github.io/docile/'
   s.summary     = 'Docile keeps your Ruby DSLs tame and well-behaved'
   s.description = 'Docile turns any Ruby object into a DSL. Especially useful with the Builder pattern.'
   s.license     = 'MIT'
@@ -19,14 +19,17 @@ Gem::Specification.new do |s|
   s.require_paths = %w(lib)
 
   # Running rspec tests from rake
-  s.add_development_dependency 'rake', '~> 0.9.2'
-  s.add_development_dependency 'rspec', '~> 2.11.0'
+  s.add_development_dependency 'rake', '>= 10.1.1'
+  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_development_dependency 'mime-types', '~> 1.25.1'
 
-  # Github flavored markdown in YARD documentation
-  # http://blog.nikosd.com/2011/11/github-flavored-markdown-in-yard.html
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'github-markup'
+  if !(defined?(RUBY_ENGINE) && 'jruby' == RUBY_ENGINE)
+    # Github flavored markdown in YARD documentation
+    # http://blog.nikosd.com/2011/11/github-flavored-markdown-in-yard.html
+    s.add_development_dependency 'yard'
+    s.add_development_dependency 'redcarpet', '2.3.0' # because 1.8
+    s.add_development_dependency 'github-markup'
+  end
 
   # Coveralls test coverage tool
   s.add_development_dependency 'coveralls'

data/lib/docile/fallback_context_proxy.rb

@@ -53,9 +53,11 @@ module Docile
     # Proxy all methods, excluding {NON_PROXIED_METHODS}, first to `receiver`
     # and then to `fallback` if not found.
     def method_missing(method, *args, &block)
-      @__receiver__.__send__(method.to_sym, *args, &block)
-    rescue ::NoMethodError => _
-      @__fallback__.__send__(method.to_sym, *args, &block)
+      if @__receiver__.respond_to?(method.to_sym)
+        @__receiver__.__send__(method.to_sym, *args, &block)
+      else
+        @__fallback__.__send__(method.to_sym, *args, &block)
+      end
     end
   end
 end

data/lib/docile/version.rb

@@ -1,4 +1,4 @@
 module Docile
   # The current version of this library
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 end

data/spec/docile_spec.rb

@@ -18,15 +18,15 @@ describe Docile do
       end
 
       it 'executes the block against the DSL context object' do
-         array.should == [1, 3]
+        expect(array).to eq([1, 3])
       end
 
       it 'returns the DSL object after executing block against it' do
-         result.should == array
+        expect(result).to eq(array)
       end
 
       it "doesn't proxy #__id__" do
-        Docile.dsl_eval(array) { __id__.should_not == array.__id__ }
+        Docile.dsl_eval(array) { expect(__id__).not_to eq(array.__id__) }
       end
 
       it "raises NoMethodError if the DSL object doesn't implement the method" do
@@ -60,7 +60,7 @@ describe Docile do
       end
 
       it 'returns correctly built object' do
-        result.should == Pizza.new(true, false, true, :extra)
+        expect(result).to eq(Pizza.new(true, false, true, :extra))
       end
     end
 
@@ -93,88 +93,104 @@ describe Docile do
 
       it 'passes parameters to the block' do
         parameterized(1,2,3) do |x,y,z|
-          x.should == 1
-          y.should == 2
-          z.should == 3
+          expect(x).to eq(1)
+          expect(y).to eq(2)
+          expect(z).to eq(3)
         end
       end
 
       it 'finds parameters before methods' do
-        parameterized(1) { |a| a.should == 1 }
+        parameterized(1) { |a| expect(a).to eq(1) }
       end
 
       it 'find outer dsl parameters in inner dsl scope' do
         parameterized(1,2,3) do |a,b,c|
           inner_with_params(c) do |d,e|
-            a.should == 1
-            b.should == 2
-            c.should == 3
-            d.should == c
-            e.should == :foo
+            expect(a).to eq(1)
+            expect(b).to eq(2)
+            expect(c).to eq(3)
+            expect(d).to eq(c)
+            expect(e).to eq(:foo)
           end
         end
       end
     end
 
+    class DSLWithNoMethod
+      def initialize(b); @b = b; end
+      attr_accessor :b
+      def push_element
+        @b.push 1
+      end
+    end
+
+    context 'when DSL have NoMethod error inside' do
+      it 'raise error from nil' do
+        Docile.dsl_eval(DSLWithNoMethod.new(nil)) do
+          expect { push_element }.to raise_error(NoMethodError, /undefined method `push' (for|on) nil:NilClass/)
+        end
+      end
+    end
+
     context 'when DSL blocks are nested' do
 
       context 'method lookup' do
         it 'finds method of outer dsl in outer dsl scope' do
-          outer { a.should == 'a' }
+          outer { expect(a).to eq('a') }
         end
 
         it 'finds method of inner dsl in inner dsl scope' do
-          outer { inner { b.should == 'b' } }
+          outer { inner { expect(b).to eq('b') } }
         end
 
         it 'finds method of outer dsl in inner dsl scope' do
-          outer { inner { a.should == 'a' } }
+          outer { inner { expect(a).to eq('a') } }
         end
 
         it "finds method of block's context in outer dsl scope" do
           def c; 'c'; end
-          outer { c.should == 'c' }
+          outer { expect(c).to eq('c') }
         end
 
         it "finds method of block's context in inner dsl scope" do
           def c; 'c'; end
-          outer { inner { c.should == 'c' } }
+          outer { inner { expect(c).to eq('c') } }
         end
 
         it 'finds method of outer dsl in preference to block context' do
           def a; 'not a'; end
-          outer { a.should == 'a' }
-          outer { inner { a.should == 'a' } }
+          outer { expect(a).to eq('a') }
+          outer { inner { expect(a).to eq('a') } }
         end
       end
 
       context 'local variable lookup' do
         it 'finds local variable from block context in outer dsl scope' do
           foo = 'foo'
-          outer { foo.should == 'foo' }
+          outer { expect(foo).to eq('foo') }
         end
 
         it 'finds local variable from block definition in inner dsl scope' do
           bar = 'bar'
-          outer { inner { bar.should == 'bar' } }
+          outer { inner { expect(bar).to eq('bar') } }
         end
       end
 
       context 'instance variable lookup' do
         it 'finds instance variable from block definition in outer dsl scope' do
-          @iv1 = 'iv1'; outer { @iv1.should == 'iv1' }
+          @iv1 = 'iv1'; outer { expect(@iv1).to eq('iv1') }
         end
 
         it "proxies instance variable assignments in block in outer dsl scope back into block's context" do
-          @iv1 = 'foo'; outer { @iv1 = 'bar' }; @iv1.should == 'bar'
+          @iv1 = 'foo'; outer { @iv1 = 'bar' }; expect(@iv1).to eq('bar')
         end
 
         it 'finds instance variable from block definition in inner dsl scope' do
-          @iv2 = 'iv2'; outer { inner { @iv2.should == 'iv2' } }
+          @iv2 = 'iv2'; outer { inner { expect(@iv2).to eq('iv2') } }
         end
 
         it "proxies instance variable assignments in block in inner dsl scope back into block's context" do
-          @iv2 = 'foo'; outer { inner { @iv2 = 'bar' } }; @iv2.should == 'bar'
+          @iv2 = 'foo'; outer { inner { @iv2 = 'bar' } }; expect(@iv2).to eq('bar')
         end
       end
 
@@ -224,7 +240,7 @@ describe Docile do
 
         def x(y) ; "Got a #{y}"; end
         respond '/third' do |third|
-          x(third).should == 'Got a third thing'
+          expect(x(third)).to eq('Got a third thing')
         end
 
         fourth = nil
@@ -237,9 +253,9 @@ describe Docile do
         send_request '/third', 'third thing'
         send_request '/params', :b
 
-        @first.should == 1
-        @second.should == 'Got a new ten speed'
-        fourth.should == 2
+        expect(@first).to eq(1)
+        expect(@second).to eq('Got a new ten speed')
+        expect(fourth).to eq(2)
       end
 
     end
@@ -260,11 +276,11 @@ describe Docile do
       end
 
       it "doesn't modify the original string" do
-         original.should == "I'm immutable!"
+        expect(original).to eq("I'm immutable!")
       end
 
       it 'chains the commands in the block against the DSL context object' do
-         result.should == "!ELBATUMMI M'I"
+        expect(result).to eq("!ELBATUMMI M'I")
       end
     end
 
@@ -280,7 +296,7 @@ describe Docile do
       end
 
       it 'chains the commands in the block against the DSL context object' do
-         result.should == 42
+        expect(result).to eq(42)
       end
     end
   end
@@ -289,7 +305,7 @@ end
 
 describe Docile::FallbackContextProxy do
 
-  describe "#instance_variables" do
+  describe '#instance_variables' do
     subject { create_fcp_and_set_one_instance_variable.instance_variables }
     let(:expected_type_of_names) { type_of_ivar_names_on_this_ruby }
     let(:actual_type_of_names) { subject.first.class }
@@ -307,15 +323,15 @@ describe Docile::FallbackContextProxy do
     end
 
     it 'returns proxied instance variables' do
-      subject.map(&:to_sym).should include(:@foo)
+      expect(subject.map(&:to_sym)).to include(:@foo)
     end
 
     it "doesn't return non-proxied instance variables" do
-      subject.map(&:to_sym).should_not include(*excluded)
+      expect(subject.map(&:to_sym)).not_to include(*excluded)
     end
 
     it 'preserves the type (String or Symbol) of names on this ruby version' do
-      actual_type_of_names.should == expected_type_of_names
+      expect(actual_type_of_names).to eq(expected_type_of_names)
     end
   end
 

data/spec/spec_helper.rb

@@ -1,22 +1,37 @@
-require 'rubygems'
-require 'rspec'
-require 'singleton'
-require 'simplecov'
-require 'coveralls'
+begin
+  require 'simplecov'
+  require 'coveralls'
 
-# Both local SimpleCov and publish to Coveralls.io
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-  add_filter "/spec/"
-end
+  # On Ruby 1.9+ use SimpleCov and publish to Coveralls.io
+  if !RUBY_VERSION.start_with? '1.8'
+    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+      SimpleCov::Formatter::HTMLFormatter,
+      Coveralls::SimpleCov::Formatter
+    ]
+    SimpleCov.start do
+      add_filter '/spec/'    # exclude test code
+      add_filter '/vendor/'  # exclude gems which are vendored on Travis CI
+    end
 
-test_dir = File.dirname(__FILE__)
-$LOAD_PATH.unshift test_dir unless $LOAD_PATH.include?(test_dir)
+    # Remove Docile, which was required by SimpleCov, to require again later
+    Object.send(:remove_const, :Docile)
+    $LOADED_FEATURES.reject! { |f| f =~ /\/docile\// }
+  end
+rescue LoadError
+  warn 'warning: simplecov/coveralls gems not found; skipping coverage'
+end
 
-lib_dir = File.join(File.dirname(test_dir), 'lib')
-$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include?(lib_dir)
+lib_dir = File.join(File.dirname(File.dirname(__FILE__)), 'lib')
+$LOAD_PATH.unshift lib_dir unless $LOAD_PATH.include? lib_dir
 
+# Require Docile again, now with coverage enabled on 1.9+
 require 'docile'
+
+require 'singleton'
+require 'rspec'
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+end

metadata

@@ -1,97 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: docile
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Marc Siegel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.25.1
 - !ruby/object:Gem::Dependency
   name: yard
   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: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: github-markup
   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: coveralls
   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: Docile turns any Ruby object into a DSL. Especially useful with the Builder
@@ -102,13 +116,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - HISTORY.md
 - LICENSE
@@ -122,7 +135,7 @@ files:
 - lib/docile/version.rb
 - spec/docile_spec.rb
 - spec/spec_helper.rb
-homepage: http://ms-ati.github.com/docile/
+homepage: https://ms-ati.github.io/docile/
 licenses:
 - MIT
 metadata: {}
@@ -132,20 +145,21 @@ 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: docile
-rubygems_version: 2.1.11
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Docile keeps your Ruby DSLs tame and well-behaved
 test_files:
 - spec/docile_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/.coveralls.yml

@@ -1,2 +0,0 @@
-service_name: travis-ci
-