bishl 0.0.2 → 0.0.3

data/Gemfile

@@ -1,19 +1,3 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-  gem "vcr"
-  gem "webmock"
-end
-
-gem "nokogiri"
-gem "httparty"
-gem "chronic"
+gemspec 

data/README.textile

@@ -4,9 +4,17 @@ A tiny little ruby wrapper around the XML api of www.bishl.de .
 
 h2. Installation
 
-Installation via Bundler is easy to setup though it's not offical released.
+Installation via Bundler is easy to setup.
 Put the following line to your Gemfile:
 
+<pre>
+<code>
+gem "bishl"
+</code>
+</pre>
+
+To ride "cutting edge" use github as gem source:
+
 <pre>
 <code>
 gem "bishl", :git => "git://github.com/dsci/bishl.git"

data/Rakefile

@@ -46,6 +46,16 @@ Jeweler::Tasks.new do |gem|
     "spec/url_spec.rb"
   ]
   gem.add_runtime_dependency "nokogiri"
+  gem.add_runtime_dependency "httparty"
+  gem.add_runtime_dependency "virtus"
+  gem.add_runtime_dependency "bundler"
+  gem.add_runtime_dependency "chronic"
+
+  gem.add_development_dependency "rspec", "~> 2.3.0"
+  gem.add_development_dependency "vcr"
+  gem.add_development_dependency "fuubar"
+  gem.add_development_dependency "webmock"
+  gem.add_development_dependency "jeweler"
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/bishl.rb

@@ -3,6 +3,7 @@ require 'open-uri'
 require "nokogiri"
 require "httparty"
 require "chronic"
+require "virtus"
 
 #Dir[File.expand_path(File.join(File.dirname(__FILE__),'lib','**','*.rb'))].each {|f| require f}
 require File.dirname(__FILE__) + "/errors"

data/lib/bishl_klass.rb

@@ -15,21 +15,26 @@ class BISHL
     # opt(:team => 12, :strip => false)
     # opt[:strip] is true by default
     def next_game_for(opt={})
-      strip = true
-      if opt.has_key?(:strip)
-        strip = opt.delete(:strip)
-      end
-      games = self.schedule(opt)
-      result = []
-      games.each do |game|
-        result << game if game.date >= Time.now
-      end
-      if strip
-        return [result.first] unless result.empty?
-        return [] if result.empty?
-      else
-        result
-      end
+      self.new.next_game_for(opt)
+      #strip = true
+      #if opt.has_key?(:strip)
+      #  strip = opt.delete(:strip)
+      #end
+      #games = self.schedule(opt)
+      #result = []
+      #games.each do |game|
+      #  result << game if game.date >= Time.now
+      #end
+      #if strip
+      #  return [result.first] unless result.empty?
+      #  return [] if result.empty?
+      #else
+      #  result
+      #end
+    end
+
+    def last_game_for(opt={})
+      self.new.last_game_for(opt)
     end
 
     def logo_for(opt={})
@@ -42,7 +47,7 @@ class BISHL
         found.attributes.each do |attr|
           if attr.include?("src")
             logo_path = "#{Bishl::Url.base}/#{attr.last.value}"
-            logo_path
+            #logo_path
             return logo_path
           end
         end
@@ -51,4 +56,33 @@ class BISHL
 
   end
 
+  def method_missing(method_name,*args,&block)
+    match_next = method_name.to_s.match /next_game/
+    match_last = method_name.to_s.match /last_game/
+    if match_last or match_next
+      opt = args.pop
+      strip = true
+      if opt.has_key?(:strip)
+        strip = opt.delete(:strip)
+      end
+      games = self.class.schedule(opt)
+      result = []
+      games.each do |game|
+        result << game if game.date >= DateTime.now if match_next
+        result << game if game.date <= DateTime.now if match_last
+      end
+      if strip and match_next
+        return [result.first] unless result.empty?
+        return [] if result.empty?
+      elsif strip and match_last
+        return [result.last] unless result.empty?
+        return [] if result.empty?
+      elsif not strip
+        return result
+      end
+    else
+      super
+    end
+  end
+
 end

data/lib/game.rb

@@ -1,11 +1,26 @@
 module Bishl
-  class Game < Struct.new(:startdate,:hometeam,:awayteam,:gameid,:stadium,:goalshome,:goalsaway,:overtime,:shootout,
-                          :awayteamid,:hometeamid)
+  class Game 
+    
+    include Virtus
+
+    attribute :startdate, DateTime
+    attribute :hometeam, String
+    attribute :awayteam, String
+    attribute :gameid, Integer
+    attribute :stadium, String
+    attribute :goalshome, Integer
+    attribute :goalsaway, Integer
+    attribute :overtime, Integer
+    attribute :shootout, Integer
+    attribute :awayteamid, Integer
+    attribute :hometeamid, Integer  
 
     alias_method :date, :startdate
     alias_method :id, :gameid
     alias_method :awayteam_id, :awayteamid
     alias_method :hometeam_id, :hometeamid
     
+    alias_method :hashify, :attributes
+
   end
 end

data/lib/schedule_line.rb

@@ -1,11 +1,20 @@
 module Bishl
-  class ScheduleLine < Struct.new(:position)
+  class ScheduleLine
+
+    include Virtus
+
+    attribute :position, :Integer
+
 
     attr_accessor :team
     
     def initialize
       @team = ScheduleTeam.new
     end
+
+    def hashify
+      self.attributes.merge!({:team => @team.attributes})
+    end
     
     def method_missing(method, *arguments, &block)
       #puts method.to_s

data/lib/schedule_team.rb

@@ -1,8 +1,26 @@
 module Bishl
-  class ScheduleTeam < Struct.new(:teamname, :wins,:losses, :ties,:otwins,
-                                  :otlosses,:sowins,:points,:goalsfor,
-                                  :goalsagainst,:gamesplayed,:solosses,
-                                  :schedule)
+  class ScheduleTeam 
+
+    include Virtus
+
+    attribute :teamname, String
+    attribute :wins, Integer
+    attribute :losses, Integer
+    attribute :ties, Integer
+    attribute :otwins, Integer
+    attribute :otlosses, Integer
+    attribute :sowins, Integer
+    attribute :points, Integer
+    attribute :goalsfor, Integer
+    attribute :goalsagainst, Integer
+    attribute :gamesplayed, Integer
+    attribute :solosses, Integer
+
+    attr_accessor :schedule
+
+    def hashify
+      self.attributes.merge!({:goals_diff => self.goals_diff})
+    end
 
     class << self
 

data/spec/parser_spec.rb

@@ -2,48 +2,62 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Parser" do
 
+  let(:year){Time.now.year}
+
   subject do
     @parser ||= Bishl::Parser.new
   end
 
   it "should parse the standings url" do
-    parse = proc{subject.parse_standings(:season => "2010", :cs => "LLA")}
+    parse = proc{subject.parse_standings(:season => year, :cs => "LLA")}
     lambda{ parse.call }.should_not raise_error
     parse.call.should_not be_empty
   end
 
   context "schedule" do
     it "parse the schedule for given team" do
-      parse = proc {subject.parse_schedule(:season => "2011", :cs => "LLA",  :team => "74")}
+      parse = proc {subject.parse_schedule(:season => 2011, :cs => "LLA",  :team => "74")}
       lambda{parse.call}.should_not raise_error
-      parse.call.first.id.should == 1058.to_s
-      parse.call.should have(11).items
+      parse.call.first.id.should == 1058
+      parse.call.should have(22).items
     end
 
-    it "parse the next game for given team" do
-      parse = proc {BISHL.next_game_for(:season => "2010", :cs => "LLA",  :team => "74")}
-      parse.call.should have(0).items
-
-      parse = proc {BISHL.next_game_for(:season => "2011", :cs => "LLA",  :team => "74")}
-      parse.call.should have(1).items
-    end
+    context "the next game" do
 
-    context "stripped" do
+      it "parses for given team" do
+        parse = proc {BISHL.next_game_for(:season => year-1, :cs => "LLA",  :team => "74")}
+        parse.call.should have(0).items
 
-      it "parse the next game for given team and returns it as a single array" do
-        parse = proc {BISHL.next_game_for(:season => "2011", :cs => "LLA",  :team => "74")}
+        parse = proc {BISHL.next_game_for(:season => year, :cs => "LLA",  :team => "74")}
         parse.call.should have(1).items
       end
 
-    end
+      context "stripped" do
 
-    context "not stripped" do
+        it "parse the next game for given team and returns it as a single array" do
+          parse = proc {BISHL.next_game_for(:season => year, :cs => "LLA",  :team => "74")}
+          parse.call.should have(1).items
+        end
 
-      it "parse the next game for given team and returns it as an array" do
-        parse = proc {BISHL.next_game_for(:season => "2011", :cs => "LLA",  :team => "74", :strip => false)}
-        parse.call.should_not have(1).items
       end
 
+      context "not stripped" do
+
+        it "parse the next game for given team and returns it as an array" do
+          parse = proc {BISHL.next_game_for(:season => year, :cs => "LLA",  :team => "74", :strip => false)}
+          parse.call.should_not have(1).items
+        end
+
+      end
+    end
+
+    context "the last game" do
+      it "parses for given team" do
+        parse = proc{BISHL.last_game_for(:season => "2010", :cs => "LLA",  :team => "74")}
+        lambda{parse.call}.should_not raise_error
+        parse.call.should have(1).items
+        parse.call.first.awayteam.should == "Galabau"
+      end
     end
 
     context "logo" do

metadata

@@ -1,179 +1,255 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bishl
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 0.0.3
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
 platform: ruby
-authors: 
+authors:
 - Daniel Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-24 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: nokogiri
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: httparty
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  prerelease: false
+date: 2012-04-02 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bishl
+  requirement: &70113138444700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: chronic
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70113138444700
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70113138444180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.3.0
-  name: rspec
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70113138444180
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70113138443640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  name: bundler
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
+  version_requirements: *70113138443640
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &70113138443160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *70113138443160
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70113138442680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  name: jeweler
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70113138442680
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70113138442200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rcov
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
+  version_requirements: *70113138442200
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70113138437300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  prerelease: false
+  version_requirements: *70113138437300
+- !ruby/object:Gem::Dependency
   name: vcr
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  requirement: &70113138436720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70113138436720
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &70113138436120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  prerelease: false
+  version_requirements: *70113138436120
+- !ruby/object:Gem::Dependency
   name: webmock
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  requirement: &70113138435460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: *70113138435460
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70113138434860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70113138434860
+- !ruby/object:Gem::Dependency
   name: nokogiri
-  version_requirements: *id010
+  requirement: &70113138434260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70113138434260
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: &70113138433660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70113138433660
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: &70113138433060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70113138433060
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70113138432460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70113138432460
+- !ruby/object:Gem::Dependency
+  name: chronic
+  requirement: &70113138431860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70113138431860
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70113138431260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *70113138431260
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: &70113138430680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70113138430680
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &70113138430080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70113138430080
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70113138429500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70113138429500
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70113138429020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70113138429020
 description: Ruby wrapper for bishl.de xml api.
 email: dsci@code79.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.textile
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -198,41 +274,35 @@ files:
 - spec/parser_spec.rb
 - spec/spec_helper.rb
 - spec/url_spec.rb
-has_rdoc: true
 homepage: http://github.com/dsci/bishl
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3663803295061550580
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for bishl.de xml api.
-test_files: 
+test_files:
 - spec/form_helper_spec.rb
 - spec/params_builder_spec.rb
 - spec/parser_spec.rb