simple_slug 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42fa741cbe466a58681cb3cefadc7b6d0b51b482
-  data.tar.gz: 14481b78f88550c22b0d2de99fc57cca767d18f3
+  metadata.gz: caac6febd23cca44010d4b67fe7cb412328e8be3
+  data.tar.gz: f37d62b115a1d829bab4a1b819594015259352e4
 SHA512:
-  metadata.gz: decf2bb240b092b883d6de908ac75840d04e51bc60ffa198eea175e1e380c511f1d990b2ba200a14e84acc8ba38126f4284a1b87eea610027e6367c1a4c18d59
-  data.tar.gz: fed2de665fbd48727cb9e1f3ff1c5ae233b5bcd12c60d980a6364f03c0e30f3762f3a5e46af7a8f277917b27f550f5f7e4c92ad8ed493b8fecf275d0328aac4e
+  metadata.gz: b2c6fbd51d8eea2145dad462bab7f4891d550e50a868af06d58c8e8d6cbe3d60e9ed9ff1ac40eedf121cd4485df10a30665a8afc92de016db2b968d311c38fc3
+  data.tar.gz: 149e04495109161a9536394f6cf6de304da9edb3e8bb0c0654d8981b6f719f04d8f1d73a7da3eda4aa2c4c593a6af3594d7268857d4479972493a6833fc0126f

data/lib/simple_slug/model_addition.rb

@@ -8,16 +8,26 @@ module SimpleSlug
       def simple_slug(*args)
         class_attribute :simple_slug_options, instance_writer: false
         options = args.extract_options!
-        self.simple_slug_options = options.reverse_merge(slug_column: SimpleSlug.slug_column, slug_method: args, max_length: SimpleSlug.max_length)
+        self.simple_slug_options = options.reverse_merge(
+            slug_column: SimpleSlug.slug_column,
+            slug_method: args,
+            max_length: SimpleSlug.max_length,
+            callback_type: SimpleSlug.callback_type,
+            add_validation: SimpleSlug.add_validation
+        )
 
         include InstanceMethods
         extend ClassMethods
 
-        before_validation :simple_slug_generate, if: :should_generate_new_slug?
-        validates simple_slug_options[:slug_column],
-                  presence: true,
-                  exclusion: {in: SimpleSlug.excludes},
-                  format: {without: SimpleSlug.exclude_regexp}
+        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}
+        end
+
         if simple_slug_options[:history]
           after_save :simple_slug_reset_unsaved_slug, :simple_slug_create_history_slug
           after_destroy :simple_slug_cleanup_history

data/lib/simple_slug/version.rb

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

data/lib/simple_slug.rb

@@ -18,10 +18,15 @@ module SimpleSlug
   mattr_accessor :max_length
   @@max_length = 240
 
+  mattr_accessor :callback_type
+  @@callback_type = :before_validation
+
+  mattr_accessor :add_validation
+  @@add_validation = true
+
   STARTS_WITH_NUMBER_REGEXP =/\A\d+/
 
   def self.setup
     yield self
   end
-
 end

data/spec/simple_slug/model_addition_spec.rb

@@ -4,6 +4,14 @@ class SlugGenerationRspecModel < RspecActiveModelBase
   simple_slug :name
 end
 
+class SlugGenerationRspecModelWithoutValidation < RspecActiveModelBase
+  simple_slug :name, add_validation: false
+end
+
+class SlugGenerationRspecModelWithoutCallback < RspecActiveModelBase
+  simple_slug :name, callback_type: nil
+end
+
 describe SimpleSlug::ModelAddition do
   describe 'slug generation' do
     before do
@@ -99,4 +107,16 @@ describe SimpleSlug::ModelAddition do
       expect(SlugGenerationRspecModel.new(name: 'Hello' * 100).simple_slug_generate.length).to eq 500
     end
   end
+
+  describe 'add_validation' do
+    it 'skip validation' do
+      expect(SlugGenerationRspecModelWithoutValidation.validators_on(:slug)).to be_blank
+    end
+  end
+
+  describe 'callback_type' do
+    it 'skip callback' do
+      expect(SlugGenerationRspecModelWithoutCallback.new).not_to receive(:should_generate_new_slug?)
+    end
+  end
 end

metadata

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