docile 0.9.2 → 1.0.0

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+bundler_args: --without development
+rvm:
+  - 1.9.3
+  - 1.9.2
+  - 1.8.7
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode

data/.yardopts

@@ -1,7 +1,7 @@
 --title 'Docile Documentation'
 
 --no-private
---hide-void-return
+--main=README.md
 
 --markup-provider=redcarpet
 --markup=markdown

data/Gemfile

@@ -1,4 +1,10 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in docile.gemspec
+# 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"
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Marc Siegel
+Copyright (c) 2012 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 in

data/README.md

@@ -8,12 +8,15 @@ Let's make our Ruby DSLs more docile...
 
 [1]: http://www.google.com/search?q=docile+definition   "Google"
 
+[![Build Status](https://travis-ci.org/ms-ati/docile.png)](https://travis-ci.org/ms-ati/docile)
+[![Dependency Status](https://gemnasium.com/ms-ati/docile.png)](https://gemnasium.com/ms-ati/docile)
+
 ## Usage
 
 Let's treat an Array's methods as its own DSL:
 
 ``` ruby
-Docile.dsl_eval [] do
+Docile.dsl_eval([]) do
   push 1
   push 2
   pop
@@ -36,7 +39,7 @@ Then you can use this same PizzaBuilder class as a DSL:
 
 ``` ruby
 @sauce_level = :extra
-pizza = Docile.dsl_eval PizzaBuilder.new do
+pizza = Docile.dsl_eval(PizzaBuilder.new) do
   cheese
   pepperoni
   sauce @sauce_level
@@ -64,8 +67,13 @@ $ gem install docile
 ## Documentation
 
 Documentation hosted on *rubydoc.info*: [Docile Documentation](http://rubydoc.info/gems/docile)
+
 Or, read the code hosted on *github.com*: [Docile Code](https://github.com/ms-ati/docile)
 
+## Status
+
+Version 1.0 works on [all ruby versions](https://github.com/ms-ati/docile/blob/master/.travis.yml).
+
 ## Note on Patches/Pull Requests
 
   * Fork the project.
@@ -79,4 +87,4 @@ Or, read the code hosted on *github.com*: [Docile Code](https://github.com/ms-at
 
 ## Copyright
 
-Copyright (c) 2011 Marc Siegel. See LICENSE for details.
+Copyright (c) 2012 Marc Siegel. See LICENSE for details.

data/Rakefile

@@ -1,11 +1,20 @@
 require "bundler/gem_tasks"
-require "github/markup"
-require "redcarpet"
-require "yard"
-require "yard/rake/yardoc_task"
-
-YARD::Rake::YardocTask.new do |t|
-  OTHER_PATHS = %w()
-  t.files   = ['lib/**/*.rb', OTHER_PATHS]
-  t.options = %w(--markup-provider=redcarpet --markup=markdown)
+require "rspec/core/rake_task"
+
+# Don't require doc generation gems on Travis
+if ENV['CI'] != 'true'
+  require "github/markup"
+  require "redcarpet"
+  require "yard"
+  require "yard/rake/yardoc_task"
+
+  YARD::Rake::YardocTask.new do |t|
+    OTHER_PATHS = %w()
+    t.files   = ['lib/**/*.rb', OTHER_PATHS]
+    t.options = %w(--markup-provider=redcarpet --markup=markdown --main=README.md)
+  end
 end
+
+RSpec::Core::RakeTask.new
+
+task :default => [:spec]

data/docile.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Docile::VERSION
   s.authors     = ["Marc Siegel"]
   s.email       = ["msiegel@usainnov.com"]
-  s.homepage    = "http://docile.github.com"
+  s.homepage    = "http://ms-ati.github.com/docile/"
   s.summary     = "Docile keeps your Ruby DSL's tame and well-behaved"
   s.description = "Docile turns any Ruby object into a DSL. Especially useful with the Builder pattern."
 
@@ -18,7 +18,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "rspec", "~> 2.7.0"
+  # Running rspec tests from rake
+  s.add_development_dependency "rake", "~> 0.9.2"
+  s.add_development_dependency "rspec", "~> 2.11.0"
 
   # Github flavored markdown in YARD documentation
   # http://blog.nikosd.com/2011/11/github-flavored-markdown-in-yard.html

data/lib/docile.rb

@@ -14,9 +14,9 @@ module Docile
   #     end
   #     #=> [1, 3]
   #
-  # @param dsl [Object]  an object whose methods represent a DSL
-  # @param block [Proc]  a block to execute in the DSL context
-  # @return    [Object]  the dsl object, after execution of the block
+  # @param dsl   [Object] an object whose methods represent a DSL
+  # @param block [Proc]   a block to execute in the DSL context
+  # @return      [Object] the dsl object, after execution of the block
   def dsl_eval(dsl, &block)
     block_context = eval("self", block.binding)
     proxy_context = FallbackContextProxy.new(dsl, block_context)

data/lib/docile/fallback_context_proxy.rb

@@ -30,7 +30,8 @@ module Docile
 
     # Special case to allow proxy instance variables
     def instance_variables
-      super - NON_PROXIED_INSTANCE_VARIABLES.to_a
+      # Ruby 1.8.x returns string names, convert to symbols
+      super.map(&:to_sym) - NON_PROXIED_INSTANCE_VARIABLES.to_a
     end
 
     def method_missing(method, *args, &block)

data/lib/docile/version.rb

@@ -1,3 +1,3 @@
 module Docile
-  VERSION = "0.9.2"
+  VERSION = "1.0.0"
 end

data/spec/docile_spec.rb

@@ -77,6 +77,7 @@ describe Docile do
       it "should find method of outer dsl in preference to block context" do
         def a; 'not a'; end
         outer { a.should == 'a' }
+        outer { inner { a.should == 'a' } }
       end
     end
 
@@ -97,7 +98,7 @@ describe Docile do
         @iv1 = 'iv1'; outer { @iv1.should == 'iv1' }
       end
 
-      it "should write instance variable assigned in block into outer dsl scope" do
+      it "should proxy instance variable assignments in block in outer dsl scope back into block's context" do
         @iv1 = 'foo'; outer { @iv1 = 'bar' }; @iv1.should == 'bar'
       end
 
@@ -105,7 +106,7 @@ describe Docile do
         @iv2 = 'iv2'; outer { inner { @iv2.should == 'iv2' } }
       end
 
-      it "should find instance variable from block definition in inner dsl scope" do
+      it "should proxy instance variable assignments in block in inner dsl scope back into block's context" do
         @iv2 = 'foo'; outer { inner { @iv2 = 'bar' } }; @iv2.should == 'bar'
       end
     end

metadata

@@ -1,72 +1,106 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: docile
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  version: 0.9.2
 platform: ruby
-authors: 
+authors:
 - Marc Siegel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+date: 2012-10-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.7.0
+      - !ruby/object:Gem::Version
+        version: 2.11.0
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: redcarpet
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: github-markup
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: github-markup
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Docile turns any Ruby object into a DSL. Especially useful with the Builder pattern.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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:
 - .gitignore
+- .travis.yml
 - .yardopts
 - Gemfile
 - LICENSE
@@ -78,34 +112,31 @@ files:
 - lib/docile/version.rb
 - spec/docile_spec.rb
 - spec/spec_helper.rb
-homepage: http://docile.github.com
+homepage: http://ms-ati.github.com/docile/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: docile
-rubygems_version: 1.8.11
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 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: