dtv_tournaments 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTBlYWMyZjliMTAzNTQwNzViZTdjODQ5NmU3ZmU2NjE5NTY2MzA4Ng==
+    MjFhNGZlNDlkNTQ2MDE2MDIwZGVlODEwNzBlM2FlMjU2YjYyM2Y5MQ==
   data.tar.gz: !binary |-
-    Yzk5ZDEyZDIwODI1Zjc1ZTg4NDQ3YWY2YzBjOTBkZGFmMDdlYTI4Zg==
+    NTM2ZDExNTkyYTkzZTUyOTFiYWFlOTY1N2RjY2Q3YzhlN2RmNjczOQ==
 SHA512:
   metadata.gz: !binary |-
-    MDgyZTViNTYzZWU4OTU3Mzg0NTczMDVkOGJjZjAwOTUxNzMyMzgwYjdmYThk
-    ZmE5MGU3MDFiOGYxOGZjYjNhODkxMGI5MWViYmE4NWQ0YmY3YTc0ZDgyNmJi
-    MDNhOGMzZDBhMDYwNmU4MzliYzQ0NTYxZGQwZTRlNDE4NjUyNmE=
+    NjBjZTQ4YzRhMTc5OTNjYWJmNDRkMDJlMDVhM2RmZmZlNWQ1OTg4ZWJkZmFm
+    NWMwNzU2ODMxYjY4YjBkYTcwZWYyNGRhNGEwZDJiYmY4NDc1MzVmYWQ5N2Ez
+    YjBlNzY1YTc5MjE1OTg1ZjBhZDVkYTA2NzQ3NjMzYjQyOGQ4Mzc=
   data.tar.gz: !binary |-
-    MzA1NTZkM2FjNWE4NGY3YmQ2ZWEyNGQ3ODk3MDUwMDNmY2Y2ZGE1OTA0NDY5
-    ZmE3ZWI1Mzk5MmFkOWZlNDU0NjkzYjU1NWQyZjZmNmQ3OGYwYWUyMWFhZWY4
-    ODM4YTU0ZWViZGViZDM5MzY4ZDMwN2FkZWM5OTIxY2MzMTI0Zjc=
+    ZTA3YTY5ZTE1N2U4NzNhNjk5YTU1Njg0Y2Q1MzZjMWNhNjA0ZTNhYjAxN2Yw
+    NzhhM2U1ZTIyYzRjNDhlNzliZDQ5MjNkYWVlYTBjODM2MGE3YjFlMmViZmE5
+    MjU5ODhkNTM4MmRiODM4NzE5ZDc3YjNiNWU0NjVhMTVhMjlmYTg=

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+dump.rdb

data/dtv_tournaments.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "codeclimate-test-reporter"
 
   spec.add_runtime_dependency "mechanize", ">= 2.0"
+  spec.add_runtime_dependency 'redis', '~> 3.0.7'
 end

data/lib/dtv_tournaments.rb

@@ -1,3 +1,25 @@
+require "redis"
+
 require "dtv_tournaments/version"
 require "dtv_tournaments/utilities"
+require "dtv_tournaments/cache"
 require "dtv_tournaments/tournament"
+
+module DTVTournaments
+  def self.get number, rerun=false
+    if rerun
+      DTVTournaments::Tournament.new(number)
+    else
+      DTVTournaments.get_cached_tournament(number)
+    end
+  end
+
+  def self.get_cached_tournament(number)
+    cached = DTVTournaments.get_cache.get_by_number(number)
+    if cached.nil?
+      DTVTournaments.get(number, true)
+    else
+      cached
+    end
+  end
+end

data/lib/dtv_tournaments/cache.rb

@@ -0,0 +1,41 @@
+require 'redis'
+
+module DTVTournaments
+  class << self
+    attr_writer :cache_configuration, :cache
+  end
+
+  def self.cache_configuration
+    reset_cache_config if @cache_configuration.nil?
+    @cache_configuration
+  end
+
+  def self.reset_cache_config
+    @cache_configuration = {:host => '127.0.0.1', :port => 6379, :db => 1}
+  end
+
+  def self.configure_cache
+    yield(cache_configuration)
+  end
+
+  def self.get_cache
+    @cache ||= Cache.new
+  end
+
+  class Cache < Struct.new(:redis)
+    def initialize
+      config = DTVTournaments.cache_configuration
+      @redis = Redis.new(config)
+    end
+
+    def get_by_number(number)
+      data = @redis.get(number)
+      return nil if data.nil?
+      Tournament.deserialize(data)
+    end
+
+    def set(tournament)
+      @redis.set(tournament.number, tournament.serialize)
+    end
+  end
+end

data/lib/dtv_tournaments/tournament.rb

@@ -3,19 +3,20 @@ 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
+    def initialize number, shouldCall=true
+      @number = number
+      call if shouldCall
     end
 
-    def call cached=  true
-      # TODO: Support cached option later
+    def call
       get_result_page
       extract_results
+      save_to_cache
+    end
+
+    def save_to_cache
+      DTVTournaments.get_cache.set(self)
     end
 
     def get_result_page
@@ -81,7 +82,6 @@ module DTVTournaments
     end
 
     def get_time_from_big_tournament tournaments
-
       times = tournaments.map do |single_tournament|
         next_time = DTVTournaments::get_subelement_if_available(single_tournament, ".uhrzeit")
 
@@ -95,10 +95,25 @@ module DTVTournaments
       index = get_index_of_marked_tournament tournaments
       get_first_time_until(times, index)
     end
-  end
-end
-
 
-__END__
+    def self.deserialize(data)
+      a = data.split('|')
+      datetime = a[2]
+
+      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.street = a[3]
+      t.zip = a[4]
+      t.city = a[5]
+      t.kind = a[6]
+      t
+    end
 
-DTVTournaments.Tournament.new 38542
+    def serialize
+      "#{@number}|#{@notes}|#{@datetime.to_s}|#{@street}|#{@zip}|#{@city}|#{@kind}"
+    end
+  end
+end

data/lib/dtv_tournaments/version.rb

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

data/spec/cache_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+describe DTVTournaments::Cache do
+  before(:all) do
+    @cache = DTVTournaments.get_cache
+  end
+  it "should return the same as given in" do
+    t1 = DTVTournaments::Tournament.new(38542)
+    @cache.set(t1)
+    t2 = @cache.get_by_number(38542)
+
+    expect(t1.number).to eq(t2.number)
+    expect(t1.notes).to eq(t2.notes)
+    expect(t1.kind).to eq(t2.kind)
+    expect(t1.datetime.to_s).to eq(t2.datetime.to_s)
+    expect(t1.date.to_s).to eq(t2.date.to_s)
+    expect(t1.time.to_s).to eq(t2.time.to_s)
+  end
+end

data/spec/tournament_spec.rb

@@ -3,7 +3,7 @@ describe DTVTournaments::Tournament do
   describe "results" do
     describe "large tournaments" do
       before(:all) do
-        @t = DTVTournaments::Tournament.new(40472)
+        @t = DTVTournaments.get(40472, true)
       end
 
       it "should have the right date" do
@@ -21,7 +21,7 @@ describe DTVTournaments::Tournament do
 
     describe "small tournaments" do
       before(:all) do
-        @t = DTVTournaments::Tournament.new(38542)
+        @t = DTVTournaments.get(38542, true)
       end
 
       it "should have the right date" do
@@ -36,12 +36,62 @@ describe DTVTournaments::Tournament do
         expect(@t.kind).to eq('HGR D ST')
       end
     end
+
+    describe "caching" do
+      it "should ask the cache if tournament would be fetched" do
+        DTVTournaments.should_receive(:get_cached_tournament).with(38542)
+
+        DTVTournaments.get(38542)
+      end
+
+      it "should fetch normally if not found in cache" do
+        cache = double('Cache', :get_by_number => nil)
+
+        DTVTournaments.should_receive(:get_cache).and_return(cache)
+        DTVTournaments::Tournament.should_receive(:new).with(38542)
+
+        DTVTournaments.get(38542)
+      end
+
+      it "should save to cache if not found in cache" do
+        cache = double('Cache', :get_by_number => nil)
+        cache.should_receive(:set)
+        DTVTournaments.should_receive(:get_cache).at_least(1).and_return(cache)
+
+        DTVTournaments.get(38542)
+      end
+
+      it "should save to cache if rerun is set" do
+        cache = double('Cache', :get_by_number => nil)
+        cache.should_receive(:set)
+        DTVTournaments.should_receive(:get_cache).and_return(cache)
+
+        DTVTournaments.get(38542, true)
+      end
+
+      it "should not ask the cache if rerun is set" do
+        cache = double('Cache', :set => nil)
+        cache.should_not_receive(:get_by_number)
+        DTVTournaments.should_receive(:get_cache).and_return(cache)
+
+        DTVTournaments.get(38542, true)
+      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"
+    after(:each) do
+        DTVTournaments.reset_cache_config
+    end
+    it "should be possible to configure a redis cache" do
+      DTVTournaments.configure_cache do |config|
+        config[:host] = '10.0.1.42'
+        config[:port] = 6342
+        config[:db]   = 15
+      end
+      Redis.should_receive(:new).with(:host => "10.0.1.42", :port => 6342, :db => 15)
+
+      DTVTournaments::Cache.new
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtv_tournaments
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Schmidt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.7
 description: This gem fetches the appsrv.tanzsport.de/dtv-webdbs/turnier/suche.spf
   portal and gives all available informations about the tournaments
 email:
@@ -96,9 +110,11 @@ files:
 - Rakefile
 - dtv_tournaments.gemspec
 - lib/dtv_tournaments.rb
+- lib/dtv_tournaments/cache.rb
 - lib/dtv_tournaments/tournament.rb
 - lib/dtv_tournaments/utilities.rb
 - lib/dtv_tournaments/version.rb
+- spec/cache_spec.rb
 - spec/spec_helper.rb
 - spec/tournament_spec.rb
 homepage: https://github.com/DanielMSchmidt/dtv_tournaments
@@ -126,5 +142,6 @@ signing_key:
 specification_version: 4
 summary: A ruby gem for fetching tournaments from the dtv tournaments portal
 test_files:
+- spec/cache_spec.rb
 - spec/spec_helper.rb
 - spec/tournament_spec.rb