parameters 0.2.1 → 0.2.2

data/.gitignore

@@ -2,6 +2,7 @@ doc
 pkg
 tmp/*
 .DS_Store
+.bundle
 .yardoc
 *.db
 *.log

data/ChangeLog.md

@@ -1,3 +1,12 @@
+### 0.2.2 / 2010-08-06
+
+* Require Bundler ~> 1.0.0.
+* Updated {Parameters::InstanceParam#inspect} and
+  {Parameters::ClassParam#inspect} to also include the class-name.
+* Use `included_modules.include?` when testing whether {Parameters}
+  was included.
+* Fix failing specs for Rubinius.
+
 ### 0.2.1 / 2010-05-05
 
 * Added {Parameters::ClassMethods#included}, so that

data/Gemfile

@@ -0,0 +1,20 @@
+source 'https://rubygems.org'
+
+group(:development) do
+  gem 'bundler',		'~> 1.0.0'
+  gem 'rake',			'~> 0.8.7'
+  gem 'jeweler',		'~> 1.4.0', :git => 'git://github.com/technicalpickles/jeweler.git'
+end
+
+group(:doc) do
+  case RUBY_PLATFORM
+  when 'java'
+    gem 'maruku',	'~> 0.6.0'
+  else
+    gem 'rdiscount',	'~> 1.6.3'
+  end
+
+  gem 'yard',			'~> 0.5.3'
+end
+
+gem 'rspec',	'~> 1.3.0', :group => [:development, :test]

data/Gemfile.lock

@@ -0,0 +1,30 @@
+GIT
+  remote: git://github.com/technicalpickles/jeweler.git
+  revision: b996854
+  specs:
+    jeweler (1.4.0)
+      bundler (>= 0.9.5)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rake
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    gemcutter (0.6.1)
+    git (1.2.5)
+    rake (0.8.7)
+    rdiscount (1.6.5)
+    rspec (1.3.0)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0.0)
+  jeweler (~> 1.4.0)!
+  rake (~> 0.8.7)
+  rdiscount (~> 1.6.3)
+  rspec (~> 1.3.0)
+  yard (~> 0.5.3)

data/Rakefile

@@ -1,25 +1,28 @@
 require 'rubygems'
+require 'bundler'
+
+begin
+  Bundler.setup(:development, :doc)
+rescue Bundler::BundlerError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
 require 'rake'
+require 'jeweler'
 require './lib/parameters/version.rb'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = 'parameters'
-    gem.version = Parameters::VERSION
-    gem.license = 'MIT'
-    gem.summary = %Q{Allows you to add annotated variables to your classes}
-    gem.description = %Q{Parameters allows you to add annotated variables to your classes which may have configurable default values.}
-    gem.email = 'postmodern.mod3@gmail.com'
-    gem.homepage = 'http://github.com/postmodern/parameters'
-    gem.authors = ['Postmodern']
-    gem.add_development_dependency 'rspec', '>= 1.3.0'
-    gem.add_development_dependency 'yard', '>= 0.5.3'
-    gem.has_rdoc = 'yard'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+Jeweler::Tasks.new do |gem|
+  gem.name = 'parameters'
+  gem.version = Parameters::VERSION
+  gem.license = 'MIT'
+  gem.summary = %Q{Allows you to add annotated variables to your classes}
+  gem.description = %Q{Parameters allows you to add annotated variables to your classes which may have configurable default values.}
+  gem.email = 'postmodern.mod3@gmail.com'
+  gem.homepage = 'http://github.com/postmodern/parameters'
+  gem.authors = ['Postmodern']
+  gem.has_rdoc = 'yard'
 end
 
 require 'spec/rake/spectask'
@@ -29,15 +32,7 @@ Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.spec_opts = ['--options', '.specopts']
 end
 
-task :spec => :check_dependencies
 task :default => :spec
 
-begin
-  require 'yard'
-
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yard do
-    abort "YARD is not available. In order to run yard, you must: gem install yard"
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/lib/parameters/class_methods.rb

@@ -103,7 +103,7 @@ module Parameters
       name = name.to_sym
 
       ancestors.each do |ancestor|
-        if ancestor.include?(Parameters)
+        if ancestor.included_modules.include?(Parameters)
           if ancestor.params.has_key?(name)
             return ancestor.params[name]
           end
@@ -122,7 +122,7 @@ module Parameters
       name = name.to_sym
 
       ancestors.each do |ancestor|
-        if ancestor.include?(Parameters)
+        if ancestor.included_modules.include?(Parameters)
           return true if ancestor.params.has_key?(name)
         end
       end
@@ -138,7 +138,7 @@ module Parameters
     #
     def each_param(&block)
       ancestors.each do |ancestor|
-        if ancestor.include?(Parameters)
+        if ancestor.included_modules.include?(Parameters)
           ancestor.params.each_value(&block)
         end
       end

data/lib/parameters/class_param.rb

@@ -55,12 +55,14 @@ module Parameters
       return text
     end
 
+    #
+    # Inspects the class parameter.
     #
     # @return [String]
     #   Inspection of the class params value.
     #
     def inspect
-      @value.inspect
+      "#<#{self.class}: #{@value.inspect}>"
     end
 
   end

data/lib/parameters/instance_param.rb

@@ -62,12 +62,14 @@ module Parameters
       return text
     end
 
+    #
+    # Inspects the instance parameter.
     #
     # @return [String]
     #   Inspection of the instance params value.
     #
     def inspect
-      value.inspect
+      "#<#{self.class}: #{value.inspect}>"
     end
 
   end

data/lib/parameters/version.rb

@@ -1,3 +1,3 @@
 module Parameters
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/parameters.gemspec

@@ -5,85 +5,92 @@
 
 Gem::Specification.new do |s|
   s.name = %q{parameters}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Postmodern"]
-  s.date = %q{2010-05-05}
+  s.date = %q{2010-08-06}
   s.description = %q{Parameters allows you to add annotated variables to your classes which may have configurable default values.}
   s.email = %q{postmodern.mod3@gmail.com}
   s.extra_rdoc_files = [
     "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md"
+    "LICENSE.txt",
+    "README.md"
   ]
   s.files = [
     ".gitignore",
-     ".specopts",
-     ".yardopts",
-     "ChangeLog.md",
-     "LICENSE.txt",
-     "README.md",
-     "Rakefile",
-     "lib/parameters.rb",
-     "lib/parameters/class_methods.rb",
-     "lib/parameters/class_param.rb",
-     "lib/parameters/exceptions.rb",
-     "lib/parameters/exceptions/missing_param.rb",
-     "lib/parameters/exceptions/param_not_found.rb",
-     "lib/parameters/extensions.rb",
-     "lib/parameters/extensions/meta.rb",
-     "lib/parameters/extensions/meta/object.rb",
-     "lib/parameters/instance_param.rb",
-     "lib/parameters/param.rb",
-     "lib/parameters/parameters.rb",
-     "lib/parameters/version.rb",
-     "parameters.gemspec",
-     "spec/class_param_spec.rb",
-     "spec/classes/custom_parameters.rb",
-     "spec/classes/custom_type.rb",
-     "spec/classes/inherited_parameters.rb",
-     "spec/classes/module_parameters.rb",
-     "spec/classes/other_parameters.rb",
-     "spec/classes/test_parameters.rb",
-     "spec/instance_param_spec.rb",
-     "spec/parameters_spec.rb",
-     "spec/spec_helper.rb"
+    ".specopts",
+    ".yardopts",
+    "ChangeLog.md",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.md",
+    "Rakefile",
+    "lib/parameters.rb",
+    "lib/parameters/class_methods.rb",
+    "lib/parameters/class_param.rb",
+    "lib/parameters/exceptions.rb",
+    "lib/parameters/exceptions/missing_param.rb",
+    "lib/parameters/exceptions/param_not_found.rb",
+    "lib/parameters/extensions.rb",
+    "lib/parameters/extensions/meta.rb",
+    "lib/parameters/extensions/meta/object.rb",
+    "lib/parameters/instance_param.rb",
+    "lib/parameters/param.rb",
+    "lib/parameters/parameters.rb",
+    "lib/parameters/version.rb",
+    "parameters.gemspec",
+    "spec/class_param_spec.rb",
+    "spec/classes/custom_parameters.rb",
+    "spec/classes/custom_type.rb",
+    "spec/classes/inherited_parameters.rb",
+    "spec/classes/module_parameters.rb",
+    "spec/classes/other_parameters.rb",
+    "spec/classes/test_parameters.rb",
+    "spec/instance_param_spec.rb",
+    "spec/parameters_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/postmodern/parameters}
   s.licenses = ["MIT"]
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Allows you to add annotated variables to your classes}
   s.test_files = [
-    "spec/spec_helper.rb",
-     "spec/class_param_spec.rb",
-     "spec/parameters_spec.rb",
-     "spec/instance_param_spec.rb",
-     "spec/classes/inherited_parameters.rb",
-     "spec/classes/custom_type.rb",
-     "spec/classes/test_parameters.rb",
-     "spec/classes/module_parameters.rb",
-     "spec/classes/custom_parameters.rb",
-     "spec/classes/other_parameters.rb"
+    "spec/class_param_spec.rb",
+    "spec/classes/custom_parameters.rb",
+    "spec/classes/custom_type.rb",
+    "spec/classes/inherited_parameters.rb",
+    "spec/classes/module_parameters.rb",
+    "spec/classes/other_parameters.rb",
+    "spec/classes/test_parameters.rb",
+    "spec/instance_param_spec.rb",
+    "spec/parameters_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_development_dependency(%q<yard>, [">= 0.5.3"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
-      s.add_dependency(%q<yard>, [">= 0.5.3"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<rake>, ["~> 0.8.7"])
+      s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
-    s.add_dependency(%q<yard>, [">= 0.5.3"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<rake>, ["~> 0.8.7"])
+    s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
   end
 end
 

data/spec/class_param_spec.rb

@@ -45,7 +45,7 @@ describe Parameters::ClassParam do
       param = Parameters::ClassParam.new(:x,Array[Integer])
 
       param.value = Set['1', '2', '3']
-      param.value.should == [1, 2, 3]
+      param.value.should =~ [1, 2, 3]
     end
 
     it "should coerce values into URIs" do

data/spec/instance_param_spec.rb

@@ -65,7 +65,7 @@ describe Parameters::InstanceParam do
       param = Parameters::InstanceParam.new(@obj,:x,Array[Integer])
 
       param.value = Set['1', '2', '3']
-      param.value.should == [1, 2, 3]
+      param.value.should =~ [1, 2, 3]
     end
 
     it "should coerce values into URIs" do

data/spec/spec_helper.rb

@@ -1,5 +1,14 @@
 require 'rubygems'
-gem 'rspec', '>=1.3.0'
+require 'bundler'
+
+begin
+  Bundler.setup(:runtime, :test)
+rescue Bundler::BundlerError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
 require 'spec'
 
 require 'parameters/version'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: parameters
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Postmodern
@@ -14,37 +15,73 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -07:00
+date: 2010-08-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
-        - 3
         - 0
-        version: 1.3.0
+        - 0
+        version: 1.0.0
+  requirement: *id001
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  requirement: *id002
   type: :development
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
+        - 1
+        - 4
         - 0
-        - 5
+        version: 1.4.0
+  requirement: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rspec
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 1
         - 3
-        version: 0.5.3
+        - 0
+        version: 1.3.0
+  requirement: *id004
   type: :development
-  version_requirements: *id002
 description: Parameters allows you to add annotated variables to your classes which may have configurable default values.
 email: postmodern.mod3@gmail.com
 executables: []
@@ -60,6 +97,8 @@ files:
 - .specopts
 - .yardopts
 - ChangeLog.md
+- Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -92,39 +131,43 @@ homepage: http://github.com/postmodern/parameters
 licenses: 
 - MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 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"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Allows you to add annotated variables to your classes
 test_files: 
-- spec/spec_helper.rb
 - spec/class_param_spec.rb
-- spec/parameters_spec.rb
-- spec/instance_param_spec.rb
-- spec/classes/inherited_parameters.rb
+- spec/classes/custom_parameters.rb
 - spec/classes/custom_type.rb
-- spec/classes/test_parameters.rb
+- spec/classes/inherited_parameters.rb
 - spec/classes/module_parameters.rb
-- spec/classes/custom_parameters.rb
 - spec/classes/other_parameters.rb
+- spec/classes/test_parameters.rb
+- spec/instance_param_spec.rb
+- spec/parameters_spec.rb
+- spec/spec_helper.rb