rack-geoip 0.1.2 → 2.0.1

data/.gitignore

@@ -0,0 +1,19 @@
+*.gem
+*.rbc
+.bundle
+vendor/bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+data
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in rack-geoip.gemspec
+gemspec

data/Rakefile

@@ -1,48 +1,7 @@
-require 'rubygems'
-require 'rake'
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "rack-geoip"
-    gem.summary = %Q{A rack middleware component that handles simple geoip lookups.}
-    gem.description = %Q{A rack middleware component that handles simple geoip lookups.}
-    gem.email = "ckraybill@gmail.com"
-    gem.homepage = "http://github.com/ckraybill/rack-geoip"
-    gem.authors = ["Chris Kraybill"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "geoip_city"
-    gem.add_dependency "json"
-    # 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 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
+RSpec::Core::RakeTask.new
 
 task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "rack-geoip #{version}"
-  rdoc.rdoc_files.include('README*','COPYING')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-  rdoc.rdoc_files.include('TODO')
-end
+task :test => :spec

data/VERSION

@@ -1 +1 @@
-0.1.2
+2.0.1

data/lib/rack/geoip/lookup.rb

@@ -11,18 +11,18 @@ module Rack::Geoip
       @app, @options = app, DEFAULT.merge(options)
       @db = GeoIPCity::Database.new(@options[:db], @options[:db_lookup])
     end
-    
+
     def call(env)
       dup._call(env)
     end
-    
+
     def _call(env)
       if env['PATH_INFO'] == @options[:path]
         request = Rack::Request.new(env)
         if request.params['ip'] && result=@db.look_up(request.params['ip'])
-          [200, {'Content-Type' => 'application/json'}, result.to_json]
+          [200, {'Content-Type' => 'application/json'}, [result.to_json]]
         else
-          [404, {'Content-Type' => 'text/plain'}, "Example usage: #{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['PATH_INFO']}?ip=8.8.8.8"]
+          [404, {'Content-Type' => 'text/plain'}, ["Example usage: #{env['rack.url_scheme']}://#{env['HTTP_HOST']}#{env['PATH_INFO']}?ip=8.8.8.8"]]
         end
       else
         @app.call(env)

data/lib/rack/geoip/version.rb

@@ -0,0 +1,5 @@
+module Rack
+  module Geoip
+    VERSION = '2.0.1'
+  end
+end

data/rack-geoip.gemspec

@@ -1,63 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'rack/geoip/version'
 
 Gem::Specification.new do |s|
-  s.name = %q{rack-geoip}
-  s.version = "0.1.2"
+  s.name          = "rack-geoip"
+  s.version       = Rack::Geoip::VERSION
+  s.authors       = ["Chris Kraybill"]
+  s.email         = ["ckraybill@gmail.com"]
+  s.description   = %q{A rack middleware component that handles simple geoip lookups.}
+  s.summary       = %q{A rack middleware component that handles simple geoip lookups.}
+  s.homepage      = %q{http://github.com/ckraybill/rack-geoip}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris Kraybill"]
-  s.date = %q{2011-01-03}
-  s.description = %q{A rack middleware component that handles simple geoip lookups.}
-  s.email = %q{ckraybill@gmail.com}
-  s.extra_rdoc_files = [
-    "README",
-    "TODO"
-  ]
-  s.files = [
-    ".document",
-    "COPYING",
-    "README",
-    "Rakefile",
-    "TODO",
-    "VERSION",
-    "examples/basic.ru",
-    "lib/rack-geoip.rb",
-    "lib/rack/geoip.rb",
-    "lib/rack/geoip/lookup.rb",
-    "rack-geoip.gemspec",
-    "spec/rack-geoip_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/ckraybill/rack-geoip}
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = []
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A rack middleware component that handles simple geoip lookups.}
-  s.test_files = [
-    "spec/rack-geoip_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency 'rack'
+  s.add_dependency 'geoip_city19', '>= 2.0.1'
+  s.add_dependency 'json'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<geoip_city>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<geoip_city>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<geoip_city>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-  end
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
+  s.add_development_dependency 'rack-test'
 end
-

data/spec/rack-geoip_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require_relative "spec_helper"
 
 describe "RackGeoip" do
   def app
@@ -14,7 +14,7 @@ describe "RackGeoip" do
     last_response.should be_ok
     last_response.body.should == 'Hello World'
   end
-  
+
   # This makes sure that the middleware will return a 404 with some suggested usage
   # when the request is malformed
   it 'should return 404 when a geocode lookup request has malformed parameters' do
@@ -22,7 +22,7 @@ describe "RackGeoip" do
     last_response.status.should == 404
     last_response.body.should == 'Example usage: http://example.org/geocode/lookup?ip=8.8.8.8'
   end
-  
+
   # This makes sure that the response is JSON parse-able
   it 'should return some json when a geocode lookup works' do
     get '/geocode/lookup?ip=8.8.8.8'
@@ -30,7 +30,7 @@ describe "RackGeoip" do
     json = JSON.parse(last_response.body)
     json.class.should == Hash
   end
-  
+
   # This tests the actual geocode lookup
   it 'should return the city Mountain View when the provided IP lookup is for a googleplex' do
     get '/geocode/lookup?ip=8.8.8.8'

data/spec/spec_helper.rb

@@ -1,18 +1,13 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
-require 'json'
-require 'rack-geoip'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'rack/test'
+require 'rack/geoip'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include Rack::Test::Methods
 end
 
 class BasicRackApp
   def call(env)
-    [200, {'Content-Type' => 'text/plain'}, 'Hello World']
+    [200, {'Content-Type' => 'text/plain'}, ['Hello World']]
   end
-end
+end

metadata

@@ -1,79 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rack-geoip
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 2.0.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Chris Kraybill
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-03 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-02-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: geoip_city
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: geoip_city19
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A rack middleware component that handles simple geoip lookups.
-email: ckraybill@gmail.com
+email:
+- ckraybill@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README
-- TODO
-files: 
+extra_rdoc_files: []
+files:
 - .document
+- .gitignore
 - COPYING
+- Gemfile
 - README
 - Rakefile
 - TODO
@@ -82,44 +126,42 @@ files:
 - lib/rack-geoip.rb
 - lib/rack/geoip.rb
 - lib/rack/geoip/lookup.rb
+- lib/rack/geoip/version.rb
 - rack-geoip.gemspec
 - spec/rack-geoip_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/ckraybill/rack-geoip
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 851683759161573456
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 851683759161573456
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A rack middleware component that handles simple geoip lookups.
-test_files: 
+test_files:
 - spec/rack-geoip_spec.rb
+- spec/spec.opts
 - spec/spec_helper.rb