slugger 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/slugger.rb

@@ -73,7 +73,11 @@ module Slugger
       # Replace spaces with dashes or custom substitution character
       s.gsub!(/\ +/, slugger_options[:substitution_char].to_s)
       s.downcase! if slugger_options[:downcase]
-      s = s[0..(slugger_options[:max_length] - 1)] if slugger_options[:max_length]
+
+      if slugger_options[:max_length]
+        s = s[0..(slugger_options[:max_length] - 1)]
+        s = s[0..-2] if s[-1] == slugger_options[:substitution_char].to_s
+      end
 
       self.send("#{self.slugger_options[:slug_column]}=", s)
 

data/spec/lib/comment_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+# class Comment < ActiveRecord::Base
+#   belongs_to :post
+#   has_slug   :title, :scope => :post_id
+# end
+
+describe Comment do
+  it "should honor scope" do
+    p1 = Post.create(:slug => 'hello-world')
+    p2 = Post.create(:slug => 'hello-world')
+    c1 = Comment.create(:post => p1, :slug => 'first-comment')
+    Comment.create(:post => p2, :slug => 'first-comment').should be_valid
+    Comment.create(:post => p1, :slug => 'first-comment').should_not be_valid
+  end
+end

data/spec/lib/post_spec.rb

@@ -13,11 +13,16 @@ describe Post do
     p = Post.create(:title => "apostrop'hes", :slug => "apostrophes")
     p.slug.should == "apostrophes"
   end
-  it "should be limited to 20 characters" do
+  it "slug should be limited to 20 characters" do
     p = Post.create(
       :title => "when you write really long titles slugs should be shortened")
     p.slug.should == "when-you-write-reall"
   end
+  it "slug should not end with a substitution character" do
+    p = Post.create(
+      :title => "when you write very long titles slugs should be shortened")
+    p.slug.should == "when-you-write-very"
+  end
   it "should not be valid on duplicate" do
     p = Post.create(:title => "hello")
     p.slug.should == "hello"

data/spec/schema.rb

@@ -25,6 +25,11 @@ class CreateSchema < ActiveRecord::Migration
       t.string :name
       t.string :slug_name
     end
+    create_table :comments, :force => true do |t|
+      t.integer :post_id
+      t.string  :title
+      t.string  :slug
+    end
   end
 end
 
@@ -33,6 +38,7 @@ CreateSchema.suppress_messages do
 end
 
 class Post < ActiveRecord::Base
+  has_many :comments
   has_slug 'title', :max_length => 20
 end
 
@@ -46,3 +52,8 @@ class Edge < ActiveRecord::Base
                    :downcase => false,
                    :on_conflict => :concat_random_chars
 end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+  has_slug   :title, :scope => :post_id
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slugger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-11 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70106294659920 !ruby/object:Gem::Requirement
+  requirement: &70110795330660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70106294659920
+  version_requirements: *70110795330660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70106294659420 !ruby/object:Gem::Requirement
+  requirement: &70110795330000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70106294659420
+  version_requirements: *70110795330000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70106294658960 !ruby/object:Gem::Requirement
+  requirement: &70110795329540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70106294658960
+  version_requirements: *70110795329540
 description: Slugger is yet another slug generator.
 email:
 - seth.faxon@gmail.com
@@ -62,6 +62,7 @@ files:
 - lib/slugger.rb
 - lib/slugger/version.rb
 - slugger.gemspec
+- spec/lib/comment_spec.rb
 - spec/lib/edge_spec.rb
 - spec/lib/post_spec.rb
 - spec/lib/user_spec.rb
@@ -93,6 +94,7 @@ signing_key:
 specification_version: 3
 summary: Slugger is yet another slug generator.
 test_files:
+- spec/lib/comment_spec.rb
 - spec/lib/edge_spec.rb
 - spec/lib/post_spec.rb
 - spec/lib/user_spec.rb