wulffeld_slug 0.0.20 → 0.0.21

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.0.20
+0.0.21

data/lib/wulffeld_slug/prepare_string.rb

@@ -0,0 +1,61 @@
+module WulffeldSlug
+  class PrepareString
+    attr_accessor :words,
+                  :options,
+                  :slug
+    
+    def initialize(words, options = {})
+      @words             = words
+      @options           = options
+      @options[:max]   ||= 239
+      @options[:case]  ||= :downcase
+      @options[:kinds] ||= [:latin, :bulgarian, :cyrillic, :danish, :german, :greek, :macedonian, :norwegian, :romanian, :russian, :serbian, :spanish, :swedish, :ukrainian]
+      
+      @slug              = ''
+      
+      prepare_string
+    end
+    
+    # Use dashes.
+    # http://www.mattcutts.com/blog/dashes-vs-underscores/
+    def prepare_string
+      words = @words.map do |s|
+        prepare_word(s)
+      end
+
+      words.reject!(&:blank?)
+      
+      @slug =
+        case options[:case]
+        when :preserve
+          words
+        when :downcase
+          words.map(&:downcase)
+        when :capitalize
+          words.map(&:capitalize)
+        when :upcase
+          words.map(&:upcase)
+        end.join('-')[0..@options[:max]]
+    end
+
+    def prepare_word(word)
+      # Blow away apostrophes
+      word.gsub! /['`]/,""
+
+      # @ --> at, and & --> and
+      word.gsub! /\s*@\s*/, " at "
+      word.gsub! /\s*&\s*/, " and "
+
+      options[:kinds].each do |kind|
+        word = Babosa::Identifier.new(word).transliterate!(kind)
+        break if word =~ /^[[:ascii:]]+$/
+      end
+      word.strip!
+
+      # Convert spaces to dashes.
+      word.gsub!(/[^a-zA-Z0-9]+/i, '-')
+      
+      word
+    end
+  end
+end

data/lib/wulffeld_slug/slug_include.rb

@@ -37,14 +37,18 @@ module WulffeldSlug
       # NOTE: Uniqueness is not checked if slug is non-nil. You must ensure uniqueness yourself then.
       return unless slug.blank?
 
-      a = [*send(slug_config[:fields])].reject {|f| f.blank? }.map {|f| f.is_a?(String) ? f : send(f) }.flatten
-      return if a.blank?
+      slug_items = resolve_slug_items
+      return if slug_items.blank?
 
-      self.slug = to_unique_slug(a.join('-'))
+      self.slug = to_unique_slug(slug_items)
     end
 
-    def to_unique_slug(s, n=nil)
-      str_part = prepare_string(s)
+    def resolve_slug_items
+      [*send(slug_config[:fields])].reject(&:nil?).map {|f| f.is_a?(String) ? f : send(f) }.flatten.reject(&:blank?)
+    end
+
+    def to_unique_slug(slug_items, n=nil)
+      str_part = WulffeldSlug::PrepareString.new(slug_items, slug_config.merge(:kinds => (respond_to?(:slug_kinds) ? [*slug_kinds] : nil))).slug
       str_part = self.id.to_s if str_part.blank? && !self.new_record?
 
       loop do
@@ -72,46 +76,5 @@ module WulffeldSlug
         n += 1
       end
     end
-
-    # Use dashes.
-    # http://www.mattcutts.com/blog/dashes-vs-underscores/
-    def prepare_string(s, max=239)
-      # Blow away apostrophes
-      s.gsub! /['`]/,""
-
-      # @ --> at, and & --> and
-      s.gsub! /\s*@\s*/, " at "
-      s.gsub! /\s*&\s*/, " and "
-
-      if respond_to?(:slug_kinds)
-        kinds = [*slug_kinds]
-      else
-        kinds = [:latin, :bulgarian, :cyrillic, :danish, :german, :greek, :macedonian, :norwegian, :romanian, :russian, :serbian, :spanish, :swedish, :ukrainian]
-      end
-      kinds.each do |kind|
-        s = Babosa::Identifier.new(s).transliterate!(kind)
-        break if s =~ /^[[:ascii:]]+$/
-      end
-      s.strip!
-
-      # Convert spaces to dashes.
-      s.gsub!(/[^a-zA-Z0-9]+/i, '-')
-
-      words = s.split('-').reject {|w| w.blank? }
-
-      new_slug =
-        case slug_config[:case]
-        when :preserve
-          words
-        when :downcase
-          words.map(&:downcase)
-        when :capitalize
-          words.map(&:capitalize)
-        when :upcase
-          words.map(&:upcase)
-        end.join('-')
-    
-      new_slug = new_slug[0..max]
-    end
   end
 end

data/lib/wulffeld_slug.rb

@@ -1,4 +1,5 @@
 require 'babosa'
 require 'active_support'
+require 'wulffeld_slug/prepare_string'
 require 'wulffeld_slug/slug'
 require 'wulffeld_slug/slug_include'

data/spec/app/models/venue.rb

@@ -0,0 +1,13 @@
+class Venue
+  include Mongoid::Document
+  extend WulffeldSlug::Slug
+
+  field :name
+  field :country
+
+  has_slug :slug_fields, :mongo => true
+  
+  def slug_fields
+    [:name, :country]
+  end
+end

data/spec/lib/prepare_string_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'WulffeldSlug::PrepareString' do
+  it "should convert @ to 'at'" do
+    WulffeldSlug::PrepareString.new(["deckard@nexus6.net"]).slug.should == 'deckard-at-nexus6-net'
+  end
+
+  it "should convert & to 'and'" do
+    WulffeldSlug::PrepareString.new(["Deckard & Batty"]).slug.should == 'deckard-and-batty'
+  end
+end

data/spec/lib/slug_spec.rb

@@ -4,17 +4,17 @@ describe 'WulffeldSlug' do
   context ":case option" do
     context ":case => :upcase" do
       it "should upcase the slug" do
-        user = Actor.new(:name => "Geoffrey Rush")
-        user.save!
-        user.reload.slug.should == 'GEOFFREY-RUSH'
+        actor = Actor.new(:name => "Geoffrey Rush")
+        actor.valid?
+        actor.slug.should == 'GEOFFREY-RUSH'
       end
     end
 
     context ":case => :preserve" do
       it "should preserve capitalization" do
         user = User.new(:login => "Batty")
-        user.save!
-        user.reload.slug.should == 'Batty'
+        user.valid?
+        user.slug.should == 'Batty'
       end
     end
   end
@@ -25,18 +25,19 @@ describe 'WulffeldSlug' do
     end
     
     it "creates a slug" do
-      article.save
+      article.save!
       article.slug.should == "blade-runner"
     end
     
     it "creates a unique slug" do
-      article.save
+      Article.create!(:title => "Blade Runner")
+      article.save!
       article.slug.should == "blade-runner-1"
     end
     
     it "creates a slug without superfluous spaces" do
       article.title = "   The   Shawshank  Redemption    "
-      article.save
+      article.valid?
       article.slug.should == "the-shawshank-redemption"
     end
   end
@@ -44,8 +45,8 @@ describe 'WulffeldSlug' do
   context "dynamic slug fields" do
     it "should create a slug based on the non-nil field(s)" do
       user = User.new(:login => "deckard")
-      user.save!
-      user.reload.slug.should == 'deckard'
+      user.valid?
+      user.slug.should == 'deckard'
     end
   end
 
@@ -89,5 +90,11 @@ describe 'WulffeldSlug' do
       article.valid?
       article.slug.should == "dvorec-sporta"
     end
+
+    it "should transliterate all parts" do
+      venue = Venue.new(:name => "Дворец Спорта", :country => "Russia")
+      venue.valid?
+      venue.slug.should == "dvorec-sporta-russia"
+    end
   end
 end

data/spec/spec_helper.rb

@@ -10,8 +10,9 @@ ENV["RAILS_ENV"] = "test"
 
 require "wulffeld_slug"
 require "mongoid"
-require "rspec"
+require "database_cleaner"
 require "factory_girl"
+require "rspec"
 
 Mongoid.configure do |config|
   config.master = Mongo::Connection.new.db("wulffeld_slug_test")
@@ -20,6 +21,8 @@ end
 
 Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file) }
 
+DatabaseCleaner[:mongoid].strategy = :truncation
+
 RSpec.configure do |config|
   require 'rspec/expectations'
 
@@ -27,6 +30,12 @@ RSpec.configure do |config|
 
   config.mock_with :rspec
 
-  config.after(:suite) { Mongoid.purge! }
-  config.before(:each) { Mongoid::IdentityMap.clear }
+  config.before(:each) do
+    DatabaseCleaner.clean
+    Mongoid::IdentityMap.clear
+  end
+
+  config.after(:suite) do
+    Mongoid.purge!
+  end
 end

data/wulffeld_slug.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wulffeld_slug"
-  s.version = "0.0.20"
+  s.version = "0.0.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Moen Wulffeld"]
-  s.date = "2012-04-25"
+  s.date = "2012-04-26"
   s.description = ""
   s.email = "martin@wulffeld.org"
   s.extra_rdoc_files = [
@@ -22,12 +22,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/wulffeld_slug.rb",
+    "lib/wulffeld_slug/prepare_string.rb",
     "lib/wulffeld_slug/slug.rb",
     "lib/wulffeld_slug/slug_include.rb",
     "spec/app/models/actor.rb",
     "spec/app/models/article.rb",
     "spec/app/models/user.rb",
+    "spec/app/models/venue.rb",
     "spec/factories.rb",
+    "spec/lib/prepare_string_spec.rb",
     "spec/lib/slug_spec.rb",
     "spec/spec_helper.rb",
     "wulffeld_slug.gemspec"
@@ -129,6 +132,27 @@ 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_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
@@ -220,6 +244,27 @@ 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<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
@@ -312,6 +357,27 @@ 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<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