permalink 1.2.0 → 1.2.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    permalink (1.2.0)
+    permalink (1.2.1)
 
 GEM
   remote: http://rubygems.org/

data/lib/permalink/orm/base.rb

@@ -37,19 +37,19 @@ module Permalink
         end
 
         private
-        def next_available_permalink(_permalink)
-          the_permalink = _permalink
+        def next_available_permalink(permalink)
+          unique_permalink = permalink
 
           if self.class.permalink_options[:unique]
             suffix = 2
 
-            while self.class.where(to_permalink_name => the_permalink).first
-              the_permalink = "#{_permalink}-#{suffix}"
+            while self.class.where(to_permalink_name => unique_permalink).first
+              unique_permalink = "#{permalink}-#{suffix}"
               suffix += 1
             end
           end
 
-          the_permalink
+          unique_permalink
         end
 
         def from_permalink_name
@@ -69,7 +69,7 @@ module Permalink
         end
 
         def update_permalink?
-          self.class.permalink_options[:force] || to_permalink_value.blank?
+          changes[from_permalink_name] && (self.class.permalink_options[:force] || to_permalink_value.blank?)
         end
 
         def create_permalink

data/lib/permalink/version.rb

@@ -2,7 +2,7 @@ module Permalink
   module Version
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/support/schema.rb

@@ -1,5 +1,5 @@
 ActiveRecord::Schema.define(:version => 0) do
   create_table :posts do |t|
-    t.string :title, :permalink, :slug
+    t.string :title, :permalink, :description, :slug
   end
 end

data/spec/support/shared.rb

@@ -92,4 +92,26 @@ shared_examples_for "orm" do
 
     record.permalink.should == "awesome-post"
   end
+
+  it "should force permalink and keep unique" do
+    model.permalink :title, :force => true, :unique => true
+
+    record = model.create(:title => "Some nice post")
+
+    record.update_attributes :title => "Awesome post"
+    record.permalink.should == "awesome-post"
+
+    record = model.create(:title => "Awesome post")
+    record.permalink.should == "awesome-post-2"
+  end
+
+  it "should keep same permalink when another field changes" do
+    model.permalink :title, :force => true, :unique => true
+
+    record = model.create(:title => "Some nice post")
+    record.update_attributes :description => "some description"
+
+    record.permalink.should == "some-nice-post"
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: permalink
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-21 00:00:00.000000000 Z
+date: 2011-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70099538008620 !ruby/object:Gem::Requirement
+  requirement: &70228101514700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099538008620
+  version_requirements: *70228101514700
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70099537997320 !ruby/object:Gem::Requirement
+  requirement: &70228101512180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099537997320
+  version_requirements: *70228101512180
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70099538001440 !ruby/object:Gem::Requirement
+  requirement: &70228101510700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099538001440
+  version_requirements: *70228101510700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70099537985380 !ruby/object:Gem::Requirement
+  requirement: &70228101509420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70099537985380
+  version_requirements: *70228101509420
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70099537969500 !ruby/object:Gem::Requirement
+  requirement: &70228101525920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70099537969500
+  version_requirements: *70228101525920
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70099537975840 !ruby/object:Gem::Requirement
+  requirement: &70228101524760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70099537975840
+  version_requirements: *70228101524760
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70099537055460 !ruby/object:Gem::Requirement
+  requirement: &70228101524280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099537055460
+  version_requirements: *70228101524280
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70099537034980 !ruby/object:Gem::Requirement
+  requirement: &70228101523620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099537034980
+  version_requirements: *70228101523620
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70099537034280 !ruby/object:Gem::Requirement
+  requirement: &70228101522800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70099537034280
+  version_requirements: *70228101522800
 description: Generate permalink attributes on ActiveRecord
 email:
 - fnando.vieira@gmail.com
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 232250411774848879
+      hash: -1346400587143548814
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 232250411774848879
+      hash: -1346400587143548814
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10