simple_slug 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caac6febd23cca44010d4b67fe7cb412328e8be3
-  data.tar.gz: f37d62b115a1d829bab4a1b819594015259352e4
+  metadata.gz: 1e8cbeedf05abbf945614e72846da70ca8e21379
+  data.tar.gz: 550eada3c913277bbe43a57d64a22d1215d3a483
 SHA512:
-  metadata.gz: b2c6fbd51d8eea2145dad462bab7f4891d550e50a868af06d58c8e8d6cbe3d60e9ed9ff1ac40eedf121cd4485df10a30665a8afc92de016db2b968d311c38fc3
-  data.tar.gz: 149e04495109161a9536394f6cf6de304da9edb3e8bb0c0654d8981b6f719f04d8f1d73a7da3eda4aa2c4c593a6af3594d7268857d4479972493a6833fc0126f
+  metadata.gz: eab35d261a855fcfb5a95dd626a8faa3447dff6e65fd8f7dace62dbb3e0e16a6f3ed75b14b625bfdd256412ab3bc9a4708b00461c57c9f1401ff3394d9cc0a9b
+  data.tar.gz: 973807508c775c94a059b437a7fc8afee529a2963113d3b65ff4fd561bf2feb58ba919be92646137e9b32dfea809bf91cf683ac9f6d611b6af53f956f0a01fc1

data/lib/simple_slug/model_addition.rb

@@ -56,15 +56,43 @@ module SimpleSlug
       end
 
       def should_generate_new_slug?
-        simple_slug_get.blank? || simple_slug_options[:history]
+        return true if simple_slug_options[:history]
+        return simple_slug_get.blank? unless simple_slug_options[:locales]
+        simple_slug_options[:locales].any? { |locale| simple_slug_get(locale).blank? }
       end
 
       def simple_slug_generate(force=false)
+        (simple_slug_options[:locales] || [nil]).each do |locale|
+          simple_slug_generate_for_locale(locale, force)
+        end
+      end
+
+      def simple_slug_generate_for_locale(locale=nil, force=false)
+        simple_slug_with_locale(locale) do
+          simple_slug = simple_slug_normalize(simple_slug_base)
+          simple_slug = simple_slug.first(simple_slug_options[:max_length]) if simple_slug_options[:max_length]
+          return if !force && simple_slug == simple_slug_get(locale).to_s.sub(/--\d+\z/, '')
+          resolved_simple_slug = simple_slug_resolve(simple_slug, locale)
+          simple_slug_set(resolved_simple_slug, locale)
+        end
+      end
+
+      def simple_slug_with_locale(locale)
+        if defined? Globalize
+          Globalize.with_locale(locale) do
+            I18n.with_locale(locale) { yield }
+          end
+        else
+          I18n.with_locale(locale) { yield }
+        end
+      end
+
+      def simple_slug_generate_(force=false, locale=nil)
         simple_slug = simple_slug_normalize(simple_slug_base)
         simple_slug = simple_slug.first(simple_slug_options[:max_length]) if simple_slug_options[:max_length]
-        return true if !force && simple_slug == send(simple_slug_options[:slug_column]).to_s.sub(/--\d+\z/, '')
-        resolved_simple_slug = simple_slug_resolve(simple_slug)
-        send "#{simple_slug_options[:slug_column]}=", resolved_simple_slug
+        return true if !force && simple_slug == simple_slug_get(locale).to_s.sub(/--\d+\z/, '')
+        resolved_simple_slug = simple_slug_resolve(simple_slug, locale)
+        simple_slug_set(resolved_simple_slug, locale)
       end
 
       def simple_slug_base
@@ -72,15 +100,17 @@ module SimpleSlug
       end
 
       def simple_slug_normalize(base)
-        normalized = I18n.transliterate(base).parameterize(separator: '-').downcase
+        base = SimpleSlug.normalize_cyrillic(base)
+        parameterize_args = ActiveSupport::VERSION::MAJOR > 4 ? {separator: '-'} : '-'
+        normalized = I18n.transliterate(base).parameterize(parameterize_args).downcase
         normalized.to_s =~ SimpleSlug::STARTS_WITH_NUMBER_REGEXP ? "_#{normalized}" : normalized
       end
 
-      def simple_slug_resolve(slug_value)
-        if simple_slug_exists?(slug_value)
+      def simple_slug_resolve(slug_value, locale=nil)
+        if simple_slug_exists?(slug_value, locale)
           loop do
             slug_value_with_suffix = simple_slug_next(slug_value)
-            break slug_value_with_suffix unless simple_slug_exists?(slug_value_with_suffix)
+            break slug_value_with_suffix unless simple_slug_exists?(slug_value_with_suffix, locale)
           end
         else
           slug_value
@@ -91,12 +121,12 @@ module SimpleSlug
         "#{slug_value}--#{rand(99999)}"
       end
 
-      def simple_slug_exists?(slug_value)
-        simple_slug_base_exists?(slug_value) || simple_slug_history_exists?(slug_value)
+      def simple_slug_exists?(slug_value, locale=nil)
+        simple_slug_base_exists?(slug_value, locale) || simple_slug_history_exists?(slug_value)
       end
 
-      def simple_slug_base_exists?(slug_value)
-        base_scope = self.class.unscoped.where(simple_slug_options[:slug_column] => slug_value)
+      def simple_slug_base_exists?(slug_value, locale=nil)
+        base_scope = self.class.unscoped.where(simple_slug_column(locale) => slug_value)
         base_scope = base_scope.where('id != ?', id) if persisted?
         base_scope.exists?
       end
@@ -108,16 +138,20 @@ module SimpleSlug
         base_scope.exists?
       end
 
-      def simple_slug_set(value)
-        send "#{simple_slug_options[:slug_column]}=", value
+      def simple_slug_set(value, locale=nil)
+        send "#{simple_slug_column(locale)}=", value
+      end
+
+      def simple_slug_get(locale=nil)
+        send simple_slug_column(locale)
       end
 
-      def simple_slug_get
-        send simple_slug_options[:slug_column]
+      def simple_slug_stored_slug(locale=nil)
+        send("#{simple_slug_column(locale)}_was")
       end
 
-      def simple_slug_stored_slug
-        send("#{simple_slug_options[:slug_column]}_was")
+      def simple_slug_column(locale=nil)
+        [simple_slug_options[:slug_column], locale].compact.join('_')
       end
     end
 

data/lib/simple_slug/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlug
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/simple_slug.rb

@@ -29,4 +29,8 @@ module SimpleSlug
   def self.setup
     yield self
   end
+
+  def self.normalize_cyrillic(base)
+    base.tr('АаВЕеіКкМНОорСсТуХх', 'AaBEeiKkMHOopCcTyXx')
+  end
 end

data/spec/simple_slug/model_addition_spec.rb

@@ -12,6 +12,17 @@ class SlugGenerationRspecModelWithoutCallback < RspecActiveModelBase
   simple_slug :name, callback_type: nil
 end
 
+class SlugGenerationRspecModelLocalized < RspecActiveModelBase
+  attr_accessor :slug_en, :name_en
+  alias_method :slug_en_was, :slug_en
+
+  simple_slug :name, locales: [nil, :en]
+
+  def name
+    I18n.locale == :en ? name_en : @name
+  end
+end
+
 describe SimpleSlug::ModelAddition do
   describe 'slug generation' do
     before do
@@ -39,15 +50,15 @@ describe SimpleSlug::ModelAddition do
   describe 'resolve conflicts' do
     it 'duplicate slug' do
       record = SlugGenerationRspecModel.new(name: 'Hi')
-      expect(record).to receive(:simple_slug_exists?).once.ordered.with('hi').and_return(true)
-      expect(record).to receive(:simple_slug_exists?).once.ordered.with(/hi--\d+/).and_return(false)
+      expect(record).to receive(:simple_slug_exists?).once.ordered.with('hi', nil).and_return(true)
+      expect(record).to receive(:simple_slug_exists?).once.ordered.with(/hi--\d+/, nil).and_return(false)
       record.save
       expect(record.slug).to start_with('hi--')
     end
 
     it 'numeric slug' do
       record = SlugGenerationRspecModel.new(name: '123')
-      expect(record).to receive(:simple_slug_exists?).with('_123').and_return(false)
+      expect(record).to receive(:simple_slug_exists?).with('_123', nil).and_return(false)
       record.save
       expect(record.slug).to eq '_123'
     end
@@ -94,17 +105,23 @@ describe SimpleSlug::ModelAddition do
     end
 
     it 'cuts slug to max length' do
-      expect(SlugGenerationRspecModel.new(name: 'Hello' * 100).simple_slug_generate.length).to eq 240
+      record = SlugGenerationRspecModel.new(name: 'Hello' * 100)
+      record.simple_slug_generate
+      expect(record.slug.length).to eq 240
     end
 
     it 'use max length from per model options' do
       SlugGenerationRspecModel.simple_slug_options[:max_length] = 100
-      expect(SlugGenerationRspecModel.new(name: 'Hello' * 100).simple_slug_generate.length).to eq 100
+      record = SlugGenerationRspecModel.new(name: 'Hello' * 100)
+      record.simple_slug_generate
+      expect(record.slug.length).to eq 100
     end
 
     it 'omit max length' do
       SimpleSlug.max_length = nil
-      expect(SlugGenerationRspecModel.new(name: 'Hello' * 100).simple_slug_generate.length).to eq 500
+      record = SlugGenerationRspecModel.new(name: 'Hello' * 100)
+      record.simple_slug_generate
+      expect(record.slug.length).to eq 500
     end
   end
 
@@ -119,4 +136,16 @@ describe SimpleSlug::ModelAddition do
       expect(SlugGenerationRspecModelWithoutCallback.new).not_to receive(:should_generate_new_slug?)
     end
   end
+
+  describe 'localized' do
+    before do
+      allow_any_instance_of(SlugGenerationRspecModelLocalized).to receive(:simple_slug_exists?).and_return(false)
+    end
+
+    it 'generate slug for locales' do
+      record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+      expect(record.slug).to eq 'hello'
+      expect(record.slug_en).to eq 'hello-en'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'simple_slug'
 
 # just silence warning
 I18n.enforce_available_locales = false
+I18n.default_locale = :uk
 
 class RspecActiveModelBase
   include ActiveModel::Model

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_slug
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord