radiospieler 0.3.0 → 0.3.1

data/Gemfile

@@ -7,6 +7,7 @@ gem "pg"
 gem "sqlite3"
 gem "redis"
 gem "micro_sql"
+gem "simple_cache"
 gem "htmlentities"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -35,6 +35,8 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
+    simple_cache (0.8.1)
+      sqlite3
     simplecov (0.6.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
@@ -57,6 +59,7 @@ DEPENDENCIES
   psych
   redis
   ruby-debug19
+  simple_cache
   simplecov
   sqlite3
   vcr

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/radiospieler/radiospieler/cache.rb

@@ -1,77 +1,86 @@
 require_relative "config"
+require "simple_cache"
 
-#
-# This is a cache module, which keeps entries for a certain time period, 
-# stored away in a redis store.
+# This is a cache module, which keeps entries for a certain time period (or forever).
 #
 # Entries are packed via Marshal.
 module App
   module Cache
     DEFAULT_MAX_AGE = 4 * 3600     # 4 hours.
 
-    def self.clear
-      store.flushdb
-    end
-
-    def self.uid(key)
-      case key
-      when String, Hash then key.uid64
-      when Fixnum       then key
-      else
-        App.logger.warn "Don't know how to deal with non-uid key #{key}"
-        nil
-      end 
+    def self.store
+      @store ||= Store.create(App.config[:cache]) || Store.fallback
     end
-    
-    def self.cached(key, max_age = DEFAULT_MAX_AGE, &block)
-      cache_id = uid(key)
 
-      return yield if !store || !max_age || !cache_id
-
-      if marshalled = store.get(cache_id)
-        unmarshal(marshalled)
-      else
-        yield.tap { |v| 
-          store.set(cache_id, marshal(v))
-          store.expire(cache_id, max_age)
-        }
-      end
+    def self.store=(store)
+      @store = store
     end
 
-    def self.unmarshal(marshalled)
-      Marshal.load Base64.decode64(marshalled) if marshalled
+    def self.clear
+      store.clear
     end
     
-    def self.marshal(value)
-      Base64.encode64 Marshal.dump(value)
+    module Store
+      def self.create(url)
+        return unless url
+        
+        uri = URI.parse(url)
+        case uri.scheme
+        when "redis"  then RedisStore.new(url)
+        when nil      then ::SimpleCache.new(uri.path)
+        end
+      end
+      
+      def self.fallback
+        name = "#{File.basename(App.root)}/a#{App.root.uid64}"
+        SimpleCache.new(name).tap do |store|
+          App.logger.warn "No, invalid, or unsupported :cache configuration, fallback to #{store.path}"
+        end
+      end
     end
-    
-    def self.store_from_url(url)
-      return unless url
-      uri = URI.parse(url)
-      case uri.scheme
-      when "redis"
+
+    class Store::RedisStore
+      def initialize(url)
         require "redis"
-        Redis.connect(:url => url)
-      when nil
-        SimpleCache.new(uri.path)
+        @redis = Redis.connect(:url => url)
       end
-    end
-    
-    attr :store, true
-    extend self
-    
-    def self.store
-      @store ||= store_from_url(App.config[:cache]) || begin
-        name = "#{File.basename(App.root)}-#{App.root.uid64}"
-        store = SimpleCache.new(name)
-        App.logger.warn "No or invalid :cache configuration, fallback to #{store.path}"
-        store
+
+      include SimpleCache::Marshal
+      
+      def keys
+        @redis.keys
+      end
+      
+      def clear
+        @redis.flushdb
+        #debugger
+        1
+      end
+      
+      def store(key, value, max_age = DEFAULT_MAX_AGE)
+        cache_id = uid(key)
+        if value
+          @redis.set cache_id, marshal(value)
+          @redis.expire cache_id, max_age if max_age
+        else
+          @redis.del cache_id
+        end
+        value
+      end
+      
+      def fetch(key, &block)
+        marshalled = @redis.get(uid(key))
+        marshalled ? unmarshal(marshalled) : yield
       end
     end
   end
 
   def cached(key, max_age = Cache::DEFAULT_MAX_AGE, &block)
-    Cache.cached(key, max_age, &block)
+    return yield if !max_age
+
+    cache_store = Cache.store
+    cache_store.fetch(key) do
+      cache_store.store(key, yield, max_age)
+    end
   end
 end

data/radiospieler.gemspec

@@ -0,0 +1,120 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "radiospieler"
+  s.version = "0.3.1"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["radiospiel"]
+  s.date = "2012-04-05"
+  s.description = "Some basics that your application could benefit from."
+  s.email = "eno@open-lab.org"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "app.tmproj",
+    "config/app.yml",
+    "lib/core-extensions/array_ext.rb",
+    "lib/core-extensions/benchmark-logger.rb",
+    "lib/core-extensions/cgi_ext.rb",
+    "lib/core-extensions/hash_ext.rb",
+    "lib/core-extensions/object_ext.rb",
+    "lib/core-extensions/string_ext.rb",
+    "lib/core-extensions/string_without_accents.rb",
+    "lib/core-extensions/tls.rb",
+    "lib/core-extensions/uids.rb",
+    "lib/core-extensions/uri_ext.rb",
+    "lib/extensions/bitly.rb",
+    "lib/extensions/http.rb",
+    "lib/radiospieler.rb",
+    "lib/radiospieler/radiospieler.rb",
+    "lib/radiospieler/radiospieler/cache.rb",
+    "lib/radiospieler/radiospieler/config.rb",
+    "lib/radiospieler/radiospieler/logger.rb",
+    "lib/radiospieler/radiospieler/root.rb",
+    "radiospieler.gemspec",
+    "script/watchr",
+    "test/app_test.rb",
+    "test/array_ext_test.rb",
+    "test/bitlify_test.rb",
+    "test/cache_test.rb",
+    "test/cgi_ext_test.rb",
+    "test/config.yml",
+    "test/config_test.rb",
+    "test/fixtures-vcr/bitly_limit_exceeded.yml",
+    "test/fixtures-vcr/bitly_ok.yml",
+    "test/fixtures-vcr/http_test.yml",
+    "test/hash_ext_test.rb",
+    "test/http_test.rb",
+    "test/string_ext_test.rb",
+    "test/test_helper.rb",
+    "test/tls_test.rb",
+    "test/uid_test.rb"
+  ]
+  s.homepage = "http://github.com/radiospiel/radiospieler"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.17"
+  s.summary = "Application base code"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<pg>, [">= 0"])
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<redis>, [">= 0"])
+      s.add_runtime_dependency(%q<micro_sql>, [">= 0"])
+      s.add_runtime_dependency(%q<simple_cache>, [">= 0"])
+      s.add_runtime_dependency(%q<htmlentities>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<vcr>, [">= 0"])
+      s.add_development_dependency(%q<webmock>, [">= 0"])
+      s.add_development_dependency(%q<psych>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+    else
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<redis>, [">= 0"])
+      s.add_dependency(%q<micro_sql>, [">= 0"])
+      s.add_dependency(%q<simple_cache>, [">= 0"])
+      s.add_dependency(%q<htmlentities>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<vcr>, [">= 0"])
+      s.add_dependency(%q<webmock>, [">= 0"])
+      s.add_dependency(%q<psych>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<redis>, [">= 0"])
+    s.add_dependency(%q<micro_sql>, [">= 0"])
+    s.add_dependency(%q<simple_cache>, [">= 0"])
+    s.add_dependency(%q<htmlentities>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<vcr>, [">= 0"])
+    s.add_dependency(%q<webmock>, [">= 0"])
+    s.add_dependency(%q<psych>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+  end
+end
+

data/test/app_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'test_helper'
 
 class TestApp < Test::Unit::TestCase
   def test_root

data/test/array_ext_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 
 class ArrayExtTest < Test::Unit::TestCase
   def test_extract_options

data/test/bitlify_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require_relative './helper'
+require_relative './test_helper'
 require 'vcr'
 
 VCR.configure do |c|

data/test/cache_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'test_helper'
 
 class CacheTest < Test::Unit::TestCase
   def test_caching

data/test/cgi_ext_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 
 class CgiExtTest < Test::Unit::TestCase
   def test_url_for

data/test/config_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative 'test_helper'
 
 class TestConfig < Test::Unit::TestCase
   def test_read_from_test_config

data/test/hash_ext_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 
 class HashExtTest < Test::Unit::TestCase
   def test_stringify

data/test/http_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 require 'vcr'
 
 VCR.configure do |c|

data/test/string_ext_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 
 class StringExtTest < Test::Unit::TestCase
   def test_html_decode

data/test/tls_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 
 class TlsTest < Test::Unit::TestCase
   thread_local_attribute :tester

data/test/uid_test.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'helper'
+require_relative 'test_helper'
 
 class UidTest < Test::Unit::TestCase
   def test_string_uids

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospieler
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70278898758980 !ruby/object:Gem::Requirement
+  requirement: &70359227563120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278898758980
+  version_requirements: *70359227563120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70278898757820 !ruby/object:Gem::Requirement
+  requirement: &70359227562000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278898757820
+  version_requirements: *70359227562000
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70278898756340 !ruby/object:Gem::Requirement
+  requirement: &70359227560880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278898756340
+  version_requirements: *70359227560880
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70278898754320 !ruby/object:Gem::Requirement
+  requirement: &70359227559640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278898754320
+  version_requirements: *70359227559640
+- !ruby/object:Gem::Dependency
+  name: simple_cache
+  requirement: &70359227558760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70359227558760
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70278898753620 !ruby/object:Gem::Requirement
+  requirement: &70359227541000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278898753620
+  version_requirements: *70359227541000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70278898753140 !ruby/object:Gem::Requirement
+  requirement: &70359227540160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898753140
+  version_requirements: *70359227540160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70278898752400 !ruby/object:Gem::Requirement
+  requirement: &70359227539520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898752400
+  version_requirements: *70359227539520
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70278898751400 !ruby/object:Gem::Requirement
+  requirement: &70359227538720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898751400
+  version_requirements: *70359227538720
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70278898750540 !ruby/object:Gem::Requirement
+  requirement: &70359227537260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898750540
+  version_requirements: *70359227537260
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70278898749860 !ruby/object:Gem::Requirement
+  requirement: &70359227535340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898749860
+  version_requirements: *70359227535340
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70278898748920 !ruby/object:Gem::Requirement
+  requirement: &70359227534760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898748920
+  version_requirements: *70359227534760
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70278898748160 !ruby/object:Gem::Requirement
+  requirement: &70359227533920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278898748160
+  version_requirements: *70359227533920
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -178,6 +189,7 @@ files:
 - lib/radiospieler/radiospieler/config.rb
 - lib/radiospieler/radiospieler/logger.rb
 - lib/radiospieler/radiospieler/root.rb
+- radiospieler.gemspec
 - script/watchr
 - test/app_test.rb
 - test/array_ext_test.rb
@@ -190,9 +202,9 @@ files:
 - test/fixtures-vcr/bitly_ok.yml
 - test/fixtures-vcr/http_test.yml
 - test/hash_ext_test.rb
-- test/helper.rb
 - test/http_test.rb
 - test/string_ext_test.rb
+- test/test_helper.rb
 - test/tls_test.rb
 - test/uid_test.rb
 homepage: http://github.com/radiospiel/radiospieler
@@ -210,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1058781715600460096
+      hash: -3145811610061597683
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: