radiospiel-app 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/core-extensions/hash_ext.rb

@@ -9,7 +9,7 @@ class Hash
 
   def symbolize_keys
     r = []
-    each { |k,v| r << k.to_sym << v }
+    each { |k,v| r << (k.respond_to?(:to_sym) ? k.to_sym : k) << v }
     Hash[*r]
   end
 end

data/lib/extensions/http.rb

@@ -9,10 +9,22 @@ module Http
   extend self
 
   # the default expiration time for get requests.
-  attr :max_age
+  module MaxAge
+    def self.config
+      @config ||= (App.config["cache-max-age"] || {}).to_a
+    end
+    
+    def self.for(url)
+      config.each do |pattern, max_age|
+        return max_age if url.index(pattern)
+      end
+      nil
+    end
+  end
   
-  def get(url, max_age = self.max_age)
+  def get(url, max_age = MaxAge.for(url))
     App.logger.benchmark("[GET] #{url}", :minimum => 20) do 
+      App.logger.debug "[GET] #{url}"
       App.cached(url, max_age) do get_(url) end
     end
   end

data/lib/extensions/zz_geocoder.rb

@@ -6,7 +6,8 @@ require "micro_sql"
 module Geocoder
   extend self
   
-  TIME_TO_LIVE = 3600
+  # 30 days
+  TIME_TO_LIVE = 30 * 24 * 3600
   
   def geocode(address)
     Geocoder.cached(address) { __geocode__(address) }

data/radiospiel-app.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospiel-app"
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
@@ -52,7 +52,10 @@ Gem::Specification.new do |s|
     "test/cgi_ext_test.rb",
     "test/config.yml",
     "test/config_test.rb",
+    "test/fixtures-vcr/geocoder.yml",
     "test/fixtures-vcr/http_test.yml",
+    "test/geocoder_test.rb",
+    "test/hash_ext_test.rb",
     "test/helper.rb",
     "test/http_test.rb",
     "test/string_ext_test.rb",

data/test/fixtures-vcr/geocoder.yml

@@ -0,0 +1,57 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://maps.google.com/maps/geo?oe=utf-8&output=json&q=Berlin
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Content-Type:
+      - !binary |-
+        dGV4dC9qYXZhc2NyaXB0OyBjaGFyc2V0PVVURi04
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUxhbmd1YWdl
+      !binary "RGF0ZQ==":
+      - !binary |-
+        V2VkLCAwNCBBcHIgMjAxMiAxNToxMTo0MyBHTVQ=
+      !binary "U2VydmVy":
+      - !binary |-
+        bWFmZQ==
+      Cache-Control:
+      - !binary |-
+        cHJpdmF0ZQ==
+      X-Xss-Protection:
+      - !binary |-
+        MTsgbW9kZT1ibG9jaw==
+      X-Frame-Options:
+      - !binary |-
+        U0FNRU9SSUdJTg==
+      Transfer-Encoding:
+      - !binary |-
+        Y2h1bmtlZA==
+    body:
+      encoding: US-ASCII
+      string: ! "{\n  \"name\": \"Berlin\",\n  \"Status\": {\n    \"code\": 200,\n
+        \   \"request\": \"geocode\"\n  },\n  \"Placemark\": [ {\n    \"id\": \"p1\",\n
+        \   \"address\": \"Berlin, Germany\",\n    \"AddressDetails\": {\n   \"Accuracy\"
+        : 4,\n   \"Country\" : {\n      \"AdministrativeArea\" : {\n         \"AdministrativeAreaName\"
+        : \"Berlin\",\n         \"Locality\" : {\n            \"LocalityName\" : \"Berlin\"\n
+        \        }\n      },\n      \"CountryName\" : \"Deutschland\",\n      \"CountryNameCode\"
+        : \"DE\"\n   }\n},\n    \"ExtendedData\": {\n      \"LatLonBox\": {\n        \"north\":
+        52.7409729,\n        \"south\": 52.3064887,\n        \"east\": 13.9185276,\n
+        \       \"west\": 12.8940524\n      }\n    },\n    \"Point\": {\n      \"coordinates\":
+        [ 13.4062900, 52.5242680, 0 ]\n    }\n  } ]\n}\n"
+    http_version: 
+  recorded_at: Wed, 04 Apr 2012 15:11:44 GMT
+recorded_with: VCR 2.0.1

data/test/geocoder_test.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+
+require 'helper'
+require 'vcr'
+
+VCR.configure do |c|
+  c.cassette_library_dir = "#{File.dirname(__FILE__)}/fixtures-vcr"
+  c.hook_into :webmock
+end
+
+class GeocoderTest < Test::Unit::TestCase
+  def test_geocoder
+    VCR.use_cassette('geocoder') do
+      expected = [13.40629, 52.524268, 0]
+      assert_equal(expected, Geocoder.geocode("Berlin"))
+    end
+  end
+end

data/test/hash_ext_test.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+require 'helper'
+
+class HashExtTest < Test::Unit::TestCase
+  def test_stringify
+    assert_equal({}, {}.stringify_keys)
+    assert_equal({ "a" => "a", "b" => "b", "1" => 1 }, { :a => "a", "b" => "b", 1 => 1 }.stringify_keys)
+  end
+
+  def test_symbolize
+    assert_equal({}, {}.symbolize_keys)
+    assert_equal({ :a => "a", :b => "b", 1 => 1 }, { :a => "a", "b" => "b", 1 => 1 }.symbolize_keys)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospiel-app
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   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: &70142794674320 !ruby/object:Gem::Requirement
+  requirement: &70217957037640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142794674320
+  version_requirements: *70217957037640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70142794673660 !ruby/object:Gem::Requirement
+  requirement: &70217957036420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142794673660
+  version_requirements: *70217957036420
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70142794673040 !ruby/object:Gem::Requirement
+  requirement: &70217957035480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142794673040
+  version_requirements: *70217957035480
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70142794672460 !ruby/object:Gem::Requirement
+  requirement: &70217957034820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142794672460
+  version_requirements: *70217957034820
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70142794671900 !ruby/object:Gem::Requirement
+  requirement: &70217957034200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70142794671900
+  version_requirements: *70217957034200
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70142794671100 !ruby/object:Gem::Requirement
+  requirement: &70217957033440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794671100
+  version_requirements: *70217957033440
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70142794670440 !ruby/object:Gem::Requirement
+  requirement: &70217957032620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794670440
+  version_requirements: *70217957032620
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70142794669380 !ruby/object:Gem::Requirement
+  requirement: &70217957031760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794669380
+  version_requirements: *70217957031760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70142794668780 !ruby/object:Gem::Requirement
+  requirement: &70217957030980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794668780
+  version_requirements: *70217957030980
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70142794668260 !ruby/object:Gem::Requirement
+  requirement: &70217957029440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794668260
+  version_requirements: *70217957029440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70142794667460 !ruby/object:Gem::Requirement
+  requirement: &70217957028300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794667460
+  version_requirements: *70217957028300
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70142794666640 !ruby/object:Gem::Requirement
+  requirement: &70217957027160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142794666640
+  version_requirements: *70217957027160
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -186,7 +186,10 @@ files:
 - test/cgi_ext_test.rb
 - test/config.yml
 - test/config_test.rb
+- test/fixtures-vcr/geocoder.yml
 - test/fixtures-vcr/http_test.yml
+- test/geocoder_test.rb
+- test/hash_ext_test.rb
 - test/helper.rb
 - test/http_test.rb
 - test/string_ext_test.rb
@@ -207,7 +210,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -342124506213546758
+      hash: -2234513131889917525
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: