accept_values_for 0.4.1 → 0.4.2

data/Changelog.textile

@@ -1,3 +1,7 @@
+h3 0.4.2
+
+* Make suitable to use with any ORM based on ActiveModel::Validations
+
 h3. 0.4.0
 
 * Migrated to ActiveRecord 3.0

data/Gemfile

@@ -1,8 +1,10 @@
 source :gemcutter
-gem 'activerecord', '>=3.0.0'
+gem 'activemodel', '>=3.0.0'
 gem "rspec", ">=0"
 
 group :development do
+  gem "activerecord", ">=3.0.0"
+  gem "rspec-rails", ">=2.0.0"
   gem 'jeweler'
   gem 'sqlite3-ruby'
 end

data/Gemfile.lock

@@ -1,6 +1,17 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    abstract (1.0.0)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
     activemodel (3.0.3)
       activesupport (= 3.0.3)
       builder (~> 2.1.2)
@@ -14,12 +25,24 @@ GEM
     arel (2.0.7)
     builder (2.1.2)
     diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
     git (1.2.5)
     i18n (0.5.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.3)
+      actionpack (= 3.0.3)
+      activesupport (= 3.0.3)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
     rake (0.8.7)
     rspec (2.4.0)
       rspec-core (~> 2.4.0)
@@ -29,16 +52,24 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    rspec-rails (2.4.1)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.4.0)
     sqlite3 (1.3.3)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
+    thor (0.14.6)
     tzinfo (0.3.24)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  activemodel (>= 3.0.0)
   activerecord (>= 3.0.0)
   jeweler
   rspec
+  rspec-rails (>= 2.0.0)
   sqlite3-ruby

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/accept_values_for.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{accept_values_for}
-  s.version = "0.4.0"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bogdan Gusiev"]
-  s.date = %q{2011-02-25}
+  s.date = %q{2011-03-16}
   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.
@@ -36,10 +36,7 @@ accepts_values_for rspec matcher simplify the code. See example for more informa
   s.test_files = [
     "spec/accept_values_for_spec.rb",
     "spec/discover_spec.rb",
-    "spec/spec_helper.rb",
-    "test/lib/test.rb",
-    "test/test/helper.rb",
-    "test/test/test_test.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -47,19 +44,25 @@ accepts_values_for rspec matcher simplify the code. See example for more informa
     s.specification_version = 3
 
     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<activemodel>, [">= 3.0.0"])
       s.add_runtime_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 2.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<activemodel>, [">= 3.0.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+      s.add_dependency(%q<rspec-rails>, [">= 2.0.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<activemodel>, [">= 3.0.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 3.0.0"])
+    s.add_dependency(%q<rspec-rails>, [">= 2.0.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end

data/lib/accept_values_for.rb

@@ -1,4 +1,4 @@
-if defined?(ActiveRecord)
+if defined?(ActiveModel)
   
   # In order to spec a complex validation for ActiveRecord models
   # Implemented accept_values_for custom matcher
@@ -23,6 +23,7 @@ if defined?(ActiveRecord)
     AcceptValuesFor.new(attribute, *values)
   end
   
+  
 end
 
 class AcceptValuesFor  #:nodoc:
@@ -30,11 +31,12 @@ class AcceptValuesFor  #:nodoc:
   def initialize(attribute, *values)
     @attribute = attribute
     @values = values
+
   end
 
   def matches?(model)
     @model = model
-    return false unless model.is_a?(ActiveRecord::Base)
+    return false unless model.class.included_modules.include?(ActiveModel::Validations)
     @values.each do |value|
       model.send("#{@attribute}=", value)
       model.valid?
@@ -48,7 +50,7 @@ class AcceptValuesFor  #:nodoc:
 
   def does_not_match?(model)
     @model = model
-    return false unless model.is_a?(ActiveRecord::Base)
+    return false unless model.class.included_modules.include?(ActiveModel::Validations)
     @values.each do |value|
       model.send("#{@attribute}=", value)
       model.valid?
@@ -62,9 +64,8 @@ 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) && ActiveModel::Errors === @model.errors 
-      result += "Errors: " + @model.errors[(@attribute)].to_a.
-        map{|a| "#{@attribute} #{a}"}.join(", ")
+    if @model.respond_to?(:errors) && @model.errors.is_a?(ActiveModel::Errors)
+      result += "Errors: #{@attribute} " + Array(@model.errors[@attribute]).join(", ")
     end
     result
   end
@@ -77,6 +78,5 @@ class AcceptValuesFor  #:nodoc:
     "accept values #{@values.map(&:inspect).join(', ')} for #{@attribute.inspect} attribute"
   end
 
-
 end
 

data/spec/discover_spec.rb

@@ -56,8 +56,10 @@ describe "Discover" do
     it { should discover(java) }
 
     it { should discover(json, java, jruby) }
-    it { should discover(java, jruby, json).with_exact_order }
+
+    it { should discover(java, jruby, json).with_exact_order}
     it { should discover(java, json).with_exact_order }
+    
 
     it { should_not discover(ruby) }
     it { should_not discover(ruby, python) }

data/spec/spec_helper.rb

@@ -5,9 +5,15 @@ require 'active_record'
 require 'lib/accept_values_for'
 require 'lib/discover'
 
+require "rspec/rails/adapters"
+require "rspec/rails/fixture_support"
+
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.configurations = true
 
+File.open('spec.log', "w").close
+ActiveRecord::Base.logger = Logger.new('spec.log')
+
 ActiveRecord::Schema.verbose = false
 ActiveRecord::Schema.define(:version => 1) do
 
@@ -23,6 +29,7 @@ ActiveRecord::Schema.define(:version => 1) do
 end
 
 RSpec.configure do |config|
+  config.use_transactional_examples = true
   config.before(:each) do
     class ::Group < ActiveRecord::Base
       has_many :people

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: accept_values_for
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Bogdan Gusiev
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 +02:00
+date: 2011-03-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: activemodel
+  type: :runtime
   prerelease: false
-  name: activerecord
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -33,10 +34,10 @@ dependencies:
         - 0
         version: 3.0.0
   requirement: *id001
-  type: :runtime
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   name: rspec
+  type: :runtime
+  prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,25 +48,43 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  name: activerecord
+  type: :development
   prerelease: false
-  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        - 0
+        version: 3.0.0
   requirement: *id003
-  type: :development
 - !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  type: :development
   prerelease: false
-  name: sqlite3-ruby
   version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  type: :development
+  prerelease: false
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -74,8 +93,21 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   type: :development
+  prerelease: false
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
 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.