simple_slug 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee4149b3d1f301a58ec9bc4ff2000727be10650
-  data.tar.gz: 8e9554c782d1b5b33187e3848873f0d12b81ca5d
+  metadata.gz: 4e372bf7c9afde482560d5e69ed52ce343e0c08e
+  data.tar.gz: 3f51178cc10919580d3e167839c93d1ceaa5fedd
 SHA512:
-  metadata.gz: 9392260bc6505c78f5044916e93d79dcfb3d0dc1bb64570da75c859fb5932d6034d87438af8c3ade9e911ccb728879a8c7712b4fab28488d19b356d99e7b7948
-  data.tar.gz: de23e545145e537dce36ca62973648724ef9dd5e748b0998de3cda46a5c10670004dc6f5e6f8a299ca77de997ec045486eef177c3eeb960b10748d1bf3f3bc67
+  metadata.gz: e6b3a471ce38ccb23d33ca1be285012b7980d1d5c15f6a982b869c8d348ee879d405728c1fe0eeea80e112b4471a2765e6ceec7b38da3b01c1ea7e1dcd64be6f
+  data.tar.gz: 5872ee8fe9b193d425ec3090c403a19fe7fec864f1fdf94f0a6039a65782248bef837600d49ba3b2679299ba6008353ea83bd8d6d749678f2b867d0bde8431ec

data/lib/simple_slug/model_addition.rb

@@ -81,12 +81,25 @@ module SimpleSlug
 
       def should_generate_new_slug?
         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? }
+        if simple_slug_options[:locales]
+          should_generate_new_slug_for_locales.present?
+        else
+          simple_slug_get.blank?
+        end
+      end
+
+      def should_generate_new_slug_for_locales
+        return unless simple_slug_options[:locales]
+        simple_slug_options[:locales].find_all {|locale| simple_slug_get(locale).blank?}
       end
 
       def simple_slug_generate(force=false)
-        (simple_slug_options[:locales] || [nil]).each do |locale|
+        locales = if simple_slug_options[:locales]
+                    ((!force && should_generate_new_slug_for_locales) || simple_slug_options[:locales])
+                  else
+                    [nil]
+                  end
+        locales.each do |locale|
           simple_slug_generate_for_locale(locale, force)
         end
       end
@@ -95,6 +108,7 @@ module SimpleSlug
         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]
+          simple_slug = "__#{id || rand(9999)}" if simple_slug.blank? && simple_slug_options[:fallback_on_blank]
           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)
@@ -116,9 +130,8 @@ module SimpleSlug
       end
 
       def simple_slug_normalize(base)
-        base = SimpleSlug.normalize_cyrillic(base) unless SimpleSlug::CYRILLIC_LOCALES.include?(I18n.locale)
         parameterize_args = ActiveSupport::VERSION::MAJOR > 4 ? {separator: '-'} : '-'
-        normalized = I18n.transliterate(base).parameterize(parameterize_args).downcase
+        normalized = I18n.transliterate(SimpleSlug.normalize_i18n_fix(base)).parameterize(parameterize_args).downcase
         normalized.to_s =~ SimpleSlug::STARTS_WITH_NUMBER_REGEXP ? "_#{normalized}" : normalized
       end
 

data/lib/simple_slug/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlug
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/lib/simple_slug.rb

@@ -10,7 +10,7 @@ module SimpleSlug
   @@excludes = %w(new edit show index session login logout sign_in sign_out users admin stylesheets assets javascripts images)
 
   mattr_accessor :slug_regexp
-  @@slug_regexp = /\A\w+[\w\d\-_]*\z/
+  @@slug_regexp = /\A(?:\w+[\w\d\-_]*|--\d+)\z/
 
   mattr_accessor :slug_column
   @@slug_column = 'slug'
@@ -26,12 +26,37 @@ module SimpleSlug
 
   STARTS_WITH_NUMBER_REGEXP =/\A\d+/
   CYRILLIC_LOCALES = [:uk, :ru, :be].freeze
+  ES_LOCALES = [:es].freeze
+
+  ES_NORMALIZE_SINGLE = [
+      'ÀÁÂÃÄÅÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåçèéêëìíîïñòóôõöøùúûüýÿĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıĴĵĶķĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŌōŎŏŐőŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƒƠơƯưǍǎǏǐǑǒǓǔǕǖǗǘǙǚǛǜǺǻǾǿ',
+      'AAAAAACEEEEIIIIDNOOOOOOUUUUYsaaaaaaceeeeiiiinoooooouuuuyyAaAaAaCcCcCcCcDdDdEeEeEeEeEeGgGgGgGgHhHhIiIiIiIiIiJjKkLlLlLlLlllNnNnNnnOoOoOoRrRrRrSsSsSsSsTtTtTtUuUuUuUuUuUuWwYyYZzZzZzsfOoUuAaIiOoUuUuUuUuUuAaOo'
+  ].freeze
+
+  ES_NORMALIZE_MULTI = [['Æ', 'AE'], ['æ', 'ae'], ['IJ', 'IJ'], ['ij', 'ij'], ['Œ', 'OE'], ['œ', 'oe'], ['Ǽ', 'AE'], ['ǽ', 'ae']].freeze
 
   def self.setup
     yield self
   end
 
+  def self.normalize_i18n_fix(base, locale=I18n.locale)
+    locale_sym = locale.to_sym
+    if CYRILLIC_LOCALES.include?(locale_sym)
+      normalize_cyrillic(base)
+    elsif ES_LOCALES.include?(locale_sym)
+      normalize_es(base)
+    else
+      base
+    end
+  end
+
   def self.normalize_cyrillic(base)
     base.tr('АаВЕеіКкМНОоРрСсТуХх', 'AaBEeiKkMHOoPpCcTyXx')
   end
+
+  def self.normalize_es(base)
+    base = base.tr(*ES_NORMALIZE_SINGLE)
+    ES_NORMALIZE_MULTI.each{|d| base.gsub!(*d) }
+    base
+  end
 end

data/simple_slug.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.0.0', '< 5.2'
+  spec.add_dependency 'activerecord', '>= 4.0.0', '< 5.3'
   spec.add_dependency 'i18n', '~> 0.7'
 
   spec.add_development_dependency 'bundler', '~> 1.5'

data/spec/simple_slug/model_addition_spec.rb

@@ -12,6 +12,10 @@ class SlugGenerationRspecModelWithoutCallback < RspecActiveModelBase
   simple_slug :name, callback_type: nil
 end
 
+class SlugGenerationRspecModelWithFallbackOnBlank < RspecActiveModelBase
+  simple_slug :name, fallback_on_blank: true
+end
+
 class SlugGenerationRspecModelLocalized < RspecActiveModelBase
   attr_accessor :slug_en, :name_en
   alias_method :slug_en_was, :slug_en
@@ -27,6 +31,7 @@ describe SimpleSlug::ModelAddition do
   describe 'slug generation' do
     before do
       allow_any_instance_of(SlugGenerationRspecModel). to receive(:simple_slug_exists?).and_return(false)
+      allow_any_instance_of(SlugGenerationRspecModelWithFallbackOnBlank). to receive(:simple_slug_exists?).and_return(false)
     end
 
     it 'after save' do
@@ -49,6 +54,17 @@ describe SimpleSlug::ModelAddition do
       expect(SlugGenerationRspecModel.new(slug: 'test.test')).not_to be_valid
     end
 
+    it 'es chars' do
+      I18n.with_locale(:es) do
+        expect(SlugGenerationRspecModel.create(name: 'áǼßHello').slug).to eq 'aaeshello'
+      end
+    end
+
+    it 'fallback on blank' do
+      SlugGenerationRspecModelWithFallbackOnBlank.create({})
+      expect(SlugGenerationRspecModelWithFallbackOnBlank.create({}).slug).to start_with '__'
+    end
+
     it 'skip slug generation' do
       allow_any_instance_of(SlugGenerationRspecModel).to receive(:should_generate_new_slug?).and_return(false)
       expect(SlugGenerationRspecModel.create(name: 'Hello').slug).to be_blank
@@ -156,6 +172,24 @@ describe SimpleSlug::ModelAddition do
       expect(record.slug_en).to eq 'hello-en'
     end
 
+    describe '#should_generate_new_slug?' do
+      it 'keep generated slugs' do
+        record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+        record.name = 'bye'
+        record.slug_en = nil
+        record.name_en = 'Bye en'
+        expect{ record.save }.not_to change{ record.slug }
+      end
+
+      it 'generate slug for locales with blank slug' do
+        record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+        record.name = 'bye'
+        record.slug_en = nil
+        record.name_en = 'Bye en'
+        expect{ record.save }.to change{ record.slug_en }.to('bye-en')
+      end
+    end
+
     describe '#to_param' do
       it 'generate not localized for default locale' do
         record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_slug
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Friendly url generator with history.