rice-dining 0.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9daa87593abac15b47c885be99cac5417c530d4
-  data.tar.gz: 99c5275f06dc486a268dc90020122738425ea965
+  metadata.gz: fb60ebd8074ac82c4320cc651b77244b701ffe1f
+  data.tar.gz: 032954ce38d5f06fb50fd2e51fa60e295d5a046e
 SHA512:
-  metadata.gz: c8cb808dd1528715fee7f9049b328b8590cfad5f03e8d45e0a0598a14d8fbcf6fd0d42a02118e8bf91731f79601c550b21ed6fa6119afe7e6a8f4b61393b65e3
-  data.tar.gz: 1cabcc2322f47969b27c9713aa90c1490b54106ff164726b0cf7738c441949a77b76420b54699661ea2adbd885a0b7e8b2c10b1e4862879cd70486b5dc229194
+  metadata.gz: 88cc2e2a8f4ff5a2976543fbfa02d8e0070b4678b130c34f2140e2c5e030e54837e053d9fccff20f3a6688cb51559521f9f74dd21cfa557d9e31ed813c6e219f
+  data.tar.gz: bbb299f046fd5f85007768c53b5e2ab012ca307563ce47c6c3e564f90488348e6d8b554da0824ee3fd7459c7798a6bf7fd84b51782350bff0a295d9a8aa40b9a

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    rice-dining (0.1)
-      colorize (>= 0.7.0)
-      nokogiri (>= 1.6.0)
+    rice-dining (0.2.1)
+      colorize (~> 0.7)
+      nokogiri (~> 1.6)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # rice-dining
 
-Provides a `dining` executable that prints servery offerings at Rice.
+Provides a `rice-dining` executable that prints servery offerings at Rice.
 
 ## Installation
 
@@ -10,3 +10,8 @@ Provides a `dining` executable that prints servery offerings at Rice.
 
 Run `rice-dining` to print status for everything, or `rice-dining <regex>` to print status
 for locations matching `<regex>`
+
+## Screenshot
+
+![Screenshot](/png/screenshot.png?raw=true)
+

data/bin/rice-dining

@@ -28,7 +28,7 @@ require 'colorize'
 begin
   regex = !ARGV.empty? ? Regexp.compile(ARGV.first, Regexp::IGNORECASE) : //
   manifest = Rice::Dining.manifest
-  allergens = manifest.allergens.sort {|a, b| a.id <=> b.id}
+  allergens = manifest.allergens.sort {|a, b| a.shortcode <=> b.shortcode}
   allergen_colors = {
     vegan: :magenta,
     vegetarian: :light_green,
@@ -47,7 +47,7 @@ begin
     next unless location.name =~ regex
     STDOUT.print "#{location.name}: "
     if location.open?
-      STDOUT.puts 'OPEN'.white.on_green
+      STDOUT.puts 'OPEN'.green
       location.items.each_with_index do |item, idx|
         STDOUT.print idx == 0 ? ' \- ' : ' |- '
         allergens.each do |allergen|
@@ -57,7 +57,7 @@ begin
         STDOUT.puts " #{item.name}"
       end
     else
-      STDOUT.puts 'CLOSED'.white.on_red
+      STDOUT.puts 'CLOSED'.red
     end
 
     printed += 1
@@ -69,9 +69,9 @@ begin
       max_width = allergen.id.length if allergen.id.length > max_width
     end
 
-    STDOUT.puts '-' * ((max_width + 3) * 5 + 12)
+    STDOUT.puts '-' * ((max_width + 3) * 5 + 8)
     allergens.each_with_index do |allergen, idx|
-      newline = (idx + 1) % 5 == 0
+      newline = idx == allergens.length - 1 || (idx + 1) % 5 == 0
       color = allergen_colors.include?(allergen.id) ? allergen_colors[allergen.id] : :white
       str = "#{allergen.shortcode.to_s.colorize(color)}: #{allergen.id}"
       str << ' ' * (max_width - allergen.id.length) unless newline

data/lib/rice/dining.rb

@@ -94,95 +94,114 @@ module Rice
       end
     end
 
-    ManifestCreateError ||= Class.new StandardError
+    class ManifestFetcher
+      def initialize
+        @allergen_map = {}
+        @allergen_shortcodes = Set.new
+      end
 
-    def self.manifest
-      # Make the request
-      req = Net::HTTP::Get.new Rice::Dining::BASE
-      req['User-Agent'.freeze] = Rice::Dining::IDENT
-      res = Net::HTTP.start(Rice::Dining::BASE.hostname, Rice::Dining::BASE.port,
-                            use_ssl: Rice::Dining::BASE.scheme == 'https'.freeze) {|h| h.request(req)}
-
-      if res.is_a? Net::HTTPSuccess
-        doc = Nokogiri::HTML(res.body)
-
-        # stash allergen references
-        allergens, allergen_shortcodes = {}, Set.new
-
-        # build locations
-        locations = []
-        location_nodes = doc.css('div.item'.freeze)
-        raise ManifestCreateError, "couldn't find locations".freeze if location_nodes.empty?
-        location_nodes.each do |location_node|
-          # Get the servery name
-          name_nodes = location_node.css('div.servery-title h1'.freeze)
-          next if name_nodes.empty?
-          name = name_nodes.first.text
-          name.strip!
-
-          # might be closed
-          closed = !location_node.css('div.nothere'.freeze).empty?
-          if closed
-            locations << Rice::Dining::Location.new(name)
-          else
-            # grab the items
-            items = []
-            item_nodes = location_node.css('div.menu-item'.freeze)
-            item_nodes.each do |item_node|
-              item_allergens, item_name = [], item_node.text
-              item_name.strip!
-              item_node.parent.css('div.allergen div.diet'.freeze).each do |allergen_node|
-                # build the allergen key
-                key = Rice::Dining.allergen_cleanup allergen_node['class'.freeze]
-                if !allergens.include? key
-                  # find a unique value for the shortcode
-                  shortcode = key[0].to_sym
-                  if allergen_shortcodes.include? shortcode
-                    shortcode = shortcode.swapcase
-
-                    while allergen_shortcodes.include? shortcode
-                      shortcode = shortcode.downcase.succ
-                    end
-                  end
-
-                  # create the allergen
-                  allergen = allergens[key] = Rice::Dining::Allergen.new(key, shortcode)
-                  allergen_shortcodes << shortcode
-                else
-                  allergen = allergens[key]
+      def fetch
+        @allergen_map.clear
+        @allergen_shortcodes.clear
+
+        # Make the request
+        req = Net::HTTP::Get.new Rice::Dining::BASE
+        req['User-Agent'.freeze] = Rice::Dining::IDENT
+        res = Net::HTTP.start(Rice::Dining::BASE.hostname, Rice::Dining::BASE.port,
+                              use_ssl: Rice::Dining::BASE.scheme == 'https'.freeze) {|h| h.request(req)}
+
+        if res.is_a? Net::HTTPSuccess
+          doc = Nokogiri::HTML(res.body)
+
+          # stash allergen references in the "key" section
+          doc.css('div#key div.diet'.freeze).each do |allergen_node|
+            self.allergen_reference allergen_node['class'.freeze]
+          end
+
+          # build each location
+          locations = []
+          location_nodes = doc.css('div.item'.freeze)
+          raise ManifestCreateError, "couldn't find locations".freeze if location_nodes.empty?
+          location_nodes.each do |location_node|
+            # get the servery name
+            name_nodes = location_node.css('div.servery-title h1'.freeze)
+            next if name_nodes.empty?
+            name = name_nodes.first.text
+            name.strip!
+
+            # might be closed
+            closed = !location_node.css('div.nothere'.freeze).empty?
+            if closed
+              locations << Rice::Dining::Location.new(name)
+            else
+              # grab the items
+              items = []
+              item_nodes = location_node.css('div.menu-item'.freeze)
+              item_nodes.each do |item_node|
+                item_allergens, item_name = [], item_node.text
+                item_name.strip!
+                item_node.parent.css('div.allergen div.diet'.freeze).each do |allergen_node|
+                  allergen = self.allergen_reference allergen_node['class'.freeze]
+                  item_allergens << allergen if allergen
                 end
 
-                item_allergens << allergen
+                items << Rice::Dining::Item.new(item_name, *item_allergens.sort)
               end
 
-              items << Rice::Dining::Item.new(item_name, *item_allergens.sort)
+              locations << Rice::Dining::Location.new(name, *items)
             end
+          end
 
-            locations << Rice::Dining::Location.new(name, *items)
+          locations.sort! do |a, b|
+            if a.closed? and b.open?
+              1
+            elsif a.open? and b.closed?
+              -1
+            else
+              a.name <=> b.name
+            end
           end
+
+          Rice::Dining::Manifest.new locations, @allergen_map.values
+        else
+          # Problem with the response
+          raise ManifestCreateError, "got HTTP #{res.code} from #{Rice::Dining::BASE}"
         end
+      end
+
+      def allergen_reference allergen_class
+        # build the allergen key
+        key = allergen_cleanup allergen_class
+        return nil if key.nil?
+
+        if !@allergen_map.include? key
+          # find a unique value for the shortcode
+          shortcode = key[0].to_sym
+          if @allergen_shortcodes.include? shortcode
+            shortcode = shortcode.swapcase
 
-        locations.sort! do |a, b|
-          if a.closed? and b.open?
-            1
-          elsif a.open? and b.closed?
-            -1
-          else
-            a.name <=> b.name
+            while @allergen_shortcodes.include? shortcode
+              shortcode = shortcode.downcase.succ
+            end
           end
+
+          # create the allergen
+          allergen = @allergen_map[key] = Rice::Dining::Allergen.new(key, shortcode)
+          @allergen_shortcodes << shortcode
+        else
+          allergen = @allergen_map[key]
         end
+      end
 
-        Rice::Dining::Manifest.new locations, allergens.values
-      else
-        # Problem with the response
-        raise ManifestCreateError, "got HTTP #{res.code} from #{Rice::Dining::BASE}"
+      def allergen_cleanup allergens
+        ret = allergens.match(/\Adiet\s+(?<type>[a-z]+)/i)
+        return nil if ret.nil?
+        ret[:type].downcase.to_sym
       end
     end
 
-    def self.allergen_cleanup allergens
-      ret = allergens.match(/\Adiet\s+(?<type>[a-z]+)/i)
-      return nil if ret.nil?
-      ret[:type].downcase.to_sym
+    def self.manifest
+      ManifestFetcher.new.fetch
     end
   end
 end

data/lib/rice/dining/version.rb

@@ -1,7 +1,7 @@
 module Rice
   module Dining
     module Version
-      VERSION     = '0.2'.freeze
+      VERSION     = '0.2.1'.freeze
       SHORT_NAME  = Rice::Dining.to_s.freeze
       SHORT_IDENT = "#{SHORT_NAME} v#{VERSION}".freeze
       NAME        = SHORT_NAME.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rice-dining
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
 platform: ruby
 authors:
 - Morgan Jones
@@ -54,6 +54,7 @@ files:
 - bin/rice-dining
 - lib/rice/dining.rb
 - lib/rice/dining/version.rb
+- png/screenshot.png
 - rice-dining.gemspec
 homepage: https://numin.it
 licenses: