rice-dining 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ba72d909940c766ae7986376076eff2a7e86e4a
-  data.tar.gz: 4d8a502c61a2d191bdbe46edbdb0ef5c315e2106
+  metadata.gz: 053c8958f2d51a5126a1e35eecda8feb8c87e0f8
+  data.tar.gz: 677740468a8bc2000ae5e440b8ba9621a3353791
 SHA512:
-  metadata.gz: a36d5b22138fe1ee7bc87b0c08ea6d893cf72e9d4e92a968ed1f295e756815d54926a8118f96a29eeb5fd349dee236a5844ac14316b946723898848a68a92a5d
-  data.tar.gz: 97e05d13092ea66bb6f0a942d2d71550cdea48ea37b89bf0273e75c38ca0f5e0e2aebab94a9ae8ecc9ee6d7d36039998c916a4092b87a754bb8f747cad9ec68a
+  metadata.gz: 51a9af6fd340a2bbae2485a6eed03a1f2af4a101645a61fc80ae47c2a808ec25824a298c7e16173d5a4175457439397e4f89b3870e8c9dbe82c9613c6a33cfb9
+  data.tar.gz: 558a8a1e61bb1d5f6a5bc10b110edf08ec198db9efed91b300227513aa50a1b55851b4948aaaa51dbfd3eeb6af68dea50ce28ae0b319c8656559d56f56d90da9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rice-dining (0.2.1)
+    rice-dining (0.2.2)
       colorize (~> 0.7)
       nokogiri (~> 1.6)
 

data/README.md

@@ -9,9 +9,35 @@ Provides a `rice-dining` executable that prints servery offerings at Rice.
 ## Invocation
 
 Run `rice-dining` to print status for everything, or `rice-dining <regex>` to print status
-for locations matching `<regex>`
+for locations matching `<regex>`.
+
+For example, `rice-dining 'baker|seibel'` would display information for the Baker and
+Seibel serveries.
 
 ## Screenshot
 
 ![Screenshot](/png/screenshot.png?raw=true)
 
+## Class hierarchy
+
+```ruby
+Rice::Dining::Manifest {
+  locations: [Rice::Dining::Location, ...], # Array
+  allergens: [Rice::Dining::Allergen, ...]  # Set
+}
+
+Rice::Dining::Location {
+  name: String,
+  items: [Rice::Dining::Item, ...] # Array
+}
+
+Rice::Dining::Item {
+  name: String,
+  allergens: [Rice::Dining::Allergen, ...] # Set
+}
+
+Rice::Dining::Allergen {
+  id: Symbol,
+  shortcode: Symbol
+}
+```

data/bin/rice-dining

@@ -43,6 +43,7 @@ begin
   }
   printed = 0
 
+  STDOUT.puts "#{manifest.title.white} (as of #{Time.now})"
   manifest.locations.each do |location|
     next unless location.name =~ regex
     STDOUT.print "#{location.name}: "

data/lib/rice/dining.rb

@@ -10,9 +10,11 @@ module Rice
     BASE = URI('http://dining.rice.edu').freeze
 
     class Manifest
-      attr_reader :locations, :allergens
-      def initialize locations, allergens
-        raise ArgumentError unless locations.is_a? Enumerable and allergens.is_a? Enumerable
+      attr_reader :title, :locations, :allergens
+      def initialize title, locations, allergens
+        title = title ? title.dup.freeze : 'Dining'.freeze
+        raise ArgumentError unless title.is_a? String and locations.is_a? Enumerable and allergens.is_a? Enumerable
+        @title = title
         @locations, @allergens = [], Set.new
         locations.each do |location|
           raise ArgumentError unless location.is_a?(Rice::Dining::Location)
@@ -40,8 +42,8 @@ module Rice
           raise ArgumentError unless item.is_a?(Rice::Dining::Item)
           @items << item
         end
-
         @items.freeze
+
         self.freeze
       end
 
@@ -65,6 +67,7 @@ module Rice
           @allergens << allergen
         end
         @allergens.freeze
+
         self.freeze
       end
     end
@@ -113,6 +116,21 @@ module Rice
         if res.is_a? Net::HTTPSuccess
           doc = Nokogiri::HTML(res.body)
 
+          # find the title
+          title_nodes = doc.css('div.alpha h1:contains("Your")'.freeze)
+          unless title_nodes.empty?
+            title_stuff = title_nodes.first.text
+            title_stuff.strip!
+            title_match = title_stuff.match /\Ayour\s+(?<title>[a-z]+)/i
+            if title_match
+              title = title_match[:title]
+            else
+              title = nil
+            end
+          else
+            title = nil
+          end
+
           # stash allergen references in the "key" section
           doc.css('div#key div.diet'.freeze).each do |allergen_node|
             allergen_reference allergen_node['class'.freeze]
@@ -162,7 +180,7 @@ module Rice
             end
           end
 
-          Rice::Dining::Manifest.new locations, @allergen_map.values
+          Rice::Dining::Manifest.new title, locations, @allergen_map.values
         else
           # Problem with the response
           raise CreateError, "got HTTP #{res.code} from #{Rice::Dining::BASE}"

data/lib/rice/dining/version.rb

@@ -1,7 +1,7 @@
 module Rice
   module Dining
     module Version
-      VERSION     = '0.2.2'.freeze
+      VERSION     = '0.2.3'.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.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Morgan Jones