geoip_server 1.2.0 → 1.3.0

data/Gemfile

@@ -1,14 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-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
+gemspec

data/Gemfile.lock

@@ -1,39 +1,45 @@
+PATH
+  remote: .
+  specs:
+    geoip_server (1.3.0)
+      geoip (~> 1.1)
+      multi_json (~> 1.3)
+      newrelic_rpm (~> 3.4)
+      sinatra (~> 1.1)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   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)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    geoip (1.1.2)
+    i18n (0.6.1)
+    multi_json (1.3.6)
+    newrelic_rpm (3.4.2.1)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     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)
-    tilt (1.2.1)
+    shoulda (3.1.1)
+      shoulda-context (~> 1.0)
+      shoulda-matchers (~> 1.2)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.3.0)
+      activesupport (>= 3.0.0)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
+    tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
-  geoip
-  i18n
-  jeweler
-  newrelic_rpm
+  geoip_server!
   rack-test
   rake
   shoulda
-  sinatra (= 1.1.2)

data/README.markdown

@@ -10,21 +10,28 @@ This simple Rack server is useful as a self-hosted service for making lookups to
 * Commit that data file to your clone: `git add vendor && git commit -m "adding data file"`
 * Signup for an account at Heroku ([better details here](http://github.com/sinatra/heroku-sinatra-app))
 * Create and name a new app where you want to host this
-* push it to Heroku.com: `git push heroku master`
+* Push it to Heroku.com: `git push heroku master`
 
 
 ## HowTo
 
 Once the server is running you can make a GET request to the server and receive lookup results in JSON format.
 
-    ip = request.remote_ip
-    require 'open-uri'
-    data = JSON.decode(open("http://my-geoip-service-app.heroku.com/#{ip}").read)
-    render :text => "You're in: #{data[:city]}"
+```ruby
+require 'json'
+require 'open-uri'
+# Get the requesting user's IP address
+# In a Rails app, you can use: request.remote_ip
+# In a Sinatra app, you can use: request.ip
+# In a Rack app, you can use: @env['REMOTE_ADDR']
+ip = "207.97.227.239"
+data = JSON.load(open("http://my-geoip-service-app.herokuapp.com/#{ip}").read)
+"You're in: #{data['city']}"
+```
 
 Or, straight from a terminal:
 
-    curl -X POST http://my-geoip-service-app.heroku.com/207.97.227.239
+    curl http://my-geoip-service-app.herokuapp.com/207.97.227.239
 
 Patches welcome, forks celebrated.
 

data/Rakefile

@@ -1,24 +1,5 @@
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "geoip_server"
-    gem.summary = %Q{Query the MaxMind GeoIP data records via a web service}
-    gem.description = %Q{Query the MaxMind GeoIP data records via a web service}
-    gem.email = "gitcommit@6brand.com"
-    gem.homepage = "http://github.com/JackDanger/geoip_server"
-    gem.authors = ["Jack Danger Canty"]
-    gem.add_dependency "sinatra", ">= 1.0.0"
-    gem.add_dependency "active_support", ">= 0"
-    gem.add_dependency "geoip", ">= 0"
-    gem.add_development_dependency "shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 task :default => :test
 
@@ -29,9 +10,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-
-
-
 namespace :geoip do
   desc "Update GeoIP City data file"
   task :update_city_lite => :vendor do
@@ -46,4 +24,4 @@ namespace :geoip do
   task :vendor do
     %x{mkdir -p vendor}
   end
-end
+end

data/config.ru

@@ -1,8 +1,2 @@
-require 'rubygems'
-require 'bundler/setup'
-require File.expand_path(File.join(File.dirname(__FILE__), 'lib/geoip_server'))
-
-## There is no need to set directories here anymore;
-## Just run the application
-
+require './lib/geoip_server'
 run Sinatra::Application

data/geoip_server.gemspec

@@ -1,70 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
-  s.name = %q{geoip_server}
-  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", "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 fabien@foodtree.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "config.ru",
-    "geoip_server.gemspec",
-    "lib/geoip_server.rb",
-    "test.rb"
-  ]
-  s.homepage = %q{http://github.com/JackDanger/geoip_server}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{Query the MaxMind GeoIP data records via a web service}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<geoip>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<newrelic_rpm>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0.0"])
-      s.add_runtime_dependency(%q<active_support>, [">= 0"])
-      s.add_runtime_dependency(%q<geoip>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<geoip>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<newrelic_rpm>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 1.0.0"])
-      s.add_dependency(%q<active_support>, [">= 0"])
-      s.add_dependency(%q<geoip>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<geoip>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<newrelic_rpm>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 1.0.0"])
-    s.add_dependency(%q<active_support>, [">= 0"])
-    s.add_dependency(%q<geoip>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-  end
+  s.name = 'geoip_server'
+  s.version = '1.3.0'
+  s.authors = ["Jack Danger Canty", "Erik Michaels-Ober"]
+  s.description = 'Query the MaxMind GeoIP data records via a web service'
+  s.email = 'gitcommit@6brand.com'
+  s.files = %w(Gemfile Gemfile.lock README.markdown Rakefile config.ru geoip_server.gemspec test.rb)
+  s.files += Dir.glob('lib/**/*.rb')
+  s.test_files = %w(test.rb)
+  s.homepage = 'http://github.com/JackDanger/geoip_server'
+  s.require_paths = ['lib']
+  s.summary = s.description
+  s.add_dependency 'sinatra', '~> 1.1'
+  s.add_dependency 'geoip', '~> 1.1'
+  s.add_dependency 'multi_json', '~> 1.3'
+  s.add_dependency 'newrelic_rpm', '~> 3.4'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'rack-test'
 end
-

data/lib/geoip_server.rb

@@ -1,14 +1,9 @@
-## Resources
-gem 'sinatra', :version => '1.0'
 require 'sinatra'
 require 'geoip'
-require 'i18n'
-require 'active_support'
+require 'multi_json'
 
 data_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor', 'GeoLiteCity.dat'))
 
-## Application
-
 configure :production do
   ENV['APP_ROOT'] ||= File.dirname(__FILE__)
   begin
@@ -35,17 +30,12 @@ get '/' do
 }
 end
 
-get '/:ip' do
-  pass unless params[:ip] =~ /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/
-
-  data = GeoIP.new(data_file).city(params[:ip])
-
+get /\/(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/ do |ip|
+  data = GeoIP.new(data_file).city(ip)
   content_type 'application/json;charset=ascii-8bit'
-  headers['Cache-Control'] = "public; max-age=#{365*24*60*60}"
-
+  headers['Cache-Control'] = "public; max-age=31536000" # = 365 (days) * 24 (hours) * 60 (minutes) * 60 (seconds)
   return "{}" unless data
-
-  respond_with(ActiveSupport::JSON.encode(encode(data)))
+  respond_with(MultiJson.encode(encode(data)))
 end
 
 def respond_with json
@@ -64,34 +54,33 @@ end
 
 def encode data
   {
-    # * The host or IP address string as requested
-    :ip => data.shift,
-    # * The IP address string after looking up the host
-    :ip_lookup => data.shift,
-    # * The GeoIP country-ID as an integer
-    # :country_id => data.shift,
-    # * The ISO3166-1 two-character country code
-    :country_code => data.shift,
-    # * The ISO3166-2 three-character country code
-    :country_code_long => data.shift,
-    # * The ISO3166 English-language name of the country
-    :country => data.shift,
-    # * The two-character continent code
-    :continent => data.shift,
-    # * The region name
-    :region => data.shift,
-    # * The city name
-    :city => data.shift,
-    # * The postal code
-    :postal_code => data.shift,
-    # * The latitude
-    :lat => data.shift,
-    # * The longitude
-    :lng => data.shift,
-    # * The USA dma_code and area_code, if available (REV1 City database)
-    :dma_code => data.shift,
-    :area_code => data.shift,
+    # The host or IP address string as requested
+    :ip => data.request,
+    # The IP address string after looking up the host
+    :ip_lookup => data.ip,
+    # The ISO3166-1 two-character country code
+    :country_code => data.country_code2,
+    # The ISO3166-2 three-character country code
+    :country_code_long => data.country_code3,
+    # The ISO3166 English-language name of the country
+    :country => data.country_name,
+    # The two-character continent code
+    :continent => data.continent_code,
+    # The region name
+    :region => data.region_name,
+    # The city name
+    :city => data.city_name,
+    # The postal code
+    :postal_code => data.postal_code,
+    # The latitude
+    :lat => data.latitude,
+    # The longitude
+    :lng => data.longitude,
+    # The USA DMA code, if available
+    :dma_code => data.dma_code,
+    # The area code, if available
+    :area_code => data.area_code,
     # Timezone, if available
-    :timezone => data.shift
+    :timezone => data.timezone,
   }
 end

data/test.rb

@@ -52,9 +52,26 @@ class GeoipServerTest < Test::Unit::TestCase
     end
   end
 
-  context "converting array" do
+  context "converting struct" do
     setup {
-      array = [
+      Struct.new(
+        "City",
+        :request,
+        :ip,
+        :country_code2,
+        :country_code3,
+        :country_name,
+        :continent_code,
+        :region_name,
+        :city_name,
+        :postal_code,
+        :latitude,
+        :longitude,
+        :dma_code,
+        :area_code,
+        :timezone
+      ) unless defined? Struct::City
+      city = Struct::City.new(
         "67.161.92.71",
         "67.161.92.71",
         "US",
@@ -69,8 +86,8 @@ class GeoipServerTest < Test::Unit::TestCase
         819,
         206,
         "America/Los_Angeles"
-      ]
-      @hash = encode(array)
+      )
+      @hash = encode(city)
     }
     should "find city" do
       assert_equal 'Seattle', @hash[:city]

metadata

@@ -1,113 +1,85 @@
 --- !ruby/object:Gem::Specification 
 name: geoip_server
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Jack Danger Canty
-- Fabien Allanic
+- Erik Michaels-Ober
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 Z
+date: 2012-09-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
+        - 1
+        - 1
+        version: "1.1"
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :runtime
-  version_requirements: *id002
+  name: sinatra
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: geoip
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: i18n
+        - 1
+        - 1
+        version: "1.1"
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   type: :runtime
-  version_requirements: *id004
+  name: geoip
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: newrelic_rpm
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 9
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 3
+        version: "1.3"
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
+  name: multi_json
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        - 3
+        - 4
+        version: "3.4"
+  prerelease: false
   type: :runtime
-  version_requirements: *id006
+  name: newrelic_rpm
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: active_support
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,12 +88,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: geoip
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  name: rake
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -130,12 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  name: shoulda
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -144,26 +116,27 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  name: rack-test
+  requirement: *id007
 description: Query the MaxMind GeoIP data records via a web service
-email: gitcommit@6brand.com fabien@foodtree.com
+email: gitcommit@6brand.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
 - Gemfile
 - Gemfile.lock
 - README.markdown
 - Rakefile
-- VERSION
 - config.ru
 - geoip_server.gemspec
-- lib/geoip_server.rb
 - test.rb
+- lib/geoip_server.rb
 homepage: http://github.com/JackDanger/geoip_server
 licenses: []
 
@@ -193,9 +166,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Query the MaxMind GeoIP data records via a web service
-test_files: []
-
+test_files: 
+- test.rb

data/VERSION

@@ -1 +0,0 @@
-1.2.0