wulffeld_slug 0.0.22 → 0.0.23

data/Gemfile.lock

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

data/VERSION

@@ -1 +1 @@
-0.0.22
+0.0.23

data/lib/wulffeld_slug/prepare_string.rb

@@ -3,6 +3,8 @@ module WulffeldSlug
     attr_accessor :words,
                   :options,
                   :slug
+
+    VALID_WORD_REGEX = /^[\sa-zA-Z0-9-]+$/i
     
     def initialize(words, options = {})
       # Original words. Will not be touched.
@@ -14,7 +16,7 @@ module WulffeldSlug
       @options           = options
       @options[:max]   ||= 239
       @options[:case]  ||= :downcase
-      @options[:kinds] ||= [:latin, :bulgarian, :cyrillic, :danish, :german, :greek, :macedonian, :norwegian, :romanian, :russian, :serbian, :spanish, :swedish, :ukrainian]
+      @options[:kinds] ||= [:latin, :danish, :norwegian, :german, :swedish, :spanish, :russian, :bulgarian, :cyrillic, :greek, :macedonian, :romanian, :serbian, :ukrainian]
       
       @slug              = ''
       
@@ -30,21 +32,45 @@ module WulffeldSlug
     end
 
     def prepare_word(word)
+      word = word.dup
       # Blow away apostrophes
-      word.gsub! /['`]/,""
+      word.gsub! /['`´]/, ''
 
       # @ --> at, and & --> and
       word.gsub! /\s*@\s*/, " at "
       word.gsub! /\s*&\s*/, " and "
 
+      # First see if transliteration produces something worthwhile.
       options[:kinds].each do |kind|
-        word = Babosa::Identifier.new(word).transliterate!(kind)
-        break if word =~ /^[[:ascii:]]+$/
+        w = Babosa::Identifier.new(word).transliterate!(kind)
+        if w =~ VALID_WORD_REGEX && word.length - w.length < 10
+          word = w
+          break
+        end
+      end
+
+      # More brutality needed.
+      if word !~ VALID_WORD_REGEX
+        potential = []
+        options[:kinds].each do |kind|
+          potential << Babosa::Identifier.new(word).transliterate!(kind).gsub(/[^\sa-zA-Z0-9]+/i, '-').split('-').map(&:strip).reject(&:blank?).join('-')
+        end
+        
+        potential.sort {|a,b| b.length <=> a.length }.each do |w|
+          if w =~ VALID_WORD_REGEX
+            word = w
+            break
+          end
+        end
       end
+
       word.strip!
 
       # Convert spaces to dashes.
-      word.gsub!(/[^a-zA-Z0-9]+/i, '-')
+      word.gsub!(/[\s]+/i, '-')
+
+      # Remove non-alpha/num.
+      word.gsub!(/[^a-zA-Z0-9-]+/i, '')
 
       # Remove dashes at start and end of word.
       word.gsub!(/^\-+/, '')

data/spec/lib/prepare_string_spec.rb

@@ -12,8 +12,14 @@ describe 'WulffeldSlug::PrepareString' do
   describe "preparing various words" do
     [
       [["This", "PLACE"], "this-place"],
-      ["«Огни Уфы»", "ogni-ufy"],
-      ["Развлекательный Комплекс «Огни Уфы», «Колизео»", "razvlekatelinyi-komplekz-ogni-ufy-kolizeo"]
+      ["«Огни Уфы»", "ogny-ufy"],
+      ["Развлекательный Комплекс «Огни Уфы», «Колизео»", "razvlekatelinyi-kompleks-ogni-ufy-kolizeo"],
+      ["Rider´s Cafe", "riders-cafe"],
+      ["Rider`s Cafe", "riders-cafe"],
+      ["Rider's Cafe", "riders-cafe"],
+      ["o|∞", "o"],
+      ["рок клуб (Привокзальна, Залізнична 1 а), Львов", 'rok-klub-privokzalina-zal-znichna-1-a-livov'],
+      ["рок клуб 'Старушка' (Привокзальна, Залізнична 1 а)", 'aaa']
     ].each do |orig, result|
       it "should convert '#{orig}' to '#{result}" do
         WulffeldSlug::PrepareString.new([*orig]).slug.should == result

data/spec/lib/slug_spec.rb

@@ -88,13 +88,13 @@ describe 'WulffeldSlug' do
     it "should transliterate Russian" do
       article = Article.new(:title => "Дворец Спорта")
       article.valid?
-      article.slug.should == "dvorec-sporta"
+      article.slug.should == "dvorets-sporta"
     end
 
     it "should transliterate all parts" do
       venue = Venue.new(:name => "Дворец Спорта", :country => "Russia")
       venue.valid?
-      venue.slug.should == "dvorec-sporta-russia"
+      venue.slug.should == "dvorets-sporta-russia"
     end
   end
 end

data/wulffeld_slug.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "wulffeld_slug"
-  s.version = "0.0.22"
+  s.version = "0.0.23"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Moen Wulffeld"]
@@ -167,6 +167,34 @@ 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_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
@@ -293,6 +321,34 @@ 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<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
@@ -420,6 +476,34 @@ 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<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