t6d-mensa 0.1.2 → 0.1.3

data/{README.rdoc → README.md}

@@ -1,10 +1,12 @@
-= mensa
+mensa
+=====
 
 Fetches the daily bill of fare from the canteen page of Studentenwerk Darmstadt.
 
 It is a little fun project to get familiar with TDD techniques, git and web
 scraping.
 
-== Copyright
+Copyright
+---------
 
 Copyright (c) 2009 Konstantin Tennhard. See LICENSE for details.

data/Rakefile

@@ -35,6 +35,7 @@ end
 task :default => :spec
 
 require 'rake/rdoctask'
+
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
@@ -49,3 +50,9 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
+desc "Generates documentation with yard"
+task :yardoc do
+  Dir.chdir(File.dirname(__FILE__)) do
+    `yardoc 'lib/**/*.rb'`
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/mensa

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH << File.join(File.dirname(__FILE__), '../lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '../lib')
+
+# its important to set the kcode to use the jcode library
+$KCODE = 'u' if RUBY_VERSION < '1.9'
 
 require 'mensa'
 

data/fixtures/canteens.rb

@@ -1,4 +1,5 @@
 canteen "http://www.studentenwerkdarmstadt.de/essen/mensa-stadtmitte.html"
 canteen "http://www.studentenwerkdarmstadt.de/essen/mensa-haardtring.html"
 canteen "http://www.studentenwerkdarmstadt.de/essen/mensa-lichtwiese.html"
+canteen "http://www.studentenwerkdarmstadt.de/essen/mensa-schofferstrase.html"
 

data/fixtures/mensa-schofferstrase.html

@@ -61,7 +61,7 @@
 		<table class="contentpaneopen">
 				<tr>
 			<td valign="top" colspan="2">
-				<table border="0"><tbody><tr><td><a href="stwscripts/show_image.php?abteilung=essen&amp;bild=bio-siegel.jpg"><img class="mosimage_class" src="http://www.studentenwerkdarmstadt.de/images/stories/essen/bio-siegel_k.jpg" width="80" height="66" hspace="0" alt="Bio-Siegel" title="Bio-Siegel" border="0" /></a></td><td>&nbsp;</td><td><h2>Echt bio! Jeden Mittwoch<br /></h2>Unser Bio-Essen aus biozertifizierten Produkten:<br /><strong><br /></strong><strong class="color_essen">03.06.09</strong><br />2 Texas Beanburger*<br /> mit Tomatensauce** FL 2,50 &euro;<br /> f&uuml;r G&auml;ste und MitarbeiterInnen der TU Darmstadt 3,50 &euro;&nbsp; <br /><br /></td></tr><tr><td valign="top">&nbsp;</td><td>&nbsp;</td><td valign="top"><span class="color_essen">&nbsp; *</span> Bio-Komponente - DE-007-&Ouml;ko-Kontrollstelle <span class="color_essen"><br />**</span> Komponente aus konventionellem Anbau</td></tr></tbody></table>
+				<table border="0"><tbody><tr><td><a href="stwscripts/show_image.php?abteilung=essen&amp;bild=bio-siegel.jpg"><img class="mosimage_class" src="http://www.studentenwerkdarmstadt.de/images/stories/essen/bio-siegel_k.jpg" width="80" height="66" hspace="0" alt="Bio-Siegel" title="Bio-Siegel" border="0" /></a></td><td>&nbsp;</td><td><h2>Echt bio! Jeden Mittwoch<br /></h2>Unser Bio-Essen aus biozertifizierten Produkten:<br /><strong><br /></strong><strong class="color_essen">10.06.09</strong><br />Lasagne &quot;Vegetaria&quot;*<br /> mit Tomatensauce** FL 3,30 &euro;<br /> f&uuml;r G&auml;ste und MitarbeiterInnen der TU Darmstadt 4,30 &euro;&nbsp; <br /><br /></td></tr><tr><td valign="top">&nbsp;</td><td>&nbsp;</td><td valign="top"><span class="color_essen">&nbsp; *</span> Bio-Komponente - DE-007-&Ouml;ko-Kontrollstelle <span class="color_essen"><br />**</span> Komponente aus konventionellem Anbau</td></tr></tbody></table>
 		</tr>
 				</table>
 
@@ -82,20 +82,8 @@
 <p>&Auml;nderungen behalten wir uns vor.</p>
 
 <a href="http://www.studentenwerkdarmstadt.de/index.php?option=com_spk&amp;task=sch�fferstra�e&amp;view=week">Wochenansicht</a>
-<br />&nbsp;<br /><table border="1" class="spk_table"><tr><th></th><th class="hl_today">Donnerstag, den 28.05.2009</th></tr>
-<tr><td valign="top">Mensa</td><td valign="top"><img class="spk_img" src="components/com_spk/images/gefluegelpict_k.jpg" alt="gefluegel" width="50px" />H&auml;hnchen-Nuggets-im Knuspermantel dazu ein Kr&auml;uterdip  G 1,90 �</td></tr>
-<tr><td valign="top">&nbsp;</td><td valign="top"><img class="spk_img" src="components/com_spk/images/schweinpict_k.jpg" alt="schwein" width="50px" />Grillbraten vom Schweinenacken mit Thymianjus  S 2,00 �</td></tr>
-<tr><td valign="top">&nbsp;</td><td valign="top"><img class="spk_img" src="components/com_spk/images/gefluegelpict_k.jpg" alt="gefluegel" width="50px" />Wokpfanne &quot;Hot-Asia-Style&quot; mit H&auml;hnchenbrust und Mie-Nudeln  G 2,80 �</td></tr>
-<tr><td valign="top">&nbsp;</td><td valign="top"><img class="spk_img" src="components/com_spk/images/pict_k.jpg" alt="" width="50px" />Spargelwoche !!!  Bitte beachten Sie unsere Aush&auml;nge !  </td></tr>
-<tr><td valign="top">&nbsp;</td><td valign="top"><img class="spk_img" src="components/com_spk/images/fleischlospict_k.jpg" alt="fleischlos" width="50px" />R&uuml;hreier mit Rahmspinat  FL 1,20 �</td></tr>
-</table><br />
-<div class="legende">
-(S) Schweinefleisch # (R) Rindfleisch # (K) Kalbfleisch # (L) Lammfleisch # (G) Gefl&uuml;gel # (F) Fisch # (FL) Fleischlos
-</div> 
-<div class="legende">
-(1) Farbstoff # (2) Konservierungsstoff # (3) Antioxidationsmittel # (4) Geschmacksverst&auml;rker # (5) geschwefelt # (6) geschw&auml;rzt # (7) gewachst # (8) Phosphat # (9) S&uuml;ssungsmittel # (11) Phenylalaninquelle
-</div>
-<br />
+<p><br /><b>Am Samstag, den 13.06.2009 bleibt die Mensa geschlossen.</b></p>
+
 <table class="contentpaneopen">
 <tr><td>
    </td></tr>
@@ -129,4 +117,4 @@ I</div><div id="footer2">
 
 </body>
 </html>
-<!-- 1243545358 -->
+<!-- 1244894038 -->

data/fixtures/output.txt

@@ -45,3 +45,10 @@
 
     Country Kartoffeln mit Quark                                      1,10 €
 
+
+
+  Mensa Schöfferstraße                                                  13.06.
+  ============================================================================
+
+                                  geschlossen                                   
+

data/lib/mensa/canteen.rb

@@ -4,10 +4,18 @@ module Mensa
   class Canteen
     attr_reader :document
     
+    ##
+    # Creates a new canteen for a given uri
+    # @param [String]
+    # @return [Canteen]
     def initialize(uri)
       @document = Nokogiri::HTML(Document.new(uri).to_s)
     end
     
+    ##
+    # Extracts the bill of fare
+    #
+    # @return [Array]
     def fares
       if @fares.nil?
         @fares = []
@@ -33,28 +41,49 @@ module Mensa
       @fares
     end
     
+    ##
+    # A canteen is opened if it offers at least one fare
+    #
+    # @return [true | false]
     def opened?
       !fares.empty?
     end
     
+    ##
+    # A canteen is closed if it offers no fares
+    #
+    # @return [true | false]
     def closed?
       fares.empty?
     end
     
+    ##
+    # Extracts the date
+    #
+    # @return [Time]
     def date
-      string = document.css('.spk_table th:last-child').first.text.strip
+      node = document.css('div.inside p b')
+      node = document.css('.spk_table th:last-child') if node.empty?
+      raise "Website does not contain a proper date" if node.empty?
       
-      if date = /(\d{2})\.(\d{2})\.(\d{4})/.match(string)[1..3].reverse
-        return Time.local(*(date.map { |e| e.to_i }))
-      end
+      date = /(\d{2})\.(\d{2})\.(\d{4})/.match(node.first.text.strip)
       
-      nil
+      Time.local(*(date.captures.reverse.map { |e| e.to_i }))
     end
     
+    ##
+    # Extracts the name
+    #
+    # @return [String]
     def name
       document.css('.contentheading').first.text.strip
     end
     
+    ##
+    # Compares two canteens based on their date, state and name
+    #
+    # @param [Canteen]
+    # @return [true | false]
     def ==(other)
       self.name == other.name && self.date == other.date && 
         self.closed? == other.closed? && self.opened? == other.opened?

data/lib/mensa/client.rb

@@ -65,9 +65,11 @@ module Mensa
     end
     
     def print_header(canteen)
+      pad = (RUBY_VERSION < '1.9' ? canteen.name.length - canteen.name.jlength : 0) + 70
+      
       result  = "\n"
       result += "  "
-      result += canteen.name.ljust(70)
+      result += canteen.name.ljust(pad)
       result += canteen.date.strftime('%d.%m.')
       result += "\n"
       result += "  "
@@ -80,14 +82,19 @@ module Mensa
       lines << '   '
       
       fare.name.split(' ').each do |word|
-        if (lines.last.length + word.length) < 64
+        word_length = RUBY_VERSION < '1.9' ? word.jlength : word.length
+        
+        if (lines.last.length + word_length) < 64
           lines.push(lines.pop + ' ' + word)
         else
           lines << "    #{word}"
         end
       end
       
-      result  = lines.shift.ljust(70)
+      # calculates the right amount of space padding (ruby < 1.9 compatibility hack)
+      pad = (RUBY_VERSION < '1.9' ? lines.first.length - lines.first.jlength : 0) + 70
+      
+      result  = lines.shift.ljust(pad)
       result += "%1d,%02d €" % [fare.price / 100, fare.price % 100]
       result += "\n"
       

data/lib/mensa.rb

@@ -4,6 +4,8 @@ require 'uri'
 require 'net/http'
 require 'iconv'
 
+require 'jcode' if RUBY_VERSION < '1.9'
+
 require 'rubygems'
 require 'nokogiri'
 

data/mensa.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mensa}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Konstantin Tennhard"]
-  s.date = %q{2009-06-04}
+  s.date = %q{2009-06-14}
   s.default_executable = %q{mensa}
   s.email = %q{development@tennhard.net}
   s.executables = ["mensa"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.md"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.md",
      "Rakefile",
      "VERSION",
      "bin/mensa",
@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/t6d/mensa}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.3}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Fetches the daily bill of fare from the canteen page of Studentenwerk Darmstadt.}
   s.test_files = [
     "spec/mensa/canteen_spec.rb",

data/spec/mensa/canteen_spec.rb

@@ -3,10 +3,19 @@
 require File.join(File.dirname(__FILE__), '../spec_helper')
 
 module Mensa
+  ##
+  # Setup
+  ##
+  
   uri = {}
-  uri[:stadtmitte] = "http://www.studentenwerkdarmstadt.de/essen/mensa-stadtmitte.html"
-  uri[:lichtwiese] = "http://www.studentenwerkdarmstadt.de/essen/mensa-lichtwiese.html"
-  uri[:haardtring] = "http://www.studentenwerkdarmstadt.de/essen/mensa-haardtring.html"
+  # open - 6 fares offering
+  uri[:stadtmitte]        = "http://www.studentenwerkdarmstadt.de/essen/mensa-stadtmitte.html"
+  # open - 8 fares offering
+  uri[:lichtwiese]        = "http://www.studentenwerkdarmstadt.de/essen/mensa-lichtwiese.html"
+  # closed
+  uri[:haardtring]        = "http://www.studentenwerkdarmstadt.de/essen/mensa-haardtring.html"
+  # closed (unexpected markup)
+  uri[:schoefferstrasse]  = "http://www.studentenwerkdarmstadt.de/essen/mensa-schofferstrase.html"
   
   fares = {}
   fares[:stadtmitte] = [
@@ -27,20 +36,27 @@ module Mensa
     Fare.new("Wokpfanne \"Thai 7 Spice\" mit Putenbrust und Basmatireis", :poultry, 280),
     Fare.new("Country Kartoffeln mit Quark", :meatless, 110)
   ]
-  fares[:haardtring] = []
+  fares[:haardtring]        = []
+  fares[:schoefferstrasse]  = []
   
   date = {}
-  date[:stadtmitte] = Time.local(2009, 5, 28)
-  date[:lichtwiese] = Time.local(2009, 5, 29)
-  date[:haardtring] = Time.local(2009, 6, 1)
+  date[:stadtmitte]         = Time.local(2009, 5, 28)
+  date[:lichtwiese]         = Time.local(2009, 5, 29)
+  date[:haardtring]         = Time.local(2009, 6, 1)
+  date[:schoefferstrasse]   = Time.local(2009, 6, 13)
   
   name = {}
-  name[:stadtmitte] = "Mensa Stadtmitte"
-  name[:lichtwiese] = "Mensa Lichtwiese"
-  name[:haardtring] = "Mensa Haardtring"
+  name[:stadtmitte]         = "Mensa Stadtmitte"
+  name[:lichtwiese]         = "Mensa Lichtwiese"
+  name[:haardtring]         = "Mensa Haardtring"
+  name[:schoefferstrasse]   = "Mensa Schöfferstraße"
+  
+  ##
+  # Specs
+  ##
   
-  [:stadtmitte, :lichtwiese, :haardtring].each do |canteen|
-   describe "#{canteen.to_s.capitalize} am #{date[canteen].strftime('%d.%m.%Y')} Canteen" do
+  [:stadtmitte, :lichtwiese, :haardtring, :schoefferstrasse].each do |canteen|
+   describe "#{canteen.to_s.capitalize} am #{date[canteen].strftime('%d.%m.%Y')}: Canteen" do
       subject { Canteen.new(uri[canteen]) }
       
       it { should have(fares[canteen].length).fares }
@@ -63,7 +79,7 @@ module Mensa
       end
     
       describe "#name" do
-        it "should be \"Mensa Stadtmitte\"" do
+        it "should be \"#{name[canteen]}\"" do
           subject.name.should == name[canteen]
         end
       end

data/spec/mensa/client_spec.rb

@@ -4,9 +4,19 @@ require File.join(File.dirname(__FILE__), '../spec_helper')
 
 module Mensa
   describe Client do
+    ##
+    # Setup
+    ##
+    
+    ##
+    # Access to the configuration file is _mocked out_!
     user_config_file = File.join(ENV['HOME'], ".mensarc")
     global_config_file = File.join(MENSA_DIR, 'config/canteens.rb')
     
+    ##
+    # used to check if canteens are displayed in the order of the user
+    # specific configuration file
+    # (see spec 'Client with user specific settings')
     canteens = {}
     canteens[:stadtmitte] = Canteen.new(
       'http://www.studentenwerkdarmstadt.de/essen/mensa-stadtmitte.html'
@@ -15,6 +25,10 @@ module Mensa
       'http://www.studentenwerkdarmstadt.de/essen/mensa-haardtring.html'
     )
     
+    ##
+    # Specs
+    ##
+    
     subject { Client.new(StringIO.new) }
     
     describe 'with global settings (config/canteens.rb)' do
@@ -36,7 +50,7 @@ module Mensa
         File.should_receive(:read).with(user_config_file).and_return(config)
       end
 
-      it { should have(3).canteens }
+      it { should have(4).canteens }
       
       it 'should have "Mensa Stadtmitte" as first canteen' do
         subject.canteens[0].should == canteens[:stadtmitte]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: t6d-mensa
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Konstantin Tennhard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-14 00:00:00 -07:00
 default_executable: mensa
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,12 +30,12 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .document
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/mensa