nyc-farmers-markets 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8928dc5449c9466f49d9fc74afd5f6d180e9606b
-  data.tar.gz: d6636590140994ec2b695eee0bee2805d8757ddf
+SHA256:
+  metadata.gz: 2b21916ba6a2b697a879dcde3d0b19d3a64f4f14d8bc502485c4e4ca3df380e6
+  data.tar.gz: ac30be3edd8e9e6169d98680d19ee2bf874326b82fa3b38a71606d45cd71d233
 SHA512:
-  metadata.gz: e9634cb631551775abbc1cebfd183bcaf52e8e0ec5d579c1934ee57cce6ce6e8a2c63fafaad1467cdb40c83a08a9cacf6c3eae327a7abd6eff8bae393245cab4
-  data.tar.gz: 935f212c0b6fec9f36152bf471ca5dfe8c0d9923f8ed3cf6b28caa129f599ce2551238a19f06a2c3d2760f684c27ef55e90ec23ea08d0171fff7b0b9979fd482
+  metadata.gz: a8f0b354a07a7ed87502a2cbaf00161f8f8b0f137fd34071da9a86ac4591721e99c38d2770a28f98f9f64ad5ff98385a9082f6c9a844bbcd9ddc785d2a70e70b
+  data.tar.gz: c0435b1210ab51b3b6290f91f5462efbd1aaf21ddad44baabf04a9c5c0dd2de1ff7b73e5b55d841f98bd1d092160bfa4e1a3640fec340d2bf7adc3d7088320d7

data/bin/nyc-farmers-markets

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require_relative '../lib/nyc_farmers_markets'
 
-NYCFarmersMarkets::CLI.new.call
+NYCFarmersMarkets::Cli.call

data/lib/nyc_farmers_markets.rb

@@ -1,4 +1,7 @@
-module NYCFarmersMarkets
-end
+# frozen_string_literal: true
 
 require_relative '../config/environment'
+
+# The main module
+module NYCFarmersMarkets
+end

data/lib/nyc_farmers_markets/cli.rb

@@ -1,93 +1,129 @@
-class NYCFarmersMarkets::CLI
+# frozen_string_literal: true
 
-  def call
-    NYCFarmersMarkets::GetMarkets.new.make_markets
-    vesta = "\u26B6".encode('utf-8')
-    flower = "\u2698".encode('utf-8')
-    puts "\n\t #{vesta} Welcome to the Farmers Markets of NYC #{vesta} ".green.underline
-    print "\t"; 15.times { print "#{flower}  ".light_blue }; puts ""
+module NYCFarmersMarkets
+  EXIT_CMD = 'exit'
+  FLOWER = "\u2698".encode('utf-8')
+  FLOWER_ROW = Array.new(15, FLOWER).join('  ')
+  HAND = "\u261E".encode('utf-8')
+  KEYBOARD = "\u2328".encode('utf-8')
+  CMD_LIST = [
+    'exit',
+    'help',
+    'list all',
+    'list boroughs',
+    'list zip codes',
+    'version'
+  ].flatten
+  VESTA = "\u26B6".encode('utf-8')
+  WELCOME_MSG = 'Welcome to the Farmers Markets of NYC'
 
-    start
-  end
+  # The commandline interface class
+  class Cli
+    def self.call
+      new.call
+    end
 
-  def start
-    loop do
-      print "\nWhat would you like to do (type help for more info)? "
+    def call
+      NYCFarmersMarkets::GetMarkets.new.make_markets
+      print_welcome
+      start
+    end
+
+    private
+
+    def start
+      loop do
+        input = prompt_user
+        interpret(input)
+        break if input == EXIT_CMD
+      end
+    end
 
-      input = gets.chomp.downcase
+    def prompt_user
+      print "\nWhat would you like to do (type help for more info)? "
+      gets.chomp.downcase
+    end
 
+    def interpret(input)
       case input
-      when "list all"
-        list_all
-      when "list boroughs"
-        #puts market_set.list_boroughs.join(" - ")
-        list_boroughs
-      when "bronx", "brooklyn", "manhattan", "queens", "staten island"
+      when *CMD_LIST
+        send input.gsub(/\s/, '_').to_sym
+      when *market_set.boroughs_lowercase
         print_by_borough(input)
-      when "list zip codes"
-        puts market_set.list_zipcodes.join(" - ")
-      when *market_set.list_zipcodes
-        print_by_zipcode(input)
-      when "help"
-        help
-      when "exit"
-        puts "See you next time!"
-        break
+      when *market_set.zip_codes
+        print_by_zip_code(input)
       else
-        puts "Invalid selection!".red
+        puts 'Invalid selection!'.red
       end
     end
-  end
 
-  def print_by_borough(borough)
-    market_set.find_by_borough(borough).each do |m|
-      puts "\n#{m.name}".green
-      puts "#{m.street_address}, #{m.borough}, #{m.zipcode}"
-      puts "#{m.additional_info}" unless m.additional_info == nil
-      puts "#{m.website}" unless m.website == nil
+    def exit
+      puts 'See you next time!'
     end
-  end
 
-  def print_by_zipcode(zipcode)
-    market_set.find_by_zipcode(zipcode).each do |m|
-      puts "\n#{m.name}".green
-      puts "#{m.street_address}, #{m.borough}, #{m.zipcode}"
-      puts "#{m.additional_info}" unless m.additional_info == nil
-      puts "#{m.website}" unless m.website == nil
+    def print_by_borough(borough)
+      market_set.find_by_borough(borough).each do |market|
+        print_market_info market
+      end
     end
-  end
 
-  def list_all
-    market_set.all.each do |m|
-      puts "\n#{m.name}".green
-      puts m.street_address == nil ? "-address not available-" : "#{m.street_address}, #{m.borough}, #{m.zipcode}"
-      puts "#{m.additional_info}" unless m.additional_info == nil
-      puts "#{m.website}" unless m.website == nil
+    def print_by_zip_code(zip_code)
+      market_set.find_by_zip_code(zip_code).each do |market|
+        print_market_info market
+      end
     end
-  end
 
-  def list_boroughs
-    puts "\n\tBoroughs and Their Number of Farmers Markets".green
-    boroughs_with_num_markets = market_set.list_boroughs.collect do |b|
-      "#{b}(#{market_set.num_markets_in_borough(b)})"
+    def print_market_info(market)
+      info = "\n#{market.name}\n".green
+      info << "#{market.full_address}\n"
+      info << "#{market.additional_info}\n" unless market.additional_info.nil?
+      info << "#{market.website}\n" unless market.website.nil?
+      info << "#{market.open_street_map_link}\n" unless market.open_street_map_link.nil?
+      puts info
     end
-    puts boroughs_with_num_markets.join(", ")
-  end
 
-  def help
-    hand = "\u261E".encode('utf-8')
-    keyboard = "\u2328".encode('utf-8')
-    puts "\n #{keyboard} These are the available commands #{keyboard}".light_blue.underline
-    puts "#{hand}list all\t-See a list of all Farmers Markets"
-    puts "#{hand}list boroughs  -See a list of boroughs with Farmers Markets"
-    puts "#{hand}[borough name] -See all markets in this borough"
-    puts "#{hand}list zip codes -See a list of zip codes"
-    puts "#{hand}[zip code]\t-See all markets in this zip code"
-    puts "#{hand}help\t\t-See this helpful list of commands!"
-    puts "#{hand}exit\t\t-Say good-bye"
-  end
+    def list_all
+      market_set.all.each do |market|
+        print_market_info market
+      end
+    end
+
+    def list_boroughs
+      puts "\n\tBoroughs and Their Number of Farmers Markets".green
+      boroughs_with_num_markets = market_set.boroughs.collect do |b|
+        "#{b}(#{market_set.num_markets_in_borough(b)})"
+      end
+      puts boroughs_with_num_markets.join(', ')
+    end
+
+    def list_zip_codes
+      puts market_set.zip_codes.join(' - ')
+    end
+
+    def help
+      headline = "\n #{KEYBOARD} These are the available commands #{KEYBOARD}"
+      puts headline.light_blue.underline
+      puts "#{HAND} list all\t - See a list of all Farmers Markets"
+      puts "#{HAND} list boroughs  - See a list of boroughs with Farmers Markets"
+      puts "#{HAND} [borough name] - See all markets in this borough"
+      puts "#{HAND} list zip codes - See a list of zip codes"
+      puts "#{HAND} [zip code]\t - See all markets in this zip code"
+      puts "#{HAND} help\t\t - See this helpful list of commands!"
+      puts "#{HAND} version\t - See the currently running version!"
+      puts "#{HAND} exit\t\t - Say good-bye"
+    end
+
+    def market_set
+      @market_set ||= NYCFarmersMarkets::Market
+    end
+
+    def print_welcome
+      puts "\n\t #{VESTA} #{WELCOME_MSG} #{VESTA} ".green.underline
+      puts "\t#{FLOWER_ROW.light_blue}"
+    end
 
-  def market_set
-    NYCFarmersMarkets::Market
+    def version
+      puts NYCFarmersMarkets::VERSION
+    end
   end
 end

data/lib/nyc_farmers_markets/get_markets.rb

@@ -1,15 +1,22 @@
-class NYCFarmersMarkets::GetMarkets
-  URL = "https://data.cityofnewyork.us/resource/cw3p-q2v6.json"
+# frozen_string_literal: true
 
-  def get_markets
-    content = open(URL).read
-    markets = JSON.parse(content)
-  end
+module NYCFarmersMarkets
+  # Retrieves the from the NYC Open Data API
+  class GetMarkets
+    # https://data.cityofnewyork.us/dataset/DOHMH-Farmers-Markets-and-Food-Boxes/8vwk-6iz2
+    URL = 'https://data.cityofnewyork.us/resource/94pk-v63f.json'
+
+    def make_markets
+      retrieved_markets.each do |market_hash|
+        NYCFarmersMarkets::Market.create_from_hash(market_hash)
+      end
+      NYCFarmersMarkets::Market.all
+    end
+
+    private
 
-  def make_markets
-    get_markets.each do |market_hash|
-      NYCFarmersMarkets::Market.create_from_hash(market_hash)
+    def retrieved_markets
+      JSON.parse open(URL).read
     end
-    NYCFarmersMarkets::Market.all
   end
 end

data/lib/nyc_farmers_markets/market.rb

@@ -1,78 +1,102 @@
-class NYCFarmersMarkets::Market
-  attr_accessor :name, :additional_info, :street_address, :borough, :state, :zipcode, :latitude, :longitude, :website
-
-  @@all = []
-
-  def initialize(name: nil, additional_info: nil, street_address: nil, borough: nil, state: "NY", zipcode: nil, website: nil)
-    @name = name
-    @additional_info = additional_info
-    @street_address = street_address
-    @borough = borough
-    @state = state
-    @zipcode = zipcode
-  end
-
-  def self.all
-    @@all
-  end
+# frozen_string_literal: true
 
-  def save
-    @@all << self
-  end
+module NYCFarmersMarkets
+  # Organizes the actual market data
+  class Market
+    attr_reader :additional_info, :additional_info_raw, :borough, :name, :state,
+                :street_address, :latitude, :longitude, :website, :zip_code
 
-  def self.create_from_hash(h)
-    market = self.new(
-      name: h["facilityname"],
-      additional_info: h["facilityaddinfo"],
-      street_address: h["facilitystreetname"],
-      borough: h["facilitycity"],
-      state: h["facilitystate"],
-      zipcode: h["facilityzipcode"]
-    )
-
-    market.set_website_from_additional_info
-    market.remove_html
-    market.save
-    market
-  end
+    @all = []
 
-  def set_website_from_additional_info
-    if @additional_info != nil
-      url_from_info = @additional_info.match(/http:(\w|\/|\.|\&|\=|\?|\_)*</)
-      @website = url_from_info[0].chomp("<").chomp(".") unless url_from_info == nil
+    def initialize(attributes = {})
+      attributes.each do |attribute, value|
+        instance_variable_set "@#{attribute}", value
+      end
+      @state ||= 'NY'
     end
-  end
 
-  def remove_html
-    if @additional_info != nil && @additional_info.include?("<")
-      x = @additional_info.index("<")
-      y = @additional_info.length - 1
-      @additional_info.slice!(x..y)
+    def cleanup
+      set_website_from_additional_info_raw
+      set_additional_info
+      self
     end
 
-  end
+    def full_address
+      return '- address not available -' if street_address.nil?
+      "#{street_address}, #{borough}, #{zip_code}"
+    end
 
-  def self.find_by_borough(b)
-    self.all.select do |market|
-      market if market.borough != nil && market.borough.downcase == b.downcase
+    def open_street_map_link
+      return if latitude.to_s.empty? || longitude.to_s.empty?
+      'https://www.openstreetmap.org/' \
+        "?mlat=#{latitude}&mlon=#{longitude}#map=11/#{latitude}/#{longitude}"
     end
-  end
 
-  def self.find_by_zipcode(z)
-    self.all.select do |market|
-      market if market.zipcode == z
+    class << self
+      attr_accessor :all
+
+
+      def create(attributes)
+        market = new attributes
+        market.cleanup
+        all << market
+        market
+      end
+
+      def create_from_hash(h)
+        create(
+          name: h['facilityname'],
+          additional_info_raw: h['additionalinfo'],
+          street_address: h['address'],
+          borough: h['borough'],
+          zip_code: h['zipcode'],
+          latitude: h['latitude'],
+          longitude: h['longitude'],
+          website: h['website']
+        )
+      end
+
+      def find_by_borough(b)
+        all.select { |m| b.casecmp(m.borough.to_s).zero? }
+      end
+
+      def find_by_zip_code(z)
+        all.select { |market| market.zip_code == z }
+      end
+
+      def boroughs
+        @boroughs ||= all.collect(&:borough).compact.uniq.sort
+      end
+
+      def boroughs_lowercase
+        @boroughs_lowercase ||= boroughs.map(&:downcase)
+      end
+
+      def zip_codes
+        @zip_codes ||= all.collect(&:zip_code).compact.uniq.sort
+      end
+
+      def num_markets_in_borough(b)
+        find_by_borough(b).count
+      end
+
+      def destroy_all!
+        @all = []
+      end
     end
-  end
 
-  def self.list_boroughs
-    self.all.collect { |market| market.borough }.compact.uniq.sort
-  end
+    private
 
-  def self.list_zipcodes
-    self.all.collect { |market| market.zipcode }.compact.uniq.sort
-  end
+    def set_website_from_additional_info_raw
+      return if additional_info_raw.to_s.empty?
+      url = additional_info_raw.match %r{http(:|\w|\/|\.|\&|\=|\?|\_)*<}
+      return if url.nil?
+      @website = url[0].chomp('<').chomp('.')
+    end
 
-  def self.num_markets_in_borough(b)
-    self.find_by_borough(b).count
+    def set_additional_info
+      return if additional_info_raw.to_s.empty?
+      @additional_info ||= additional_info_raw.match(/\A[^<]*/).to_s
+    end
   end
 end

data/lib/nyc_farmers_markets/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module NYCFarmersMarkets
+  VERSION = '2.0.0'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nyc-farmers-markets
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Kevin McCormack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2018-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -16,83 +16,111 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: open-uri-cached
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '0.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.47'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.47'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 description: A Ruby gem for the NYC Farmers Markets API with a CLI
-email: wittyman37@yahoo.com
+email: HarlemSquirrel@gmail.com
 executables:
 - nyc-farmers-markets
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/nyc-farmers-markets
-- config/environment.rb
 - lib/nyc_farmers_markets.rb
 - lib/nyc_farmers_markets/cli.rb
 - lib/nyc_farmers_markets/get_markets.rb
 - lib/nyc_farmers_markets/market.rb
+- lib/nyc_farmers_markets/version.rb
 homepage: https://github.com/HarlemSquirrel/nyc-farmers-markets-cli-gem
 licenses:
 - MIT
@@ -112,8 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Wrapper and CLI the NYC Farmers Markets API

data/config/environment.rb

@@ -1,10 +0,0 @@
-require 'colorize'
-require 'json'
-#require 'open-uri'
-require 'open-uri/cached'
-require 'pry'
-
-
-require_relative '../lib/nyc_farmers_markets/cli'
-require_relative '../lib/nyc_farmers_markets/get_markets'
-require_relative '../lib/nyc_farmers_markets/market'