accept_values_for 0.3.1 → 0.4.1

data/Changelog.textile

@@ -1,3 +1,8 @@
+h3. 0.4.0
+
+* Migrated to ActiveRecord 3.0
+* Migrated to Rspec 2.0
+
 h3. 0.3.0
 
 * add 'discover' matcher to test named scopes

data/Gemfile

@@ -1,6 +1,8 @@
 source :gemcutter
-gem 'activerecord'
-gem 'rspec'
-group :test do
+gem 'activerecord', '>=3.0.0'
+gem "rspec", ">=0"
+
+group :development do
+  gem 'jeweler'
   gem 'sqlite3-ruby'
-end # do
+end

data/Gemfile.lock

@@ -0,0 +1,44 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.3)
+    arel (2.0.7)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (>= 3.0.0)
+  jeweler
+  rspec
+  sqlite3-ruby

data/Rakefile

@@ -1,10 +1,11 @@
 require 'rubygems'
+require "bundler"
+Bundler.setup
+
 require 'rake'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 begin
@@ -20,8 +21,8 @@ EOI
     gemspec.email = "agresso@gmail.com"
     gemspec.homepage = "http://github.com/bogdan/accept_values_for"
     gemspec.authors = ["Bogdan Gusiev"]
-    gemspec.add_dependency "activerecord"
-    gemspec.add_dependency "rspec"
+    #gemspec.add_dependency "activerecord"
+    #gemspec.add_dependency "rspec"
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: [sudo] gem install jeweler"

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.1

data/accept_values_for.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{accept_values_for}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2010-09-09}
+  s.date = %q{2011-02-25}
   s.description = %q{Rspec: When you have a complex validation(e.g. regexp or custom method) on ActiveRecord model
 you have to write annoying easy specs on which values should be accepted by your validation method and which should not.
 accepts_values_for rspec matcher simplify the code. See example for more information.
@@ -17,42 +17,51 @@ accepts_values_for rspec matcher simplify the code. See example for more informa
   s.email = %q{agresso@gmail.com}
   s.files = [
     "Changelog.textile",
-     "Gemfile",
-     "Rakefile",
-     "Readme.textile",
-     "VERSION",
-     "accept_values_for.gemspec",
-     "lib/accept_values_for.rb",
-     "lib/discover.rb",
-     "spec/accept_values_for_spec.rb",
-     "spec/discover_spec.rb",
-     "spec/spec_helper.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "Rakefile",
+    "Readme.textile",
+    "VERSION",
+    "accept_values_for.gemspec",
+    "lib/accept_values_for.rb",
+    "lib/discover.rb",
+    "spec/accept_values_for_spec.rb",
+    "spec/discover_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/bogdan/accept_values_for}
-  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{In order to test a complex validation for ActiveRecord models Implemented accept_values_for custom rspec matcher}
   s.test_files = [
+    "spec/accept_values_for_spec.rb",
     "spec/discover_spec.rb",
-     "spec/accept_values_for_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "test/lib/test.rb",
+    "test/test/helper.rb",
+    "test/test/test_test.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_runtime_dependency(%q<activerecord>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end
 

data/lib/accept_values_for.rb

@@ -38,7 +38,7 @@ class AcceptValuesFor  #:nodoc:
     @values.each do |value|
       model.send("#{@attribute}=", value)
       model.valid?
-      if model.errors.on(@attribute)
+      unless model.errors[@attribute].to_a.empty?
         @failed_value = value
         return false 
       end
@@ -52,7 +52,7 @@ class AcceptValuesFor  #:nodoc:
     @values.each do |value|
       model.send("#{@attribute}=", value)
       model.valid?
-      unless model.errors.on(@attribute)
+      if model.errors[@attribute].to_a.empty?
         @failed_value = value
         return false 
       end
@@ -62,8 +62,9 @@ class AcceptValuesFor  #:nodoc:
 
   def failure_message_for_should
     result = "expected #{@model.inspect} to accept value #{@failed_value.inspect} for #{@attribute.inspect}, but it was not\n" 
-    if @model.respond_to?(:errors) && ActiveRecord::Errors === @model.errors 
-      result += "Errors: " + Array(@model.errors.on(@attribute)).join(", ")
+    if @model.respond_to?(:errors) && ActiveModel::Errors === @model.errors 
+      result += "Errors: " + @model.errors[(@attribute)].to_a.
+        map{|a| "#{@attribute} #{a}"}.join(", ")
     end
     result
   end

data/spec/accept_values_for_spec.rb

@@ -18,7 +18,7 @@ describe "AcceptValuesFor" do
     it "should return false if one of values is not accepted" do
       matcher.matches?(subject).should be_false
       matcher.failure_message_for_should.should == "expected #{subject.inspect} to accept value \"INVALID\" for :gender, but it was not\n" +
-        "Errors: is not included in the list"
+        "Errors: gender is not included in the list"
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'rubygems'
-require 'spec'
-require 'spec/autorun'
+require 'sqlite3'
+require 'rspec'
+require 'rspec/autorun'
 require 'active_record'
 require 'lib/accept_values_for'
 require 'lib/discover'
@@ -22,12 +22,12 @@ ActiveRecord::Schema.define(:version => 1) do
   end
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.before(:each) do
     class ::Group < ActiveRecord::Base
       has_many :people
       
-      named_scope :by_char, lambda { |char| 
+      scope :by_char, lambda { |char| 
         { 
           :conditions => ["name like ?", char + "%"],
           :order => "name"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: accept_values_for
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 1
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -14,33 +15,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 +03:00
+date: 2011-02-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  requirement: *id001
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id002
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
   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: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: sqlite3-ruby
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
+  type: :development
 description: |
   Rspec: When you have a complex validation(e.g. regexp or custom method) on ActiveRecord model
   you have to write annoying easy specs on which values should be accepted by your validation method and which should not.
@@ -56,6 +91,7 @@ extra_rdoc_files: []
 files: 
 - Changelog.textile
 - Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.textile
 - VERSION
@@ -70,32 +106,36 @@ homepage: http://github.com/bogdan/accept_values_for
 licenses: []
 
 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: In order to test a complex validation for ActiveRecord models Implemented accept_values_for custom rspec matcher
 test_files: 
-- spec/discover_spec.rb
 - spec/accept_values_for_spec.rb
+- spec/discover_spec.rb
 - spec/spec_helper.rb