geoipdb 0.5.5 → 0.5.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bd4014a1f5219ad80dcc4edf0f2676cfe6a25c15
+  data.tar.gz: 9023e01afee88c14087ce533ba53a835db050153
+SHA512:
+  metadata.gz: 051bf0ed38ea950a7ac3d738cbbce26f5dfa13d748c5d56a80676124ac8c82c950265bc937cffafcb615c84bc8a096aca2225ffa2625d14927a878ad8d822431
+  data.tar.gz: a86a82c253f1f1521adfc046765d3b3b6b57dec78ee9990d8f8666534c9db82a0faf99da8bdb58720cd2b4ce1802e74e38a72db2325859bfa03e68e3f01ae1c6

data/.gitignore

@@ -12,6 +12,7 @@ ext/geoipdb/geoipdb.o
 ext/geoipdb/ipdb.o
 ext/geoipdb/test
 ext/geoipdb/test.o
+lib/geoipdb.jar
 pkg
 rdoc
 tags

data/.rspec

@@ -1 +1,2 @@
+--require spec_helper
 --color

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+- jruby
+- 2.1.0
+- 2.0.0
+- 1.9.3
+notifications:
+  email: false
+  hipchat:
+    rooms:
+      secure: RFtqDVDCk3BfP9yrVgToifCEbtEljndNWX61YCtsFXuCYihPODfii33HqEJ/CCZARuSMpomezOWsHP10+gT2VgRG8nfSQ6AIPLR1H2cs4uFtNN3WKd3I+LDF/GDua4rfEY8g4tZWFYTLbxgtpxD5rrGL6/ASLdAlKy33i/gTuPM=

data/Gemfile

@@ -1,10 +1,9 @@
-source :rubygems
+source "https://rubygems.org"
+
+gemspec
+
+gem 'liquid-ext'
 
 group :development, :test do
-  gem 'bundler'
-  gem 'rake'
-  gem 'rake-compiler'
-  gem 'rspec'
-  gem 'simplecov'
-  gem 'yard'
+  gem 'liquid-development'
 end

data/README.md

@@ -0,0 +1,40 @@
+# geoipdb: fast (in memory!) geo location db.
+
+Fast GeoIpDb implementation for Ruby using C/Java-Extensions.
+
+* Returns a GeoLocation and additional information for a given IP.
+* Reads Data from CSV-Files and uses internal binary caching.
+
+[![Gem Version](https://badge.fury.io/rb/geoipdb.png)](http://badge.fury.io/rb/geoipdb)
+[![Build Status](https://secure.travis-ci.org/liquidm/geoipdb.png)](http://travis-ci.org/liquidm/geoipdb)
+[![Code Climate](https://codeclimate.com/github/liquidm/geoipdb.png)](https://codeclimate.com/github/liquidm/geoipdb)
+[![Dependency Status](https://gemnasium.com/liquidm/geoipdb.png)](https://gemnasium.com/liquidm/geoipdb)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'geoipdb'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install geoipdb
+
+## Usage
+
+    db = IpDb.init "city_codes.csv", "ip_city.txt", "ip_city.cache"
+    ip_info = db.information_for_ip("178.0.0.1")
+    ip_info.inspect
+    => #<IpInformation:0x101385c78 @city_name="eschborn", @city_code="ax5", @lng=8.55, @country_iso_code="de", @lat=50.133333, @is_mobile=true>
+
+## Contributing
+
+1. Fork it ( http://github.com/liquidm/geoipdb/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,7 +1,15 @@
-require 'bundler/setup'
-require 'bundler/gem_tasks'
+require "bundler/setup"
+require "bundler/gem_tasks"
+require "liquid/tasks"
 
-Dir['tasks/**/*.rake'].each { |t| load t }
+case RUBY_PLATFORM
+when 'java'
+  require 'rake/javaextensiontask'
+  Rake::JavaExtensionTask.new('geoipdb')
+else
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new('geoipdb')
+end
 
 task :default => [:spec]
 task :build => :compile

data/ext/geoipdb/geoipdb.c

@@ -74,7 +74,7 @@ VALUE build_ip_information_object(IpRange *range, City *city, char* isp) {
   rb_ivar_set(ip_information, rb_intern("@lng"), rb_float_new(city->lng) );
   rb_ivar_set(ip_information, rb_intern("@lat"), rb_float_new(city->lat) );
   rb_ivar_set(ip_information, rb_intern("@is_mobile"), range->is_mobile == 1 ? Qtrue : Qfalse );
-  rb_ivar_set(ip_information, rb_intern("@isp_name"), isp == NULL ? Qnil : ID2SYM( rb_intern(isp) ) );
+  rb_ivar_set(ip_information, rb_intern("@isp_name"), isp == NULL || strcmp(isp, "?") == 0 ? Qnil : ID2SYM( rb_intern(isp) ) );
 
   return ip_information;
 }

data/geoipdb.gemspec

@@ -1,28 +1,26 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |gem|
-  gem.name = "geoipdb"
-  gem.version = "0.5.5"
-  gem.licenses = ["MIT"]
+Gem::Specification.new do |spec|
+  spec.name          = "geoipdb"
+  spec.version       = "0.5.6"
+  spec.authors       = ["LiquidM, Inc."]
+  spec.email         = ["opensource@liquidm.com"]
+  spec.description   = "Fast GeoIpDb implementation for Ruby"
+  spec.summary       = "Fast GeoIpDb implementation for Ruby"
+  spec.homepage      = "http://github.com/liquidm/geoipdb"
+  spec.licenses      = ["MIT"]
 
-  gem.authors = ["Eugen Martin", "Martin Karlsch", "Thomas Hirsch", "Benedikt Böhm"]
-  gem.email = ["eugeniusmartinus@googlemail.com", "martin.karlsch@madvertise.com", "thomas.hirsch@madvertise.com", "benedikt.boehm@madvertise.com"]
-
-  gem.description = "Returns a GeoLocation and additional information for given IP. Reads Data from CSV-Files and uses internal binary caching."
-  gem.summary = "Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions."
-  gem.homepage = "http://github.com/madvertise/geoipdb"
-
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.require_paths = ["lib", "ext"]
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib", "ext"]
 
   if RUBY_PLATFORM =~ /java/
-    gem.platform = "java"
-    gem.files << "lib/geoipdb.jar"
+    spec.platform = "java"
+    spec.files << "lib/geoipdb.jar"
   else
-    gem.extensions = ["ext/geoipdb/extconf.rb"]
+    spec.extensions = ["ext/geoipdb/extconf.rb"]
   end
 
-  gem.add_development_dependency "rake-compiler"
+  spec.add_development_dependency "rake-compiler"
 end

data/lib/cgeoipdb.rb

@@ -0,0 +1,2 @@
+require 'rbconfig'
+require File.expand_path('../geoipdb.so', __FILE__)

data/lib/geoipdb.rb

@@ -2,7 +2,6 @@ require 'ip_information'
 
 if defined?(JRUBY_VERSION)
   require 'jgeoipdb'
-  require 'rbconfig'
 else
-  require 'geoipdb/geoipdb'
+  require 'cgeoipdb'
 end

data/lib/jgeoipdb.rb

@@ -1,3 +1,4 @@
+require 'rbconfig'
 require 'java'
 require File.expand_path('../geoipdb.jar', __FILE__)
 
@@ -28,15 +29,13 @@ class GeoIpDb
 
   def build_ip_information_object(range, city, isp)
     info = IpInformation.new
-
     info.country_iso_code = city.country_iso2
     info.city_name = city.name
     info.city_code = city.city_code
     info.lng = city.lng
     info.lat = city.lat
     info.is_mobile  = range.is_mobile
-    info.isp_name = isp && isp.to_sym
-
+    info.isp_name = isp ? isp.to_sym : :"?"
     info
   end
 

data/spec/geoipdb_spec.rb

@@ -51,7 +51,7 @@ describe GeoIpDb do
     init_db
     @db.information_for_ip("1.0.0.1").isp_name.should == :vodafone
     @db.information_for_ip("1.1.1.1").isp_name.should == "1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone1vodafone2vodafone3vodafone4vodafone5vodafone"[0..99].to_sym
-    @db.information_for_ip("1.2.1.1").isp_name.should == nil
+    @db.information_for_ip("1.2.1.1").isp_name.should == :"?"
   end
 
   it "should write and read the cachefile correctly"

metadata

@@ -1,50 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: geoipdb
 version: !ruby/object:Gem::Version
-  version: 0.5.5
-  prerelease: 
+  version: 0.5.6
 platform: ruby
 authors:
-- Eugen Martin
-- Martin Karlsch
-- Thomas Hirsch
-- Benedikt Böhm
+- LiquidM, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70164140517280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70164140517280
-description: Returns a GeoLocation and additional information for given IP. Reads
-  Data from CSV-Files and uses internal binary caching.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Fast GeoIpDb implementation for Ruby
 email:
-- eugeniusmartinus@googlemail.com
-- martin.karlsch@madvertise.com
-- thomas.hirsch@madvertise.com
-- benedikt.boehm@madvertise.com
+- opensource@liquidm.com
 executables: []
 extensions:
 - ext/geoipdb/extconf.rb
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .jrubyrc
-- .rspec
-- .rvmrc
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
-- README.markdown
+- README.md
 - Rakefile
 - ext/geoipdb/extconf.rb
 - ext/geoipdb/geoipdb.c
@@ -55,7 +48,7 @@ files:
 - ext/geoipdb/src/GeoIpDb.java
 - ext/geoipdb/src/IpRange.java
 - geoipdb.gemspec
-- lib/geoipdb.jar
+- lib/cgeoipdb.rb
 - lib/geoipdb.rb
 - lib/ip_information.rb
 - lib/jgeoipdb.rb
@@ -65,38 +58,31 @@ files:
 - sample_data/ip_ranges_corrupt.csv
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb
-- tasks/compile.rake
-- tasks/rspec.rake
-- tasks/yard.rake
-homepage: http://github.com/madvertise/geoipdb
+homepage: http://github.com/liquidm/geoipdb
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2066128621521199120
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
-summary: Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C-Extensions.
+specification_version: 4
+summary: Fast GeoIpDb implementation for Ruby
 test_files:
 - spec/geoipdb_spec.rb
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.jrubyrc

@@ -1,12 +0,0 @@
-compat.version=1.9
-compile.mode=JIT
-
-cext.enabled=true
-native.enabled=true
-compile.invokedynamic=false
-
-invokedynamic.all=true
-
-errno.backtrace=true
-
-fiber.coroutines=false

data/.rvmrc

@@ -1 +0,0 @@
-rvm use --create jruby-1.7.2@geoipdb

data/README.markdown

@@ -1,18 +0,0 @@
-# geoipdb: fast (in memory!) geo location db.
-
-Fast (>3 Mio queries/sec!!!) GeoIpDb implementation for Ruby using C/Java-Extensions.
-
-  * Returns a GeoLocation and additional information for a given IP. 
-  * Reads Data from CSV-Files and uses internal binary caching.
-
-## Usage
-
-    db = IpDb.init "city_codes.csv", "ip_city.txt", "ip_city.cache"
-    ip_info = db.information_for_ip("178.0.0.1")
-    ip_info.inspect
-    => #<IpInformation:0x101385c78 @city_name="eschborn", @city_code="ax5", @lng=8.55, @country_iso_code="de", @lat=50.133333, @is_mobile=true> 
-
-== Copyright
-
-Copyright (c) 2010 madvertise GmbH. See LICENSE.txt for
-further details.

data/tasks/compile.rake

@@ -1,8 +0,0 @@
-case RUBY_PLATFORM
-when 'java'
-  require 'rake/javaextensiontask'
-  Rake::JavaExtensionTask.new('geoipdb')
-else
-  require 'rake/extensiontask'
-  Rake::ExtensionTask.new('geoipdb')
-end

data/tasks/rspec.rake

@@ -1,7 +0,0 @@
-require 'rspec'
-require 'rspec/core/rake_task'
-
-desc "Run the specs"
-RSpec::Core::RakeTask.new do |t|
-  t.verbose = false
-end

data/tasks/yard.rake

@@ -1,5 +0,0 @@
-require 'yard'
-
-YARD::Rake::YardocTask.new do |t|
-  t.files = ['lib/**/*.rb', 'README.rdoc']
-end