active_permalink 0.4.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffd6fe6ef2f0721cae7068fd6e5134917f6c7490f1b203e516eff02f467f3f5e
-  data.tar.gz: 7880019fab93553b42cab37f01f0ed60d5a665082c6e511bf368e92d8a933183
+  metadata.gz: df15e663dd9dd5bb8b4b873ccdd92a6d0b116547d143336ed9520bd4ac25ea81
+  data.tar.gz: 3bd4f5b7cdaef63d23ffd393647a4207d5d57c2ded5c98838e92ad91c1b62dcd
 SHA512:
-  metadata.gz: 5186051a831200b0651a816e089ac42737241eaeb981ebb6bb39d99822562bc36dbead824e172a9604cf1040eab0e4aec8368f637dbf670246dfbfa63b595ae1
-  data.tar.gz: 2c6e6ea08a68a7a1adc934e0731ad241d5912fc24533e58bd11c75662215730374b308fabc90a6752c852a8fa5c23440442b6968ca981091165bdd7f040264dd
+  metadata.gz: d14ea28b8b4d5ef42ad0272f3a265c51dba1aa07f42349dcea0ed7c8c35e36c8b416f069e81573ce7e284509d31c7c8f6053d9bdcd925b1475208129f968a0d2
+  data.tar.gz: 1086cd95f88ba1a9d516026fa5376f549209a06b93334efe4a68ae7fc95dd35b53c19e1da2ddaa2f30bda46787c5f92e2633405eb44ae8391d7e6303f1df97c2

data/lib/active_permalink/config.rb

@@ -9,16 +9,18 @@ module ActivePermalink
     config_accessor(:localized) { false }
     config_accessor(:locale_column) { :locale }
     config_accessor(:locale_accessors) { true }
+    config_accessor(:fallthrough_accessors) { false }
     config_accessor(:fallbacks) { false }
 
     def options_for(**options)
       options.reverse_merge(
-        class_name:       class_name,
-        querying:         querying,
-        localized:        localized,
-        locale_column:    locale_column,
-        locale_accessors: locale_accessors,
-        fallbacks:        fallbacks
+        class_name:            class_name,
+        querying:              querying,
+        localized:             localized,
+        locale_column:         locale_column,
+        locale_accessors:      locale_accessors,
+        fallthrough_accessors: fallthrough_accessors,
+        fallbacks:             fallbacks
       )
     end
   end

data/lib/active_permalink/generator.rb

@@ -1,10 +1,12 @@
+require 'any_ascii'
+
 module ActivePermalink
   class Generator
     class << self
-      def generate(record, value, locale = nil)
+      def generate(record, value, locale = nil, raw: false)
         return if value.nil? && !record.slug_should_generate?
 
-        options   = record.permalink_options.merge(locale: locale)
+        options   = record.permalink_options.merge(locale: locale, raw: raw)
         generator = Generator.new(record, options)
         generator.generate(value)
 
@@ -89,7 +91,12 @@ module ActivePermalink
     def slug_from_column
       @slug_from_column ||= begin
         value = @new_value.presence || @record.send(@field)
-        value.to_s.to_url
+        return if value.blank?
+
+        return value if @options[:raw] == true
+
+        value = AnyAscii.transliterate(value)
+        value.parameterize
       end
     end
 

data/lib/active_permalink/localizer.rb

@@ -9,25 +9,34 @@ module ActivePermalink
 
       alias permalink_reader slug_backend
 
-      def slug?
-        slug_backend.exists?(I18n.locale)
+      def slug?(locale: nil)
+        slug_backend.exists?(locale || I18n.locale)
       end
 
-      def slug
-        slug_backend.read(I18n.locale)
+      def slug(locale: nil)
+        slug_backend.read(locale || I18n.locale)
+      end
+
+      def slug=(value, locale: nil)
+        slug_backend.write(value, locale || I18n.locale)
       end
 
       if permalink_options[:locale_accessors]
         include SlugLocaleAccessors
+      elsif permalink_options[:fallthrough_accessors]
+        include SlugFallthroughAccessors
       end
 
       private
 
-      def _generate_permalink_slug(value)
-        slug_backend.write(value, I18n.locale)
+      def _generate_permalink_slug(value, **options)
+        slug_backend.write(value, I18n.locale, **options)
       end
     end
 
+    class InvalidLocale < I18n::InvalidLocale
+    end
+
     class PermalinkBackend
       attr_reader :record, :permalinks, :options
 
@@ -42,19 +51,29 @@ module ActivePermalink
       end
 
       def exists?(locale)
+        enforce_available_locales!(locale)
         find_permalink(locale).present?
       end
 
       def read(locale)
+        enforce_available_locales!(locale)
         find_slug(locale)
       end
 
-      def write(value, locale)
-        update_slug(value, locale)
+      def write(value, locale, **options)
+        enforce_available_locales!(locale)
+        update_slug(value, locale, **options)
       end
 
       private
 
+      def enforce_available_locales!(locale)
+        return unless I18n.enforce_available_locales
+        return if I18n.available_locales.include?(locale.to_sym)
+
+        raise InvalidLocale.new(locale)
+      end
+
       def locale_column
         @options[:locale_column]
       end
@@ -78,8 +97,8 @@ module ActivePermalink
         permalink.try(:slug)
       end
 
-      def update_slug(value, locale)
-        Generator.generate(record, value, locale)
+      def update_slug(value, locale, **options)
+        Generator.generate(record, value, locale, **options)
         @permalinks = record.permalinks.to_a
       end
     end
@@ -103,5 +122,27 @@ module ActivePermalink
         end
       end
     end
+
+    module SlugFallthroughAccessors
+      extend ActiveSupport::Concern
+
+      included do
+        method_name_regex = /\Aslug_([a-z]{2}(_[a-z]{2})?)(=?|\??)\z/.freeze
+
+        define_method :method_missing do |method_name, *arguments, **options, &block|
+          if method_name =~ method_name_regex
+            locale, suffix = $1.split('_')
+            locale = "#{locale}-#{suffix.upcase}" if suffix
+            public_send("slug#{$3}", *arguments, **options, locale: locale.to_sym)
+          else
+            super(method_name, *arguments, &block)
+          end
+        end
+
+        define_method :respond_to_missing? do |method_name, include_private = false|
+          (method_name =~ method_name_regex) || super(method_name, include_private)
+        end
+      end
+    end
   end
 end

data/lib/active_permalink/persistence.rb

@@ -10,7 +10,11 @@ module ActivePermalink
 
       before_validation :slug_should_generate!,
         on: [:create, :update],
-        unless: :slug?
+        if: :slug_needs_generate?
+
+      def raw_slug=(value)
+        _generate_permalink_slug(value, raw: true)
+      end
 
       def slug=(value)
         _generate_permalink_slug(value)
@@ -26,6 +30,10 @@ module ActivePermalink
 
       private
 
+      def slug_needs_generate?
+        !slug? && send(:"#{permalink_options[:field]}_changed?")
+      end
+
       def slug_should_generate!
         @slug_should_generate = true
         _generate_permalink_slug(self[:slug])
@@ -33,8 +41,8 @@ module ActivePermalink
         @slug_should_generate = false
       end
 
-      def _generate_permalink_slug(value)
-        Generator.generate(self, value)
+      def _generate_permalink_slug(value, **options)
+        Generator.generate(self, value, **options)
       end
     end
   end

data/lib/active_permalink/version.rb

@@ -1,3 +1,3 @@
 module ActivePermalink
-  VERSION = '0.4.0'
+  VERSION = '0.5.3'
 end

data/lib/active_permalink.rb

@@ -1,4 +1,3 @@
-require 'stringex'
 require 'active_record'
 require 'active_delegate'
 require 'active_permalink/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_permalink
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - Jonian Guveli
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -45,19 +45,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: stringex
+  name: any_ascii
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ homepage: https://github.com/hardpixel/active-permalink
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -142,8 +142,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Add permalinks to ActiveRecord models
 test_files: []