radiospieler 0.3.4 → 0.3.5

data/Gemfile

@@ -3,12 +3,8 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "pg"
-gem "sqlite3"
-gem "redis"
-gem "micro_sql"
-gem "simple_cache"
 gem "htmlentities"
+gem "simple_cache_rs"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -15,16 +15,11 @@ GEM
     json (1.6.6)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    micro_sql (0.3.2)
-      pg
-      sqlite3
     multi_json (1.2.0)
-    pg (0.13.2)
-    psych (1.3.1)
+    psych (1.3.2)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (2.2.2)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -35,7 +30,7 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simple_cache (0.8.1)
+    simple_cache_rs (0.9.2)
       sqlite3
     simplecov (0.6.1)
       multi_json (~> 1.0)
@@ -54,13 +49,9 @@ DEPENDENCIES
   bundler
   htmlentities
   jeweler
-  micro_sql
-  pg
   psych
-  redis
   ruby-debug19
-  simple_cache
+  simple_cache_rs
   simplecov
-  sqlite3
   vcr
   webmock

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/config/app.yml

@@ -1,5 +1,5 @@
 default:
-  cache: redis://localhost:6379/0
+  no-cache: redis://localhost:6379/0
   bitly:
     user: "bitlyapidemo"
     key: "R_0da49e0a9118ff35f52f629d2d71bf07"

data/lib/extensions/http.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'simple_cache'
 
 # The Http module defines a 
 # 
@@ -24,7 +25,7 @@ module Http
   
   def get(url, max_age = MaxAge.for(url))
     App.logger.benchmark("[GET] #{url}", :minimum => 20) do 
-      App.cached(url, max_age) do 
+      SimpleCache.cached(url, max_age) do 
         App.logger.debug "[GET] #{url}"
         get_(url) 
       end

data/lib/radiospieler/radiospieler/zz_initialise.rb

@@ -0,0 +1,11 @@
+require "simple_cache"
+
+module SimpleCache
+  def self.fallback_url
+    "#{File.basename(App.root)}/a#{App.root.uid64}".tap { |name|
+      App.logger.warn "No, invalid, or unsupported :cache configuration, fallback to #{name}"
+    }
+  end
+end
+
+SimpleCache.url = App.config[:cache] || SimpleCache.fallback_url

data/radiospieler.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospieler"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
-  s.date = "2012-04-08"
+  s.date = "2012-04-09"
   s.description = "Some basics that your application could benefit from."
   s.email = "eno@open-lab.org"
   s.extra_rdoc_files = [
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "app.tmproj",
     "config/app.yml",
     "lib/core-extensions/array_ext.rb",
     "lib/core-extensions/benchmark-logger.rb",
@@ -39,15 +38,15 @@ Gem::Specification.new do |s|
     "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",
+    "lib/radiospieler/radiospieler/zz_initialise.rb",
     "radiospieler.gemspec",
+    "radiospieler.tmproj",
     "script/watchr",
     "test/app_test.rb",
     "test/array_ext_test.rb",
-    "test/cache_test.rb",
     "test/cgi_ext_test.rb",
     "test/config.yml",
     "test/config_test.rb",
@@ -62,19 +61,15 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/radiospiel/radiospieler"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "1.8.10"
   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_runtime_dependency(%q<simple_cache_rs>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<vcr>, [">= 0"])
@@ -83,12 +78,8 @@ Gem::Specification.new do |s|
       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<simple_cache_rs>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<vcr>, [">= 0"])
@@ -98,12 +89,8 @@ Gem::Specification.new do |s|
       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<simple_cache_rs>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<vcr>, [">= 0"])

data/test/test_helper.rb

@@ -19,11 +19,11 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'radiospieler'
-require 'micro_sql'
+# require 'micro_sql'
 App.env = "test"
 
 App.logger.level = Logger::ERROR
-MicroSql.logger = App.logger
+# MicroSql.logger = App.logger
 
 class Test::Unit::TestCase
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospieler
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,55 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-08 00:00:00.000000000 Z
+date: 2012-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: pg
-  requirement: &70259610997200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70259610997200
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70259610996400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70259610996400
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: &70259610995780 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70259610995780
-- !ruby/object:Gem::Dependency
-  name: micro_sql
-  requirement: &70259610995000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70259610995000
-- !ruby/object:Gem::Dependency
-  name: simple_cache
-  requirement: &70259610994380 !ruby/object:Gem::Requirement
+  name: htmlentities
+  requirement: &70249433956660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259610994380
+  version_requirements: *70249433956660
 - !ruby/object:Gem::Dependency
-  name: htmlentities
-  requirement: &70259610993720 !ruby/object:Gem::Requirement
+  name: simple_cache_rs
+  requirement: &70249433955880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70259610993720
+  version_requirements: *70249433955880
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70259610993100 !ruby/object:Gem::Requirement
+  requirement: &70249433955060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610993100
+  version_requirements: *70249433955060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70259610992200 !ruby/object:Gem::Requirement
+  requirement: &70249433953760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610992200
+  version_requirements: *70249433953760
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70259610991420 !ruby/object:Gem::Requirement
+  requirement: &70249433951800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610991420
+  version_requirements: *70249433951800
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70259610989620 !ruby/object:Gem::Requirement
+  requirement: &70249433950840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610989620
+  version_requirements: *70249433950840
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70259610988560 !ruby/object:Gem::Requirement
+  requirement: &70249433949900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610988560
+  version_requirements: *70249433949900
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70259610987980 !ruby/object:Gem::Requirement
+  requirement: &70249433949220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610987980
+  version_requirements: *70249433949220
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70259610987120 !ruby/object:Gem::Requirement
+  requirement: &70249433948560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70259610987120
+  version_requirements: *70249433948560
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -169,7 +125,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app.tmproj
 - config/app.yml
 - lib/core-extensions/array_ext.rb
 - lib/core-extensions/benchmark-logger.rb
@@ -184,15 +139,15 @@ files:
 - 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
+- lib/radiospieler/radiospieler/zz_initialise.rb
 - radiospieler.gemspec
+- radiospieler.tmproj
 - script/watchr
 - test/app_test.rb
 - test/array_ext_test.rb
-- test/cache_test.rb
 - test/cgi_ext_test.rb
 - test/config.yml
 - test/config_test.rb
@@ -218,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3553112263519257702
+      hash: 884600040953440403
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Application base code

data/lib/radiospieler/radiospieler/cache.rb

@@ -1,86 +0,0 @@
-require_relative "config"
-require "simple_cache"
-
-# 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.store
-      @store ||= Store.create(App.config[:cache]) || Store.fallback
-    end
-
-    def self.store=(store)
-      @store = store
-    end
-
-    def self.clear
-      store.clear
-    end
-    
-    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
-
-    class Store::RedisStore
-      def initialize(url)
-        require "redis"
-        @redis = Redis.connect(:url => url)
-      end
-
-      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)
-    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/test/cache_test.rb

@@ -1,15 +0,0 @@
-require_relative 'test_helper'
-
-class CacheTest < Test::Unit::TestCase
-  def test_caching
-    App::Cache.clear
-    
-    done = 0
-
-    r = App.cached("six") { done += 1; 2 * 3 }
-    assert_equal([1, 6], [done, r])
-    
-    r = App.cached("six") { done += 1; 2 * 3 }
-    assert_equal([1, 6], [done, r])
-  end
-end