simple_slug 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c874adc1930625e01a5acd27c1fe86702b83f165
-  data.tar.gz: 42c385427b5cd8f19414cc8f04425e0303d53cf6
+  metadata.gz: 4ee4149b3d1f301a58ec9bc4ff2000727be10650
+  data.tar.gz: 8e9554c782d1b5b33187e3848873f0d12b81ca5d
 SHA512:
-  metadata.gz: d4509499086e9cd6a8f56d41861c1a83328be626ba89edea4e2a0599f729a81b6345d43064515f16f7d4aee395fceb519878b356470bf44f46051f15c60bd91a
-  data.tar.gz: e43c614e9f37982a6a7b6a8eec8897161ca097093dade94674e7661cc5655b748b0333301137ecd89fb2860dcdc61a8393b7fa5e9729bf6f54c02bb7f1ae1c34
+  metadata.gz: 9392260bc6505c78f5044916e93d79dcfb3d0dc1bb64570da75c859fb5932d6034d87438af8c3ade9e911ccb728879a8c7712b4fab28488d19b356d99e7b7948
+  data.tar.gz: de23e545145e537dce36ca62973648724ef9dd5e748b0998de3cda46a5c10670004dc6f5e6f8a299ca77de997ec045486eef177c3eeb960b10748d1bf3f3bc67

data/.gitignore

@@ -20,3 +20,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.byebug_history

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in simple_slug.gemspec
 gemspec
+
+gem 'byebug'

data/lib/simple_slug.rb

@@ -9,8 +9,8 @@ module SimpleSlug
   mattr_accessor :excludes
   @@excludes = %w(new edit show index session login logout sign_in sign_out users admin stylesheets assets javascripts images)
 
-  mattr_accessor :exclude_regexp
-  @@exclude_regexp = /\A\d+\z/
+  mattr_accessor :slug_regexp
+  @@slug_regexp = /\A\w+[\w\d\-_]*\z/
 
   mattr_accessor :slug_column
   @@slug_column = 'slug'

data/lib/simple_slug/model_addition.rb

@@ -11,6 +11,7 @@ module SimpleSlug
         self.simple_slug_options = options.reverse_merge(
             slug_column: SimpleSlug.slug_column,
             slug_method: args,
+            slug_regexp: SimpleSlug.slug_regexp,
             max_length: SimpleSlug.max_length,
             callback_type: SimpleSlug.callback_type,
             add_validation: SimpleSlug.add_validation
@@ -22,10 +23,12 @@ module SimpleSlug
         send(simple_slug_options[:callback_type], :simple_slug_generate, if: :should_generate_new_slug?) if simple_slug_options[:callback_type]
 
         if simple_slug_options[:add_validation]
-          validates simple_slug_options[:slug_column],
-                    presence: true,
-                    exclusion: {in: SimpleSlug.excludes},
-                    format: {without: SimpleSlug.exclude_regexp}
+          simple_slug_locales.each do |locale|
+            validates simple_slug_column(locale),
+                      presence: true,
+                      exclusion: {in: SimpleSlug.excludes},
+                      format: {with: simple_slug_options[:slug_regexp]}
+          end
         end
 
         if simple_slug_options[:history]
@@ -43,11 +46,32 @@ module SimpleSlug
           find(id_param)
         else
           finder_method = simple_slug_options[:history] ? :find_by : :find_by!
-          send(finder_method, simple_slug_options[:slug_column] => id_param) or find(::SimpleSlug::HistorySlug.find_by!(slug: id_param).sluggable_id)
+          send(finder_method, simple_slug_column => id_param) or find(::SimpleSlug::HistorySlug.find_by!(slug: id_param).sluggable_id)
         end
       end
 
       alias_method :friendly_find, :simple_slug_find
+
+      def simple_slug_column(locale=I18n.locale)
+        if simple_slug_localized?(locale)
+          [simple_slug_options[:slug_column], locale].compact.join('_')
+        else
+          simple_slug_options[:slug_column]
+        end
+      end
+
+      def simple_slug_columns
+        simple_slug_locales.map{|locale| simple_slug_column(locale) }
+      end
+
+      def simple_slug_locales
+        Array(simple_slug_options[:locales] || [nil])
+      end
+
+      def simple_slug_localized?(locale=I18n.locale)
+        return unless locale
+        simple_slug_locales.include?(locale.to_sym)
+      end
     end
 
     module InstanceMethods
@@ -67,7 +91,7 @@ module SimpleSlug
         end
       end
 
-      def simple_slug_generate_for_locale(locale=nil, force=false)
+      def simple_slug_generate_for_locale(locale=I18n.locale, 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]
@@ -87,14 +111,6 @@ module SimpleSlug
         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 == 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
         simple_slug_options[:slug_method].map{|m| send(m).to_s }.reject(&:blank?).join(' ')
       end
@@ -106,7 +122,7 @@ module SimpleSlug
         normalized.to_s =~ SimpleSlug::STARTS_WITH_NUMBER_REGEXP ? "_#{normalized}" : normalized
       end
 
-      def simple_slug_resolve(slug_value, locale=nil)
+      def simple_slug_resolve(slug_value, locale=I18n.locale)
         if simple_slug_exists?(slug_value, locale)
           loop do
             slug_value_with_suffix = simple_slug_next(slug_value)
@@ -121,12 +137,12 @@ module SimpleSlug
         "#{slug_value}--#{rand(99999)}"
       end
 
-      def simple_slug_exists?(slug_value, locale=nil)
+      def simple_slug_exists?(slug_value, locale=I18n.locale)
         simple_slug_base_exists?(slug_value, locale) || simple_slug_history_exists?(slug_value)
       end
 
-      def simple_slug_base_exists?(slug_value, locale=nil)
-        base_scope = self.class.unscoped.where(simple_slug_column(locale) => slug_value)
+      def simple_slug_base_exists?(slug_value, locale=I18n.locale)
+        base_scope = self.class.unscoped.where(self.class.simple_slug_column(locale) => slug_value)
         base_scope = base_scope.where('id != ?', id) if persisted?
         base_scope.exists?
       end
@@ -138,20 +154,16 @@ module SimpleSlug
         base_scope.exists?
       end
 
-      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)
+      def simple_slug_set(value, locale=I18n.locale)
+        send "#{self.class.simple_slug_column(locale)}=", value
       end
 
-      def simple_slug_stored_slug(locale=nil)
-        send("#{simple_slug_column(locale)}_was")
+      def simple_slug_get(locale=I18n.locale)
+        send self.class.simple_slug_column(locale)
       end
 
-      def simple_slug_column(locale=nil)
-        [simple_slug_options[:slug_column], locale].compact.join('_')
+      def simple_slug_stored_slug(locale=I18n.locale)
+        send("#{self.class.simple_slug_column(locale)}_was")
       end
     end
 
@@ -167,9 +179,8 @@ module SimpleSlug
 
       def simple_slug_create_history_slug
         return true unless slug_changed?
-        ::SimpleSlug::HistorySlug.where(sluggable_type: self.class.name, sluggable_id: id, slug: simple_slug_get).first_or_create
+        ::SimpleSlug::HistorySlug.where(sluggable_type: self.class.name, slug: simple_slug_get).first_or_create{|hs| hs.sluggable_id = id }
       end
     end
-
   end
 end

data/lib/simple_slug/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlug
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 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.1'
+  spec.add_dependency 'activerecord', '>= 4.0.0', '< 5.2'
   spec.add_dependency 'i18n', '~> 0.7'
 
   spec.add_development_dependency 'bundler', '~> 1.5'

data/spec/simple_slug/base_spec.rb

@@ -10,10 +10,6 @@ describe SimpleSlug do
       expect(SimpleSlug.excludes).to include('new', 'edit')
     end
 
-    it 'exclude regexps' do
-     expect( SimpleSlug.exclude_regexp).to eq /\A\d+\z/
-    end
-
     it 'max length' do
      expect( SimpleSlug.max_length).to eq 240
     end

data/spec/simple_slug/history_spec.rb

@@ -12,7 +12,7 @@ describe 'slug history' do
 
     it 'create' do
       relation = double
-      expect(::SimpleSlug::HistorySlug).to receive(:where).once.ordered.with(sluggable_type: 'SlugHistoryRspecModel', sluggable_id: 1, slug: 'hello').and_return(relation)
+      expect(::SimpleSlug::HistorySlug).to receive(:where).once.ordered.with(sluggable_type: 'SlugHistoryRspecModel', slug: 'hello').and_return(relation)
       expect(relation).to receive(:first_or_create)
       SlugHistoryRspecModel.create(id: 1, name: 'Hello')
     end

data/spec/simple_slug/model_addition_spec.rb

@@ -41,6 +41,14 @@ describe SimpleSlug::ModelAddition do
       expect(SlugGenerationRspecModel.new(name: '123')).not_to be_valid
     end
 
+    it 'skip spaces' do
+      expect(SlugGenerationRspecModel.new(slug: 'test test')).not_to be_valid
+    end
+
+    it 'skip punctuation' do
+      expect(SlugGenerationRspecModel.new(slug: 'test.test')).not_to be_valid
+    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
@@ -147,5 +155,33 @@ describe SimpleSlug::ModelAddition do
       expect(record.slug).to eq 'hello'
       expect(record.slug_en).to eq 'hello-en'
     end
+
+    describe '#to_param' do
+      it 'generate not localized for default locale' do
+        record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+        expect(record.to_param).to eq 'hello'
+      end
+
+      it 'generate localized' do
+        record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+        I18n.with_locale(:en) do
+          expect(record.to_param).to eq 'hello-en'
+        end
+      end
+    end
+
+    describe '#simple_slug_find' do
+      it 'use default slug column with default locale' do
+        record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+        expect(SlugGenerationRspecModelLocalized).to receive(:find_by!).with('slug' => 'hello').and_return(record)
+        SlugGenerationRspecModelLocalized.simple_slug_find('hello')
+      end
+
+      it 'use localized slug column' do
+        record = SlugGenerationRspecModelLocalized.create(name: 'Hello', name_en: 'Hello en')
+        expect(SlugGenerationRspecModelLocalized).to receive(:find_by!).with('slug_en' => 'hello-en').and_return(record)
+        I18n.with_locale(:en) { SlugGenerationRspecModelLocalized.simple_slug_find('hello-en') }
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'active_record'
 require 'i18n'
 require 'active_support/core_ext'
+require 'byebug'
 require 'simple_slug'
 
 # just silence warning

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_slug
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2017-05-27 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.1'
+        version: '5.2'
   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.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement