acts_more_seo 0.2.2 → 0.2.3

data/CHANGELOG.rdoc

@@ -6,3 +6,5 @@
 * Way cooler ;)
 = Version 0.2.2
 * Not raising no table error
+= Version 0.2.3
+* Major bug fixes, API changes

data/README.md

@@ -53,9 +53,9 @@ However, if you do so - it is highly recommended to create string seo_url column
 
     add_column :model, :seo_url, :string
 
-so you can search via find_by_seo_url method:
+so you can search via seo method:
 
-    CoolElement.find_by_seo_url(params[:id])
+    CoolElement.find_by_seo(params[:id])
 
 You don't need to update seo_url, gem will hook up with this field automatically if it exists.
 

data/Rakefile

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('acts_more_seo', '0.2.2') do |p|
+Echoe.new('acts_more_seo', '0.2.3') 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,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_more_seo}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Maciej Mensfeld}]

data/lib/acts_more_seo.rb

@@ -46,40 +46,33 @@ module Acts
 
       # Overwrite default to_param - should return nice url
       def to_param
-        self.url
+        self.to_url
       end
 
       # Lets return nice and smooth url
-      def url
-        # If there is more than one SEO column - prepare url "text" part
-        if self.class.seo_columns.is_a?(Array)
-          seo_parts = self.class.seo_columns.collect do |field|
-            el = self.send(field)
-            el.to_url if el
-          end
-          seo_parts.delete_if{|el| el.to_s.length == 0}
-          seo_path = seo_parts.join('-')
-        else
-          el = self.send(self.class.seo_columns)
-          seo_path = el ? el.to_url : ''
-        end
+      def to_url
+        seo_path = seo_text_part
+        seo_path = "#{self.id}#{"-#{seo_path}" if seo_path && seo_path.length > 0}"
+        seo_path.length > 0 ? seo_path : "#{self.id}"
+      end
 
-        if self.class.seo_use_id
-          seo_path = "#{self.id}#{"-#{seo_path}" if seo_path && seo_path.length > 0}"
+      def to_seo
+        if self.seo_use_id
+          to_url
+        else
+          seo_text_part.length > 0 ? seo_text_part : "#{self.id}"
         end
-
-        seo_path.length > 0 ? seo_path : "#{self.id}"
       end
 
       def update_seo_url
         if self.class.seo_url_table?
-          self.update_column(:seo_url, self.to_param)
+          self.update_column(:seo_url, to_seo)
         end
       end
 
       def set_seo_url
         if self.class.seo_url_table?
-          self.update_column(:seo_url, self.to_param)
+          self.update_column(:seo_url, to_seo)
         end
       end
 
@@ -89,17 +82,36 @@ module Acts
           self.column_names.include?("#{:seo_url}")
         end
 
-        def find(*args)
-          super
-        rescue ActiveRecord::RecordNotFound
-          if !self.seo_use_id && !(el = find_by_seo_url(args.first, :first)).nil?
-            el
+        def find_by_seo(id)
+          if self.seo_use_id
+            find(id)
           else
-            raise ActiveRecord::RecordNotFound
+            el = find_by_seo_url id, :first
+            raise ActiveRecord::RecordNotFound unless el
+            el
           end
         end
 
       end
+
+      private
+
+      def seo_text_part
+        # If there is more than one SEO column - prepare url "text" part
+        if self.class.seo_columns.is_a?(Array)
+          seo_parts = self.class.seo_columns.collect do |field|
+            el = self.send(field)
+            el.to_url if el
+          end
+          seo_parts.delete_if{|el| el.to_s.length == 0}
+          seo_path = seo_parts.join('-')
+        else
+          el = self.send(self.class.seo_columns)
+          seo_path = el ? el.to_url : ''
+        end
+        seo_path
+      end
+
     end
   end
 end

data/spec/acts_more_seo_spec.rb

@@ -25,10 +25,10 @@ describe CoolElement do
   context "when we have a class which has use_id => true" do
     it "should find element unless id is corrupted" do
       a = subject.create(:name => 'bla bla bla')
-      subject.find(a.id).should eql(a)
-      subject.find(a.to_param).should eql(a)
-      subject.find("#{a.to_param}aaa").should eql(a)
-      lambda { subject.find("134534dass") }.should raise_error(ActiveRecord::RecordNotFound)
+      subject.find_by_seo(a.id).should eql(a)
+      subject.find_by_seo(a.to_param).should eql(a)
+      subject.find_by_seo("#{a.to_param}aaa").should eql(a)
+      lambda { subject.find_by_seo("134534dass") }.should raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
@@ -65,12 +65,12 @@ describe CoolerElement do
 
     it "should be able to find existing element" do
       a = subject.create
-      subject.find(a.id).should eql(a)
+      subject.find_by_seo(a.id).should eql(a)
     end
 
     it "should raise error when there is no element" do
       a = subject.create
-     lambda { subject.find(a.id+1) }.should raise_error(ActiveRecord::RecordNotFound)
+     lambda { subject.find_by_seo(a.id+1) }.should raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
@@ -78,7 +78,7 @@ describe CoolerElement do
     it "should return nice url" do
       a = subject.create(:title => 'bla bla bla')
       a.to_param.should eql("#{a.id}-bla-bla-bla")
-      subject.find(a.to_param).should eql(a)
+      subject.find_by_seo(a.to_param).should eql(a)
     end
 
     context "and there are some url-not-friendly letters" do
@@ -125,7 +125,7 @@ describe BestElement 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_param.should eql("mensfeld-test-abc")
+        a.to_seo.should eql("mensfeld-test-abc")
         a.seo_url.should eql("mensfeld-test-abc")
       end
     end
@@ -135,7 +135,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_param.should eql("mensfeld-test-abc")
+        a.to_seo.should eql("mensfeld-test-abc")
         a.reload
         a.seo_url.should eql("mensfeld-test-abc")
       end
@@ -144,7 +144,7 @@ describe BestElement do
     context "and no other param" do
       it "should return only id" do
         a = subject.create()
-        a.to_param.should eql("#{a.id}")
+        a.to_seo.should eql("#{a.id}")
         a.reload
         a.seo_url.should eql("#{a.id}")
       end
@@ -154,7 +154,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_param.should eql("maciej-mensfeld-test-abc")
+        a.to_seo.should eql("maciej-mensfeld-test-abc")
         a.reload
         a.seo_url.should eql("maciej-mensfeld-test-abc")
     end
@@ -163,20 +163,19 @@ 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(a.id).should eql(a)
-      subject.find(a.to_param).should eql(a)
-      lambda { subject.find("#{a.to_param}aaa") }.should raise_error(ActiveRecord::RecordNotFound)
+      subject.find_by_seo(a.to_seo).should eql(a)
+      lambda { subject.find_by_seo("#{a.to_param}aaa") }.should raise_error(ActiveRecord::RecordNotFound)
     end
   end
 
   context "when updating object" do
     it "should have refreshed seo_url" do
         a = subject.create({:name => 'mensfeld', :title => 'test abc'})
-        a.to_param.should eql("mensfeld-test-abc")
+        a.to_seo.should eql("mensfeld-test-abc")
         a.name = 'kowalski'
         a.save
-        a.to_param.should eql("kowalski-test-abc")
-        subject.find("kowalski-test-abc").should eql(a)
+        a.to_seo.should eql("kowalski-test-abc")
+        subject.find_by_seo("kowalski-test-abc").should eql(a)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_more_seo
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &14799600 !ruby/object:Gem::Requirement
+  requirement: &13506420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *14799600
+  version_requirements: *13506420
 - !ruby/object:Gem::Dependency
   name: active_record
-  requirement: &14799120 !ruby/object:Gem::Requirement
+  requirement: &13505960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *14799120
+  version_requirements: *13505960
 description: Gem makes your ActiveRecord models more SEO friendly. Changes URL to
   look way better
 email: maciej@mensfeld.pl