rails_core_extensions 0.11.3 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb01e71e0bcfd0cfbeb33038f8b4d0c352963b1e038281cc7b367efb857a0c4a
-  data.tar.gz: 420d2f75e7177bc8e830f3e664d715e05b7edfbe926bc1c1d8281bfded08e631
+  metadata.gz: ccc0583ffb6264c6f3a3c4ec35caf8028c263dc37403eae6417a2e2a398b01c9
+  data.tar.gz: e332a69c6ed44ab4cec2f12608a0af873ab799d6f7274f818ab9c211eff05ee2
 SHA512:
-  metadata.gz: b6ae22bd6a58fe5e52c7d87ccd3638bd61f207845634b1121974ca1f9c9c193d263e476ecc457012e189df62291b4aacfe318f4329943b30051643d355ba380e
-  data.tar.gz: '096f622ef44ccf9a96a2d08ea38604ecd73eeb42edcdff939ddae5d2256235546a8c5c31c37d796a691aaa71702796282ff5c2ab39a640ade77c9a22171eac87'
+  metadata.gz: c73627135e3553892c98facf3071f2599db2f222d0c35e9b8fa9a0f372fa3f40dbdf10f42ccfc2d5df20fa37ae6136aba5199c98e8ef093f406989d16dd23443
+  data.tar.gz: 634791e2c66ab5972318a1a8f44c15ba00dd6257ae7110487c56ca2f9c8406dcf779c94558606242923ec626541486aa0bfe53913fb2cdc28cf3a9ba8422bdcd

data/.github/workflows/ruby.yml

@@ -5,8 +5,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [rails60, rails61]
-        ruby: ["2.6", "2.7", "3.0"]
+        gemfile: [rails60, rails61, rails70]
+        ruby: ["2.7", "3.0", "3.1"]
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
@@ -17,3 +17,8 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - run: bundle exec rake
+      - name: Coveralls
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: coverage/lcov.info

data/.ruby-version

@@ -1 +1 @@
-3.0.0
+3.1.0

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.13.1
+
+- [PLAT-384] Fix the liquid extension
+
+## 0.13.0
+
+- [PLAT-378] Improve bundler startup time; Drop Concurrency
+
+## 0.12.0
+
+- [PLAT-183] Ruby 3.1, Rails 7.0 and publish coverage with github action
+
 ## 0.11.3
 
 - [TT-8647] Fix issue with position_helpers_for active record change

data/gemfiles/rails70.gemfile

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+gemspec :path => '../'
+
+group :development, :test do
+  gem 'activerecord', '~> 7.0'
+end

data/lib/rails_core_extensions/action_controller_sortable.rb

@@ -1,8 +1,6 @@
 module RailsCoreExtensions
   module ActionControllerSortable
-    def self.included(base)
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def sortable

data/lib/rails_core_extensions/action_view_has_many_extensions.rb

@@ -28,5 +28,7 @@ module RailsCoreExtensions
   end
 end
 
-ActionView::Base.send(:include, RailsCoreExtensions::HasManyExtensions::Tags) if defined?(ActionView::Base)
-ActionView::Helpers::FormBuilder.send(:include, RailsCoreExtensions::HasManyExtensions::FormBuilder) if defined?(ActionView::Base)
+ActiveSupport.on_load :action_view do
+  ActionView::Base.send(:include, RailsCoreExtensions::HasManyExtensions::Tags)
+  ActionView::Helpers::FormBuilder.send(:include, RailsCoreExtensions::HasManyExtensions::FormBuilder)
+end

data/lib/rails_core_extensions/active_model_extensions.rb

@@ -1,8 +1,6 @@
 module ActiveModelExtensions
   module Validations
-    def self.included(base)
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
 
     # Validates the presence of the required fields identified in a rule-string.
     #

data/lib/rails_core_extensions/active_record_cloning.rb

@@ -1,7 +1,5 @@
 module ActiveRecordCloning
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
+  extend ActiveSupport::Concern
 
   module ClassMethods
 

data/lib/rails_core_extensions/active_record_extensions.rb

@@ -1,7 +1,5 @@
 module ActiveRecordExtensions
-  def self.included(base)
-    base.extend ClassMethods
-  end
+  extend ActiveSupport::Concern
 
   module ClassMethods
     # Like establish_connection but postfixes the key with the rails environment

data/lib/rails_core_extensions/active_record_liquid_extensions.rb

@@ -1,32 +1,30 @@
 module RailsCoreExtensions
   module ActiveRecordLiquidExtensions
-    def self.included(base)
-      base.extend ClassMethods
-    end
-  end
+    extend ActiveSupport::Concern
 
-  module ClassMethods
-    def validates_liquid(field)
-      field = field.to_sym
-      before_validation do |record|
-        begin
-          Liquid::Template.parse(record.send(field), error_mode: :strict)
-        rescue Liquid::SyntaxError => e
-          record.errors.add(field, "Liquid Syntax Error: #{e}")
+    module ClassMethods
+      def validates_liquid(field)
+        field = field.to_sym
+        before_validation do |record|
+          begin
+            Liquid::Template.parse(record.send(field), error_mode: :strict)
+          rescue Liquid::SyntaxError => e
+            record.errors.add(field, "Liquid Syntax Error: #{e}")
+          end
         end
       end
-    end
 
-    def liquid_field(field)
-      class_eval <<-CODE
-        def parsed_#{field}
-          Liquid::Template.parse(#{field})
-        end
+      def liquid_field(field)
+        class_eval <<-CODE
+          def parsed_#{field}
+            Liquid::Template.parse(#{field})
+          end
 
-        def render_#{field}(*args)
-          parsed_#{field}.render!(*args)
-        end
-      CODE
+          def render_#{field}(*args)
+            parsed_#{field}.render!(*args)
+          end
+        CODE
+      end
     end
   end
 end

data/lib/rails_core_extensions/translations.rb

@@ -1,8 +1,6 @@
 module RailsCoreExtensions
   module Translations
-    def self.included(base)
-      base.extend ClassMethods
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def translate(key, options = {})

data/lib/rails_core_extensions/version.rb

@@ -1,3 +1,3 @@
 module RailsCoreExtensions
-  VERSION = '0.11.3'
+  VERSION = '0.13.1'
 end

data/lib/rails_core_extensions.rb

@@ -3,8 +3,6 @@ module RailsCoreExtensions
   require 'rails_core_extensions/position_initializer'
   require 'rails_core_extensions/time_with_zone'
   require 'rails_core_extensions/transfer_records'
-  require 'rails_core_extensions/active_support_concern'
-  require 'rails_core_extensions/concurrency'
 
   require 'rails_core_extensions/railtie' if defined?(Rails)
 
@@ -12,15 +10,19 @@ module RailsCoreExtensions
     require 'rails_core_extensions/activatable'
     require 'rails_core_extensions/action_controller_sortable'
 
-    ActionController::Base.send(:include, Activatable)
-    ActionController::Base.send(:include, ActionControllerSortable)
+    ActiveSupport.on_load(:action_controller) do
+      ActionController::Base.send(:include, Activatable)
+      ActionController::Base.send(:include, ActionControllerSortable)
+    end
   end
 
   if defined? ActionView
     require 'rails_core_extensions/action_view_extensions'
     require 'rails_core_extensions/action_view_has_many_extensions'
 
-    ActionView::Base.send(:include, RailsCoreExtensions::ActionViewExtensions)
+    ActiveSupport.on_load(:active_view) do
+      ActionView::Base.send(:include, RailsCoreExtensions::ActionViewExtensions)
+    end
   end
 
   if defined? ActiveRecord
@@ -30,11 +32,13 @@ module RailsCoreExtensions
     require 'rails_core_extensions/translations'
     require 'rails_core_extensions/active_model_extensions'
 
-    ActiveRecord::Base.send(:include, ActiveRecordCloning)
-    ActiveRecord::Base.send(:include, ActiveRecordExtensions)
-    ActiveRecord::Base.send(:include, RailsCoreExtensions::ActiveRecordLiquidExtensions)
-    ActiveRecord::Base.send(:include, ActiveRecordExtensions::InstanceMethods)
-    ActiveRecord::Base.send(:include, RailsCoreExtensions::Translations)
-    ActiveRecord::Base.send(:include, ActiveModelExtensions::Validations)
+    ActiveSupport.on_load(:active_record) do
+      ActiveRecord::Base.send(:include, ActiveRecordCloning)
+      ActiveRecord::Base.send(:include, ActiveRecordExtensions)
+      ActiveRecord::Base.send(:include, RailsCoreExtensions::ActiveRecordLiquidExtensions)
+      ActiveRecord::Base.send(:include, ActiveRecordExtensions::InstanceMethods)
+      ActiveRecord::Base.send(:include, RailsCoreExtensions::Translations)
+      ActiveRecord::Base.send(:include, ActiveModelExtensions::Validations)
+    end
   end
 end

data/rails_core_extensions.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.6'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.add_dependency 'activerecord', ['>= 6.0.0']
   spec.add_dependency 'actionpack', ['>= 6.0.0']
@@ -28,8 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'activerecord-nulldb-adapter'
   spec.add_development_dependency 'coverage-kit'
-  spec.add_development_dependency 'simplecov-rcov'
-  spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'sqlite3'
 end

data/spec/support/coverage_loader.rb

@@ -1,5 +1,3 @@
-require 'simplecov-rcov'
-require 'coveralls'
 require 'coverage/kit'
 
-Coverage::Kit.setup(minimum_coverage: 86.7)
+Coverage::Kit.setup(minimum_coverage: 84.1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_core_extensions
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.13.1
 platform: ruby
 authors:
 - Michael Noack
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,34 +109,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -176,9 +148,7 @@ files:
 - ".github/workflows/release.yml"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".hound.yml"
 - ".rspec"
-- ".ruby-style.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
@@ -187,6 +157,7 @@ files:
 - Rakefile
 - gemfiles/rails60.gemfile
 - gemfiles/rails61.gemfile
+- gemfiles/rails70.gemfile
 - lib/rails_core_extensions.rb
 - lib/rails_core_extensions/action_controller_sortable.rb
 - lib/rails_core_extensions/action_view_extensions.rb
@@ -196,8 +167,6 @@ files:
 - lib/rails_core_extensions/active_record_cloning.rb
 - lib/rails_core_extensions/active_record_extensions.rb
 - lib/rails_core_extensions/active_record_liquid_extensions.rb
-- lib/rails_core_extensions/active_support_concern.rb
-- lib/rails_core_extensions/concurrency.rb
 - lib/rails_core_extensions/position_initializer.rb
 - lib/rails_core_extensions/railtie.rb
 - lib/rails_core_extensions/sortable.rb
@@ -212,7 +181,6 @@ files:
 - spec/active_model_extensions_spec.rb
 - spec/active_record_cloning_spec.rb
 - spec/active_record_extensions_spec.rb
-- spec/concurrency_spec.rb
 - spec/en.yml
 - spec/position_initializer_spec.rb
 - spec/schema.rb
@@ -233,14 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: Set of extensions to core rails libraries.
@@ -250,7 +218,6 @@ test_files:
 - spec/active_model_extensions_spec.rb
 - spec/active_record_cloning_spec.rb
 - spec/active_record_extensions_spec.rb
-- spec/concurrency_spec.rb
 - spec/en.yml
 - spec/position_initializer_spec.rb
 - spec/schema.rb

data/.hound.yml

@@ -1,2 +0,0 @@
-ruby:
-  config_file: .ruby-style.yml

data/.ruby-style.yml

@@ -1,217 +0,0 @@
-AllCops:
-  Exclude:
-    - "vendor/**/*"
-    - "db/schema.rb"
-  UseCache: false
-Style/CollectionMethods:
-  Description: Preferred collection methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#map-find-select-reduce-size
-  Enabled: true
-  PreferredMethods:
-    collect: map
-    collect!: map!
-    find: detect
-    find_all: select
-    reduce: inject
-Layout/DotPosition:
-  Description: Checks the position of the dot in multi-line method calls.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#consistent-multi-line-chains
-  Enabled: true
-  EnforcedStyle: trailing
-  SupportedStyles:
-  - leading
-  - trailing
-Naming/FileName:
-  Description: Use snake_case for source file names.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
-  Enabled: false
-  Exclude: []
-Style/GuardClause:
-  Description: Check for conditionals that can be replaced with guard clauses
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
-  Enabled: false
-  MinBodyLength: 1
-Style/IfUnlessModifier:
-  Description: Favor modifier if/unless usage when you have a single-line body.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
-  Enabled: false
-Style/OptionHash:
-  Description: Don't use option hashes when you can use keyword arguments.
-  Enabled: false
-Style/PercentLiteralDelimiters:
-  Description: Use `%`-literal delimiters consistently
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#percent-literal-braces
-  Enabled: false
-  PreferredDelimiters:
-    "%": "()"
-    "%i": "()"
-    "%q": "()"
-    "%Q": "()"
-    "%r": "{}"
-    "%s": "()"
-    "%w": "()"
-    "%W": "()"
-    "%x": "()"
-Naming/PredicateName:
-  Description: Check the names of predicate methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
-  Enabled: true
-  NamePrefix:
-  - is_
-  - has_
-  - have_
-  NamePrefixBlacklist:
-  - is_
-  Exclude:
-  - spec/**/*
-Style/RaiseArgs:
-  Description: Checks the arguments passed to raise/fail.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#exception-class-messages
-  Enabled: false
-  EnforcedStyle: exploded
-  SupportedStyles:
-  - compact
-  - exploded
-Style/SignalException:
-  Description: Checks for proper usage of fail and raise.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#fail-method
-  Enabled: false
-  EnforcedStyle: semantic
-  SupportedStyles:
-  - only_raise
-  - only_fail
-  - semantic
-Style/SingleLineBlockParams:
-  Description: Enforces the names of some block params.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#reduce-blocks
-  Enabled: false
-  Methods:
-  - reduce:
-    - a
-    - e
-  - inject:
-    - a
-    - e
-Style/SingleLineMethods:
-  Description: Avoid single-line methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-single-line-methods
-  Enabled: false
-  AllowIfMethodIsEmpty: true
-Style/TrailingCommaInArguments:
-  Description: Checks for trailing comma in argument lists.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
-  EnforcedStyleForMultiline: comma
-  Enabled: true
-Style/TrailingCommaInArrayLiteral:
-  Description: Checks for trailing comma in array and hash literals.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas
-  EnforcedStyleForMultiline: comma
-  Enabled: true
-Metrics/AbcSize:
-  Description: A calculated magnitude based on number of assignments, branches, and
-    conditions.
-  Enabled: false
-  Max: 15
-Metrics/ClassLength:
-  Description: Avoid classes longer than 100 lines of code.
-  Enabled: false
-  CountComments: false
-  Max: 100
-Metrics/ModuleLength:
-  CountComments: false
-  Max: 100
-  Description: Avoid modules longer than 100 lines of code.
-  Enabled: false
-Metrics/CyclomaticComplexity:
-  Description: A complexity metric that is strongly correlated to the number of test
-    cases needed to validate a method.
-  Enabled: false
-  Max: 6
-Metrics/MethodLength:
-  Description: Avoid methods longer than 10 lines of code.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#short-methods
-  Enabled: false
-  CountComments: false
-  Max: 10
-Metrics/ParameterLists:
-  Description: Avoid parameter lists longer than three or four parameters.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#too-many-params
-  Enabled: false
-  Max: 5
-  CountKeywordArgs: true
-Metrics/PerceivedComplexity:
-  Description: A complexity metric geared towards measuring complexity for a human
-    reader.
-  Enabled: false
-  Max: 7
-Lint/AssignmentInCondition:
-  Description: Don't use assignment in conditions.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#safe-assignment-in-condition
-  Enabled: false
-  AllowSafeAssignment: true
-Style/InlineComment:
-  Description: Avoid inline comments.
-  Enabled: false
-Naming/AccessorMethodName:
-  Description: Check the naming of accessor methods for get_/set_.
-  Enabled: false
-Style/Alias:
-  Description: Use alias_method instead of alias.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#alias-method
-  Enabled: false
-Style/Documentation:
-  Description: Document classes and non-namespace modules.
-  Enabled: false
-Style/DoubleNegation:
-  Description: Checks for uses of double negation (!!).
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-bang-bang
-  Enabled: false
-Style/EachWithObject:
-  Description: Prefer `each_with_object` over `inject` or `reduce`.
-  Enabled: false
-Style/EmptyLiteral:
-  Description: Prefer literals to Array.new/Hash.new/String.new.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#literal-array-hash
-  Enabled: false
-Style/ModuleFunction:
-  Description: Checks for usage of `extend self` in modules.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#module-function
-  Enabled: false
-Style/OneLineConditional:
-  Description: Favor the ternary operator(?:) over if/then/else/end constructs.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#ternary-operator
-  Enabled: false
-Style/PerlBackrefs:
-  Description: Avoid Perl-style regex back references.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-perl-regexp-last-matchers
-  Enabled: false
-Style/Send:
-  Description: Prefer `Object#__send__` or `Object#public_send` to `send`, as `send`
-    may overlap with existing methods.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#prefer-public-send
-  Enabled: false
-Style/SpecialGlobalVars:
-  Description: Avoid Perl-style global variables.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-cryptic-perlisms
-  Enabled: false
-Style/VariableInterpolation:
-  Description: Don't interpolate global, instance and class variables directly in
-    strings.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#curlies-interpolate
-  Enabled: false
-Style/WhenThen:
-  Description: Use when x then ... for one-line cases.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#one-line-cases
-  Enabled: false
-Lint/EachWithObjectArgument:
-  Description: Check for immutable argument given to each_with_object.
-  Enabled: true
-Lint/HandleExceptions:
-  Description: Don't suppress exception.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#dont-hide-exceptions
-  Enabled: false
-Lint/LiteralInInterpolation:
-  Description: Checks for literals used in interpolation.
-  Enabled: false
-Style/FrozenStringLiteralComment:
-  Enabled: false

data/lib/rails_core_extensions/active_support_concern.rb

@@ -1,134 +0,0 @@
-module ActiveSupport
-  # A typical module looks like this:
-  #
-  #   module M
-  #     def self.included(base)
-  #       base.extend ClassMethods
-  #       base.send(:include, InstanceMethods)
-  #       scope :disabled, where(:disabled => true)
-  #     end
-  #
-  #     module ClassMethods
-  #       ...
-  #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
-  #   end
-  #
-  # By using <tt>ActiveSupport::Concern</tt> the above module could instead be written as:
-  #
-  #   require 'active_support/concern'
-  #
-  #   module M
-  #     extend ActiveSupport::Concern
-  #
-  #     included do
-  #       scope :disabled, where(:disabled => true)
-  #     end
-  #
-  #     module ClassMethods
-  #       ...
-  #     end
-  #
-  #     module InstanceMethods
-  #       ...
-  #     end
-  #   end
-  #
-  # Moreover, it gracefully handles module dependencies. Given a +Foo+ module and a +Bar+
-  # module which depends on the former, we would typically write the following:
-  #
-  #   module Foo
-  #     def self.included(base)
-  #       base.class_eval do
-  #         def self.method_injected_by_foo
-  #           ...
-  #         end
-  #       end
-  #     end
-  #   end
-  #
-  #   module Bar
-  #     def self.included(base)
-  #       base.method_injected_by_foo
-  #     end
-  #   end
-  #
-  #   class Host
-  #     include Foo # We need to include this dependency for Bar
-  #     include Bar # Bar is the module that Host really needs
-  #   end
-  #
-  # But why should +Host+ care about +Bar+'s dependencies, namely +Foo+? We could try to hide
-  # these from +Host+ directly including +Foo+ in +Bar+:
-  #
-  #   module Bar
-  #     include Foo 
-  #     def self.included(base)
-  #       base.method_injected_by_foo
-  #     end
-  #   end
-  #
-  #   class Host
-  #     include Bar
-  #   end
-  #
-  # Unfortunately this won't work, since when +Foo+ is included, its <tt>base</tt> is the +Bar+ module,
-  # not the +Host+ class. With <tt>ActiveSupport::Concern</tt>, module dependencies are properly resolved:
-  #
-  #   require 'active_support/concern'
-  #
-  #   module Foo
-  #     extend ActiveSupport::Concern
-  #     included do
-  #       class_eval do
-  #         def self.method_injected_by_foo
-  #           ...
-  #         end
-  #       end
-  #     end
-  #   end
-  #
-  #   module Bar
-  #     extend ActiveSupport::Concern
-  #     include Foo
-  #
-  #     included do
-  #       self.method_injected_by_foo
-  #     end
-  #   end
-  #
-  #   class Host
-  #     include Bar # works, Bar takes care now of its dependencies
-  #   end
-  #
-  module Concern
-    def self.extended(base)
-      base.instance_variable_set("@_dependencies", [])
-    end
-
-    def append_features(base)
-      if base.instance_variable_defined?("@_dependencies")
-        base.instance_variable_get("@_dependencies") << self
-        return false
-      else
-        return false if base < self
-        @_dependencies.each { |dep| base.send(:include, dep) }
-        super
-        base.extend const_get("ClassMethods") if const_defined?("ClassMethods")
-        base.send :include, const_get("InstanceMethods") if const_defined?("InstanceMethods")
-        base.class_eval(&@_included_block) if instance_variable_defined?("@_included_block")
-      end
-    end
-
-    def included(base = nil, &block)
-      if base.nil?
-        @_included_block = block
-      else
-        super
-      end
-    end
-  end
-end

data/lib/rails_core_extensions/concurrency.rb

@@ -1,152 +0,0 @@
-module Concurrency
-  extend ActiveSupport::Concern
-  
-  module ClassMethods
-    
-    def concurrency_safe(*methods)
-      options = methods.extract_options!
-      methods.each do |method|
-        add_concurrency_check(method, options)
-      end
-    end
-    
-    
-    def concurrency_safe_method_locked?(method)
-      concurrency_cache.read(concurrency_safe_method_cache_name(method)) == 'locked'
-    end
-    
-    
-    def concurrency_cache
-      @concurrency_cache ||= ::Rails.cache
-    end
-    
-    
-    def concurrency_cache=(cache)
-      [:read,:write,:delete].each do |method|
-        raise ConcurrencyCacheException, "#{cache} does not implement #{method}" unless cache.respond_to?(method)
-      end
-      @concurrency_cache = cache
-    end
-    
-    
-    private
-    
-    def add_concurrency_check(method, options = {})
-      method_definition = <<-DEFINITION
-        def #{method}_with_concurrency_lock(*args)
-          if concurrency_safe_method_locked?(:#{method})
-            raise ConcurrentCallException.new(self,:#{method}), "#{self.name}.#{method} is already running"
-          end
-          lock_concurrency_safe_method(:#{method})
-          return_value = nil
-          begin
-            return_value = #{method}_without_concurrency_lock(*args)
-          ensure
-            unlock_concurrency_safe_method(:#{method})
-          end
-          return_value
-        end
-        alias_method :#{method}_without_concurrency_lock, :#{method}
-        alias_method :#{method}, :#{method}_with_concurrency_lock
-      DEFINITION
-      
-      if method_type(method, options[:type]) == 'class'
-        method_definition = <<-DEFINITION
-          class << self
-            #{method_definition}
-          end
-        DEFINITION
-      end
-      
-      module_eval method_definition
-    end
-    
-    
-    def lock_concurrency_safe_method(method)
-      concurrency_cache.write(concurrency_safe_method_cache_name(method), 'locked')
-    end
-    
-    
-    def unlock_concurrency_safe_method(method)
-      concurrency_cache.delete(concurrency_safe_method_cache_name(method))
-    end
-    
-    
-    def concurrency_safe_method_cache_name(method)
-      "#{self.name.underscore}_concurrency_safe_class_method_#{method}"
-    end
-    
-    
-    def method_type(method, type = nil)
-      types = method_types(method, type)
-      raise AmbiguousMethodException.new(self, method), "#{method} for #{self.name} is ambiguous. Please specify the type (instance/class) option" if types.count == 2
-      raise NoMethodException.new(self, method), "#{method} is not not a valid method for #{self.name}." if types.blank?
-      types.first
-    end
-    
-    
-    def method_types(method, type = nil)
-      ['class', 'instance'].select do |mt|
-        (type.blank? || type.to_s == mt) && self.send("#{mt}_method?", method)
-      end
-    end
-    
-    
-    def class_method?(method)
-      self.respond_to?(method, true)
-    end
-    
-    
-    def instance_method?(method)
-      (self.instance_methods + self.private_instance_methods).map(&:to_s).include?(method.to_s)
-    end
-    
-  end
-  
-  
-  module InstanceMethods
-    
-    def concurrency_cache
-      self.class.concurrency_cache
-    end
-    
-    
-    def concurrency_safe_method_locked?(method)
-      concurrency_cache.read(concurrency_safe_method_cache_name(method)) == 'locked'
-    end
-    
-    
-    private
-    
-    def lock_concurrency_safe_method(method)
-      concurrency_cache.write(concurrency_safe_method_cache_name(method), 'locked')
-    end
-    
-    
-    def unlock_concurrency_safe_method(method)
-      concurrency_cache.delete(concurrency_safe_method_cache_name(method))
-    end
-    
-    
-    def concurrency_safe_method_cache_name(method)
-      "#{self.class.name.underscore}_concurrency_safe_instance_method_#{method}"
-    end
-    
-  end
-  
-  
-  class ConcurrencyException < ::Exception; end
-  class ConcurrencyCacheException < ConcurrencyException; end
-  class MethodException < ConcurrencyException
-    attr_reader :object, :method
-    
-    def initialize(object, method)
-      @object = object
-      @method = method
-    end
-  end
-  class ConcurrentCallException < MethodException; end
-  class NoMethodException < MethodException; end
-  class AmbiguousMethodException < MethodException; end
-    
-end

data/spec/concurrency_spec.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-class TestConcurrencyCache
-  @@cache = {}
-
-  def self.read(key)
-    @@cache[key]
-  end
-
-  def self.write(key, value)
-    @@cache[key] = value
-  end
-
-  def self.delete(key)
-    @@cache.delete(key)
-  end
-
-  def self.clear
-    @@cache = {}
-  end
-end
-
-describe Concurrency do
-  before :each do
-    TestConcurrencyCache.clear
-
-    class ConcurrencyTest
-      include Concurrency
-
-      self.concurrency_cache = TestConcurrencyCache
-
-      def self.class_test_method
-        sleep(1)
-      end
-
-      def instance_test_method
-        sleep(1)
-      end
-
-      def self.both_instance_and_class_test_method; end
-      def both_instance_and_class_test_method; end
-    end
-  end
-
-  after :each do
-    Object.send(:remove_const, :ConcurrencyTest)
-  end
-
-  it "should allow specifying which methods should implement the concurrency check" do
-    expect { ConcurrencyTest.send(:concurrency_safe, :instance_test_method) }
-      .to_not raise_error
-    expect { ConcurrencyTest.send(:concurrency_safe, :class_test_method) }
-      .to_not raise_error
-    expect { ConcurrencyTest.send(:concurrency_safe, :both_instance_and_class_test_method) }
-      .to raise_error(Concurrency::AmbiguousMethodException)
-    expect { ConcurrencyTest.send(:concurrency_safe, :both_instance_and_class_test_method, type: :instance) }
-      .to_not raise_error
-    expect { ConcurrencyTest.send(:concurrency_safe, :both_instance_and_class_test_method, type: :class) }
-      .to_not raise_error
-    expect { ConcurrencyTest.send(:concurrency_safe, :unknown_method) }
-      .to raise_error(Concurrency::NoMethodException)
-  end
-
-  it "should allow identyfying the type of a method" do
-    expect(ConcurrencyTest.send(:method_types, :class_test_method)).to eq ['class']
-    expect(ConcurrencyTest.send(:method_types, :instance_test_method)).to eq ['instance']
-    expect(ConcurrencyTest.send(:method_types, :both_instance_and_class_test_method)).to eq ['class','instance']
-    expect(ConcurrencyTest.send(:method_types, :unknown_method)).to be_blank
-    expect(ConcurrencyTest.send(:method_type, :class_test_method)).to eq 'class'
-    expect(ConcurrencyTest.send(:method_type, :instance_test_method)).to eq 'instance'
-    expect { ConcurrencyTest.send(:method_type, :both_instance_and_class_test_method) }
-      .to raise_error(Concurrency::AmbiguousMethodException)
-    expect { ConcurrencyTest.send(:method_type, :unknown_method) }
-      .to raise_error(Concurrency::NoMethodException)
-  end
-
-  it "should allow checking the concurrency lock for specified class methods" do
-    ConcurrencyTest.send(:concurrency_safe, :class_test_method)
-    started = false
-    expect(ConcurrencyTest.concurrency_safe_method_locked?(:class_test_method)).to be false
-    thread = Thread.new { ConcurrencyTest.send(:class_test_method); started = true }
-    thread.join
-    expect(ConcurrencyTest.concurrency_safe_method_locked?(:class_test_method)).to be true until started
-  end
-
-  it "should allow checking the concurrency lock for specified instance methods" do
-    ConcurrencyTest.send(:concurrency_safe, :class_test_method)
-    instance = ConcurrencyTest.new
-    started = false
-    expect(instance.concurrency_safe_method_locked?(:instance_test_method)).to be false
-    thread = Thread.new { instance.send(:instance_test_method); started = true }
-    thread.join
-    expect(instance.concurrency_safe_method_locked?(:instance_test_method)).to be true until started
-  end
-
-  it "should implement the concurrency check for specified class methods" do
-    ConcurrencyTest.send(:concurrency_safe, :class_test_method)
-    threads = 2.times.map { Thread.new { ConcurrencyTest.send(:class_test_method) } }
-    expect { threads.each(&:join) }
-      .to raise_error(Concurrency::ConcurrentCallException)
-  end
-
-  it "should implement the concurrency check for specified instance methods" do
-    ConcurrencyTest.send(:concurrency_safe, :instance_test_method)
-    instance = ConcurrencyTest.new
-    threads = 2.times.map { Thread.new { instance.send(:instance_test_method) } }
-    expect { threads.each(&:join) }
-      .to raise_error(Concurrency::ConcurrentCallException)
-  end
-end