friendly_id-method_scopes 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1bc00c7fa69696ef0b1b83c2887da9bc0aa9d91
-  data.tar.gz: 743c8ba2ebadc223d16f0dc6eac3f9e284098eab
+  metadata.gz: c28d99d80c34cd8ac0920f63e8754c362154894c
+  data.tar.gz: 0540bf0a98b5c0204f026a2bc87e84ec2e1bb6f7
 SHA512:
-  metadata.gz: 0f5d3764eb13355078d28b0866753cda1ec89abd9483ac4720671190858afa780e16936e3e2e8a4b8993aad8e49c11b93085889f64ac3badcf31251ce462e987
-  data.tar.gz: cc9d992a9402fe8b28e7dda9eea9b1b093a7615aa651f61d9fb22ea2cedc1a268f415c522d4f2ef92d2d9258d2f005af5c20674cd7120544e7b8c960e3eb69e2
+  metadata.gz: 92968430e1f1b8642158aff4b2d8f5d30e122667529eacdca40a1d807ebf98bb9e896045116dd5ec3dd7f977596fd315adfc63c0d65703b0c17b300502d1e464
+  data.tar.gz: 1a4c9dc8a1fff10132bf82584856a66d8350ee8088421539584529025b14098ff8171588f7ed9e934528cd910b16ae22b6b6f0631ffa48f2c13502a367dcfb69

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'rails', '>= 4', '< 6'
-gem 'friendly_id', '>= 5'
+gem 'friendly_id', '>= 5', '< 6'
 
 group :development, :test do
   gem 'juwelier', '~> 2'
@@ -12,7 +12,7 @@ group :development, :test do
   gem 'seedbank', '~> 0.3'
   gem 'factory_girl_rails', '~> 4.5'
   gem 'faker', '~> 1.4'
-  gem 'haml', '~> 4'
+  gem 'haml', '~> 5'
   gem 'database_cleaner', '~> 1.4'
   gem 'rails-controller-testing', '>= 1'
   gem 'coveralls', '~> 0.8', require: false

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/friendly_id-method_scopes.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: friendly_id-method_scopes 0.3.1 ruby lib
+# stub: friendly_id-method_scopes 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "friendly_id-method_scopes".freeze
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Karen Lundgren".freeze]
-  s.date = "2017-04-20"
+  s.date = "2017-10-06"
   s.description = "FriendlyId Extension to allow method scopes, in addition to column and relationship scopes.".freeze
   s.email = "karen.e.lundgren@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -114,7 +114,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>.freeze, ["< 6", ">= 4"])
-      s.add_runtime_dependency(%q<friendly_id>.freeze, [">= 5"])
+      s.add_runtime_dependency(%q<friendly_id>.freeze, ["< 6", ">= 5"])
       s.add_development_dependency(%q<juwelier>.freeze, ["~> 2"])
       s.add_development_dependency(%q<sqlite3>.freeze, ["~> 1"])
       s.add_development_dependency(%q<rspec-rails>.freeze, ["~> 3.3"])
@@ -123,13 +123,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<seedbank>.freeze, ["~> 0.3"])
       s.add_development_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
       s.add_development_dependency(%q<faker>.freeze, ["~> 1.4"])
-      s.add_development_dependency(%q<haml>.freeze, ["~> 4"])
+      s.add_development_dependency(%q<haml>.freeze, ["~> 5"])
       s.add_development_dependency(%q<database_cleaner>.freeze, ["~> 1.4"])
       s.add_development_dependency(%q<rails-controller-testing>.freeze, [">= 1"])
       s.add_development_dependency(%q<coveralls>.freeze, ["~> 0.8"])
     else
       s.add_dependency(%q<rails>.freeze, ["< 6", ">= 4"])
-      s.add_dependency(%q<friendly_id>.freeze, [">= 5"])
+      s.add_dependency(%q<friendly_id>.freeze, ["< 6", ">= 5"])
       s.add_dependency(%q<juwelier>.freeze, ["~> 2"])
       s.add_dependency(%q<sqlite3>.freeze, ["~> 1"])
       s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.3"])
@@ -138,14 +138,14 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<seedbank>.freeze, ["~> 0.3"])
       s.add_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
       s.add_dependency(%q<faker>.freeze, ["~> 1.4"])
-      s.add_dependency(%q<haml>.freeze, ["~> 4"])
+      s.add_dependency(%q<haml>.freeze, ["~> 5"])
       s.add_dependency(%q<database_cleaner>.freeze, ["~> 1.4"])
       s.add_dependency(%q<rails-controller-testing>.freeze, [">= 1"])
       s.add_dependency(%q<coveralls>.freeze, ["~> 0.8"])
     end
   else
     s.add_dependency(%q<rails>.freeze, ["< 6", ">= 4"])
-    s.add_dependency(%q<friendly_id>.freeze, [">= 5"])
+    s.add_dependency(%q<friendly_id>.freeze, ["< 6", ">= 5"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2"])
     s.add_dependency(%q<sqlite3>.freeze, ["~> 1"])
     s.add_dependency(%q<rspec-rails>.freeze, ["~> 3.3"])
@@ -154,7 +154,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<seedbank>.freeze, ["~> 0.3"])
     s.add_dependency(%q<factory_girl_rails>.freeze, ["~> 4.5"])
     s.add_dependency(%q<faker>.freeze, ["~> 1.4"])
-    s.add_dependency(%q<haml>.freeze, ["~> 4"])
+    s.add_dependency(%q<haml>.freeze, ["~> 5"])
     s.add_dependency(%q<database_cleaner>.freeze, ["~> 1.4"])
     s.add_dependency(%q<rails-controller-testing>.freeze, [">= 1"])
     s.add_dependency(%q<coveralls>.freeze, ["~> 0.8"])

data/lib/friendly_id/method_scopes.rb

@@ -31,7 +31,7 @@ module FriendlyId
     private :scope_for_slug_generator
 
     def slug_generator
-      friendly_id_config.slug_generator_class.new(scope_for_slug_generator)
+      friendly_id_config.slug_generator_class.new(scope_for_slug_generator, friendly_id_config)
     end
     private :slug_generator
 

data/spec/dummy/config/initializers/new_framework_defaults.rb

@@ -18,6 +18,3 @@ ActiveSupport.to_time_preserves_timezone = false
 
 # Require `belongs_to` associations by default. Previous versions had false.
 Rails.application.config.active_record.belongs_to_required_by_default = false
-
-# Do not halt callback chains when a callback returns false. Previous versions had true.
-ActiveSupport.halt_callback_chains_on_return_false = true

data/spec/rails_helper.rb

@@ -7,7 +7,7 @@ require 'spec_helper'
 require 'rspec/rails'
 require 'shoulda/matchers'
 require 'database_cleaner'
-require 'rake'
+# require 'rake'
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -32,9 +32,9 @@ ActiveRecord::Migration.maintain_test_schema!
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation)
-    Dummy::Application.load_tasks
-    Rake::Task['db:seed'].invoke # loading seeds
+    # DatabaseCleaner.clean_with(:truncation)
+    # Dummy::Application.load_tasks
+    # Rake::Task['db:seed'].invoke # loading seeds
   end
   config.around(:each) do |example|
     DatabaseCleaner.cleaning do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id-method_scopes
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,6 +34,9 @@ dependencies:
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
@@ -41,6 +44,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
@@ -162,14 +168,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement