simple_slug 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38033c0b797c80a5f1ea79325d95605f9f35dae9
-  data.tar.gz: 9bcc30728ffaaa925711bf374b94d359579a84aa
+  metadata.gz: d858815acb25626bd487c3a08d1550cdf39c3895
+  data.tar.gz: 18a66060a237cb85e5f901566305e6b5e6698dff
 SHA512:
-  metadata.gz: 2a2135bcbc5a5aa951989a6a073c692598ff1bbb7b73195347be469a749c14a1f65a24e93f9cbc553f12632dcf39b7cf8223cacb64e6c3c275cab6db0e82ce8e
-  data.tar.gz: 74200571bf0ca1c83747b034920c07fe432f24d9afb977caf89c61de3fe406bca3d5478ff4f208da967c668fb8de414c7fc6ee88fa7338e3d8e3ccd0648cd26e
+  metadata.gz: 8b2edc684abb85fa503c0b214488428a4ebd5684cd62a79424e703f486e52b805fe41aa0d44dfa9e7fdde2a215f56d95295d0bee822710b21410b5bb7f9761e1
+  data.tar.gz: 2258496ff4fb76de5a69cd08f5d9dd14036875817eb473f0ac9d84abb35efd146877a42ca5fa62270dfa5da521559ba827c51b2ff06eecb1fa16edc4f5607f10

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+
+rvm:
+  - 2.1.0

data/README.md

@@ -1,6 +1,9 @@
 # SimpleSlug
 
-This is not a "bulldozer", this is just friendly id generator for ActiveRecord.
+[![Build Status](https://travis-ci.org/leschenko/simple_slug.png?branch=master)](https://travis-ci.org/leschenko/simple_slug)
+[![Dependency Status](https://gemnasium.com/leschenko/simple_slug.png)](https://gemnasium.com/leschenko/simple_slug)
+
+Simple friendly url generator for ActiveRecord models with history.
 
 ## Installation
 
@@ -34,9 +37,21 @@ class User < ActiveRecord::Base
 end
 ```
 
+If you want to control when slug is generated, define `should_generate_new_slug?` method:
+
+```ruby
+class User < ActiveRecord::Base
+  simple_slug :full_name
+
+  def should_generate_new_slug?
+    true
+  end
+end
+```
+
 ## Contributing
 
-1. Fork it ( http://github.com/<my-github-username>/simple_slug/fork )
+1. Fork it ( http://github.com/leschenko/simple_slug/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/Rakefile

@@ -1 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/simple_slug/model_addition.rb

@@ -19,7 +19,7 @@ module SimpleSlug
                   exclusion: {in: SimpleSlug.excludes},
                   format: {without: SimpleSlug.exclude_regexp}
         if simple_slug_options[:history]
-          after_save :simple_slug_create_history_slug
+          after_save :simple_slug_reset_unsaved_slug, :simple_slug_create_history_slug
           after_destroy :simple_slug_cleanup_history
           include InstanceHistoryMethods
         end
@@ -42,16 +42,16 @@ module SimpleSlug
 
     module InstanceMethods
       def to_param
-        send(simple_slug_options[:slug_column]).presence || super
+        simple_slug_stored_slug.presence || super
       end
 
       def should_generate_new_slug?
-        send(simple_slug_options[:slug_column]).blank? || simple_slug_options[:history]
+        simple_slug_get.blank? || simple_slug_options[:history]
       end
 
-      def simple_slug_generate
+      def simple_slug_generate(force=false)
         simple_slug = simple_slug_normalize(simple_slug_base)
-        return true if simple_slug == send(simple_slug_options[:slug_column]).to_s.sub(/--\d+\z/, '')
+        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
       end
@@ -96,16 +96,33 @@ module SimpleSlug
         base_scope = base_scope.where('sluggable_id != ?', id) if persisted?
         base_scope.exists?
       end
+
+      def simple_slug_set(value)
+        send "#{simple_slug_options[:slug_column]}=", value
+      end
+
+      def simple_slug_get
+        send simple_slug_options[:slug_column]
+      end
+
+      def simple_slug_stored_slug
+        send("#{simple_slug_options[:slug_column]}_was")
+      end
     end
 
     module InstanceHistoryMethods
+      def simple_slug_reset_unsaved_slug
+        return true if errors.blank?
+        simple_slug_set simple_slug_stored_slug
+      end
+
       def simple_slug_cleanup_history
         ::SimpleSlug::HistorySlug.where(sluggable_type: self.class.name, sluggable_id: id).delete_all
       end
 
       def simple_slug_create_history_slug
         return true unless slug_changed?
-        ::SimpleSlug::HistorySlug.where(sluggable_type: self.class.name, sluggable_id: id, slug: send(simple_slug_options[:slug_column])).first_or_create
+        ::SimpleSlug::HistorySlug.where(sluggable_type: self.class.name, sluggable_id: id, slug: simple_slug_get).first_or_create
       end
     end
 

data/lib/simple_slug/version.rb

@@ -1,3 +1,3 @@
 module SimpleSlug
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 end

data/simple_slug.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = SimpleSlug::VERSION
   spec.authors       = ['Alex Leschenko']
   spec.email         = ['leschenko.al@gmail.com']
-  spec.summary       = %q{Simple slug generator with history.}
-  spec.description   = %q{This is not a "bulldozer. This is just friendly id generator fo ActiveRecord."}
+  spec.summary       = %q{Friendly url generator with history.}
+  spec.description   = %q{Simple friendly url generator for ActiveRecord with history."}
   spec.homepage      = 'https://github.com/leschenko/simple_slug'
   spec.license       = 'MIT'
 
@@ -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'
+  spec.add_dependency 'activerecord', '>= 4.0.0', '< 5.0'
   spec.add_dependency 'i18n', '~> 0.6.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'

data/spec/spec_helper.rb

@@ -16,6 +16,7 @@ class RspecActiveModelBase
   define_model_callbacks :validation, :save, :destroy
 
   attr_accessor :id, :slug, :name, :created_at
+  alias_method :slug_was, :slug
 
   def self.create(attributes, *)
     record = new(attributes)

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: simple_slug
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Leschenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +86,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: This is not a "bulldozer. This is just friendly id generator fo ActiveRecord."
+description: Simple friendly url generator for ActiveRecord with history."
 email:
 - leschenko.al@gmail.com
 executables: []
@@ -88,6 +94,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -123,10 +130,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.rc.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Simple slug generator with history.
+summary: Friendly url generator with history.
 test_files:
 - spec/simple_slug/base_spec.rb
 - spec/simple_slug/history_spec.rb