radiospiel-app 0.2.9 → 0.2.10

data/Gemfile.lock

@@ -15,7 +15,7 @@ GEM
     json (1.6.6)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    micro_sql (0.3.0)
+    micro_sql (0.3.2)
       pg
       sqlite3
     multi_json (1.2.0)
@@ -41,7 +41,7 @@ GEM
     simplecov-html (0.5.3)
     sqlite3 (1.3.5)
     vcr (2.0.1)
-    webmock (1.8.5)
+    webmock (1.8.6)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
 

data/VERSION

@@ -1 +1 @@
-0.2.9
+0.2.10

data/lib/app/app/cache.rb

@@ -10,7 +10,7 @@ module App
     class SqliteStore < MicroSql::KeyValueTable
       def self.db_path
         @db_path ||= begin
-          path = "#{Dir.home}/cache/#{File.basename(App.root)}/#{App.root.uid64}.sqlite3"
+          path = "#{Dir.home}/cache/#{File.basename(App.root)}/a#{App.root.uid64}.sqlite3"
           FileUtils.mkdir_p File.dirname(path)
           path
         end
@@ -20,24 +20,10 @@ module App
         @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
+      alias :get :[]
+      alias :set :update
+      alias :flushdb :delete_all
     end
     
     DEFAULT_MAX_AGE = 4 * 3600     # 4 hours.
@@ -49,20 +35,39 @@ module App
       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 
+    end
+    
     def self.cached(key, max_age = DEFAULT_MAX_AGE, &block)
-      redis = App::Cache.store
-      return yield if !store || !max_age
+      cache_id = uid(key)
+
+      return yield if !store || !max_age || !cache_id
 
-      if marshalled = store.get(key)
-        Marshal.load(marshalled)
+      if marshalled = store.get(cache_id)
+        unmarshal(marshalled)
       else
         yield.tap { |v| 
-          store.set(key, Marshal.dump(v)) 
-          store.expire(key, max_age)
+          store.set(cache_id, marshal(v))
+          store.expire(cache_id, max_age)
         }
       end
     end
 
+    def self.unmarshal(marshalled)
+      Marshal.load Base64.decode64(marshalled) if marshalled
+    end
+    
+    def self.marshal(value)
+      Base64.encode64 Marshal.dump(value)
+    end
+    
     def self.setup
       cache_url = App.config[:cache] || begin
         App.logger.warn "No :cache configuration, fallback to #{SqliteStore.db_path}"

data/radiospiel-app.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospiel-app"
-  s.version = "0.2.9"
+  s.version = "0.2.10"
 
   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.9
+  version: 0.2.10
   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: &70297298449160 !ruby/object:Gem::Requirement
+  requirement: &70341331048700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297298449160
+  version_requirements: *70341331048700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70297298432140 !ruby/object:Gem::Requirement
+  requirement: &70341331048120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297298432140
+  version_requirements: *70341331048120
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70297298429600 !ruby/object:Gem::Requirement
+  requirement: &70341331040740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297298429600
+  version_requirements: *70341331040740
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70297298425520 !ruby/object:Gem::Requirement
+  requirement: &70341331040060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297298425520
+  version_requirements: *70341331040060
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70297298423440 !ruby/object:Gem::Requirement
+  requirement: &70341331039440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70297298423440
+  version_requirements: *70341331039440
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70297298421280 !ruby/object:Gem::Requirement
+  requirement: &70341331038840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297298421280
+  version_requirements: *70341331038840
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70297298420520 !ruby/object:Gem::Requirement
+  requirement: &70341331038060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297298420520
+  version_requirements: *70341331038060
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70297298419780 !ruby/object:Gem::Requirement
+  requirement: &70341331037020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297298419780
+  version_requirements: *70341331037020
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70297298418960 !ruby/object:Gem::Requirement
+  requirement: &70341331036480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297298418960
+  version_requirements: *70341331036480
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70297298418020 !ruby/object:Gem::Requirement
+  requirement: &70341331035940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297298418020
+  version_requirements: *70341331035940
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70297298417140 !ruby/object:Gem::Requirement
+  requirement: &70341331034960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297298417140
+  version_requirements: *70341331034960
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70297295190040 !ruby/object:Gem::Requirement
+  requirement: &70341331034320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297295190040
+  version_requirements: *70341331034320
 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: 4380036455675446384
+      hash: 3278441396145415002
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: