pennu 0.0.1 → 0.1

data/.gitignore

@@ -15,4 +15,6 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-tmp
+tmp
+examples.rb
+api/

data/README.md

@@ -1,6 +1,12 @@
 # pennu: Penn students, get fed. #
 
-pennu is a simple Ruby library (soon to be gem) that allows you to easily retreive the menus of Penn dining halls.
+pennu is a simple Ruby gem that allows you to easily retreive the menus of Penn dining halls.
+
+## Installation ##
+
+pennu is hosted on rubygems, so installation is as simple as:
+
+```gem install pennu```
 
 ## How to use pennu ##
 
@@ -32,7 +38,7 @@ Deli: Assorted Breads, Deli Meats and Cheeses made to order
 Good 4 You: Tofu and Red Lentil Risotto, Roasted Eggplant, Balsamic Tomatoes
 ```
 
-Calling ``` hill.friday.dinner``` will yield a ``` String``` like the output above.  The menu items are more accessible as a hash of titles (e.g. ```Kettles``` and items (e.g. ```Mushroom Barley and Chicken Tortilla Soup```).  To get the menu as a hash, simple call ```to_hash```.  Running:
+Calling ``` hill.friday.dinner``` will yield a ``` String``` like the output above.  The menu items are more accessible as a hash of titles (e.g. ```Kettles```) and items (e.g. ```Mushroom Barley and Chicken Tortilla Soup```).  To get the menu as a hash, simply call ```to_hash```.  Running:
 
 ```ruby
 puts hill.friday.dinner.to_hash.inspect
@@ -54,5 +60,4 @@ pennu was written and tested on Windows; some hiccups may result from running pe
 All contributions are welcome via pull request.
 
 ## TODO ##
-*	Create gem
 * More extensive testing

data/lib/classes/day.rb

@@ -1,9 +1,26 @@
 class Day
-  attr_accessor :date, :breakfast, :lunch, :dinner
+  attr_accessor :date, :dining_hall, :breakfast, :lunch, :dinner
   def initialize(dining_hall, date)
     @date = date
-    @breakfast = Menu.new(dining_hall, date, 'breakfast')
-    @lunch = Menu.new(dining_hall, date, 'lunch')
-    @dinner = Menu.new(dining_hall, date, 'dinner')
+    @dining_hall = dining_hall
   end
+  
+  def breakfast()
+    # fetch bfast menu for the date
+    @breakfast = Meal.new(@dining_hall, @date, 'breakfast')
+    @breakfast
+  end
+  
+  def lunch()
+    # fetch lunch menu for the date
+    @lunch = Meal.new(@dining_hall, @date, 'lunch')
+    @lunch
+  end
+  
+  def dinner()
+    # fetch dinner menu for the date
+    @dinner = Meal.new(@dining_hall, @date, 'dinner')
+    @dinner
+  end
+  
 end

data/lib/classes/dininghall.rb

@@ -1,7 +1,7 @@
 class DiningHall
-  attr_accessor :name, :urls, :tds, :dates, :sunday, :monday,
-                :tuesday, :wednesday, :thursday, :friday,
-                :saturday, :sunday
+  attr_accessor :name, :urls, :breakfast_tds, :lunch_tds, :dinner_tds,
+                :dates, :sunday, :monday, :tuesday, :wednesday, :thursday,
+                :friday, :saturday, :sunday
   
   # Has days, which have meals
   def initialize(name)
@@ -18,63 +18,51 @@ class DiningHall
     end
     
     @urls = {
-    'breafast' => ROOT_URL + dining_hall_path + BREAKFAST_PATH,
+    'breakfast' => ROOT_URL + dining_hall_path + BREAKFAST_PATH,
     'lunch' => ROOT_URL + dining_hall_path + LUNCH_PATH,
     'dinner' => ROOT_URL + dining_hall_path + DINNER_PATH,
     }
     
-    self.get_menus()
+    # Get dates for each day in the current week
+    self.get_days()
+    
+    # Get the tds for each #{meal} for each day of the week
+    @urls.each { |meal, _| self.get_meal_tds(meal) }
+  end
+  
+  def get_days()
+    @dates = []
+    today = Date.today
+    @dates << today - today.wday # sunday
+    (1..6).each { |n| @dates << @dates[0] + n }
+    
+    # Assign dates to days
+    # Each day will contain b, l, and d menus
+    @dates.each do |date|
+      if !(DAYS.index(date.strftime("%A").downcase).nil?)
+        self.instance_variable_set("@#{date.strftime("%A").downcase}", Day.new(self, date))
+      end
+    end
   end
   
-  def get_menus()
+  def get_meal_tds(meal)
     # Get menu table from dining website, use dinner for dates
     agent = Mechanize.new
-    meal_page = agent.get(self.urls['dinner'])
+    meal_page = agent.get(self.urls[meal])
     table = meal_page.search("div.boxbody")
     
     # Scrape all tds into array
-    @tds = []
+    tds = []
     table.xpath('//tr/td').to_a.each do |td|
       td = td.text.lstrip.rstrip
       tds << td unless (td.gsub(/\s+/, "") == "" or td.gsub(/\s+/, "") == "\u00A0")
     end
     
     # Remove dining hall title, which is the first element in tds
-    @tds.shift
+    tds.shift
     
-    # Create array of dates
-    tds_clone = @tds.clone
-    @dates = @tds.keep_if { |td|
-      begin
-        DateTime.strptime(td, "%A, %B %d, %Y")
-      rescue ArgumentError
-        false
-      else
-        true
-      end
-    }.map { |day_string|  DateTime.strptime(day_string, "%A, %B %d, %Y") }
-    
-    # Clone tds to preserve for later methods
-    @tds = tds_clone
-    
-    # Assign dates to days
-    # Each day will contain b, l, and d menus
-    @dates.each do |date|
-      if date.strftime("%A") == "Sunday"
-        @sunday = Day.new(self, date)
-      elsif date.strftime("%A") == "Monday"
-        @monday = Day.new(self, date)
-      elsif date.strftime("%A") == "Tuesday"
-        @tuesday = Day.new(self, date)
-      elsif date.strftime("%A") == "Wednesday"
-        @wednesday = Day.new(self, date)
-      elsif date.strftime("%A") == "Thursday"
-        @thursday = Day.new(self, date)
-      elsif date.strftime("%A") == "Friday"
-        @friday = Day.new(self, date)
-      elsif date.strftime("%A") == "Saturday"
-        @saturday = Day.new(self, date)
-      end
-    end
+    # Set instance var
+    self.instance_variable_set("@#{meal}_tds", tds)
   end
+  
 end

data/lib/classes/errors.rb

@@ -0,0 +1,4 @@
+# More descriptive errors
+
+class NoDataError < StandardError
+end

data/lib/classes/meal.rb

@@ -0,0 +1,63 @@
+class Meal
+  # Scrapes for one dining hall, one day, one meal
+  def initialize(dining_hall, date, meal)
+    @date = date
+    @meal = meal
+    @dining_hall = dining_hall
+    
+    @day_items = self.get_day_items(@meal, @date)
+  end
+  
+  def to_hash()
+    # Add date key to beginning of hash and
+    # return hash of items and titles
+    {'date' => @date.to_s}.merge @day_items
+  end
+  
+  def to_s()
+    str = "Menu for #{@meal} at #{@dining_hall.name.titlecase} on #{@date.strftime("%A, %B %d, %Y")}:\n"
+    @day_items.each do |title, item|
+      str += "#{title}: #{item}\n"
+    end
+    str.rstrip
+  end
+  
+  def fetch_menu(meal)
+    # Get menu table from dining website, use dinner for dates
+    agent = Mechanize.new
+    meal_page = agent.get(@dining_hall.urls[meal])
+    table = meal_page.search("div.boxbody")
+    
+    # Scrape all tds into array
+    @tds = []
+    table.xpath('//tr/td').to_a.each do |td|
+      td = td.text.lstrip.rstrip
+      @tds << td unless (td.gsub(/\s+/, "") == "" or td.gsub(/\s+/, "") == "\u00A0")
+    end
+    
+    # Remove dining hall title, which is the first element in tds
+    @tds.shift
+  end
+  
+  def get_day_items(meal, date)
+    # Split dining hall tds array by date delimiter
+    # Each child array contains menu titles and items for one day
+    tds = @dining_hall.instance_variable_get("@#{meal}_tds")
+    days_items = tds.split do |td|
+      begin
+        DateTime.strptime(td, "%A, %B %d, %Y")
+      rescue ArgumentError
+        false
+      else
+        true
+      end
+    end
+    
+    begin
+      Hash[*days_items[DAYS.index(date.strftime("%A").downcase) + 1].flatten]
+    rescue NoMethodError => e
+      raise NoDataError, "Menu data unavailable for this meal."
+    end
+  end
+  
+end

data/lib/pennu/version.rb

@@ -1,5 +1,5 @@
 module Pennu
   module Ruby
-    VERSION = "0.0.1"
+    VERSION = "0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pennu
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: '0.1'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -41,7 +41,8 @@ files:
 - lib/classes/array.rb
 - lib/classes/day.rb
 - lib/classes/dininghall.rb
-- lib/classes/menu.rb
+- lib/classes/errors.rb
+- lib/classes/meal.rb
 - lib/classes/string.rb
 - lib/pennu.rb
 - lib/pennu/version.rb

data/lib/classes/menu.rb

@@ -1,35 +0,0 @@
-class Menu
-  # Scrapes for one dining hall, one day, one meal
-  def initialize(dining_hall, date, meal)
-    @date = date
-    @meal = meal
-    @dining_hall = dining_hall
-    
-    # Split dining hall tds array by date delimiter
-    # Each child array contains menu titles and items for one day
-    days_items = @dining_hall.tds.split do |td|
-      begin
-        DateTime.strptime(td, "%A, %B %d, %Y")
-      rescue ArgumentError
-        false
-      else
-        true
-      end
-    end
-  
-    @day_items = Hash[*days_items[DAYS.index(date.strftime("%A").downcase)].flatten]
-  end
-  
-  def to_hash()
-    # Return hash of items and titles
-    @day_items
-  end
-  
-  def to_s()
-    str = "Menu for #{@meal} at #{@dining_hall.name.titlecase} on #{@date.strftime("%A, %B %d, %Y")}:\n"
-    @day_items.each do |title, item|
-      str += "#{title}: #{item}\n"
-    end
-    str.rstrip
-  end
-end