friendly_id-globalize 1.0.0.alpha3 → 1.0.0.alpha4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 26844163b66ff103307b8f064989dd81cd75dde5
-  data.tar.gz: 8fa22695b5243a5a024477d47f82864305c00691
+SHA256:
+  metadata.gz: 3c63abb7940af7e1cfb45dc6bcc7203699a4993ee7fb7d2bda9a8f788c2710a2
+  data.tar.gz: c87d245f950ef8da97062015d6bd05be41e4c2466953d0dcf689077d1a160839
 SHA512:
-  metadata.gz: d33a80f8d66e16a97169a66230f7042ef4767adb3b7ee7425205aa1fe969026c0774f2f093d4f5207927ce6de4d440916a9c1554d34a7fabce070d507a3131fb
-  data.tar.gz: 24eff53635369319398cb77547f6edd11a7b7a70531504b9e7d95d99c7c9d81af84dba24a66b0e6fb0f3b8a1210af79122ec9238fbedc451a693f1dc320a8479
+  metadata.gz: 70275b9abdc134b05ec8e0836b0a22894f02faa18304f8962231bcb55052312dde373d115b2ee16aeed1e33220bb063776535c3911d6ec3a56cae30f13079f52
+  data.tar.gz: 94721821b35d7ad98055e76498ac403d964af9ad03a26daf982bf2e1bc4081e650749f4b5d6ca481260a198d04fc1970c37b98a09775c35406145c7c800e7523

data/friendly_id-globalize.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'friendly_id', '>= 5.2.0', '< 6.0'
+  s.add_dependency 'friendly_id', '>= 5.1.0', '< 6.0'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'yard'
   s.add_development_dependency "globalize"

data/lib/friendly_id/globalize/version.rb

@@ -1,5 +1,5 @@
 module FriendlyId
   module Globalize
-    VERSION = '1.0.0.alpha3'
+    VERSION = '1.0.0.alpha4'
   end
 end

data/lib/friendly_id/globalize.rb

@@ -7,7 +7,7 @@ module FriendlyId
 == Translating Slugs Using Globalize
 
 The {FriendlyId::Globalize Globalize} module lets you use
-Globalize[https://github.com/svenfuchs/globalize3] to translate slugs. This
+Globalize[https://github.com/globalize/globalize] to translate slugs. This
 module is most suitable for applications that need to be localized to many
 languages. If your application only needs to be localized to one or two
 languages, you may wish to consider the {FriendlyId::SimpleI18n SimpleI18n}
@@ -85,7 +85,7 @@ current locale:
 
     def set_friendly_id(text, locale = nil)
       ::Globalize.with_locale(locale || ::Globalize.locale) do
-        set_slug normalize_friendly_id(text)
+        super_set_slug normalize_friendly_id(text)
       end
     end
 
@@ -94,12 +94,8 @@ current locale:
     end
 
     def set_slug(normalized_slug = nil)
-      if self.translations.size > 1
-        self.translations.map(&:locale).each do |locale|
-          ::Globalize.with_locale(locale) { super_set_slug(normalized_slug) }
-        end
-      else
-        ::Globalize.with_locale(::Globalize.locale) { super_set_slug(normalized_slug) }
+      (self.translations.map(&:locale).presence || [::Globalize.locale]).each do |locale|
+        ::Globalize.with_locale(locale) { super_set_slug(normalized_slug) }
       end
     end
 
@@ -107,9 +103,8 @@ current locale:
       if should_generate_new_friendly_id?
         candidates = FriendlyId::Candidates.new(self, normalized_slug || send(friendly_id_config.base))
         slug = slug_generator.generate(candidates) || resolve_friendly_id_conflict(candidates)
-        translation.slug = slug
+        translation.send("#{friendly_id_config.slug_column}=", slug)
       end
     end
   end
 end
-

data/lib/friendly_id/history.rb

@@ -70,11 +70,11 @@ method.
     # Configures the model instance to use the History add-on.
     def self.included(model_class)
       model_class.class_eval do
-        has_many :slugs, -> {order("#{Slug.quoted_table_name}.id DESC")}, {
-          :as         => :sluggable,
-          :dependent  => :destroy,
-          :class_name => Slug.to_s
-        }
+        has_many :slugs, -> {order(Slug.arel_table[:id].desc)}, 
+          as:         :sluggable,
+          dependent:  :destroy,
+          class_name: Slug.to_s
+        
         after_save :create_slug
       end
     end

data/test/globalize_test.rb

@@ -22,14 +22,14 @@ ActiveRecord::Migration.verbose = false
 FriendlyIdGlobalizeTest.up
 
 class Article < ActiveRecord::Base
-  translates :slug, :title, fallbacks_for_empty_translations: true
+  translates :my_slug, :title, fallbacks_for_empty_translations: true
   accepts_nested_attributes_for :translations
 
   extend FriendlyId
-  friendly_id :title, :use => [:slugged, :globalize]
+  friendly_id :title, :use => :globalize, :slug_column => 'my_slug'
 end
 
-Article.create_translation_table! :slug => :string, :title => :string
+Article.create_translation_table! :my_slug => :string, :title => :string
 
 class Module
   def test(name, &block)
@@ -77,21 +77,25 @@ class GlobalizeTest < MiniTest::Unit::TestCase
     transaction do
       article = Article.create!(:title => "War and Peace")
       article.set_friendly_id("Guerra y paz", :es)
+      article.set_friendly_id("Guerra e pace", :it)
       article.save!
       found_article = Article.friendly.find('war-and-peace')
       I18n.with_locale(:es) { assert_equal "guerra-y-paz", found_article.friendly_id }
       I18n.with_locale(:en) { assert_equal "war-and-peace", found_article.friendly_id }
+      I18n.with_locale(:it) { assert_equal "guerra-e-pace", found_article.friendly_id }
     end
   end
 
   test "should set all friendly ids for each nested translation" do
     transaction do
       article = Article.create!(translations_attributes: {
-        xx: { :title => "Guerra e pace", locale: 'it' },
-        yy: { title: 'Guerre et paix', locale: 'fr' }
+        xx: { title: 'Guerra e pace', locale: 'it' },
+        yy: { title: 'Guerre et paix', locale: 'fr' },
+        zz: { title: 'Guerra y paz', locale: 'es' }
       })
       I18n.with_locale(:it) { assert_equal "guerra-e-pace", article.friendly_id }
       I18n.with_locale(:fr) { assert_equal "guerre-et-paix", article.friendly_id }
+      I18n.with_locale(:es) { assert_equal "guerra-y-paz", article.friendly_id }
     end
   end
 
@@ -110,4 +114,3 @@ class GlobalizeTest < MiniTest::Unit::TestCase
     end
   end
 end
-

metadata

@@ -1,76 +1,75 @@
 --- !ruby/object:Gem::Specification
 name: friendly_id-globalize
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3
+  version: 1.0.0.alpha4
 platform: ruby
 authors:
 - Norman Clarke
 - Philip Arndt
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2025-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
-    - - <
+        version: 5.1.0
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.0
-    - - <
+        version: 5.1.0
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   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: yard
   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: globalize
   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'
 description: Adds Globalize support to the FriendlyId gem.
@@ -81,8 +80,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .yardopts
+- ".gitignore"
+- ".yardopts"
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -98,24 +97,21 @@ homepage: http://github.com/norman/friendly_id-globalize
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Globalize support for FriendlyId.
 test_files: []