junctions 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f34a5f6716ebcc9cb8765c86de1932eab58872ab2103ba86088f5016f7a15fb
-  data.tar.gz: b10d5fb3f8b1da99c97ab58d0f0f634009dc765f6af5c5e05cf3b4b87e716543
+  metadata.gz: 7c071544ca819acc52e00005f1e0f90e532fe6960fb76a041afe85d23889ddc7
+  data.tar.gz: acf2efa3d4d0abbe8173932ba040d584784536d610b1067b7ea9039c81300974
 SHA512:
-  metadata.gz: acbf34a8056248c1b8235da5f26f73427d9822c31f658667d540d7e9bd63f69536982ca94c97df3d661fc2293e9c952728f732255b9f0d867a2084cacc329e12
-  data.tar.gz: b08ec8e43351e3814976df87b94cd7e8dd800c4398a152e1762e65a0da02c7e1c7a108a1f6dc4712a22fc9fd1b459c6fd24ba3bc199ec716eb8e9006226589f2
+  metadata.gz: 3a5ba3ab9a0f9b9247de6a7e445efbcbd0b8b42785f0094b740a254662020aec10a2bb007640f38b7e596a6f92bf73b482ac20f50faba1f78350a7452b76b663
+  data.tar.gz: f6c70b05de1e9e8aefe0e21b2d5e52af2976336676f2870bfd0afdda206539997900dac3d966370155f559a7e5b4378b5b2da5b076eaffa4e2064a45c85b53c1

data/README.md

@@ -6,34 +6,23 @@ in a module can be enabled or disable by creating them in a particular namespace
 
 ```ruby
 module Core
-  module Extensions
-    include Junctions
-    def overridden_method
-      puts('You are in core')
-    end
-  end 
+  include Junctions
+  def overridden_method
+    puts('You are in core')
+  end
 end
 
 module Wibble
-  module Extensions
-    def overridden_method
-      puts('Wibble')
-    end
+  def overridden_method
+    puts('Wibble')
   end
 end
 
 module Wobble
-  module Extensions
-    def overridden_method
-      puts('Something else')
-    end
+  def overridden_method
+    puts('Something else')
   end
 end
-
-class Demon
-  include Core::Extensions
-end
-
 ```
 Including Junctions in Core means that if there is a 'junctions' setting as, for example, an environment variable
 ```bash
@@ -47,14 +36,14 @@ Likewise if the environment variable were:
 ```
 This would only include Wibble into the list of namespaces to override Core methods.
 
-You can also perform this override within the code entirely. Passing it in as an environment variable is the preferred
-way to handle it, but there are other options since the Junctions core and junction_list setter functions are exposed
-```ruby 
-Junctions::Engine.core = 'common'
-Junctions::Engine.junction_list = ['wibble', 'wobble']
-```
+Ruby and Rails Versions
+
+Junctions has been built for Ruby 2.5 and Rails 5. Although it was originally built for Ruby 1.8 and Rails 2, 
+because of fundamental changes to later versions of rails and engines in particular, the decision was made to
+track the latest Rails version only.
+
+
+
 
-#Ruby and Rails Versions
 
-Junctions is built for Ruby 2.4+ and Rails 5+.
 

data/junctions.gemspec

@@ -1,7 +1,7 @@
 $:.push File.expand_path('../lib', __FILE__)
 
 # Maintain your gem's version:
-require 'junctions/version'
+require 'junctions'
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
@@ -19,11 +19,10 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_dependency 'activesupport', '~> 5'
+  s.add_dependency 'activesupport', '>= 5.2.4.3'
 
-  s.add_development_dependency 'bundler', '~>1'
-  s.add_development_dependency 'rake','~>12.2'
-  s.add_development_dependency 'minitest', '~>5.11'
-  s.add_development_dependency 'simplecov', '~>0.16'
-  s.add_development_dependency 'config_files', '~>0.1.3'
+  s.add_development_dependency 'bundler', '~> 2.2', '>= 2.2.33'
+  s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
+  s.add_development_dependency 'simplecov', '~> 0.21'
+  s.add_development_dependency 'config_files', '~> 0.1.6'
 end

data/lib/junctions/engine.rb

@@ -1,4 +1,5 @@
 require 'active_support/inflector'
+
 module Junctions
   class Engine
     class << self
@@ -29,7 +30,9 @@ module Junctions
         name=base_name.gsub("#{core.classify}::", "#{junction_class}::")
         begin
           require(name.underscore)
-          base.prepend name.constantize if name.gsub(/::[^:]*$/, '').constantize.const_defined?(name.demodulize)
+          base.instance_eval {
+            include name.constantize
+          } if name.gsub(/::[^:]*$/, '').constantize.const_defined?(name.demodulize)
         rescue NameError
         rescue LoadError
         rescue Exception => e

data/lib/junctions/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Junctions
-    VERSION = '0.0.7'
+    VERSION = '0.0.8'
   end
 end

data/lib/junctions.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/module'
 require 'junctions/engine'
 require "junctions/version"
 
@@ -6,7 +7,7 @@ module Junctions
     delegate :core=, :junction_list=, :activate, to: Junctions::Engine
 
     def included(base)
-      Junctions::Engine.activate(base, base.name)
+      Junctions::Engine.activate(base, self.name)
     end
   end
 end

data/test/junctions_test.rb

@@ -13,7 +13,7 @@ class Junctions::Test < MiniTest::Spec
 
   describe ::Wibble do
     it 'has to_s overridden' do
-      assert_equal 'metal', Wibble.new.to_s
+      assert_equal Wibble.new.to_s, 'metal'
     end
 
     it 'has a metal method' do

data/test/lib/common/wibble_extensions.rb

@@ -3,7 +3,7 @@ module Common
     include Junctions
     class << self
       def included(base)
-        Junctions::activate(base, name)
+        Junctions::activate(base, self.name)
       end
     end
 

data/test/lib/wobble.rb

@@ -1,6 +1,6 @@
 require 'junctions'
-Junctions::Engine.core = 'common'
-Junctions::Engine.junction_list = ['plastic', 'metal']
+Junctions.core = 'common'
+Junctions.junction_list = ['plastic', 'metal']
 require 'common/wibble_extensions'
 
 class Wobble

metadata

@@ -1,99 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: junctions
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Paul McKibbin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2022-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 5.2.4.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.33
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.33
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '13.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '12.2'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.11'
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.11'
+        version: '13.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: config_files
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.6
 description: Description of Junctions.
 email:
 - pmckibbin@gmail.com
@@ -103,7 +101,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - junctions.gemspec
@@ -121,7 +118,7 @@ homepage: http://github.com/blackrat/junctions
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -136,8 +133,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Summary of Junctions.
 test_files:

data/Gemfile.lock

@@ -1,45 +0,0 @@
-PATH
-  remote: .
-  specs:
-    junctions (0.0.7)
-      activesupport (~> 5)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.4)
-    config_files (0.1.3)
-      activesupport
-    docile (1.3.1)
-    i18n (1.5.3)
-      concurrent-ruby (~> 1.0)
-    json (2.2.0)
-    minitest (5.11.3)
-    rake (12.3.2)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1)
-  config_files (~> 0.1.3)
-  junctions!
-  minitest (~> 5.11)
-  rake (~> 12.2)
-  simplecov (~> 0.16)
-
-BUNDLED WITH
-   1.17.3