validation_scopes 0.4.0 → 0.4.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.4.1 2012-04-15
+
+* Rails 3.1 and 3.2 compatibility
+* Added the method all_scopes that return all the scopes in a model
+
 == 0.4.0 2011-05-23
 
 * Fixed problem with #model_name on proxy class (dynamic_form plugin)

data/README.md

@@ -46,6 +46,9 @@ previous example:
     film.errors.full_messages
     => []
 
+    film.class.all_scopes
+    => [:warnings]
+
     film.save
     => true
 
@@ -57,7 +60,11 @@ does not accept an `ActiveRecord::Errors` object directly.  Instead you need to
 
 ## Compatibility
 
-Should work for Ruby 1.8 and 1.9, as well as Rails 2.x and 3.x; Battle-tested in the formers.
+The current version should work for Rails 3 on Ruby 1.8 or 1.9; Battle-tested in the former.
+
+For Rails 2 see the 0.3.x version of the gem which is maintained on the [rails2
+branch](https://github.com/dasil003/validation_scopes/tree/rails2)
+
 
 ## Installation
 
@@ -69,7 +76,7 @@ In your Gemfile:
 
     gem 'validation_scopes'
 
-Or old-school Rails-style, in your environment.rb:
+Or old-school-Rails-style, in your environment.rb:
 
     config.gem 'validation_scopes'
 
@@ -99,8 +106,8 @@ about the design process](http://www.darwinweb.net/articles/80) is on my blog.
 
 ## TODO
 
-* In Rails 3 validations are no longer coupled to ActiveRecord.  As part of of ActiveModel, validations can be included
-  in any object.  It shouldn't be too much work to make validation_scopes work with arbitrary models as well.
+* In Rails 3 validations are no longer coupled to ActiveRecord.  Although the current version of the gem uses
+  ActiveModel, it hasn't been tested against arbitrary objects.
 
 
 ## Copyright

data/Rakefile

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'rake'
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -11,7 +8,6 @@ begin
     gem.homepage = "http://github.com/dasil003/validation_scopes"
     gem.authors = ["Gabe da Silveira"]
     gem.add_development_dependency "shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
@@ -20,34 +16,11 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
+  test.libs << %w(lib test)
   test.pattern = 'test/**/test_*.rb'
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
 task :test => :check_dependencies
 
 task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "validation_scopes #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

data/lib/validation_scopes.rb

@@ -9,6 +9,17 @@ module ValidationScopes
   module ClassMethods
     def validation_scope(scope)
       base_class = self
+      @all_scopes ||= []
+      class << self
+        def all_scopes=(scope)
+          @all_scopes << scope
+        end
+
+        def all_scopes
+          @all_scopes
+        end
+      end
+      self.all_scopes = scope
       deferred_proxy_class_declaration = Proc.new do
         proxy_class = Class.new(DelegateClass(base_class)) do
           include ActiveModel::Validations

data/test/db/schema.rb

@@ -6,4 +6,11 @@ ActiveRecord::Schema.define do
     t.column "bio",        :text
     t.column "sponsor_id", :integer
   end
-end
+
+  create_table "books" do |t|
+    t.column "title",      :string
+    t.column "author",     :string
+    t.column "isbn",       :integer
+    t.column "user_id",    :integer
+  end
+end

data/test/fixtures/books.yml

@@ -0,0 +1,12 @@
+one:
+  id: 1
+  title: Feature Selection for Knowledge Discovery and Data Mining
+  author: Huan Liu
+  isbn: 9780792381983
+  user_id: 1
+two:
+  id: 2
+  title: SSL and TLS - theory and practice
+  author: Rolf Oppliger
+  isbn: 9781596934474
+  user_id: 1

data/test/helper.rb

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'test/unit'
 require 'shoulda'
 
@@ -13,7 +12,10 @@ ActiveRecord::Base.establish_connection(
 
 require 'db/schema.rb'
 
-Dir['test/models/*.rb'].each { |f| require f }
+Dir['./test/models/*.rb'].each { |f| require f }
 
 require 'active_record/fixtures'
-Fixtures.create_fixtures('test/fixtures/', ActiveRecord::Base.connection.tables)
+
+fixtures_constant = defined?(ActiveRecord::Fixtures) ? ActiveRecord::Fixtures : Fixtures
+
+fixtures_constant.create_fixtures('test/fixtures/', ActiveRecord::Base.connection.tables)

data/test/models/book.rb

@@ -0,0 +1,13 @@
+class Book < ActiveRecord::Base
+  belongs_to :user
+
+  validates_presence_of :title
+
+  validation_scope :warnings_book do |s|
+    s.validates_presence_of  :author
+  end
+
+  validation_scope :alerts_book do |s|
+    s.validates_presence_of :isbn
+  end
+end

data/test/models/user.rb

@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
   belongs_to :sponsor, :class_name => 'User'
+  has_many :books
 
   validates_presence_of :name
 

data/test/test_validation_scopes.rb

@@ -73,4 +73,21 @@ class TestValidationScopes < Test::Unit::TestCase
                    @user.validation_scope_proxy_for_warnings.class.model_name
     end
   end
+
+  context "scopes per model" do
+    setup do
+      @user = User.find(1)
+      @book = Book.find(1)
+      @book2 = Book.find(2)
+    end
+
+    should "return all the scopes declared in User model" do
+      assert_equal [:warnings, :alerts], @user.class.all_scopes 
+    end
+
+    should "return all the scopes declared in Book model" do
+      assert_equal [:warnings_book, :alerts_book], @book.class.all_scopes 
+      assert_equal [:warnings_book, :alerts_book], @book2.class.all_scopes 
+    end
+  end
 end

data/validation_scopes.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{validation_scopes}
-  s.version = "0.4.0"
+  s.name = "validation_scopes"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gabe da Silveira"]
-  s.date = %q{2011-05-23}
-  s.description = %q{Define additional sets of validations beyond the standard "errors" that is tied to the ActiveRecord life-cycle.  These additional sets can be defined with all the standard ActiveRecord::Validation macros, and the resulting collection is a standard ActiveRecord::Errors object.}
-  s.email = %q{gabe@websaviour.com}
+  s.date = "2012-04-15"
+  s.description = "Define additional sets of validations beyond the standard \"errors\" that is tied to the ActiveRecord life-cycle.  These additional sets can be defined with all the standard ActiveRecord::Validation macros, and the resulting collection is a standard ActiveRecord::Errors object."
+  s.email = "gabe@websaviour.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -25,22 +25,18 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/validation_scopes.rb",
     "test/db/schema.rb",
+    "test/fixtures/books.yml",
     "test/fixtures/users.yml",
     "test/helper.rb",
+    "test/models/book.rb",
     "test/models/user.rb",
     "test/test_validation_scopes.rb",
     "validation_scopes.gemspec"
   ]
-  s.homepage = %q{http://github.com/dasil003/validation_scopes}
+  s.homepage = "http://github.com/dasil003/validation_scopes"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Create sets of validations independent of the life-cycle of an ActiveRecord object}
-  s.test_files = [
-    "test/db/schema.rb",
-    "test/helper.rb",
-    "test/models/user.rb",
-    "test/test_validation_scopes.rb"
-  ]
+  s.rubygems_version = "1.8.22"
+  s.summary = "Create sets of validations independent of the life-cycle of an ActiveRecord object"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: validation_scopes
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Gabe da Silveira
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -05:00
-default_executable: 
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -50,12 +49,13 @@ files:
 - VERSION
 - lib/validation_scopes.rb
 - test/db/schema.rb
+- test/fixtures/books.yml
 - test/fixtures/users.yml
 - test/helper.rb
+- test/models/book.rb
 - test/models/user.rb
 - test/test_validation_scopes.rb
 - validation_scopes.gemspec
-has_rdoc: true
 homepage: http://github.com/dasil003/validation_scopes
 licenses: []
 
@@ -85,12 +85,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Create sets of validations independent of the life-cycle of an ActiveRecord object
-test_files: 
-- test/db/schema.rb
-- test/helper.rb
-- test/models/user.rb
-- test/test_validation_scopes.rb
+test_files: []
+