wulffeld_slug 0.0.25 → 0.0.26

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wulffeld_slug (0.0.25)
+    wulffeld_slug (0.0.26)
       activesupport (>= 3.1.0)
       babosa (>= 0.3.7)
       wulffeld_slug

data/VERSION

@@ -1 +1 @@
-0.0.25
+0.0.26

data/lib/wulffeld_slug/slug_include.rb

@@ -56,36 +56,37 @@ module WulffeldSlug
         return slug if !slug.blank? && slug_unique?(slug)
 
         # First loop we do some optimistic searching.
-        if n.nil?
-          # There's often a difference between adding a number to a slug where the string is present
-          # and one where we only have the number for the final slug.
-          # :blank_loop_start and :blank_loop_chunk helps speed up the looping on blank slugs.
-          if str_part.blank?
-            b = slug_config[:blank_loop_start]
-          else
-            b = slug_config[:loop_start]
-          end
+        n ||= find_n_optimistically(str_part) || 0
+        n += 1
+      end
+    end
+    
+    def find_n_optimistically(str_part)
+      # There's often a difference between adding a number to a slug where the string is present
+      # and one where we only have the number for the final slug.
+      # :blank_loop_start and :blank_loop_chunk helps speed up the looping on blank slugs.
+      if str_part.blank?
+        b = slug_config[:blank_loop_start]
+      else
+        b = slug_config[:loop_start]
+      end
+
+      last_used_postfix = nil
 
-          last_b = nil
-          loop do
-            slug = [str_part, b].reject(&:blank?).join('-')
-            if slug_unique?(slug) || b < 1
-              last_b = b
-              break if b < 1
-            else
-              n = last_b
-              break
-            end
-            
-            if str_part.blank? && slug_config[:blank_loop_chunk] && b - slug_config[:blank_loop_chunk] > slug_config[:blank_loop_chunk]
-              b -= slug_config[:blank_loop_chunk]
-            else
-              b /= 2
-            end
-          end
+      loop do
+        slug = [str_part, b].reject(&:blank?).join('-')
+        if slug_unique?(slug) || b < 1
+          # No postfixes used yet.
+          return 0 if b < 1
+        else
+          return b
+        end
+        
+        if str_part.blank? && slug_config[:blank_loop_chunk] && b - slug_config[:blank_loop_chunk] > slug_config[:blank_loop_chunk]
+          b -= slug_config[:blank_loop_chunk]
+        else
+          b /= 2
         end
-        n ||= 0
-        n += 1
       end
     end
   end

data/spec/app/models/article.rb

@@ -5,5 +5,5 @@ class Article
   field :title
   field :author
 
-  has_slug :title, :mongo => true
+  has_slug :title, :mongo => true, :loop_start => 6, :blank_loop_start => 50, :blank_loop_chunk => 10
 end

data/spec/lib/slug_spec.rb

@@ -40,6 +40,30 @@ describe 'WulffeldSlug' do
       article.valid?
       article.slug.should == "the-shawshank-redemption"
     end
+    
+    describe ":blank_loop_start and :blank_loop_chunk options" do
+      it "should generate correct slugs with a blank string part" do
+        71.times do |i|
+          Article.create!(:title => "하")
+        end
+        a = Article.create!(:title => "하")
+        a.save!
+        a.slug.should == '72'
+        
+        Article.all.map(&:slug).sort.should == 72.times.map { |i| "#{i + 1}"}.sort
+      end
+
+      it "should generate correct slugs with a blank string part" do
+        21.times do |i|
+          Article.create!(:title => "하")
+        end
+        a = Article.create!(:title => "하")
+        a.save!
+        a.slug.should == '22'
+        
+        Article.all.map(&:slug).sort.should == 22.times.map { |i| "#{i + 1}"}.sort
+      end
+    end
   end
   
   context "dynamic slug fields" do

data/wulffeld_slug.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wulffeld_slug"
-  s.version = "0.0.25"
+  s.version = "0.0.26"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Moen Wulffeld"]
-  s.date = "2012-05-03"
+  s.date = "2012-05-04"
   s.description = ""
   s.email = "martin@wulffeld.org"
   s.extra_rdoc_files = [
@@ -223,6 +223,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, [">= 1.6.2"])
       s.add_development_dependency(%q<rdoc>, [">= 3.8"])
       s.add_development_dependency(%q<rspec>, [">= 2.7.0"])
+      s.add_development_dependency(%q<mongoid>, ["= 2.2.0"])
+      s.add_development_dependency(%q<bson>, ["= 1.3.0"])
+      s.add_development_dependency(%q<bson_ext>, ["= 1.3.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.21"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.2"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.8"])
+      s.add_development_dependency(%q<rspec>, [">= 2.7.0"])
+      s.add_development_dependency(%q<mongoid>, ["= 2.2.0"])
+      s.add_development_dependency(%q<bson>, ["= 1.3.0"])
+      s.add_development_dependency(%q<bson_ext>, ["= 1.3.0"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.21"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.2"])
+      s.add_development_dependency(%q<rdoc>, [">= 3.8"])
+      s.add_development_dependency(%q<rspec>, [">= 2.7.0"])
       s.add_runtime_dependency(%q<babosa>, [">= 0.3.7"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.1.0"])
     else
@@ -405,6 +419,20 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 1.6.2"])
       s.add_dependency(%q<rdoc>, [">= 3.8"])
       s.add_dependency(%q<rspec>, [">= 2.7.0"])
+      s.add_dependency(%q<mongoid>, ["= 2.2.0"])
+      s.add_dependency(%q<bson>, ["= 1.3.0"])
+      s.add_dependency(%q<bson_ext>, ["= 1.3.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.21"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.2"])
+      s.add_dependency(%q<rdoc>, [">= 3.8"])
+      s.add_dependency(%q<rspec>, [">= 2.7.0"])
+      s.add_dependency(%q<mongoid>, ["= 2.2.0"])
+      s.add_dependency(%q<bson>, ["= 1.3.0"])
+      s.add_dependency(%q<bson_ext>, ["= 1.3.0"])
+      s.add_dependency(%q<bundler>, [">= 1.0.21"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.2"])
+      s.add_dependency(%q<rdoc>, [">= 3.8"])
+      s.add_dependency(%q<rspec>, [">= 2.7.0"])
       s.add_dependency(%q<babosa>, [">= 0.3.7"])
       s.add_dependency(%q<activesupport>, [">= 3.1.0"])
     end
@@ -588,6 +616,20 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, [">= 1.6.2"])
     s.add_dependency(%q<rdoc>, [">= 3.8"])
     s.add_dependency(%q<rspec>, [">= 2.7.0"])
+    s.add_dependency(%q<mongoid>, ["= 2.2.0"])
+    s.add_dependency(%q<bson>, ["= 1.3.0"])
+    s.add_dependency(%q<bson_ext>, ["= 1.3.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.21"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.2"])
+    s.add_dependency(%q<rdoc>, [">= 3.8"])
+    s.add_dependency(%q<rspec>, [">= 2.7.0"])
+    s.add_dependency(%q<mongoid>, ["= 2.2.0"])
+    s.add_dependency(%q<bson>, ["= 1.3.0"])
+    s.add_dependency(%q<bson_ext>, ["= 1.3.0"])
+    s.add_dependency(%q<bundler>, [">= 1.0.21"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.2"])
+    s.add_dependency(%q<rdoc>, [">= 3.8"])
+    s.add_dependency(%q<rspec>, [">= 2.7.0"])
     s.add_dependency(%q<babosa>, [">= 0.3.7"])
     s.add_dependency(%q<activesupport>, [">= 3.1.0"])
   end