eaternet 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cee1dfd59cbfd4d2ff5914c0f4a05aa4f0df68bf
-  data.tar.gz: bb7a292eb048bb501557c871fae04c891ab5c80c
+  metadata.gz: fc17111a80609816dddf66515267734e22085088
+  data.tar.gz: 6df34dc57c4faadf6d754d933194f4a5cfc8da0e
 SHA512:
-  metadata.gz: 90c77526acf205fff1be2570ce163806c2cbd3e75aa12a2f232fc130bafabce2363fc77c1d696f89a8717c890f5c070b14e78532a894ba3b5857af0865765d07
-  data.tar.gz: 0e56fa6989291aabf01b83e2dee206696287f3a002aa7139e6dd348e6fbc00f185b5fffaa8fd72a63fe2c4cb16750890175eafd91d11c52db8882faccbf4e662
+  metadata.gz: 3b13979c1ef4944117a68deb206c81b5c573f71dd53f8017e27336fa22d227dac2001c1c5851e26acc4671c8633ee808e88f17effd8ff55b73ad5d86e1924977
+  data.tar.gz: a121ff06cae73d6c1ed22e041c7019e02bf2cc803d7556caa143b455f43ddf3228a7ebd6a15e34530fc78ca0943e362a4c622c19a263a90e6f17ebc135269fb3

data/lib/eaternet/agencies/nyc.rb

@@ -161,9 +161,9 @@ module Eaternet
 
         Business.new do |b|
           b.business_id = business_id(row)
-          b.name =    Eaternet::Util.cleanup_title(row['DBA'])
-          b.address = Eaternet::Util.cleanup_title(address)
-          b.city =    Eaternet::Util.cleanup_title(row['BORO'])
+          b.name =    row['DBA']
+          b.address = address
+          b.city =    row['BORO']
           b.postal_code = row['ZIPCODE']
           b.state = 'NY'
           b.phone_number = row['PHONE']

data/lib/eaternet/agencies/snhd.rb

@@ -109,7 +109,7 @@ module Eaternet
       end
 
       def csv_reader(path:, headers:)
-        file = open(path)
+        file = open(path, encoding: 'utf-8')
         file.readline  # Skip the non-standard header line
         CSV.new(
           file,

data/lib/eaternet/agencies/snhd_lives.rb

@@ -43,9 +43,9 @@ module Eaternet
       def business(proto)
         Business.new do |b|
           b.business_id = proto.orig_key
-          b.name =    Eaternet::Util.cleanup_title(proto.name)
-          b.address = Eaternet::Util.cleanup_title(proto.address)
-          b.city =    Eaternet::Util.cleanup_title(proto.city)
+          b.name =    proto.name
+          b.address = proto.address
+          b.city =    proto.city
           b.postal_code = proto.zipcode
           b.state = 'NV'
         end
@@ -79,7 +79,7 @@ module Eaternet
 
       def _violations
         violation_kinds = {}
-        @prototype.violation_kinds.to_a.each do |vk|
+        @prototype.violation_kinds.each do |vk|
           violation_kinds[vk.orig_key] = vk
         end
 

data/lib/eaternet/util.rb

@@ -61,23 +61,6 @@ module Eaternet
       end
     end
 
-    # Remove extraneous whitespace and ensure capitalization
-    # is correct for a proper name or title.
-    #
-    # @return [String] the cleaned up string
-    def self.cleanup_title(a_string)
-      return nil if a_string.nil?
-      titleize(cleanup(a_string))
-    end
-
-    # Remove extraneous whitespace from the string
-    #
-    # @return [String] the cleaned up string
-    def self.cleanup(a_string)
-      return nil if a_string.nil?
-      a_string.strip.gsub(/ +/, ' ')
-    end
-
     # @return [Float]
     def self.file_age_in_days(path)
       (Time.now - File.mtime(path)).to_i / 86_400.0
@@ -100,50 +83,5 @@ module Eaternet
       `mkdir -p #{cache_dir}`
       cache_dir
     end
-
-    #
-    # A titleize that creates a usable title according to grammar rules.
-    #
-    ARTICLES = Set.new %w(a an and by di et for in is not of on or over the to under with)
-
-    def self.titleize(a_string)
-      # Only fix if all uppercase
-      return a_string unless all_uppercase?(a_string)
-
-      result = []
-
-      for word in a_string.downcase.split(/[[:space:]]/) # handle unicode
-        if irish?(word)
-          result << inflect_irish(word)
-        else
-          word = word.capitalize unless ARTICLES.include? word
-          result << word
-        end
-      end
-
-      just_capitalize(result.join(' '))
-    end
-
-    def self.all_uppercase?(a_string)
-      a_string.upcase == a_string
-    end
-
-    def self.irish?(a_string)
-      a_string =~ /^((ma?c)|(o')).+$/ && !italian?(a_string)
-    end
-
-    def self.italian?(a_string)
-      %w(macaron macaroni macchiato machiavelli).include? a_string
-    end
-
-    def self.inflect_irish(a_string)
-      a_string =~ /^((ma?c)|(o'))(.+)$/
-      Regexp.last_match(1).capitalize + Regexp.last_match(4).capitalize
-    end
-
-    def self.just_capitalize(a_string)
-      head, tail = a_string.split(//, 2)
-      head.upcase + tail
-    end
   end
 end

data/lib/eaternet/version.rb

@@ -1,3 +1,3 @@
 module Eaternet
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

data/test/eaternet/agencies/nyc_test.rb

@@ -32,9 +32,9 @@ class NycAdapterTest < Minitest::Test
   def test_businesses_returns_lives_attributes
     b = @@nyc.businesses.first
     assert_equal '30075445', b.business_id
-    assert_equal 'Morris Park Bake Shop', b.name
-    assert_equal '1007 Morris Park Ave', b.address
-    assert_equal 'Bronx', b.city
+    assert_equal 'MORRIS PARK BAKE SHOP', b.name
+    assert_equal '1007 MORRIS PARK AVE', b.address
+    assert_equal 'BRONX', b.city
     assert_equal '10462', b.postal_code
     assert_equal 'NY', b.state
     assert_equal '7188924968', b.phone_number
@@ -44,17 +44,6 @@ class NycAdapterTest < Minitest::Test
     assert_equal 1, @@nyc.businesses.to_a.size
   end
 
-  def test_cleans_up_whitespace_1
-    b = @@nyc.business(@may_may_data)
-    assert_equal '1269 Sutter Avenue', b.address
-  end
-
-  def test_cleans_up_whitespace_2
-    @may_may_data['STREET'] = 'EAST   52 STREET                                  '
-    b = @@nyc.business(@may_may_data)
-    assert_equal '1269 East 52 Street', b.address
-  end
-
   #
   # Inspections
   #

data/test/eaternet/util_test.rb

@@ -44,71 +44,4 @@ class UtilTest < Minitest::Test
     assert_requested :get, @url, times: 2
   end
 
-  #
-  # #cleanup_title
-  #
-
-  def assert_cleans_up_to(output, input)
-    assert_equal output, Eaternet::Util.cleanup_title(input)
-  end
-
-  def test_doesnt_mess_up_numeric_streets
-    assert_cleans_up_to '1654 86th St', '1654 86TH ST'
-  end
-
-  # Irish
-
-  def test_mcdonald_avenue
-    assert_cleans_up_to '1158 McDonald Avenue', '1158 MCDONALD AVENUE'
-  end
-
-  def test_mckennas_pub
-    assert_cleans_up_to "McKenna's Pub", "MCKENNA'S PUB"
-  end
-
-  def test_macdougal_street
-    assert_cleans_up_to '122 MacDougal St', '122 MACDOUGAL ST'
-  end
-
-  def test_o_sullivans_pub
-    assert_cleans_up_to "O'Sullivan's Pub", "O'SULLIVAN'S PUB"
-  end
-
-  def test_mc_sorleys
-    assert_cleans_up_to "McSorley's Old Ale House", "MCSORLEY'S OLD ALE HOUSE"
-  end
-
-  # Italian
-
-  def test_macchiato
-    assert_cleans_up_to 'Macchiato Espresso Bar', 'MACCHIATO ESPRESSO BAR'
-  end
-
-  def test_di_vittorio
-    assert_cleans_up_to 'La Lanterna di Vittorio', 'LA LANTERNA DI VITTORIO'
-  end
-
-  def test_machiavelli
-    assert_cleans_up_to 'Machiavelli', 'MACHIAVELLI'
-  end
-
-  def test_macaroni
-    assert_cleans_up_to 'Macaroni', 'MACARONI'
-  end
-
-  # French
-
-  def test_rouge_et_blanc
-    assert_cleans_up_to 'Rouge et Blanc', 'ROUGE ET BLANC'
-  end
-
-  def test_macaron
-    assert_cleans_up_to 'Macaron', 'MACARON'
-  end
-
-  # Weird
-
-  def test_weird_stuff
-    assert_cleans_up_to 'aBcDeFg', 'aBcDeFg'
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eaternet
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler