dtv_tournaments 0.0.4 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjFhNGZlNDlkNTQ2MDE2MDIwZGVlODEwNzBlM2FlMjU2YjYyM2Y5MQ==
+    MWE3OWJkNDAyYjFkNDA5NGFhZTkyMTgyZGM0N2RmZWFkOTE1MDMzMw==
   data.tar.gz: !binary |-
-    NTM2ZDExNTkyYTkzZTUyOTFiYWFlOTY1N2RjY2Q3YzhlN2RmNjczOQ==
+    ZjBlNTZhNmU4N2M3YWM5NGE1N2VhMjJkNzc2MDNjZjg0M2FjOTk5NA==
 SHA512:
   metadata.gz: !binary |-
-    NjBjZTQ4YzRhMTc5OTNjYWJmNDRkMDJlMDVhM2RmZmZlNWQ1OTg4ZWJkZmFm
-    NWMwNzU2ODMxYjY4YjBkYTcwZWYyNGRhNGEwZDJiYmY4NDc1MzVmYWQ5N2Ez
-    YjBlNzY1YTc5MjE1OTg1ZjBhZDVkYTA2NzQ3NjMzYjQyOGQ4Mzc=
+    NWZmMjA2ZTYyOWIxODNiM2ZmYjQ5N2IyZGZjN2FiZDI2ZWY1MWNjOGUyNzkx
+    YTI1ZDA5ZWVhZTZmMzBiZDhiY2RkNDUyNGVjODUyYjZmZjNlZGMwZWVmNjQz
+    NDYwMGVjMmViMjJiNzkwYjVkYThlNjFkM2I4NTkwYWNkOTlkYjE=
   data.tar.gz: !binary |-
-    ZTA3YTY5ZTE1N2U4NzNhNjk5YTU1Njg0Y2Q1MzZjMWNhNjA0ZTNhYjAxN2Yw
-    NzhhM2U1ZTIyYzRjNDhlNzliZDQ5MjNkYWVlYTBjODM2MGE3YjFlMmViZmE5
-    MjU5ODhkNTM4MmRiODM4NzE5ZDc3YjNiNWU0NjVhMTVhMjlmYTg=
+    YjdmN2I4ZTRhZWFjYmZkODc2MmZlMzA3ODI3ZmU2NjI1YzEwZGU2YTZjMTcz
+    YmQwOGExOGFhMTYyNDA5ZGI3YmM5ZDBiMzc2OTk0ZDBhNGJjMTk0MjExZDZj
+    ZDYxNTY3MzQ2MTZjYzBiNDkzMzk4MDI4MzMyOGQ1YWM0YjVkZTk=

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
 
 ## Usage
 
-Call ``DtvTournaments::Tournament.new(number)`` to get an tournament instance with the the attributes
+Call ``DtvTournaments.get(number)`` to get an tournament instance with the the attributes
 
 - number
 - date / time / datetime
@@ -36,9 +36,19 @@ It provides also the methods
 
 - rerun (to rerun the fetching process and update the cache)
 
+### Caching
+  To configure caching do
+
+```ruby
+DTVTournaments.configure_cache do |config|
+  config[:active] = true
+  config[:host] = '10.0.1.42'
+  config[:port] = 6342
+  config[:db]   = 15
+end
+```
 
 ## Todos
-- 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, ...)
 
 

data/lib/dtv_tournaments/cache.rb

@@ -11,7 +11,7 @@ module DTVTournaments
   end
 
   def self.reset_cache_config
-    @cache_configuration = {:host => '127.0.0.1', :port => 6379, :db => 1}
+    @cache_configuration = {:host => '127.0.0.1', :port => 6379, :db => 1, :active => false}
   end
 
   def self.configure_cache
@@ -25,17 +25,23 @@ module DTVTournaments
   class Cache < Struct.new(:redis)
     def initialize
       config = DTVTournaments.cache_configuration
-      @redis = Redis.new(config)
+      active = config.delete(:active)
+
+      @redis = Redis.new(config) if active
     end
 
     def get_by_number(number)
-      data = @redis.get(number)
+      data = @redis.get(number) unless @redis.nil?
       return nil if data.nil?
-      Tournament.deserialize(data)
+      Tournament.deserialize(Cache.toDataArray(data))
+    end
+
+    def self.toDataArray(data)
+      data.split('|')
     end
 
     def set(tournament)
-      @redis.set(tournament.number, tournament.serialize)
+      @redis.set(tournament.number, tournament.serialize) unless @redis.nil?
     end
   end
 end

data/lib/dtv_tournaments/tournament.rb

@@ -37,7 +37,7 @@ module DTVTournaments
       extract_kind
       extract_notes
       extract_location
-      extract_time
+      parse_time(extract_date, extract_time)
     end
 
     def extract_kind
@@ -49,18 +49,22 @@ module DTVTournaments
     end
 
     def extract_location
-      # TODO
+      @zip = @page.search('.ort strong').text.gsub!(/\D|\s/, "").to_i
+      @city = @page.search('.ort strong').text.gsub!(/\d|\s/, "")
+      @street = @page.search('.ort').to_html.split('<br>')[1].strip
     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"))
+        get_time_from_big_tournament(page.search(".turniere tr"))
       else
-        time = page.search(".markierung .uhrzeit").text.scan(/\d{1,2}:\d{2}/).first
+        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 extract_date
+      page.search(".kategorie").text.scan(/^\d{1,2}.\d{1,2}.\d{4}/).first
     end
 
     def parse_time date, time
@@ -96,15 +100,10 @@ module DTVTournaments
       get_first_time_until(times, index)
     end
 
-    def self.deserialize(data)
-      a = data.split('|')
-      datetime = a[2]
-
+    def self.deserialize(a)
       t = Tournament.new(a[0].to_i, false)
       t.notes = a[1]
-      t.datetime = DateTime.parse(datetime)
-      t.time = Time.parse(datetime) - 60*60
-      t.date = Date.parse(datetime)
+      t.timeFromString(a[2])
       t.street = a[3]
       t.zip = a[4]
       t.city = a[5]
@@ -112,6 +111,12 @@ module DTVTournaments
       t
     end
 
+    def timeFromString(datetime)
+      self.datetime = DateTime.parse(datetime)
+      self.time = Time.parse(datetime) - Time.zone_offset(Time.parse(datetime).zone)
+      self.date = Date.parse(datetime)
+    end
+
     def serialize
       "#{@number}|#{@notes}|#{@datetime.to_s}|#{@street}|#{@zip}|#{@city}|#{@kind}"
     end

data/lib/dtv_tournaments/version.rb

@@ -1,3 +1,3 @@
 module DtvTournaments
-  VERSION = "0.0.4"
+  VERSION = "0.1.0"
 end

data/spec/cache_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 describe DTVTournaments::Cache do
-  before(:all) do
+  before(:each) do
+    DTVTournaments.configure_cache do |config|
+      config[:active] = true
+    end
+
     @cache = DTVTournaments.get_cache
   end
   it "should return the same as given in" do

data/spec/tournament_spec.rb

@@ -13,7 +13,12 @@ describe DTVTournaments::Tournament do
         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 address" do
+        expect(@t.zip).to eq(13629)
+        expect(@t.city).to eq('Berlin')
+        expect(@t.street).to include('Buolstr. 14')
+      end
+
       it "should have the right kind" do
         expect(@t.kind).to eq('HGR C LAT')
       end
@@ -31,7 +36,12 @@ describe DTVTournaments::Tournament do
         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 address" do
+        expect(@t.zip).to eq(21465)
+        expect(@t.city).to eq('Reinbek')
+        expect(@t.street).to include('Theodor-Storm-Str')
+      end
+
       it "should have the right kind" do
         expect(@t.kind).to eq('HGR D ST')
       end
@@ -83,8 +93,14 @@ describe DTVTournaments::Tournament do
     after(:each) do
         DTVTournaments.reset_cache_config
     end
+
+    it "should have a deactivated cache" do
+      DTVTournaments.get_cache.redis.should be_nil
+    end
+
     it "should be possible to configure a redis cache" do
       DTVTournaments.configure_cache do |config|
+        config[:active] = true
         config[:host] = '10.0.1.42'
         config[:port] = 6342
         config[:db]   = 15

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtv_tournaments
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A ruby gem for fetching tournaments from the dtv tournaments portal