bookland 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb28ebe351f2678644bfb9e06d41cfef77fe6726
-  data.tar.gz: 1e76248492dfe5eb72823704ae491d628db3a170
+  metadata.gz: 5b5ae359f32e9fe781b86320bcf0b7a7b095caa4
+  data.tar.gz: 80143d0efdb7a3b958ab4e5fddefb93579d3b9da
 SHA512:
-  metadata.gz: d750aee9d54437ce127c0f460b586b219e544ec74a8aadf9266347f4f4412f90ff85d03b2ce032384f2083afd3c56cbcc5818a4d16cf35040965af8cc0d9e310
-  data.tar.gz: b49e799178349e883c5f8226af3ef53a157fb9fb98ce40327ea5d268618dd539f75e5ef8679c449982470b89f19fc81e55ae18ae9f8b65c45a53439fcdc7b636
+  metadata.gz: 772184fabb0aef7f79fa41a7dfaa9abfac58c27bb85dd518f2282ef64b3cfeb7db0e132fb4291391ef47d4d08cf5f0bea78daa757e3cd9e6bb3d118b2e5916a9
+  data.tar.gz: 2da6323dc8a21306674b50199d653be13bd71f89dc725ccc4b38a9af198b5e67b5cfcb962bc3121a9810984718037274a5d855080068754a9c85d9f4f7b1e903

data/README.md

@@ -10,6 +10,7 @@
 include 'bookland'
 
 # functional
+EAN.valid?('0814916013890') # => true
 ISBN.valid?('9780262011532') # => true
 
 # oo
@@ -17,7 +18,7 @@ isbn = ISBN.new('9780262011532')
 isbn.valid? # => true
 ```
 
-**Bookland** also comes with an :poop: ASIN class:
+**Bookland** also comes with an ASIN class:
 
 ```ruby
 isbn = '9780262011532'
@@ -25,7 +26,7 @@ asin = ASIN.from_isbn(isbn) # => "0262011530"
 ASIN.to_isbn(asin) # => "9780262011532"
 ```
 
-Caveat: `ASIN` does not calculate the checksum digit for propietary ASINs. If you happen to break their code, ping me.
+Caveat: `ASIN` does not calculate the checksum digit for propietary ASINs. If you happen to break their algo, ping me.
 
 All three classes expose a class-level `calculate_checksum_digit` method:
 
@@ -34,7 +35,7 @@ data_digits = [9, 7, 8, 0, 2, 6, 2, 1, 1, 5, 3]
 ISBN.calculate_checksum_digit(data_digits) # => 2
 ```
 
-Rails-heads: **Bookland** will include custom EAN, ISBN, and ASIN validators if Active Model is loaded. Use it like so:
+**Bookland** includes custom EAN, ISBN, and ASIN validators if Active Model is loaded. Use it like so:
 
 ```ruby
 class Book
@@ -46,6 +47,6 @@ class Book
 end
 ```
 
-:metal:
+:metal::metal:
 
 [bo]: http://en.wikipedia.org/wiki/Bookland

data/bookland.gemspec

@@ -20,5 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest', '~> 4.2'
+  spec.add_development_dependency 'activemodel', '~> 4.0'
 end

data/lib/bookland/validators.rb

@@ -1,29 +1,17 @@
-class AsinValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if value.nil? && options[:allow_nil]
+%w(ASIN EAN ISBN).each do |klass|
+  Object.class_eval <<-EOF
+    class #{klass.capitalize}Validator < ActiveModel::EachValidator
+      def validate_each(record, attribute, value)
+        return if value.nil? && options[:allow_nil]
 
-    unless Bookland::ASIN.valid?(value)
-      record.errors[attribute] << (options[:message] || 'is not an ASIN')
+        unless Bookland::#{klass}.valid?(value)
+          if options[:strict]
+            raise ActiveModel::StrictValidationFailed, "\#{value} \#{options[:message] || "is not an #{klass}"}"
+          else
+            record.errors[attribute] << (options[:message] || 'is not an #{klass}')
+          end
+        end
+      end
     end
-  end
-end
-
-class EanValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if value.nil? && options[:allow_nil]
-
-    unless Bookland::EAN.valid?(value.to_s)
-      record.errors[attribute] << (options[:message] || 'is not an EAN')
-    end
-  end
-end
-
-class IsbnValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    return if value.nil? && options[:allow_nil]
-
-    unless Bookland::ISBN.valid?(value)
-      record.errors[attribute] << (options[:message] || 'is not an ISBN')
-    end
-  end
+  EOF
 end

data/lib/bookland/version.rb

@@ -1,3 +1,3 @@
 module Bookland
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/test/asin_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestASIN < MiniTest::Test
+class TestASIN < MiniTest::Unit::TestCase
   def test_validates_isbn_like_asins
     File.open('./test/data/isbns').each do |line|
       asin = line.split.first.chomp

data/test/ean_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestEAN < MiniTest::Test
+class TestEAN < MiniTest::Unit::TestCase
   def test_validates
     assert EAN.valid?('0814916013890')
   end

data/test/identifier_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestIdentifier < MiniTest::Test
+class TestIdentifier < MiniTest::Unit::TestCase
   def setup
     @id = Identifier.new('123')
   end

data/test/isbn_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class TestISBN < MiniTest::Test
+class TestISBN < MiniTest::Unit::TestCase
   def test_validates
     File.open('./test/data/isbns').each do |line|
       isbn = line.split.last.chomp

data/test/validators_test.rb

@@ -0,0 +1,86 @@
+require 'test_helper'
+
+require 'active_model'
+require 'bookland/validators'
+
+class TestValidators < MiniTest::Unit::TestCase
+  def setup
+    @klass = Class.new do
+      include ActiveModel::Model
+      attr_accessor :attribute
+    end
+  end
+
+  def test_validates_asin
+    @klass.validates(:attribute, asin: true)
+    instance = @klass.new
+    refute instance.valid?
+    instance.attribute = '123'
+    refute instance.valid?
+    instance.attribute = '0262011530'
+    assert instance.valid?
+  end
+
+  def test_allows_nil_asin
+    @klass.validates(:attribute, asin: true, allow_nil: true)
+    instance = @klass.new
+    assert instance.valid?
+  end
+
+  def test_validates_asin_strictly
+    @klass.validates!(:attribute, asin: true)
+    instance = @klass.new(attribute: '0262011530')
+    assert instance.valid?
+    instance.attribute = nil
+    instance = @klass.new
+    assert_raises(ActiveModel::StrictValidationFailed) { instance.valid? }
+  end
+
+  def test_validates_ean
+    @klass.validates(:attribute, ean: true)
+    instance = @klass.new
+    refute instance.valid?
+    instance.attribute = '123'
+    refute instance.valid?
+    instance.attribute = '0814916013890'
+    assert instance.valid?
+  end
+
+  def test_allows_nil_ean
+    @klass.validates(:attribute, ean: true, allow_nil: true)
+    instance = @klass.new
+    assert instance.valid?
+  end
+
+  def test_validates_ean_strictly
+    @klass.validates!(:attribute, ean: true)
+    instance = @klass.new(attribute: '0814916013890')
+    assert instance.valid?
+    instance.attribute = nil
+    assert_raises(ActiveModel::StrictValidationFailed) { instance.valid? }
+  end
+
+  def test_validates_isbn
+    @klass.validates(:attribute, isbn: true)
+    instance = @klass.new
+    refute instance.valid?
+    instance.attribute = '123'
+    refute instance.valid?
+    instance.attribute = '9780262011532'
+    assert instance.valid?
+  end
+
+  def test_allows_nil_isbn
+    @klass.validates(:attribute, isbn: true, allow_nil: true)
+    instance = @klass.new
+    assert instance.valid?
+  end
+
+  def test_validates_isbn_strictly
+    @klass.validates!(:attribute, isbn: true)
+    instance = @klass.new(attribute: '9780262011532')
+    assert instance.valid?
+    instance.attribute = nil
+    assert_raises(ActiveModel::StrictValidationFailed) { instance.valid? }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookland
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Hakan Ensari
@@ -44,14 +44,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
 description: Provides EAN, ISBN, and ASIN classes and validators in Ruby
 email: hakan.ensari@papercavalier.com
 executables: []
@@ -78,6 +92,7 @@ files:
 - test/identifier_test.rb
 - test/isbn_test.rb
 - test/test_helper.rb
+- test/validators_test.rb
 homepage: https://github.com/hakanensari/bookland
 licenses:
 - MIT
@@ -109,3 +124,4 @@ test_files:
 - test/identifier_test.rb
 - test/isbn_test.rb
 - test/test_helper.rb
+- test/validators_test.rb