slugtastic 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,28 +1,28 @@
 PATH
   remote: .
   specs:
-    slugtastic (1.1.0)
+    slugtastic (1.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.0.17)
-      activesupport (= 3.0.17)
+    activemodel (3.0.20)
+      activesupport (= 3.0.20)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activesupport (3.0.17)
+    activesupport (3.0.20)
     builder (2.1.2)
     diff-lcs (1.1.3)
     i18n (0.5.0)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.2)
+    rake (10.0.3)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
+    rspec-mocks (2.12.2)
     supermodel (0.1.6)
       activemodel (~> 3.0.0)
 

data/lib/slugtastic.rb

@@ -3,8 +3,12 @@ require "slugtastic/model_additions"
 require "slugtastic/railtie" if defined? Rails
 
 module Slugtastic
-  def self.generate_slug(string)
+  def self.generate_slug(string, delimiter = nil)
     return if string.nil?
-    string.parameterize
+    slug = string.parameterize
+    if delimiter
+      slug.gsub!("-", delimiter)
+    end
+    slug
   end
 end

data/lib/slugtastic/model_additions.rb

@@ -11,7 +11,7 @@ module Slugtastic
     #   end
     def has_slug name, options = { :from => :title }
       before_validation do |record|
-        send("#{name}=", Slugtastic.generate_slug(send(options[:from]))) if send(name).nil? or send(name).blank?
+        send("#{name}=", Slugtastic.generate_slug(send(options[:from]), options[:delimiter])) if send(name).nil? or send(name).blank?
       end
     end
 

data/lib/slugtastic/version.rb

@@ -1,3 +1,3 @@
 module Slugtastic
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/slugtastic/model_additions_spec.rb

@@ -4,8 +4,9 @@ require 'spec_helper'
 class Model < SuperModel::Base
   include ActiveModel::Validations::Callbacks
   extend Slugtastic::ModelAdditions
-  attr_accessor :slug, :title
+  attr_accessor :slug, :slug_2, :title
   has_slug :slug, from: :title
+  has_slug :slug_2, from: :title, delimiter: "_"
 end
 
 describe Slugtastic::ModelAdditions do
@@ -13,6 +14,10 @@ describe Slugtastic::ModelAdditions do
     Model.create!(:title => "A Simple Title").slug.should eq "a-simple-title"
   end
 
+  it "generates a slug from the title with delimiter substitutions" do
+    Model.create!(:title => "A Simple Title").slug_2.should eq "a_simple_title"
+  end
+
   it "doesn't regenerate the slug if it already exists" do
     model = Model.create!(:title => "A Simple Title")
     model.slug.should eq "a-simple-title"
@@ -20,5 +25,6 @@ describe Slugtastic::ModelAdditions do
     model.title = "A new title"
     model.save
     model.slug.should eq "a-simple-title"
+    model.slug_2.should eq "a_simple_title"
   end
 end

data/spec/slugtastic_spec.rb

@@ -11,6 +11,10 @@ describe Slugtastic do
       Slugtastic.generate_slug("A simple string.").should eq "a-simple-string"
     end
 
+    it "substitutes hyphens for delimiter if specified" do
+      Slugtastic.generate_slug("A simple string.", "_").should eq "a_simple_string"
+    end
+
     it "generates a slug from a string with numbers" do
       Slugtastic.generate_slug("Slugtastic was built in 2012.").should eq "slugtastic-was-built-in-2012"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slugtastic
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -96,18 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -120995727452376200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -120995727452376200
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23