eaternet 1.3.5 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c897d6faf9805e3e8d4c2c2ff8c71200d95bffe4
-  data.tar.gz: d8f203475413d0f7fa2c1cb1a47b4abd29cf035d
+  metadata.gz: 8d9f6681a4904685bd6678d202b705258be40c4d
+  data.tar.gz: a4d61b8baed63e2185500b1cba50deffdd45ecaa
 SHA512:
-  metadata.gz: 4f15fa3e30d5721253882acd667191917a8f77293573d134bf9665939bcd603ea293b2274b0c6c2ccb6b6423c846b08493a1af1f37328235d9956287bef082c8
-  data.tar.gz: ad6cf99e1c02b3fe5f2ef6c6517cb265d5c6e9e6641a48204dce759992c439b980e8b0be9bb539cc37f5c1d1199978dbf23ec52c8556bd964b2d70d2f0b8b03c
+  metadata.gz: 1d7e8d871a4be9318533c1fe0c8530d619d5ee477b97993e25544342425dac0973efb423a637bae84291d6d08c49950abfeb96c2ff777170f50a7cf3251a91fe
+  data.tar.gz: 850f79dd5b1f41f452cf0554f45bf8409764a437c31e71aefd519ae3cf5735578361ec069a86e100f09109901ea9bb987fc8a7b45084cbdb23b8e2873e75fc64

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 2.1
-  - 2.2.1
   - 2.2.2
+  - 2.3.1

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'minitest-utils', git: 'https://github.com/dogweather/minitest-utils.git'
 gemspec

data/eaternet.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard-minitest'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-perf'
+  spec.add_development_dependency 'minitest-utils'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '~> 10'
   spec.add_development_dependency 'timecop'

data/lib/eaternet.rb

@@ -1,3 +1,4 @@
+require 'eaternet/version'
 require 'eaternet/agencies/multco'
 require 'eaternet/agencies/nyc'
 require 'eaternet/agencies/sf'

data/lib/eaternet/agencies/snhd.rb

@@ -21,12 +21,14 @@ module Eaternet
 
       def businesses
         @prototype.businesses
-          .map { |proto| try_to_create(:business, from_csv_row: proto) }
+                  .map { |proto| try_to_create(:business, from_csv_row: proto) }
+                  .compact
       end
 
       def inspections
         @prototype.inspections
-          .map { |proto| try_to_create(:inspection, from_csv_row: proto) }
+                  .map { |proto| try_to_create(:inspection, from_csv_row: proto) }
+                  .compact
       end
 
       def business(proto)
@@ -88,7 +90,7 @@ module Eaternet
             end
           end
         end
-        result
+        result.compact
       end
     end
   end

data/lib/eaternet/agencies/snhd_config.rb

@@ -2,61 +2,9 @@ module Eaternet
   module Agencies
     # @private
     class SnhdConfig
-      DOWNLOAD_URL = 'http://southernnevadahealthdistrict.org/restaurants/download/restaurants.zip'
-      COLUMN_SEPARATOR = ';'
-      QUOTE_CHARACTER = '|'  # TODO: Verify this with SNHD.
-
-      # The SNHD CSV does not have a true header row. And so, this data
-      # structure provides the column names.
-      CSV_SCHEMA = {
-        'restaurant_inspections.csv' => %w(
-          serial_number
-          permit_number
-          inspection_date
-          inspection_time
-          employee_id
-          inspection_type_id
-          inspection_demerits
-          inspection_grade
-          permit_status
-          inspection_result
-          violations
-          record_updated
-        ),
-        'restaurant_establishments.csv' => %w(
-          permit_number
-          facility_id
-          PE
-          restaurant_name
-          location_name
-          address
-          latitude
-          longitude
-          city_id
-          city_name
-          zip_code
-          nciaa
-          plan_review
-          record_status
-          current_grade
-          current_demerits
-          date_current
-          previous_grade
-          date_previous
-        ),
-        'restaurant_inspection_violations.csv' => %w(
-          inspection_violation_id
-          inspection_id
-          inspection_violation
-        ),
-        'restaurant_violations.csv' => %w(
-          violation_id
-          violation_code
-          violation_sort
-          violation_demerits
-          violation_description
-        )
-      }
+      DOWNLOAD_URL = 'http://southernnevadahealthdistrict.org/restaurants/download/restaurants.zip'.freeze
+      COLUMN_SEPARATOR = ';'.freeze
+      QUOTE_CHARACTER = '|'.freeze # TODO: Verify this with SNHD.
     end
   end
 end

data/lib/eaternet/agencies/snhd_prototype.rb

@@ -31,11 +31,11 @@ module Eaternet
       # (see Eaternet::Prototype::AbstractAdapter#inspections)
       def inspections
         lazy_csv_map('restaurant_inspections.csv') do |row|
-          if row['violations']
-            violations = row['violations'].split(',')
-          else
-            violations = []
-          end
+          violations = if row['violations']
+                         row['violations'].split(',')
+                       else
+                         []
+                       end
           Eaternet::Prototype::InspectionData.new(
             orig_key: row['serial_number'],
             business_orig_key: row['permit_number'],
@@ -73,23 +73,19 @@ module Eaternet
 
       private
 
-      def lazy_csv_map(filename, &block)
-        csv_rows(filename).lazy.map { |row| block.call(row) }
+      def lazy_csv_map(filename)
+        csv_rows(filename).lazy.map { |row| yield(row) }
       end
 
       def csv_rows(filename)
-        csv_reader(
-          path: File.join(zip_dir, filename),
-          headers: SnhdConfig::CSV_SCHEMA[filename]
-        )
+        csv_reader path: File.join(zip_dir, filename)
       end
 
-      def csv_reader(path:, headers:)
+      def csv_reader(path:)
         file = open(path, encoding: 'utf-8')
-        file.readline  # Skip the non-standard header line
         CSV.new(
           file,
-          headers: headers,
+          headers: true,
           col_sep: SnhdConfig::COLUMN_SEPARATOR,
           quote_char: SnhdConfig::QUOTE_CHARACTER
         )

data/lib/eaternet/lives_1_0/csv_parser.rb

@@ -1,7 +1,6 @@
 module Eaternet
   module Lives_1_0
     module CsvParser
-
       def adapter_name
         fail 'Override #adapter_name with a name for log output, e.g. "SF"'
       end
@@ -14,14 +13,14 @@ module Eaternet
         csv_map(csv) { |row| try_to_create to_type, from_csv_row: row }
       end
 
-      def map_csv(&row_handler)
+      def map_csv
         CSV.new(File.open(table_file, encoding: 'utf-8'), headers: true)
-          .lazy
-          .map { |row| row_handler.call(row) }
+           .lazy
+           .map { |row| yield(row) }
       end
 
-      def csv_map(filename, &block)
-        csv_rows(filename).lazy.map { |row| block.call(row) }
+      def csv_map(filename)
+        csv_rows(filename).lazy.map { |row| yield(row) }
       end
 
       def csv_rows(filename)
@@ -40,7 +39,6 @@ module Eaternet
         end
         nil
       end
-
     end
   end
 end

data/lib/eaternet/loggable.rb

@@ -12,7 +12,7 @@ module Eaternet
       logger = Logger.new(ENV['EATERNET_LOG_FILE'] || $stderr)
       logger.datetime_format = '%Y-%m-%d %H:%M:%S'
       logger.progname = 'Eaternet'
-      logger.level = Logger::ERROR
+      logger.level = Logger::WARN
       logger
     end
   end

data/lib/eaternet/util.rb

@@ -71,8 +71,6 @@ module Eaternet
       (Time.now - File.mtime(path)).to_i / 86_400.0
     end
 
-    private
-
     def self.expired?(cache_path)
       !File.exist?(cache_path) || file_age_in_days(cache_path) > 0.5
     end

data/lib/eaternet/version.rb

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

data/lib/ext/enumerator.rb

@@ -8,7 +8,7 @@ class Enumerator
 
   # Thanks to u/0x0dea for the lazy implementation.
   #
-  # @author u/0x0dea 
+  # @author u/0x0dea
   # @see http://www.reddit.com/r/ruby/comments/37jpnz/is_this_the_best_laziest_way_to_add_compact_and/crnckrv Discussion thread
   # @return [Enumerator] only my unique elements
   def uniq

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eaternet
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.7
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -301,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Regional adapters for restaurant health scores