acts_more_seo 0.2.4 → 0.2.5

data/CHANGELOG.rdoc

@@ -9,4 +9,6 @@
 = Version 0.2.3
 * Major bug fixes, API changes
 = Version 0.2.4
-Backward compatibility improvements
+Backward compatibility improvements
+= Version 0.2.5
+* Using ID when to_url returns same string as existing (conflicts)

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('acts_more_seo', '0.2.4') do |p|
+Echoe.new('acts_more_seo', '0.2.5') do |p|
   p.description    = "Gem makes your ActiveRecord models more SEO friendly. Changes URL to look way better"
   p.url            = "https://github.com/mensfeld/Css-Image-Embedder"
   p.author         = "Maciej Mensfeld"

data/acts_more_seo.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_more_seo}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Maciej Mensfeld}]
-  s.date = %q{2011-11-04}
+  s.date = %q{2011-11-07}
   s.description = %q{Gem makes your ActiveRecord models more SEO friendly. Changes URL to look way better}
   s.email = %q{maciej@mensfeld.pl}
   s.extra_rdoc_files = [%q{CHANGELOG.rdoc}, %q{README.md}, %q{lib/acts_more_seo.rb}, %q{lib/string_ext.rb}]

data/lib/acts_more_seo.rb

@@ -64,7 +64,12 @@ module Acts
         if self.seo_use_id
           to_url
         else
-          seo_text_part.length > 0 ? seo_text_part : "#{self.id}"
+          seo_link = seo_text_part.length > 0 ? seo_text_part : "#{self.id}"
+          if !self.class.where("seo_url = ? AND id != ?", seo_link, self.id).limit(1).empty?
+            to_url
+          else
+            seo_link
+          end
         end
       end
 

data/spec/acts_more_seo_spec.rb

@@ -21,6 +21,7 @@ end
 
 describe CoolElement do
   subject { CoolElement }
+  before(:each){ subject.destroy_all }
 
   context "when we have a class which has use_id => true" do
     it "should find element unless id is corrupted" do
@@ -56,6 +57,7 @@ end
 
 describe CoolerElement do
   subject { CoolerElement }
+  before(:each){ subject.destroy_all }
 
   context "when there is no name" do
     it "should return only id" do
@@ -92,6 +94,7 @@ end
 
 describe SpecialElement do
   subject { SpecialElement }
+  before(:each){ subject.destroy_all }
 
   context "when there is no name" do
     context "but surname and title exists" do
@@ -120,12 +123,13 @@ end
 
 describe BestElement do
   subject { BestElement }
+  before(:each){ subject.destroy_all }
 
   context "when there is no surname" do
     context "but surname and title exists" do
       it "should return nice looking url " do
         a = subject.create({:name => 'mensfeld', :title => 'test abc'})
-        a.to_seo.should eql("mensfeld-test-abc")
+        a.seo_url.should eql("mensfeld-test-abc")
         a.seo_url.should eql("mensfeld-test-abc")
       end
     end
@@ -135,7 +139,7 @@ describe BestElement do
     context "but surname and title exists" do
       it "should return nice looking url " do
         a = subject.create({:surname => 'mensfeld', :title => 'test abc'})
-        a.to_seo.should eql("mensfeld-test-abc")
+        a.seo_url.should eql("mensfeld-test-abc")
         a.reload
         a.seo_url.should eql("mensfeld-test-abc")
       end
@@ -144,7 +148,7 @@ describe BestElement do
     context "and no other param" do
       it "should return only id" do
         a = subject.create()
-        a.to_seo.should eql("#{a.id}")
+        a.seo_url.should eql("#{a.id}")
         a.reload
         a.seo_url.should eql("#{a.id}")
       end
@@ -154,7 +158,7 @@ describe BestElement do
   context "when there are all the params" do
     it "should return nice url" do
         a = subject.create({:name => 'maciej', :surname => 'mensfeld', :title => 'test abc'})
-        a.to_seo.should eql("maciej-mensfeld-test-abc")
+        a.seo_url.should eql("maciej-mensfeld-test-abc")
         a.reload
         a.seo_url.should eql("maciej-mensfeld-test-abc")
     end
@@ -163,7 +167,7 @@ describe BestElement do
   context "when we have a class which has use_id => false" do
     it "should find element only when seo_url is same (or by id)" do
       a = subject.create(:name => 'bla bla bla')
-      subject.find_by_seo(a.to_seo).should eql(a)
+      subject.find_by_seo(a.seo_url).should eql(a)
       lambda { subject.find_by_seo("#{a.to_param}aaa") }.should raise_error(ActiveRecord::RecordNotFound)
     end
   end
@@ -171,12 +175,46 @@ describe BestElement do
   context "when updating object" do
     it "should have refreshed seo_url" do
         a = subject.create({:name => 'mensfeld', :title => 'test abc'})
-        a.to_seo.should eql("mensfeld-test-abc")
+        a.seo_url.should eql("mensfeld-test-abc")
         a.name = 'kowalski'
         a.save
-        a.to_seo.should eql("kowalski-test-abc")
+        a.seo_url.should eql("kowalski-test-abc")
         subject.find_by_seo("kowalski-test-abc").should eql(a)
     end
   end
 
+  context "when we have two objects" do
+    it "should assing to the second - seo url with id" do
+        a = subject.create({:name => 'mensfeld', :title => 'test abc'})
+        b = subject.create({:name => 'mensfeld ', :title => 'test abc'})
+        a.seo_url.should eql("mensfeld-test-abc")
+        b.reload
+        b.seo_url.should eql("#{b.id}-mensfeld-test-abc")
+    end
+
+    context "and we change name in a second one" do
+      it "should add na id if necessery" do
+        a = subject.create({:name => 'mensfeld', :title => 'test abc'})
+        b = subject.create({:name => 'mensfeld2 ', :title => 'test abc'})
+        a.seo_url.should eql("mensfeld-test-abc")
+        b.seo_url.should eql("mensfeld2-test-abc")
+        b.name = 'mensfeld'
+        b.save!
+        b.reload
+        b.seo_url.should eql("#{b.id}-mensfeld-test-abc")
+      end
+
+      it "should not add id if not necessery" do
+        a = subject.create({:name => 'mensfeld', :title => 'test abc'})
+        b = subject.create({:name => 'mensfeld2 ', :title => 'test abc'})
+        a.seo_url.should eql("mensfeld-test-abc")
+        b.seo_url.should eql("mensfeld2-test-abc")
+        b.name = 'mensfeld3'
+        b.save!
+        b.reload
+        b.seo_url.should eql("mensfeld3-test-abc")
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_more_seo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26120860 !ruby/object:Gem::Requirement
+  requirement: &17432380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *26120860
+  version_requirements: *17432380
 - !ruby/object:Gem::Dependency
   name: active_record
-  requirement: &26120380 !ruby/object:Gem::Requirement
+  requirement: &17431920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26120380
+  version_requirements: *17431920
 description: Gem makes your ActiveRecord models more SEO friendly. Changes URL to
   look way better
 email: maciej@mensfeld.pl