wulffeld_slug 0.0.21 → 0.0.22

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.0.21
+0.0.22

data/lib/wulffeld_slug/prepare_string.rb

@@ -5,7 +5,12 @@ module WulffeldSlug
                   :slug
     
     def initialize(words, options = {})
-      @words             = words
+      # Original words. Will not be touched.
+      @words             = [*words]
+      
+      # Converted words.
+      @slug_words        = []
+      
       @options           = options
       @options[:max]   ||= 239
       @options[:case]  ||= :downcase
@@ -16,26 +21,12 @@ module WulffeldSlug
       prepare_string
     end
     
-    # Use dashes.
+    # Use dashes to join.
     # 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]]
+      prepare_words
+      prepare_case
+      combine_words
     end
 
     def prepare_word(word)
@@ -54,8 +45,34 @@ module WulffeldSlug
 
       # Convert spaces to dashes.
       word.gsub!(/[^a-zA-Z0-9]+/i, '-')
-      
-      word
+
+      # Remove dashes at start and end of word.
+      word.gsub!(/^\-+/, '')
+      word.gsub!(/\-+$/, '')
+
+      @slug_words << word unless word.blank?
+    end
+
+    protected
+    
+    def combine_words
+      @slug = @slug_words.join('-')[0..@options[:max]]
+    end
+
+    def prepare_words
+      @words.each { |s| prepare_word(s) }
+    end
+
+    def prepare_case
+      case options[:case]
+      when :downcase
+        @slug_words.map!(&:downcase)
+      when :capitalize
+        @slug_words.map!(&:capitalize)
+      when :upcase
+        @slug_words.map!(&:upcase)
+      when :preserve
+      end
     end
   end
 end

data/spec/lib/prepare_string_spec.rb

@@ -2,10 +2,22 @@ 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'
+    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'
+    WulffeldSlug::PrepareString.new("Deckard & Batty").slug.should == 'deckard-and-batty'
+  end
+
+  describe "preparing various words" do
+    [
+      [["This", "PLACE"], "this-place"],
+      ["«Огни Уфы»", "ogni-ufy"],
+      ["Развлекательный Комплекс «Огни Уфы», «Колизео»", "razvlekatelinyi-komplekz-ogni-ufy-kolizeo"]
+    ].each do |orig, result|
+      it "should convert '#{orig}' to '#{result}" do
+        WulffeldSlug::PrepareString.new([*orig]).slug.should == result
+      end
+    end
   end
 end

data/wulffeld_slug.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wulffeld_slug"
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Moen Wulffeld"]
@@ -153,6 +153,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
@@ -265,6 +279,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
@@ -378,6 +406,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