dtv_tournaments 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg1MmVkMDExYTUzMTRlMjdiMGFlYzc5YjYzYmFhZjk4YjA5YTU0Mg==
+    OTBlYWMyZjliMTAzNTQwNzViZTdjODQ5NmU3ZmU2NjE5NTY2MzA4Ng==
   data.tar.gz: !binary |-
-    ZThiODk3ZDc2ZTY1NGIzN2U1YWE2MWNhMjY4M2RiZDMxMjdmMzdiYg==
+    Yzk5ZDEyZDIwODI1Zjc1ZTg4NDQ3YWY2YzBjOTBkZGFmMDdlYTI4Zg==
 SHA512:
   metadata.gz: !binary |-
-    MjI5YjIyNmRhNWRlOTNlMGI5OGM1ZDIwZmFjM2FmZTk1NjgyMWZmZTJiNzIz
-    NzJiOTdkZWQ4ZTRkMzc1MTRiMzMzZmJlNmNlZmZlMWVmNGNjYmI5OWE1OWJh
-    MjM3NDcxZTgwODMzOTU1NDcyZmUxY2E3ODQzNGU3YjA4NGNkODU=
+    MDgyZTViNTYzZWU4OTU3Mzg0NTczMDVkOGJjZjAwOTUxNzMyMzgwYjdmYThk
+    ZmE5MGU3MDFiOGYxOGZjYjNhODkxMGI5MWViYmE4NWQ0YmY3YTc0ZDgyNmJi
+    MDNhOGMzZDBhMDYwNmU4MzliYzQ0NTYxZGQwZTRlNDE4NjUyNmE=
   data.tar.gz: !binary |-
-    OTc4ZjA5NTUzZWFhNDczMzYxNGFiMjE5Mzc3ZjgwZjQ5ZGEyYmM1ZWRkOWEx
-    MDM0ZTRhMzMxNzIyMTEzNzE4OGUyZGQ1NzcxOTk2OWFjNDlkODkyN2M2YTAw
-    MDZkOWM3MzdmN2MwMjJiODE2ZjE5N2UxMGE5MGU1ZTc4Mjk1MGM=
+    MzA1NTZkM2FjNWE4NGY3YmQ2ZWEyNGQ3ODk3MDUwMDNmY2Y2ZGE1OTA0NDY5
+    ZmE3ZWI1Mzk5MmFkOWZlNDU0NjkzYjU1NWQyZjZmNmQ3OGYwYWUyMWFhZWY4
+    ODM4YTU0ZWViZGViZDM5MzY4ZDMwN2FkZWM5OTIxY2MzMTI0Zjc=

data/README.md

@@ -1,3 +1,7 @@
+[![Build Status](https://drone.io/github.com/DanielMSchmidt/dtv_tournaments/status.png)](https://drone.io/github.com/DanielMSchmidt/dtv_tournaments/latest)
+[![Gem Version](https://badge.fury.io/rb/dtv_tournaments.svg)](http://badge.fury.io/rb/dtv_tournaments)
+[![Code Climate](https://codeclimate.com/github/DanielMSchmidt/dtv_tournaments.png)](https://codeclimate.com/github/DanielMSchmidt/dtv_tournaments)
+
 # DtvTournaments
 
 A ruby gem for fetching tournaments from the dtv tournaments portal. The gem only works with rails, because it's using the rails caching methods. Later on, they may be configured in a config file, so rails won't be necessary anymore.
@@ -18,31 +22,24 @@ Or install it yourself as:
 
 ## Usage
 
-Just call ``DtvTournaments.get_by_number(number, options={})`` and you will get a hash like this returned
+Call ``DtvTournaments::Tournament.new(number)`` to get an tournament instance with the the attributes
 
-    {
-      zip: ...,
-      city: ...,
-      street: ...,
-      number: ...,
-      time: ...,
-      date: ...,
-      datetime: ...,
-      kind: ...,
-      ageset: ...
-    }
+- number
+- date / time / datetime
+- street
+- zip
+- city
+- kind
+- notes
 
-The default options are
+It provides also the methods
 
-    {
-      cached: false, # If you want to get an uncached version but don't override the cached version
-      rerun: false # If you want to override the cache
-    }
+- rerun (to rerun the fetching process and update the cache)
 
 
 ## Todos
-- migrate old code to project
-- test old code
+- fix that street and city is found by searching at the all tournaments page for the date and search there for the given number
+- add tournament specific methods (is placing, get points, ...)
 
 
 ## Contributing

data/Rakefile

@@ -1,5 +1,5 @@
 require "bundler/gem_tasks"
-
+task :c => :console
 task :console do
   require 'irb'
   require 'irb/completion'

data/dtv_tournaments.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler", ">= 1.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "codeclimate-test-reporter"
 
-  spec.add_runtime_dependency "mechanize", "~> 2.7.2"
-  spec.add_runtime_dependency "rails"
+  spec.add_runtime_dependency "mechanize", ">= 2.0"
 end

data/lib/dtv_tournaments/tournament.rb

@@ -0,0 +1,104 @@
+require 'mechanize'
+
+module DTVTournaments
+  class Tournament
+    attr_accessor :number, :notes, :date, :time, :datetime, :street, :zip, :city, :kind, :page
+    def initialize number
+      @number = number
+      call
+    end
+
+    def rerun
+      call false
+    end
+
+    def call cached=  true
+      # TODO: Support cached option later
+      get_result_page
+      extract_results
+    end
+
+    def get_result_page
+      mechanize = Mechanize.new { |agent|
+        agent.read_timeout = 3
+      }
+
+      mechanize.get(DTVTournaments::FETCHINGURL)
+      search_form = mechanize.page.forms.last
+
+      search_form.nr = @number
+      search_form.submit
+
+      @page = mechanize.page
+    end
+
+    def extract_results
+      extract_kind
+      extract_notes
+      extract_location
+      extract_time
+    end
+
+    def extract_kind
+      @kind = DTVTournaments::convertToText(page.search(".markierung .turnier"))
+    end
+
+    def extract_notes
+      @notes = page.search(".turniere tr .bemerkung").to_a.collect(&:text).reject{|x| x.nil? || x.empty?}.join("\n")
+    end
+
+    def extract_location
+      # TODO
+    end
+
+    def extract_time
+      if page.search(".markierung .uhrzeit").first.text.empty?
+        # This tournament is a big one
+        time = get_time_from_big_tournament(page.search(".turniere tr"))
+      else
+        time = page.search(".markierung .uhrzeit").text.scan(/\d{1,2}:\d{2}/).first
+      end
+      date = page.search(".kategorie").text.scan(/^\d{1,2}.\d{1,2}.\d{4}/).first
+      parse_time date, time
+    end
+
+    def parse_time date, time
+      @datetime = DateTime.parse("#{date} #{time}")
+      @date     = Date.parse(date)
+      @time     = Time.parse("#{date} #{time}")
+    end
+
+    def get_index_of_marked_tournament tournaments
+      tournaments.each_with_index do |single_tournament, index|
+        return index if single_tournament.attributes().has_key?('class')
+      end
+    end
+
+    def get_first_time_until times, index
+        for i in (0..index).to_a.reverse
+          return times[i] unless times[i].nil? || times[i].empty?
+        end
+    end
+
+    def get_time_from_big_tournament tournaments
+
+      times = tournaments.map do |single_tournament|
+        next_time = DTVTournaments::get_subelement_if_available(single_tournament, ".uhrzeit")
+
+        if next_time.nil? || next_time.empty?
+          nil
+        else
+          next_time.scan(/\d{1,2}:\d{2}/).first
+        end
+      end
+
+      index = get_index_of_marked_tournament tournaments
+      get_first_time_until(times, index)
+    end
+  end
+end
+
+
+__END__
+
+DTVTournaments.Tournament.new 38542

data/lib/dtv_tournaments/utilities.rb

@@ -0,0 +1,20 @@
+# Constants and helper
+module DTVTournaments
+  FETCHINGURL = "http://appsrv.tanzsport.de/td/db/turnier/einzel/suche"
+
+  def self.convertToText content
+    if content.class == String
+      content
+    else
+      content.text
+    end
+  end
+  
+  def self.get_subelement_if_available(element, selector)
+    unless element.search(selector).first.nil?
+      element.search(selector).first.text
+    else
+      nil
+    end
+  end
+end

data/lib/dtv_tournaments/version.rb

@@ -1,3 +1,3 @@
 module DtvTournaments
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/dtv_tournaments.rb

@@ -1,9 +1,3 @@
 require "dtv_tournaments/version"
-require "dtv_tournaments/number_fetcher"
-
-# Proxy object
-module DtvTournaments
-  def self.get_by_number number, options={}
-    NumberFetcher.get_by_number number, options
-  end
-end
+require "dtv_tournaments/utilities"
+require "dtv_tournaments/tournament"

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'bundler/setup'
 Bundler.setup
 

data/spec/tournament_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+describe DTVTournaments::Tournament do
+  describe "results" do
+    describe "large tournaments" do
+      before(:all) do
+        @t = DTVTournaments::Tournament.new(40472)
+      end
+
+      it "should have the right date" do
+        expect(@t.date.to_s).to eq(Date.parse('20.04.2014').to_s)
+        expect(@t.time.hour).to eq(Time.parse('09:00').hour)
+        expect(@t.time.min).to eq(Time.parse('09:00').min)
+        expect(@t.datetime.to_s).to eq(DateTime.parse('20.04.2014 09:00').to_s)
+      end
+
+      it "should have the right address"
+      it "should have the right kind" do
+        expect(@t.kind).to eq('HGR C LAT')
+      end
+    end
+
+    describe "small tournaments" do
+      before(:all) do
+        @t = DTVTournaments::Tournament.new(38542)
+      end
+
+      it "should have the right date" do
+        expect(@t.date.to_s).to eq(Date.parse('29.03.2014').to_s)
+        expect(@t.time.hour).to eq(Time.parse('15:30').hour)
+        expect(@t.time.min).to eq(Time.parse('15:30').min)
+        expect(@t.datetime.to_s).to eq(DateTime.parse('29.03.2014 15:30').to_s)
+      end
+
+      it "should have the right address"
+      it "should have the right kind" do
+        expect(@t.kind).to eq('HGR D ST')
+      end
+    end
+  end
+
+  describe "options" do
+    it "should not take the cache if rerun is passed"
+    it "should update the cache if rerun is passed"
+    it "should not take cached if cached isn't passed"
+    it "should take the cached if cached is"
+  end
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dtv_tournaments
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Daniel Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mechanize
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: This gem fetches the appsrv.tanzsport.de/dtv-webdbs/turnier/suche.spf
   portal and gives all available informations about the tournaments
 email:
@@ -96,10 +96,11 @@ files:
 - Rakefile
 - dtv_tournaments.gemspec
 - lib/dtv_tournaments.rb
-- lib/dtv_tournaments/number_fetcher.rb
+- lib/dtv_tournaments/tournament.rb
+- lib/dtv_tournaments/utilities.rb
 - lib/dtv_tournaments/version.rb
-- spec/number_fetcher_spec.rb
 - spec/spec_helper.rb
+- spec/tournament_spec.rb
 homepage: https://github.com/DanielMSchmidt/dtv_tournaments
 licenses:
 - MIT
@@ -125,5 +126,5 @@ signing_key:
 specification_version: 4
 summary: A ruby gem for fetching tournaments from the dtv tournaments portal
 test_files:
-- spec/number_fetcher_spec.rb
 - spec/spec_helper.rb
+- spec/tournament_spec.rb

data/lib/dtv_tournaments/number_fetcher.rb

@@ -1,141 +0,0 @@
-require 'mechanize'
-
-module NumberFetcher
-  attr_accessor :number, :rerun, :cached
-  PREFIX = "tr"
-  FETCHINGURL = "http://appsrv.tanzsport.de/td/db/turnier/einzel/suche"
-
-  def self.get_by_number number, options={}
-    @number = number
-    @rerun = options[:rerun] || false
-    @cached = options[:cached] || false
-
-    # Rails.cache.delete("#{NumberFetcher::PREFIX}-#{@number}") if @rerun
-
-    if @cached
-      NumberFetcher::get_cached_tournament_data
-    else
-      get_tournament_data
-    end
-  end
-
-  def self.get_cached_tournament_data
-    #return Rails.cache.fetch("#{NumberFetcher::PREFIX}-#{@number}") do
-    self.get_tournament_data
-    #end
-  end
-
-  def self.get_tournament_data
-    puts "Tournament data is fetching for #{@number}"
-    hash = NumberFetcher::extract_results(NumberFetcher::get_result_page(@number))
-    hash[:number] = @number
-    hash
-  end
-
-  def self.get_result_page(number)
-    mechanize = Mechanize.new { |agent|
-      agent.read_timeout = 3
-    }
-
-    mechanize.get(NumberFetcher::FETCHINGURL)
-    search_form = mechanize.page.forms.last
-
-    search_form.nr = number
-    search_form.submit
-
-    mechanize.page
-  end
-
-  def self.extract_results page
-    raw_data = NumberFetcher::get_raw_data(page)
-    extracted_results = {}
-    raw_data.each do |key, value|
-      extracted_results[key] = send("extract_#{key}", value) unless value.nil?
-    end
-    create_time_and_date extracted_results
-  end
-
-  def self.create_time_and_date hash
-    time = hash.delete(:time)
-    date = hash.delete(:date)
-    hash[:datetime] = DateTime.parse("#{date} #{time}")
-    hash[:date]     = Date.parse(date)
-    hash[:time]     = Time.parse("#{date} #{time}")
-    hash
-  end
-
-  def self.extract_kind(content)
-    NumberFetcher::convert_to_text(content)
-  end
-
-  def self.extract_date(content)
-    NumberFetcher::convert_to_text(content).scan(/^\d{1,2}.\d{1,2}.\d{4}/).first
-  end
-
-  def self.extract_time(content)
-    NumberFetcher::convert_to_text(content).scan(/\d{1,2}:\d{2}/).first
-  end
-
-  def self.extract_notes(content)
-    NumberFetcher::convert_to_text(content)
-  end
-
-  def self.extract_street(content)
-    NumberFetcher::convert_to_text(content).split("\t").join("").split("\n").delete_if{|x| x.empty? }.join(" ")
-  end
-
-  def self.extract_zip(content)
-    content.text.gsub(/(\W)/, "").gsub(/(\D)/, "")
-  end
-
-  def self.extract_city(content)
-    content.text.gsub(/(\W)/, "").gsub(/(\d)/, "")
-  end
-
-  def self.convert_to_text(content)
-    if content.class ==  String
-      content
-    else
-      content.text
-    end
-  end
-
-  def self.get_raw_data(page)
-    #Test id its a multiline tournament
-    if page.search(".markierung .uhrzeit").first.text.empty?
-      puts "This Tournament seems to be a big one: #{@number}"
-
-      page.search(".turniere tr").each do |single_tournament|
-        next_kind = NumberFetcher::get_subelement_if_available(single_tournament, ".turnier")
-        kind = next_kind unless next_kind.nil? || next_kind.empty?
-
-        next_time = NumberFetcher::get_subelement_if_available(single_tournament, ".uhrzeit")
-        time = next_time unless next_time.nil? || next_time.empty?
-
-        break if single_tournament.attributes().has_key?('class')
-      end
-    else
-      kind = page.search(".markierung .turnier")
-      time = page.search(".markierung .uhrzeit")
-    end
-    notes = page.search(".turniere tr .bemerkung").to_a.collect(&:text).reject{|x| x.nil? || x.empty?}.join("\n")
-    date = page.search(".kategorie")
-    street = page.search(".ort")
-    street.search("strong").remove # remove zip and city from field
-    zip = page.search(".ort strong")
-    city = page.search(".ort strong")
-    { kind: kind, date: date, time: time, notes: notes, street: street, zip: zip, city: city }
-  end
-
-  def self.get_subelement_if_available(element, selector)
-    unless element.search(selector).first.nil?
-      element.search(selector).first.text
-    else
-      nil
-    end
-  end
-end
-
-__END__
-
-DtvTournaments.get_by_number(38543)

data/spec/number_fetcher_spec.rb

@@ -1,4 +0,0 @@
-require 'spec_helper'
-describe NumberFetcher do
-  pending "write it"
-end