gretel 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c9acb3e1bababfdec129ddf28041956e1d9cedab4168612403bc45e6f6be2ce
-  data.tar.gz: 5d8a64b3af412616443a6f2fae688b3cff882cd4e39aebeb071c551a573fc2ca
+  metadata.gz: d28cb34acf4eef47659c295f4dfd63b442fa7181552de3716015eb4f2d070c8f
+  data.tar.gz: e8cb450b18ea1f00dffc6e580655931109ddd1389cafce109b1ab597e832761a
 SHA512:
-  metadata.gz: dfd59117fcad2e1459647cbf42bb52fb063fc49b49070ae5a8f7372b58f4f95317036597ca474f7c00fb17dcbd1809f9d503066495cd8d52d510342db6ad95a0
-  data.tar.gz: 4466f946506b36678860eb17b922243fbcd4bc848f6c8fcd93ebb588dae02df4f9a78c934aa884d9a1dedf586fbc721128591696f887bafa9c88372859eb2877
+  metadata.gz: a7b13ae376b35bfc5508472752bfac4cd98022a19d7e00e0c8535ba1aa7c44e07a5f5068d98c2ca364ad6d1f25adc8671090ef9ac7f2879328273c94a8ac4e1b
+  data.tar.gz: 0e1451f51c1c2742c339a0b08489b2b503c3c751402eb432d0498b1b9ad2b44a1be2abf568c5f7387fed67aca07d959eb5bf9a41eb90d25f7b50beea3b6e09b4

data/.travis.yml

@@ -5,10 +5,13 @@ rvm:
   - 2.6
   - 2.5
 env:
-  - RAILS="~> '5.1.0'"
-  - RAILS="~> '5.2.0'"
-  - RAILS="~> '6.0.0'"
+  - RAILS_VERSION="~> 5.1.0"
+  - RAILS_VERSION="~> 5.2.0"
+  - RAILS_VERSION="~> 6.0.0"
+  - RAILS_VERSION="master"
 before_script:
   - "cd spec/dummy; rake db:migrate; rake db:test:prepare; cd ../.."
+after_script:
+  - "cat coverage/coverage.txt"
 notifications:
   email: false

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## Version 4.1.0
+* Depends only `railties` and `actionview`, not `rails` (via #7)
+* Include `Gretel::ViewHelpers` module in `ActiveSupport.on_load(:action_view)` block
+* Fix ruby 2.7 keywords warning (via #24, thanks @aki77)
+* Fix multithreaded environment issue (via #13)
+  * `breadcrumbs.rb` is now evaluated in a instance of `Gretel::Crumbs::Builder`. If you want to call methods from `breadcrumbs.rb` other than `crumb`, `crumbs` and `crumb_defined?`, you need to call it via full reference like `Gretel::Crumbs.xxxx`
+
 ## Version 4.0.2
 * The return value of `breadcrumbs` is `html_safe` now (via #22)
   * For the slim template engine users: You don't need to use `==` instead of `=` for `breadcrumbs`

data/Gemfile

@@ -3,4 +3,4 @@ source "http://rubygems.org"
 gemspec
 
 rails_version = ENV['RAILS_VERSION'] || '>= 0'
-gem 'rails', rails_version
+gem 'rails', rails_version == 'master' ? { github: 'rails/rails' } : rails_version

data/gretel.gemspec

@@ -15,7 +15,8 @@ Gem::Specification.new do |gem|
   end
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", ">= 5.1"
+  gem.add_dependency "railties", [">= 5.1", "< 7.0"]
+  gem.add_dependency "actionview", [">= 5.1", "< 7.0"]
   gem.add_development_dependency "sqlite3"
   gem.add_development_dependency "rspec-rails"
   gem.add_development_dependency "simplecov"

data/lib/gretel.rb

@@ -1,10 +1,6 @@
 require 'gretel/version'
 require 'gretel/resettable'
-require 'gretel/crumbs'
-require 'gretel/crumb'
-require 'gretel/link'
-require 'gretel/renderer'
-require 'gretel/view_helpers'
+require 'gretel/railtie'
 
 module Gretel
   class << self
@@ -57,5 +53,3 @@ module Gretel
     end
   end
 end
-
-ActionView::Base.send :include, Gretel::ViewHelpers

data/lib/gretel/crumb.rb

@@ -1,3 +1,5 @@
+require 'gretel/link'
+
 module Gretel
   class Crumb
     # Initializes a new crumb from the given +key+.
@@ -13,7 +15,7 @@ module Gretel
       raise ArgumentError, "Breadcrumb :#{key} not found." unless block
       @key = key
       @context = context
-      instance_exec *args, &block
+      instance_exec(*args, &block)
     end
 
     # Sets link of the breadcrumb.
@@ -29,7 +31,7 @@ module Gretel
 
       # Transform objects to real paths.
       url = url_for(url) if url
-      
+
       links << Gretel::Link.new(key, text, url, options)
     end
 
@@ -64,5 +66,6 @@ module Gretel
     def method_missing(method, *args, &block)
       context.send(method, *args, &block)
     end
+    ruby2_keywords(:method_missing) if respond_to?(:ruby2_keywords, true)
   end
 end

data/lib/gretel/crumbs.rb

@@ -3,11 +3,6 @@ module Gretel
     class << self
       include Resettable
 
-      # Stores the supplied block for later use.
-      def crumb(key, &block)
-        crumbs[key] = block
-      end
-
       # Returns a hash of all stored crumb blocks.
       def crumbs
         @crumbs ||= {}
@@ -20,14 +15,15 @@ module Gretel
 
       # Loads the breadcrumb configuration files.
       def load_breadcrumbs
-        @crumbs = {}
+        builder = Builder.new
 
         loaded_file_mtimes.clear
         breadcrumb_files.each do |file|
-          instance_eval open(file).read, file
+          builder.instance_eval open(file).read, file
           loaded_file_mtimes << File.mtime(file)
         end
 
+        @crumbs = builder.crumbs
         @loaded = true
       end
 
@@ -59,6 +55,29 @@ module Gretel
       def loaded_file_mtimes
         @loaded_file_mtimes ||= []
       end
+
+      class Builder
+        attr_reader :crumbs
+
+        def initialize
+          @crumbs = {}
+        end
+
+        # Stores the supplied block for later use.
+        def crumb(key, &block)
+          crumbs[key] = block
+        end
+
+        # Returns a hash of all stored crumb blocks.
+        def crumbs
+          @crumbs ||= {}
+        end
+
+        # Returns true if a crumb with the given key has been set.
+        def crumb_defined?(key)
+          crumbs.has_key?(key)
+        end
+      end
     end
   end
 end

data/lib/gretel/railtie.rb

@@ -0,0 +1,11 @@
+require 'gretel/view_helpers'
+
+module Gretel
+  class Railtie < ::Rails::Railtie
+    initializer 'gretel.view_helpers' do
+      ActiveSupport.on_load(:action_view) do
+        include ViewHelpers
+      end
+    end
+  end
+end

data/lib/gretel/renderer.rb

@@ -1,3 +1,6 @@
+require 'gretel/crumbs'
+require 'gretel/crumb'
+
 module Gretel
   class Renderer
     DEFAULT_OPTIONS = {

data/lib/gretel/version.rb

@@ -1,3 +1,3 @@
 module Gretel
-  VERSION = "4.0.2"
+  VERSION = "4.1.0"
 end

data/lib/gretel/view_helpers.rb

@@ -1,3 +1,5 @@
+require 'gretel/renderer'
+
 module Gretel
   module ViewHelpers
     # Sets the current breadcrumb to be rendered elsewhere. Put it somewhere in the view, preferably in the top, before you render any breadcrumbs HTML:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gretel
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Lasse Bunk
@@ -9,15 +9,18 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,29 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +131,7 @@ files:
 - lib/gretel/crumb.rb
 - lib/gretel/crumbs.rb
 - lib/gretel/link.rb
+- lib/gretel/railtie.rb
 - lib/gretel/renderer.rb
 - lib/gretel/resettable.rb
 - lib/gretel/version.rb