geoip_server 1.1.2 → 1.2.0

data/Gemfile

@@ -1,7 +1,14 @@
 source :rubygems
 
-gem 'sinatra'
+gem 'sinatra', '1.1.2'
 gem 'activesupport'
 gem 'geoip'
 gem 'i18n'
 gem 'newrelic_rpm'
+
+group :development, :test do
+  gem 'jeweler'
+  gem 'rake'
+  gem 'shoulda'
+  gem 'rack-test'
+end

data/Gemfile.lock

@@ -3,9 +3,22 @@ GEM
   specs:
     activesupport (3.0.3)
     geoip (0.8.8)
+    git (1.2.5)
     i18n (0.5.0)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.7.5)
     newrelic_rpm (2.13.4)
     rack (1.2.1)
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    shoulda (2.0.6)
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
@@ -18,5 +31,9 @@ DEPENDENCIES
   activesupport
   geoip
   i18n
+  jeweler
   newrelic_rpm
-  sinatra
+  rack-test
+  rake
+  shoulda
+  sinatra (= 1.1.2)

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/geoip_server.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geoip_server}
-  s.version = "1.1.2"
+  s.version = File.read('VERSION').chomp
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jack Danger Canty"]
+  s.authors = ["Jack Danger Canty", "Fabien Allanic"]
   s.date = %q{2011-04-10}
   s.description = %q{Query the MaxMind GeoIP data records via a web service}
-  s.email = %q{gitcommit@6brand.com}
+  s.email = %q{gitcommit@6brand.com fabien@foodtree.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]

data/lib/geoip_server.rb

@@ -45,8 +45,21 @@ get '/:ip' do
 
   return "{}" unless data
 
-  ActiveSupport::JSON.encode(encode(data))
+  respond_with(ActiveSupport::JSON.encode(encode(data)))
+end
 
+def respond_with json
+  # jsonp support
+  callback, variable = params[:callback], params[:variable]
+  if callback && variable
+    "var #{variable} = #{json};\n#{callback}(#{variable});"
+  elsif variable
+    "var #{variable} = #{json};"
+  elsif callback
+    "#{callback}(#{json});"
+  else
+    json
+  end
 end
 
 def encode data
@@ -81,4 +94,4 @@ def encode data
     # Timezone, if available
     :timezone => data.shift
   }
-end
+end

data/test.rb

@@ -32,10 +32,24 @@ class GeoipServerTest < Test::Unit::TestCase
     should "return ok" do
       assert last_response.ok?
     end
+    should "return json conent-type" do
+      assert_equal 'application/json;charset=ascii-8bit', last_response.headers['Content-Type']
+    end
+  end
+
+  context "on GET to /:ip?callback=myCallbackFunction" do
+    setup {
+      get '/67.161.92.71?callback=myCallbackFunction'
+    }
+    should "return ok" do
+      assert last_response.ok?
+    end
     should "return json content-type" do
-      assert_equal 'application/json', last_response.headers['Content-Type']
       assert_equal 'application/json;charset=ascii-8bit', last_response.headers['Content-Type']
     end
+    should "have a function as result" do
+      assert last_response.body =~ /myCallbackFunction\(\{.*\}\)/
+    end
   end
 
   context "converting array" do
@@ -71,4 +85,4 @@ class GeoipServerTest < Test::Unit::TestCase
       assert_equal -122.3848, @hash[:lng]
     end
   end
-end
+end

metadata

@@ -1,26 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: geoip_server
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Jack Danger Canty
+- Fabien Allanic
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -07:00
-default_executable: 
+date: 2011-04-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: sinatra
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,12 +30,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-  prerelease: false
-  name: sinatra
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -43,12 +44,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
-  name: activesupport
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: geoip
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +58,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
-  name: geoip
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -71,12 +72,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
-  name: i18n
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: newrelic_rpm
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -85,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
-  name: newrelic_rpm
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sinatra
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -101,12 +102,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id006
-  prerelease: false
-  name: sinatra
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: active_support
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -115,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-  prerelease: false
-  name: active_support
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: geoip
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -129,12 +130,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-  prerelease: false
-  name: geoip
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  name: shoulda
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,11 +144,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-  prerelease: false
-  name: shoulda
+  type: :development
+  version_requirements: *id009
 description: Query the MaxMind GeoIP data records via a web service
-email: gitcommit@6brand.com
+email: gitcommit@6brand.com fabien@foodtree.com
 executables: []
 
 extensions: []
@@ -164,7 +164,6 @@ files:
 - geoip_server.gemspec
 - lib/geoip_server.rb
 - test.rb
-has_rdoc: true
 homepage: http://github.com/JackDanger/geoip_server
 licenses: []
 
@@ -194,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Query the MaxMind GeoIP data records via a web service