radiospiel-app 0.2.7 → 0.2.9

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.9

data/lib/app/app/cache.rb

@@ -7,6 +7,39 @@ require_relative "config"
 # Entries are packed via Marshal.
 module App
   module Cache
+    class SqliteStore < MicroSql::KeyValueTable
+      def self.db_path
+        @db_path ||= begin
+          path = "#{Dir.home}/cache/#{File.basename(App.root)}/#{App.root.uid64}.sqlite3"
+          FileUtils.mkdir_p File.dirname(path)
+          path
+        end
+      end
+
+      def initialize
+        @db = MicroSql.create(SqliteStore.db_path)
+        super @db, "cache"
+      end
+
+      def get(key)
+        encoded = self[key]
+        Base64.decode64(encoded) if encoded
+      end 
+      
+      def set(key, value)
+        update key, Base64.encode64(value)
+      end
+      
+      def expire(key, max_age)
+        ttl = max_age + Time.now.to_i if max_age
+        @db.ask("UPDATE cache SET ttl=? WHERE uid=?", ttl, key)
+      end
+      
+      def flushdb
+        @db.exec "DELETE FROM cache"
+      end
+    end
+    
     DEFAULT_MAX_AGE = 4 * 3600     # 4 hours.
 
     attr :store, true
@@ -31,18 +64,22 @@ module App
     end
 
     def self.setup
-      if !(cache_url = App.config[:cache])
-        App.logger.warn "No :cache configuration"
-      elsif !(self.store = connect_to_redis(cache_url))
-        App.logger.warn "Using cache at #{cache_url}"
+      cache_url = App.config[:cache] || begin
+        App.logger.warn "No :cache configuration, fallback to #{SqliteStore.db_path}"
+        SqliteStore.db_path
+      end
+      
+      uri = URI.parse(cache_url)
+
+      self.store = case uri.scheme
+      when "redis"
+        require "redis"
+        Redis.connect(:url => cache_url)
+      when nil
+        SqliteStore.new
       end
-    end
-    
-    def self.connect_to_redis(url)
-      require "redis"
-      Redis.connect(:url => url)
     rescue LoadError
-      App.logger.warn "Cannot load 'redis' gem (connecting to #{url})"
+      App.logger.warn "LoadError: #{$!}"
       nil
     end
   end

data/lib/core-extensions/benchmark-logger.rb

@@ -13,19 +13,19 @@ class Logger
     def runtime
       Time.now - @start
     end
+    
+    def to_s
+      "#{msg}: #{(runtime * 1000).to_i} msecs" 
+    end
   end
   
   def benchmark(msg = "Benchmark", opts = {}, &block)
     benchmarker = Benchmarker.new(msg, opts[:severity] || :warn)
-    r = yield(benchmarker)
-    
-    runtime = benchmarker.runtime
-    if runtime > (opts[:minimum] || -1)
-      self.send benchmarker.severity, "#{benchmarker.msg}: #{(runtime * 1000).to_i} msecs" 
+    yield(benchmarker).tap do
+      self.send(benchmarker.severity, benchmarker.to_s) if benchmarker.runtime > (opts[:minimum] || -1)
     end
-    r
   rescue
-    warn "FAIL #{benchmarker.msg}: #{(runtime * 1000).to_i} msecs" 
+    warn "FAIL #{benchmarker}"
     raise
   end
 end

data/radiospiel-app.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospiel-app"
-  s.version = "0.2.7"
+  s.version = "0.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospiel-app
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70330854434080 !ruby/object:Gem::Requirement
+  requirement: &70297298449160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330854434080
+  version_requirements: *70297298449160
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70330854433320 !ruby/object:Gem::Requirement
+  requirement: &70297298432140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330854433320
+  version_requirements: *70297298432140
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70330854432080 !ruby/object:Gem::Requirement
+  requirement: &70297298429600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330854432080
+  version_requirements: *70297298429600
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70330854431120 !ruby/object:Gem::Requirement
+  requirement: &70297298425520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330854431120
+  version_requirements: *70297298425520
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70330854430080 !ruby/object:Gem::Requirement
+  requirement: &70297298423440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70330854430080
+  version_requirements: *70297298423440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70330854428680 !ruby/object:Gem::Requirement
+  requirement: &70297298421280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854428680
+  version_requirements: *70297298421280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70330854428100 !ruby/object:Gem::Requirement
+  requirement: &70297298420520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854428100
+  version_requirements: *70297298420520
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70330854426680 !ruby/object:Gem::Requirement
+  requirement: &70297298419780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854426680
+  version_requirements: *70297298419780
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70330854425720 !ruby/object:Gem::Requirement
+  requirement: &70297298418960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854425720
+  version_requirements: *70297298418960
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70330854424600 !ruby/object:Gem::Requirement
+  requirement: &70297298418020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854424600
+  version_requirements: *70297298418020
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70330854423240 !ruby/object:Gem::Requirement
+  requirement: &70297298417140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854423240
+  version_requirements: *70297298417140
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70330854422400 !ruby/object:Gem::Requirement
+  requirement: &70297295190040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70330854422400
+  version_requirements: *70297295190040
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4363741734785614035
+      hash: 4380036455675446384
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: