unidom-common-rspec 0.10.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b3d845d151cd31eea09c477c6480c4d449a7613f
-  data.tar.gz: ca78b9f4cac3f8ffd4bd2b7d2f0db1c713d48c1a
+SHA256:
+  metadata.gz: e73a57fee4cef81976cb6d387f8ee3b79c7f220533492971eed511233a545629
+  data.tar.gz: 9b1612de7e7f00f400326bec3b428fa870d52fd8c3eedd92272350f17236874e
 SHA512:
-  metadata.gz: 5a270c233748a619668cf878e86a9dd50c39b8ed09676b5ea7fdd32452237c7f86601c811fd21d81b00ce2eeb0074454755b41bbd2bf0c296093c7db1ac39177
-  data.tar.gz: 0ce16a83944dca17202ec40ff0f801a62dded783fe5686fad4ba395540ad36c11bfbb1f60f8bd0fd584adc822f9454119b138ad397535518fb283161e9a44e44
+  metadata.gz: 22e69f347d5638e3022e20111643ab5bd3a97d6a6af7749a5b949ffbe7f916c8d9a5956309e746b0bd048e944557c7863e2739804727a3b30312dc5a98d2c740
+  data.tar.gz: 6c42f4595da343f446ba97eec954eed80d689cd109ee43d456516b56e2a815426fb42077835612ae2b4efdc74616fe672debdb319fcf60ca20f13bb8bde15da0

data/CHANGELOG.md

@@ -1,56 +1,88 @@
 # Unidom Common RSpec Change Log Unidom Common RSpec 库变更日志
 
 ## v0.1
+
 1. Scope shared examples
 
 ## v0.2
+
 1. Validates shared examples
 
 ## v0.3
+
 1. Model Extension shared examples
 
 ## v0.4
+
 1. Has Many shared examples
 
 ## v0.5
+
 1. Belongs To shared examples
 2. Improved the Model Extension shared examples for the validates behaviors of the #``grade`` attribute & the #``priority`` attribute
 3. Improved the Model Extension shared examples for the scope behaviours of the #``priority`` attribute
 
 ## v0.6
+
 1. Has One shared examples
 
 ## v0.6.1
+
 1. Improved the Belongs To shared examples for the #``build_association`` method, the #``create_association`` method, & the #``create_association!`` method
 2. Improved the Has One shared examples for the #``build_association`` method, the #``create_association`` method, & the #``create_association!`` method
 
 ## v0.6.2
+
 1. Improved the Has Many shared examples for the #``collection.build`` method, the #``collection.create`` method, & the #``collection.create!`` method
 
 ## v0.7
+
 1. Each Validator shared examples
 
 ## v0.7.1
+
 1. Improved the Model Extension shared examples for the ``ordinal_is`` scope, the ``grade_is`` scope, the ``grade_higher_than`` scope, the ``grade_lower_than`` scope, the ``priority_is`` scope, the ``priority_higher_than`` scope, & the ``priority_lower_than`` scope
 2. Improved the Model Extension shared examples for the validations on the #``ordinal`` attribute
 
 ## v0.7.2
+
 1. Improved the Validates shared examples for the failure message
 
 ## v0.8
+
 1. Monomorphic Scope shared examples
 2. Polymorphic Scope shared examples
 
 ## v0.9
+
 1. Validates Text shared examples
 2. Validates Numericality shared examples
 
 ## v0.9.1
-1. Improve the Validates Text shared examples for the length
+
+1. Improved the Validates Text shared examples for the length
 
 ## v0.10
+
 1. Assert Present shared examples
 
 ## v0.10.1
-1. Improve the Scope shared examples to separate the Monomorphic Scope shared examples, & the Polymorphic Scope shared examples
-2. Improve the Validates shared examples to separate the Validates Text shared examples, & the Validates Numericality shared examples
+
+1. Improved the Scope shared examples to separate the Monomorphic Scope shared examples, & the Polymorphic Scope shared examples
+2. Improved the Validates shared examples to separate the Validates Text shared examples, & the Validates Numericality shared examples
+
+## v1.0
+
+1. Improved the compatibility for Rails 6.x & RSpec Rails 4.x
+
+## v1.1
+
+1. Improved the Ruby Gem Specification to depend on Rake v13.0, & RSpec v3.9
+
+## v2.0
+
+1. Improved the Scope shared examples for Ruby 3.0
+
+## v2.0.1
+
+1. Improved the compatibility of Validates Numericality shared examples and Each Validator shared examples

data/Gemfile.lock

@@ -1,91 +1,96 @@
 PATH
   remote: .
   specs:
-    unidom-common-rspec (0.10)
+    unidom-common-rspec (1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
+    actionpack (6.0.2.2)
+      actionview (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
+      rack (~> 2.0, >= 2.0.8)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.2.2)
+      activesupport (= 6.0.2.2)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activesupport (5.0.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    builder (3.2.3)
-    concurrent-ruby (1.0.5)
+      zeitwerk (~> 2.2)
+    builder (3.2.4)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     diff-lcs (1.3)
-    erubis (2.7.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
+    erubi (1.9.0)
+    i18n (1.8.2)
+      concurrent-ruby (~> 1.0)
+    loofah (2.5.0)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    rack (2.0.1)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
+    method_source (1.0.0)
+    mini_portile2 (2.4.0)
+    minitest (5.14.0)
+    nokogiri (1.10.9)
+      mini_portile2 (~> 2.4.0)
+    rack (2.2.2)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.2.2)
+      actionpack (= 6.0.2.2)
+      activesupport (= 6.0.2.2)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-rails (3.5.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    thor (0.19.4)
+      rspec-support (~> 3.9.0)
+    rspec-rails (4.0.0)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.9.2)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.12)
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec-rails (~> 3.5)
+  bundler (~> 2.0)
+  rake (~> 13.0)
+  rspec (~> 3.9)
+  rspec-rails (~> 4.0)
   unidom-common-rspec!
 
 BUNDLED WITH
-   1.13.6
+   2.1.4

data/README.md

@@ -27,12 +27,15 @@ gem 'unidom-common-rspec'
 
 And then execute:
 
-    $ bundle
+```shell
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install unidom-common-rspec
-
+```shell
+$ gem install unidom-common-rspec
+```
 
 
 ## Usage
@@ -183,7 +186,7 @@ require 'rails_helper'
 
 describe Person, type: :model do
 
-  context '.validates' do
+  context do
 
     tim_attributes = { name: 'Tim' }
 
@@ -229,7 +232,7 @@ require 'rails_helper'
 
 describe Person, type: :model do
 
-  context '.validates' do
+  context do
 
     tim_attributes = { name: 'Tim', age: 28 }
 
@@ -345,22 +348,26 @@ The ``identification_number_validator_spec.rb`` looks like the following:
 ```ruby
 RSpec.describe IdentificationNumberValidator, type: :validator do
 
-  valid_values = %w{
-      231024198506186916
-      231024198506188110
-      231024198506185470
-      231024198506182851
-      231024198506187193
-    }
-  invalid_values = %w{
-      231024198506186917
-      231024198506188111
-      231024198506185471
-      231024198506182852
-      231024198506187194
-    }
-
-  it_behaves_like 'ActiveModel::EachValidator', valid_values, invalid_values
+  context do
+
+    valid_values = %w{
+        231024198506186916
+        231024198506188110
+        231024198506185470
+        231024198506182851
+        231024198506187193
+      }
+    invalid_values = %w{
+        231024198506186917
+        231024198506188111
+        231024198506185471
+        231024198506182852
+        231024198506187194
+      }
+
+    it_behaves_like 'ActiveModel::EachValidator', valid_values, invalid_values
+
+  end
 
 end
 ```

data/ROADMAP.md

@@ -1,56 +1,88 @@
 # Unidom Common RSpec Roadmap Unidom Common RSpec 库线路图
 
 ## v0.1
+
 1. Scope shared examples
 
 ## v0.2
+
 1. Validates shared examples
 
 ## v0.3
+
 1. Model Extension shared examples
 
 ## v0.4
+
 1. Has Many shared examples
 
 ## v0.5
+
 1. Belongs To shared examples
 2. Improve the Model Extension shared examples for the validates behaviors of the #``grade`` attribute & the #``priority`` attribute
 3. Improve the Model Extension shared examples for the scope behaviours of the #``priority`` attribute
 
 ## v0.6
+
 1. Has One shared examples
 
 ## v0.6.1
+
 1. Improve the Belongs To shared examples for the #``build_association`` method, the #``create_association`` method, & the #``create_association!`` method
 2. Improve the Has One shared examples for the #``build_association`` method, the #``create_association`` method, & the #``create_association!`` method
 
 ## v0.6.2
+
 1. Improve the Has Many shared examples for the #``collection.build`` method, the #``collection.create`` method, & the #``collection.create!`` method
 
 ## v0.7
+
 1. Each Validator shared examples
 
 ## v0.7.1
+
 1. Improve the Model Extension shared examples for the ``ordinal_is`` scope, the ``grade_is`` scope, the ``grade_higher_than`` scope, the ``grade_lower_than`` scope, the ``priority_is`` scope, the ``priority_higher_than`` scope, & the ``priority_lower_than`` scope
 2. Improve the Model Extension shared examples for the validations on the #``ordinal`` attribute
 
 ## v0.7.2
+
 1. Improve the Validates shared examples for the failure message
 
 ## v0.8
+
 1. Monomorphic Scope shared examples
 2. Polymorphic Scope shared examples
 
 ## v0.9
+
 1. Validates Text shared examples
 2. Validates Numericality shared examples
 
 ## v0.9.1
+
 1. Improve the Validates Text shared examples for the length
 
 ## v0.10
+
 1. Assert Present shared examples
 
 ## v0.10.1
+
 1. Improve the Scope shared examples to separate the Monomorphic Scope shared examples, & the Polymorphic Scope shared examples
 2. Improve the Validates shared examples to separate the Validates Text shared examples, & the Validates Numericality shared examples
+
+## v1.0
+
+1. Improve the compatibility for Rails 6.x & RSpec Rails 4.x
+
+## v1.1
+
+1. Improve the Ruby Gem Specification to depend on Rake v13.0, & RSpec v4.0
+
+## v2.0
+
+1. Improve the Scope shared examples for Ruby 3.0
+
+## v2.0.1
+
+1. Improve the compatibility of Validates Numericality shared examples and Each Validator shared examples

data/lib/unidom/common/rspec.rb

@@ -1,4 +1,6 @@
-require "unidom/common/rspec/version"
+require 'rspec/core'
+
+require 'unidom/common/rspec/version'
 
 require 'unidom/common/rspec/assert_present_shared_examples'
 

data/lib/unidom/common/rspec/each_validator_shared_examples.rb

@@ -1,11 +1,17 @@
 shared_examples 'ActiveModel::EachValidator' do |valid_values, invalid_values|
 
   mock_model_class_name = "#{described_class.name}MockModel"
-  mock_model_namespace  = mock_model_class_name.deconstantize.constantize
-  mock_model_name       = mock_model_class_name.demodulize
-  validator_name        = described_class.to_s.underscore.chomp('_validator').to_sym
+  if mock_model_class_name.deconstantize.present?
+    mock_model_namespace  = mock_model_class_name.deconstantize.constantize
+    mock_model_name       = mock_model_class_name.demodulize
+  else
+    mock_model_namespace = Object
+    mock_model_name      = mock_model_class_name
+  end
+
   mock_model_namespace.const_set mock_model_name, Class.new
-  class_instance        = mock_model_namespace.const_get mock_model_name
+  class_instance = mock_model_namespace.const_get mock_model_name
+  validator_name = described_class.to_s.underscore.chomp('_validator').to_sym
 
   class_instance.class_eval do
     include       ActiveModel::Model

data/lib/unidom/common/rspec/scope_shared_examples.rb

@@ -6,19 +6,41 @@ shared_examples 'scope' do |scope_name, fixtures|
 
   fixtures.select { |fixture| 'E'!=fixture[:count_diff] } .each do |fixture|
     describe ".#{scope_name}(#{fixture[:args].blank? ? '' : (fixture[:args].map &:inspect).join(', ')})" do
+
       before :each do
-        @count = fixture[:args].present? ? described_class.send(scope_name, *fixture[:args]).count : described_class.send(scope_name).count
+        #@count = fixture[:args].present? ? described_class.send(scope_name, *fixture[:args]).count : described_class.send(scope_name).count
+        if fixture[:args].present?
+          if fixture[:args][0].is_a? Hash
+            @count = described_class.send(scope_name, **fixture[:args][0]).count
+          else
+            @count = described_class.send(scope_name, *fixture[:args]).count
+          end
+        else
+          @count = described_class.send(scope_name).count
+        end
         @model_instances = []
         fixture[:attributes_collection].each do |attributes| @model_instances << (described_class.create! attributes) end
       end
+
       after :each do
         @count = 0
         @model_instances.each do |model_instance| model_instance.destroy end if @model_instances.present?
       end
+
       it "has #{fixture[:count_diff]} added" do
-        actual_count = fixture[:args].present? ? described_class.send(scope_name, *fixture[:args]).count : described_class.send(scope_name).count
+        if fixture[:args].present?
+          if fixture[:args][0].is_a? Hash
+            actual_count = described_class.send(scope_name, **fixture[:args][0]).count
+          else
+            actual_count = described_class.send(scope_name, *fixture[:args]).count
+          end
+        else
+          actual_count = described_class.send(scope_name).count
+        end
+        #actual_count = fixture[:args].present? ? described_class.send(scope_name, **fixture[:args][0]).count : described_class.send(scope_name).count
         expect(actual_count).to eq(fixture[:count_diff]+@count)
       end
+
     end
   end
 

data/lib/unidom/common/rspec/validates_numericality_shared_examples.rb

@@ -1,8 +1,8 @@
 shared_examples 'validates numericality' do |model_attributes, attribute_name, options|
 
   attribute_name      = attribute_name.to_sym
-  presence_validator  = described_class.validators.select { |v| v.is_a?(ActiveRecord::Validations::PresenceValidator)&&v.attributes.include?(attribute_name) }.first
-  excluded_validators = described_class.validators.select { |v| v.attributes.include?(attribute_name)&&![ ActiveRecord::Validations::PresenceValidator, ActiveModel::Validations::NumericalityValidator ].include?(v.class) }
+  presence_validator  = described_class.validators.select { |v| (v.is_a?(ActiveModel::Validations::PresenceValidator)||v.is_a?(ActiveRecord::Validations::PresenceValidator))&&v.attributes.include?(attribute_name) }.first
+  excluded_validators = described_class.validators.select { |v| v.attributes.include?(attribute_name)&&![ ActiveRecord::Validations::PresenceValidator, ActiveRecord::Validations::NumericalityValidator, ActiveModel::Validations::PresenceValidator, ActiveModel::Validations::NumericalityValidator ].include?(v.class) }
 
   if excluded_validators.present?
     raise ArgumentError.new("The validators on the #{attribute_name.inspect} attribute must be PresenceValidator or NumericalityValidator. The excluded validator#{excluded_validators.size>1 ? 's are' : ' is'}: #{excluded_validators.inspect}.")

data/lib/unidom/common/rspec/version.rb

@@ -1,7 +1,7 @@
 module Unidom
   module Common
     module RSpec
-      VERSION = '0.10.1'
+      VERSION = '2.0.1'
     end
   end
 end

data/unidom-common-rspec.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = [ 'lib' ]
 
-  spec.add_development_dependency 'rspec-rails', '~> 3.5'
+  spec.add_development_dependency 'rspec-rails', '~> 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'rake',    '~> 10.0'
-  spec.add_development_dependency 'rspec',   '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'rake',    '~> 13.0'
+  spec.add_development_dependency 'rspec',   '~> 3.9'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-common-rspec
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Topbit Du
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2021-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 description: Unidom Common RSpec is a RSpec-based Shared Example for the Unidom Common-based
   models. Unidom Common RSpec 是为 Unidom Common 设计的基于 RSpec 的共享测试用例。
 email:
@@ -106,7 +106,7 @@ homepage: https://github.com/topbitdu/unidom-common-rspec
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -121,9 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.4
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Unidom Common RSpec 是为 Unidom Common 设计的基于 RSpec 的共享测试用例。
 test_files: []