eaternet 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d9f6681a4904685bd6678d202b705258be40c4d
-  data.tar.gz: a4d61b8baed63e2185500b1cba50deffdd45ecaa
+  metadata.gz: f260d5eccf43b6198afa53dbfb57b95a64606e15
+  data.tar.gz: 7ef2ce141bcda76e95d4f93ade84ae7fb68493f1
 SHA512:
-  metadata.gz: 1d7e8d871a4be9318533c1fe0c8530d619d5ee477b97993e25544342425dac0973efb423a637bae84291d6d08c49950abfeb96c2ff777170f50a7cf3251a91fe
-  data.tar.gz: 850f79dd5b1f41f452cf0554f45bf8409764a437c31e71aefd519ae3cf5735578361ec069a86e100f09109901ea9bb987fc8a7b45084cbdb23b8e2873e75fc64
+  metadata.gz: 29ea9910630f0225e4f835631396d95c47677485fcaecdc62f034a0a749132cab2c2871243f451fac8aca58a9f88588f24edd6527fe283467faafe7537a3ce47
+  data.tar.gz: 1a963f7b6143f797644bb1345d85f46a19738a5f9cdebca77797997d1d18445ee80646961d0a24f37feef93f2670646950f732b71e7e1d576261fb3d0ad1a6d1

data/lib/eaternet/agencies/nyc.rb

@@ -139,12 +139,12 @@ module Eaternet
         address = "#{row['BUILDING']} #{row['STREET']}"
 
         Eaternet::Lives_1_0::Business.new do |b|
-          b.business_id = business_id(row)
-          b.name =    row['DBA']
-          b.address = address
-          b.city =    row['BORO']
-          b.postal_code = row['ZIPCODE']
-          b.state = 'NY'
+          b.business_id =  business_id(row)
+          b.name =         row['DBA']
+          b.address =      address
+          b.city =         row['BORO']
+          b.postal_code =  row['ZIPCODE']
+          b.state =        'NY'
           b.phone_number = row['PHONE']
         end
       end
@@ -154,8 +154,8 @@ module Eaternet
       def violation(row)
         Eaternet::Lives_1_0::Violation.new do |v|
           v.business_id = business_id(row)
-          v.date = Date.strptime(row['INSPECTION DATE'], '%m/%d/%Y')
-          v.code = violation_code(row)
+          v.date =        Date.strptime(row['INSPECTION DATE'], '%m/%d/%Y')
+          v.code =        violation_code(row)
           v.description = row['VIOLATION DESCRIPTION']
         end
       end
@@ -163,8 +163,8 @@ module Eaternet
       def inspection(row)
         Eaternet::Lives_1_0::Inspection.new do |i|
           i.business_id = business_id(row)
-          i.date = Date.strptime(row['INSPECTION DATE'], '%m/%d/%Y')
-          i.score = 100 - row['SCORE'].to_i
+          i.date =        Date.strptime(row['INSPECTION DATE'], '%m/%d/%Y')
+          i.score =       100 - row['SCORE'].to_i
         end
       end
 

data/lib/eaternet/agencies/sf.rb

@@ -26,11 +26,11 @@ module Eaternet
 
       def feed_info
         Eaternet::Lives_1_0::FeedInfo.new do |fi|
-          fi.feed_date = Date.today
-          fi.feed_version = '1.0'
+          fi.feed_date =         Date.today
+          fi.feed_version =      '1.0'
           fi.municipality_name = 'San Francisco'
-          fi.municipality_url = 'https://www.sfdph.org/dph/EH/Food/Score/default.asp'
-          fi.contact_email = 'contact@sfdph.org'
+          fi.municipality_url =  'https://www.sfdph.org/dph/EH/Food/Score/default.asp'
+          fi.contact_email =     'contact@sfdph.org'
         end
       end
 
@@ -57,7 +57,7 @@ module Eaternet
           csv_row.headers.each do |header|
             b.send("#{header.downcase}=", csv_row[header])
             b.date = Date.parse(csv_row['date'])
-            b.score = csv_row['Score'].to_i
+            b.score = csv_row['score'].to_i
           end
         end
       end

data/lib/eaternet/agencies/snhd_prototype.rb

@@ -20,10 +20,10 @@ module Eaternet
         lazy_csv_map('restaurant_establishments.csv') do |row|
           Eaternet::Prototype::BusinessData.new(
             orig_key: row['permit_number'],
-            name: row['restaurant_name'],
-            address: row['address'],
-            city: row['city_name'],
-            zipcode: row['zip_code']
+            name:     row['restaurant_name'],
+            address:  row['address'],
+            city:     row['city_name'],
+            zipcode:  row['zip_code']
           )
         end
       end
@@ -37,12 +37,12 @@ module Eaternet
                          []
                        end
           Eaternet::Prototype::InspectionData.new(
-            orig_key: row['serial_number'],
+            orig_key:          row['serial_number'],
             business_orig_key: row['permit_number'],
-            score: row['inspection_grade'],
-            demerits: row['inspection_demerits'],
-            date: row['inspection_date'],
-            violations: violations
+            score:             row['inspection_grade'],
+            demerits:          row['inspection_demerits'],
+            date:              row['inspection_date'],
+            violations:        violations
           )
         end
       end
@@ -51,8 +51,8 @@ module Eaternet
       def violations
         lazy_csv_map('restaurant_inspection_violations.csv') do |row|
           Eaternet::Prototype::ViolationData.new(
-            orig_key: row['inspection_violation_id'],
-            inspection_id: row['inspection_id'],
+            orig_key:          row['inspection_violation_id'],
+            inspection_id:     row['inspection_id'],
             violation_kind_id: row['inspection_violation']
           )
         end
@@ -63,9 +63,9 @@ module Eaternet
       def violation_kinds
         lazy_csv_map('restaurant_violations.csv') do |row|
           Eaternet::Prototype::ViolationKindData.new(
-            orig_key: row['violation_id'],
-            code: row['violation_code'],
-            demerits: row['violation_demerits'],
+            orig_key:    row['violation_id'],
+            code:        row['violation_code'],
+            demerits:    row['violation_demerits'],
             description: row['violation_description']
           )
         end

data/lib/eaternet/lives_1_0/csv_parser.rb

@@ -10,7 +10,7 @@ module Eaternet
       end
 
       def convert(csv:, to_type:)
-        csv_map(csv) { |row| try_to_create to_type, from_csv_row: row }
+        csv_map(csv) { |row| try_to_create to_type, from_csv_row: row }.compact
       end
 
       def map_csv

data/lib/eaternet/lives_1_0/inspection.rb

@@ -58,7 +58,7 @@ module Eaternet
       # @return [String]
       attr_accessor :type
       validates     :type,
-                    inclusion: { in: %w(initial routine followup complaint) },
+                    format: { with: /initial|routine|followup|complaint/i },
                     allow_nil: true
 
       # @return [String]

data/lib/eaternet/util.rb

@@ -32,10 +32,11 @@ module Eaternet
     # @param [String] dest pathname in which to save the file
     # @return [File] the file
     def self.download_and_cache(source:, dest:)
-      cache_path = generate_cache_path(source)
-      download(source: source, dest: cache_path) if expired? cache_path
-      FileUtils.cp cache_path, dest
-      File.open dest
+      download(source: source, dest: dest)
+      # cache_path = generate_cache_path(source)
+      # download(source: source, dest: cache_path) if expired? cache_path
+      # FileUtils.cp cache_path, dest
+      # File.open dest
     end
 
     # Download a file from the network.

data/lib/eaternet/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Eaternet
-  VERSION = '1.3.7'
+  VERSION = '1.3.8'
 end

data/test/eaternet/agencies/sf_test.rb

@@ -26,7 +26,7 @@ class SfTest < Minitest::Test
       assert_equal 'CA', b.state
       assert_equal 37.791116, b.latitude
       assert_equal -122.403816, b.longitude
-      assert_equal '', b.phone_number
+      assert_equal '+14154217044', b.phone_number
     end
   end
 
@@ -39,15 +39,16 @@ class SfTest < Minitest::Test
       assert enumerable_of? Eaternet::Lives_1_0::Inspection, @@sf.inspections
     end
   end
-  #
-  # def test_inspections_returns_lives_attributes
-  #   VCR.use_cassette(SF_CASSETTE) do
-  #     i = @@sf.inspections.first(6).last
-  #     assert_equal '17', i.business_id
-  #     assert_equal Date.new(2012, 8, 23), i.date
-  #     assert_equal 100, i.score
-  #   end
-  # end
+
+  def test_inspections_returns_lives_attributes
+    VCR.use_cassette(SF_CASSETTE) do
+      chosen_inspection = @@sf.inspections
+                              .select { |i| i.business_id == "19" && i.date == Date.new(2016, 5, 13) }
+                              .first
+      raise "Couldn't find the chosen inspection" if chosen_inspection.nil?
+      assert_equal 94, chosen_inspection.score
+    end
+  end
 
   #
   # Violations
@@ -59,6 +60,7 @@ class SfTest < Minitest::Test
     end
   end
 
+  # TODO: Fix this test
   # def test_violations_returns_lives_attributes
   #   VCR.use_cassette(SF_CASSETTE) do
   #     v = @@sf.violations.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eaternet
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-08 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Regional adapters for restaurant health scores