active_permalink 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffd6fe6ef2f0721cae7068fd6e5134917f6c7490f1b203e516eff02f467f3f5e
-  data.tar.gz: 7880019fab93553b42cab37f01f0ed60d5a665082c6e511bf368e92d8a933183
+  metadata.gz: 5b035a60dc56c8501fd344655442f7b6e09c8c03657e99058c6690e2849a4b97
+  data.tar.gz: 25d2e648c1f8147d7b05cd20ebabc4567c9dd1a303977dbeae51efa584377055
 SHA512:
-  metadata.gz: 5186051a831200b0651a816e089ac42737241eaeb981ebb6bb39d99822562bc36dbead824e172a9604cf1040eab0e4aec8368f637dbf670246dfbfa63b595ae1
-  data.tar.gz: 2c6e6ea08a68a7a1adc934e0731ad241d5912fc24533e58bd11c75662215730374b308fabc90a6752c852a8fa5c23440442b6968ca981091165bdd7f040264dd
+  metadata.gz: 697f482ff529dfc72707ac3701d1cd2a33ec516477c7454e6b1599bd629fa81a6a9de37cbbb9ba706b49cb158fe2bdd1c31cfaa4882aa94e012e3bcbef1c05d5
+  data.tar.gz: 509f6ea30cb4cdda4fbd7f565024f17c79099b50ebad9ef49b4a2dabd07408c5bffaf40ef0bf39fe15ea0d81a758763907c3bfa4c143aacba8801bbac2af55b1

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/localizer.rb

@@ -9,16 +9,22 @@ 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
@@ -28,6 +34,9 @@ module ActivePermalink
       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)
+        enforce_available_locales!(locale)
         update_slug(value, locale)
       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
@@ -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,7 @@ module ActivePermalink
 
       before_validation :slug_should_generate!,
         on: [:create, :update],
-        unless: :slug?
+        if: :slug_needs_generate?
 
       def slug=(value)
         _generate_permalink_slug(value)
@@ -26,6 +26,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])

data/lib/active_permalink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_permalink
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jonian Guveli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord