lcbo 0.9.6 → 0.9.7

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+Version 0.9.7
+
+  * Refactored `TitleCaseHelper` to use the UnicodeUtils library.
+
 Version 0.9.6
 
   * Removed instances of `Enumerable#reduce` in favour of `Hash[]` for

data/Gemfile

@@ -2,3 +2,4 @@ source 'http://rubygems.org'
 
 gem 'typhoeus'
 gem 'nokogiri'
+gem 'unicode_utils'

data/Gemfile.lock

@@ -5,6 +5,7 @@ GEM
     rack (1.2.1)
     typhoeus (0.1.31)
       rack
+    unicode_utils (1.0.0)
 
 PLATFORMS
   ruby
@@ -12,3 +13,4 @@ PLATFORMS
 DEPENDENCIES
   nokogiri
   typhoeus
+  unicode_utils

data/lcbo.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'typhoeus'
   s.add_dependency 'nokogiri'
+  s.add_dependency 'unicode_utils'
 
   s.files         = `git ls-files`.split(?\n)
   s.test_files    = `git ls-files -- {test,spec}/*`.split(?\n)

data/lib/lcbo/crawlkit.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'typhoeus'
+require 'unicode_utils'
 require 'uri'
 
 module LCBO

data/lib/lcbo/crawlkit/response.rb

@@ -18,10 +18,10 @@ module LCBO
       end
 
       def self.normalize_encoding(html)
-        if html.valid_encoding?
-          html
-        else
+        if html.force_encoding('ISO-8859-1').valid_encoding?
           html.encode('UTF-8', 'ISO-8859-1')
+        else
+          html.encode('UTF-8')
         end.gsub("\r\n", "\n")
       end
 

data/lib/lcbo/crawlkit/titlecase_helper.rb

@@ -4,92 +4,61 @@ module LCBO
   module CrawlKit
     class TitleCaseHelper
 
-      UPPER_CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝ'
-      LOWER_CHARS = 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüý'
-      ALPHA_RANGE = "[#{UPPER_CHARS}#{LOWER_CHARS}]"
-      UPPER_RANGE = "[#{UPPER_CHARS}]"
-      LOWER_RANGE = "[#{LOWER_CHARS}]"
-      FIRST_CHAR_RE = /#{ALPHA_RANGE}{1}/u
-      ALPHA_RE = /#{ALPHA_RANGE}.*/u
-      SMALL_WORDS = %w[ a an and as at but by en for if in of del de on or the to v v. via vs vs. ]
-      ACRONYMS = %w[ vqa vsop xo nq5 vs xxx igt xiii xi xoxo srl bdb cvbg ocb lcbo i ii iii ]
+      SMALL_WORDS = %w[
+        a an and as at but by en for
+        if in of del de on or the to
+        v v. via vs vs.
+      ]
+
+      ACRONYMS = %w[
+        vqa vsop xo nq5 vs xxx igt
+        xiii xi xoxo srl bdb cvbg
+        ocb lcbo i ii iii
+      ]
 
       attr_reader :input
 
       def self.[](string)
-        titleize(string)
+        titlecase(string)
       end
 
       def self.upcase(string)
-        string.tr(LOWER_CHARS, UPPER_CHARS)
+        UnicodeUtils.simple_upcase(string)
       end
 
       def self.downcase(string)
-        string.tr(UPPER_CHARS, LOWER_CHARS)
-      end
-
-      def self.preclean(string)
-        # Strip useless bracketed crap: Some Product Name (Some Redundant Stuff)**
-        string.gsub(/\(.+\Z/, '').
-        # Strip trailing stars.
-        gsub(/\*+\Z/, '')
+        UnicodeUtils.simple_downcase(string)
       end
 
       def self.capitalize(string)
-        first_letter = string.scan(FIRST_CHAR_RE)[0]
-        if first_letter
-          uchar = upcase(first_letter)
-          string.sub(/#{first_letter}/u, uchar)
-        else
-          string
-        end
-      end
-
-      def self.titleize(string)
-        phrases(preclean(downcase(string))).map do |phrase|
-          words = phrase.split
-          words.map do |word|
-            def word.capitalize
-              self.sub(ALPHA_RE) { |subword| TitleCaseHelper.capitalize(subword) }
-            end
-            case word
-            when *(ACRONYMS + ACRONYMS.map { |ac| capitalize(ac) })
-              upcase(word)
-            when /#{ALPHA_RANGE}\&#{ALPHA_RANGE}/u # words with &, like E&J
-              word.split(/\&/).map { |w| capitalize(w) }.join('&')
-            when /#{ALPHA_RANGE}\-#{ALPHA_RANGE}/u # words with dashes, like "Smith-Weston"
-              word.split(/\-/).map { |w| capitalize(w) }.join('-')
-            when /#{ALPHA_RANGE}\/#{ALPHA_RANGE}/u # words with slashes
-              word.split(/\//).map { |w| capitalize(w) }.join(' / ')
-            when /#{ALPHA_RANGE}\.#{ALPHA_RANGE}/u # words with dots, like "example.com"
-              capitalized = word.split(/\./u).map { |w| capitalize(w) }.join('.')
-              '.' == word[-1, 1] ? capitalized + '.' : capitalized
-            when /^#{ALPHA_RANGE}.*#{UPPER_RANGE}/u # non-first letter capitalized already
-              word
-            when words.first, words.last
-              word.capitalize
-            when *(SMALL_WORDS + SMALL_WORDS.map { |small| capitalize(small) })
-              word.downcase
-            else
-              word.capitalize
-            end
-          end.join(' ')
-        end.join(' ').
-        # Special case for Word'S
-        gsub(/(['’])S\b/, '\1s')
+        UnicodeUtils.titlecase(string)
       end
 
-      def self.phrases(title)
-        phrases = title.scan(/.+?(?:[:.;?!] |$)/u).map { |phrase| phrase.strip }
-        # rejoin phrases that were split on the '.' from a small word
-        if phrases.size > 1
-          phrases[0..-2].each_with_index do |phrase, index|
-            if SMALL_WORDS.include?(phrase.split.last.downcase)
-              phrases[index] << " " + phrases.slice!(index + 1)
-            end
+      def self.titlecase(string)
+        preclean = lambda { |s|
+          # Strip bracketed stuff and trailing junk: Product (Junk)**
+          s.gsub(/\(.+\Z/, '').gsub(/\*+\Z/, '').strip
+        }
+        count = 0 # Ewwww
+        capitalize(preclean.(string)).split.map do |word|
+          count += 1
+          case word.downcase
+          when /[\w]\/[\w]/ # words with slashes
+            word.split('/').map { |w| capitalize(w) }.join(' / ')
+          when /[\w]\&[\w]/ # words with &, like E&J
+            word.split('&').map { |w| capitalize(w) }.join('&')
+          when /[\w]\-[\w]/ # words with dashes, like "Super-Cool"
+            word.split('-').map { |w| capitalize(w) }.join('-')
+          when /[\w]\.[\w]/ # words with dots, like "A.B.C."
+            word.split('.').map { |w| upcase(w) }.join('.') + '.'
+          when *SMALL_WORDS
+            1 == count ? word : word.downcase
+          when *ACRONYMS
+            word.upcase
+          else
+            word
           end
-        end
-        phrases
+        end.join(' ').gsub(/(['’])S\b/, '\1s')
       end
 
     end

data/lib/lcbo/version.rb

@@ -1,3 +1,3 @@
 module LCBO
-  VERSION = '0.9.6'
+  VERSION = '0.9.7'
 end

data/spec/crawlkit/titlecase_helper_spec.rb

@@ -8,7 +8,7 @@ describe LCBO::CrawlKit::TitleCaseHelper do
     'MONDAVI TO-KALON FUMÉ BLANC'      => 'Mondavi To-Kalon Fumé Blanc',
     'ÉVE PICARD'                       => 'Éve Picard',
     'R. PHILLIPS NIGHT HARVEST SHIRAZ' => 'R. Phillips Night Harvest Shiraz',
-    '02 OPUS ONE NAPA VALLEY C.V.B.G'  => '02 Opus One Napa Valley C.V.B.G',
+    '02 OPUS ONE NAPA VALLEY C.V.B.G'  => '02 Opus One Napa Valley C.V.B.G.',
     'LONDON XXX'                       => 'London XXX',
     'SOME NICE VQA WINE'               => 'Some Nice VQA Wine',
     'A PRODUCT NAME (WITH STUPID CRAP' => 'A Product Name',
@@ -21,10 +21,4 @@ describe LCBO::CrawlKit::TitleCaseHelper do
     end
   end
 
-  it 'should translate lowercase characters to uppercase characters properly' do
-    upper = LCBO::CrawlKit::TitleCaseHelper::UPPER_CHARS
-    lower = LCBO::CrawlKit::TitleCaseHelper::LOWER_CHARS
-    LCBO::CrawlKit::TitleCaseHelper.upcase(lower).must_equal upper
-  end
-
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 7
+  version: 0.9.7
 platform: ruby
 authors: 
 - Carsten Nielsen
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-01 00:00:00 -05:00
+date: 2010-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: unicode_utils
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Request and parse product, store, inventory, and product search pages directly from the official LCBO website.
 email: 
 - heycarsten@gmail.com