radiospieler 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/radiospieler.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "radiospieler"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
     "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",
@@ -48,13 +47,10 @@ Gem::Specification.new do |s|
     "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",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: radiospieler
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   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: &70359227563120 !ruby/object:Gem::Requirement
+  requirement: &70327946287000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359227563120
+  version_requirements: *70327946287000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70359227562000 !ruby/object:Gem::Requirement
+  requirement: &70327946286280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359227562000
+  version_requirements: *70327946286280
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70359227560880 !ruby/object:Gem::Requirement
+  requirement: &70327946285400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359227560880
+  version_requirements: *70327946285400
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70359227559640 !ruby/object:Gem::Requirement
+  requirement: &70327946281920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359227559640
+  version_requirements: *70327946281920
 - !ruby/object:Gem::Dependency
   name: simple_cache
-  requirement: &70359227558760 !ruby/object:Gem::Requirement
+  requirement: &70327946281360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359227558760
+  version_requirements: *70327946281360
 - !ruby/object:Gem::Dependency
   name: htmlentities
-  requirement: &70359227541000 !ruby/object:Gem::Requirement
+  requirement: &70327946280680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70359227541000
+  version_requirements: *70327946280680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70359227540160 !ruby/object:Gem::Requirement
+  requirement: &70327946279780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227540160
+  version_requirements: *70327946279780
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70359227539520 !ruby/object:Gem::Requirement
+  requirement: &70327946278700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227539520
+  version_requirements: *70327946278700
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70359227538720 !ruby/object:Gem::Requirement
+  requirement: &70327946277760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227538720
+  version_requirements: *70327946277760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70359227537260 !ruby/object:Gem::Requirement
+  requirement: &70327946276400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227537260
+  version_requirements: *70327946276400
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70359227535340 !ruby/object:Gem::Requirement
+  requirement: &70327946274760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227535340
+  version_requirements: *70327946274760
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70359227534760 !ruby/object:Gem::Requirement
+  requirement: &70327946273540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227534760
+  version_requirements: *70327946273540
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70359227533920 !ruby/object:Gem::Requirement
+  requirement: &70327946272560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70359227533920
+  version_requirements: *70327946272560
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -181,7 +181,6 @@ files:
 - 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
@@ -193,13 +192,10 @@ files:
 - 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
@@ -222,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3145811610061597683
+      hash: 1150779308148770786
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/extensions/bitly.rb

@@ -1,34 +0,0 @@
-require "cgi"
-
-module Bitly
-  TIME_TO_LIVE = 365 * 24 * 3600
-  
-  def self.url_base
-    return @url_base unless @url_base.nil?
-
-    user, key = (App.config[:bitly] || {}).values_at "user", "key"
-
-    @url_base = unless user && key
-      App.logger.warn "Missing or invalid bitly configuration: #{App.config[:bitly]}"
-      false
-    else
-      "https://api-ssl.bitly.com/v3/shorten?login=#{user}&apiKey=#{key}"
-    end
-  end
-  
-  def self.shorten(url)
-    return url if !self.url_base || !url || url.index("/bit.ly/")
-
-    bitly_url = "#{self.url_base}&longUrl=#{CGI.escape(url)}"
-    parsed = JSON.parse Http.get(bitly_url, TIME_TO_LIVE) 
-
-    if parsed["status_code"] == 200
-      bitlified = parsed["data"]["url"] 
-      App.logger.debug "bitlify: #{url} => #{bitlified}"
-      bitlified
-    else
-      App.logger.error "#{url}: bitly error: #{parsed["status_txt"] }"
-      url
-    end
-  end
-end

data/test/bitlify_test.rb

@@ -1,28 +0,0 @@
-# encoding: utf-8
-
-require_relative './test_helper'
-require 'vcr'
-
-VCR.configure do |c|
-  c.cassette_library_dir = "#{File.dirname(__FILE__)}/fixtures-vcr"
-  c.hook_into :webmock
-end
-
-class BitlifyTest < Test::Unit::TestCase
-  def test_limit_exceeded
-    VCR.use_cassette('bitly_limit_exceeded') do
-      assert_equal("http://radiospiel.org/foo", Bitly.shorten("http://radiospiel.org/foo"))
-    end
-  end
-
-  def test_ok
-    VCR.use_cassette('bitly_ok') do
-      assert_equal("http://bit.ly/HV7woD", Bitly.shorten("http://radiospiel.org/a=1&b=2"))
-    end
-  end
-
-  def test_url_base
-    expected = "https://api-ssl.bitly.com/v3/shorten?login=bitlyapidemo&apiKey=R_0da49e0a9118ff35f52f629d2d71bf07"
-    assert_equal expected,  Bitly.url_base
-  end
-end

data/test/fixtures-vcr/bitly_limit_exceeded.yml

@@ -1,43 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api-ssl.bitly.com/v3/shorten?apiKey=R_0da49e0a9118ff35f52f629d2d71bf07&login=bitlyapidemo&longUrl=http://radiospiel.org/foo
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      !binary "U2VydmVy":
-      - !binary |-
-        bmdpbng=
-      !binary "RGF0ZQ==":
-      - !binary |-
-        V2VkLCAwNCBBcHIgMjAxMiAxNTo0OTo0NiBHTVQ=
-      Content-Type:
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
-      !binary "Q29ubmVjdGlvbg==":
-      - !binary |-
-        a2VlcC1hbGl2ZQ==
-      Mime-Version:
-      - !binary |-
-        MS4w
-      Content-Length:
-      - !binary |-
-        NzI=
-    body:
-      encoding: US-ASCII
-      string: ! '{ "data": [ ], "status_code": 403, "status_txt": "RATE_LIMIT_EXCEEDED"
-        }'
-    http_version: 
-  recorded_at: Wed, 04 Apr 2012 15:49:46 GMT
-recorded_with: VCR 2.0.1

data/test/fixtures-vcr/bitly_ok.yml

@@ -1,46 +0,0 @@
----
-http_interactions:
-- request:
-    method: get
-    uri: https://api-ssl.bitly.com/v3/shorten?apiKey=R_0da49e0a9118ff35f52f629d2d71bf07&login=bitlyapidemo&longUrl=http://radiospiel.org/a=1%26b=2
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - ! '*/*'
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      !binary "U2VydmVy":
-      - !binary |-
-        bmdpbng=
-      !binary "RGF0ZQ==":
-      - !binary |-
-        V2VkLCAwNCBBcHIgMjAxMiAxNTo0NToyOSBHTVQ=
-      Content-Type:
-      - !binary |-
-        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD11dGYtOA==
-      !binary "Q29ubmVjdGlvbg==":
-      - !binary |-
-        a2VlcC1hbGl2ZQ==
-      Mime-Version:
-      - !binary |-
-        MS4w
-      Content-Length:
-      - !binary |-
-        MTk1
-    body:
-      encoding: US-ASCII
-      string: ! '{ "status_code": 200, "status_txt": "OK", "data": { "long_url": "http:\/\/radiospiel.org\/a=1&b=2",
-        "url": "http:\/\/bit.ly\/HV7woD", "hash": "HV7woD", "global_hash": "HV7woE",
-        "new_hash": 1 } }
-
-'
-    http_version: 
-  recorded_at: Wed, 04 Apr 2012 15:45:29 GMT
-recorded_with: VCR 2.0.1