docile 1.0.3 → 1.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b295f680ae1c64b5825a284bea4efbd8ddaa2c5b
+  data.tar.gz: d4f19b3d37e262cdbe117c98d40695798c8bfb94
+SHA512:
+  metadata.gz: 88e3011f1060083fac18a51a6337fc0f6f8f85f6c87ff45a596a8da35164374a5d815a47d20b76bee791bc346874b77062b702f90bbb81e6a5058049503cbf5a
+  data.tar.gz: 6d53a3345ce3f6ed0612cc445bdc338e8f6c3e8e53e405aedf70cfc106c9c56c02377bad6d331147b48e910f8936bcd510846bf1c6ad17a4c8e14f954905662b

data/.coveralls.yml

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

data/HISTORY.md

@@ -1,5 +1,11 @@
 # HISTORY
 
+## [v1.0.4 (Jul 25, 2013)](http://github.com/ms-ati/docile/compare/v1.0.3...v1.0.4)
+
+  - simplify and clarify code
+  - fix a minor bug where FallbackContextProxy#instance_variables would return
+    symbols rather than strings on Ruby 1.8.x
+
 ## [v1.0.3 (Jul 6, 2013)](http://github.com/ms-ati/docile/compare/v1.0.2...v1.0.3)
 
   - instrument code coverage via SimpleCov and publish to Coveralls.io

data/lib/docile.rb

@@ -22,10 +22,14 @@ module Docile
     block_context = eval("self", block.binding)
     proxy_context = FallbackContextProxy.new(dsl, block_context)
     begin
-      block_context.instance_variables.each { |ivar| proxy_context.instance_variable_set(ivar, block_context.instance_variable_get(ivar)) }
+      block_context.instance_variables.each do |ivar|
+        proxy_context.instance_variable_set(ivar, block_context.instance_variable_get(ivar))
+      end
       proxy_context.instance_exec(*args,&block)
     ensure
-      block_context.instance_variables.each { |ivar| block_context.instance_variable_set(ivar, proxy_context.instance_variable_get(ivar)) }
+      block_context.instance_variables.each do |ivar|
+        block_context.instance_variable_set(ivar, proxy_context.instance_variable_get(ivar))
+      end
     end
     dsl
   end

data/lib/docile/fallback_context_proxy.rb

@@ -2,16 +2,15 @@ require 'set'
 
 module Docile
   class FallbackContextProxy
-    NON_PROXIED_METHODS = Set[:object_id, :__send__, :__id__, :==, :equal?, :"!", :"!=", :instance_exec,
-                              :instance_variables, :instance_variable_get, :instance_variable_set,
+    NON_PROXIED_METHODS = Set[:__send__, :object_id, :__id__, :==, :equal?,
+                              :"!", :"!=", :instance_exec, :instance_variables,
+                              :instance_variable_get, :instance_variable_set,
                               :remove_instance_variable]
 
     NON_PROXIED_INSTANCE_VARIABLES = Set[:@__receiver__, :@__fallback__]
 
     instance_methods.each do |method|
-      unless NON_PROXIED_METHODS.include?(method.to_sym)
-        undef_method(method)
-      end
+      undef_method(method) unless NON_PROXIED_METHODS.include?(method.to_sym)
     end
 
     def initialize(receiver, fallback)
@@ -19,22 +18,15 @@ module Docile
       @__fallback__ = fallback
     end
 
-    # Special case to allow proxy instance variables
     def instance_variables
-      # Ruby 1.8.x returns string names, convert to symbols
-      super.map(&:to_sym) - NON_PROXIED_INSTANCE_VARIABLES.to_a
+      # Ruby 1.8.x returns string names, convert to symbols for compatibility
+      super.select { |v| !NON_PROXIED_INSTANCE_VARIABLES.include?(v.to_sym) }
     end
 
     def method_missing(method, *args, &block)
-      __proxy_method__(method, *args, &block)
-    end
-
-    def __proxy_method__(method, *args, &block)
-      begin
-        @__receiver__.__send__(method.to_sym, *args, &block)
-      rescue ::NoMethodError => e
-        @__fallback__.__send__(method.to_sym, *args, &block)
-      end
+      @__receiver__.__send__(method.to_sym, *args, &block)
+    rescue ::NoMethodError => e
+      @__fallback__.__send__(method.to_sym, *args, &block)
     end
   end
 end

data/lib/docile/version.rb

@@ -1,3 +1,3 @@
 module Docile
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/docile_spec.rb

@@ -217,4 +217,18 @@ describe Docile do
 
   end
 
+  context "FallbackContextProxy#instance_variables" do
+
+    it "should preserve the class (String or Symbol) normally returned by current ruby version" do
+      @a = 1
+      expected_type = instance_variables.first.class
+
+      fcp = Docile::FallbackContextProxy.new(nil, nil)
+      fcp.instance_variable_set(:@foo, "foo")
+
+      fcp.instance_variables.first.class.should == expected_type
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -9,7 +9,9 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   Coveralls::SimpleCov::Formatter
 ]
-SimpleCov.start
+SimpleCov.start do
+  add_filter "/spec/"
+end
 
 test_dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift test_dir unless $LOAD_PATH.include?(test_dir)

metadata

@@ -1,120 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: docile
-version: !ruby/object:Gem::Version 
-  hash: 17
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 3
-  version: 1.0.3
+version: !ruby/object:Gem::Version
+  version: 1.0.4
 platform: ruby
-authors: 
+authors:
 - Marc Siegel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-07-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  prerelease: false
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 35
-        segments: 
-        - 2
-        - 11
-        - 0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 2.11.0
-  prerelease: false
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   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'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: github-markup
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: coveralls
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   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
-  requirement: *id006
-description: Docile turns any Ruby object into a DSL. Especially useful with the Builder pattern.
-email: 
+  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
+  pattern.
+email:
 - msiegel@usainnov.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .coveralls.yml
 - .gitignore
 - .ruby-gemset
@@ -134,38 +121,28 @@ files:
 - spec/spec_helper.rb
 homepage: http://ms-ati.github.com/docile/
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+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: 1.8.25
+rubygems_version: 2.0.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Docile keeps your Ruby DSL's tame and well-behaved
-test_files: 
+test_files:
 - spec/docile_spec.rb
 - spec/spec_helper.rb
 has_rdoc: