geolocal 0.9 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d27c3ffbd6c516bc62cb08663fd536472a24ef
-  data.tar.gz: 85c77e798dab700c8ddb602fce533fad7794b46a
+  metadata.gz: 2f7cad64f85f04f0bd9971651e2470ad2f344640
+  data.tar.gz: 3e309a0a2464feb9c2431e34b2aacddfea18635c
 SHA512:
-  metadata.gz: 8e94cb66a6465c12d7b8111fc99eca1cc2a800bcc7e0e98abfbe42f690cb03ba835ba88665be74330e85eeb9e314bcd8ee98f902ff9fcad989b9717455047cbe
-  data.tar.gz: c97b4d0bc05f06481587c39b1410450036cf83887ee2188870b2e007c6a940914382c44e4a7bea0076a342fa400c098ab1b61f7f5ac52dcc6ff0f8edfc1f192c
+  metadata.gz: c9735c98cb5e6268510d41d792c9dcfb88428d4123f69855f74e03f2c48e133fdac101d6ee7a9dd6c3a90093f5bd0fa7b41a96b9a16508e1fa2f90282f1c57d8
+  data.tar.gz: 04cee72abe241e39642c681b87f003a6ab963d30d16182e1f206c438b1cdf5ec51711c1b0b4618deb462232a714c667856bff656fe174c404c7ffadc58c71148

data/README.md

@@ -1,9 +1,10 @@
 # Geolocal
 
 Geocode IP addresses with a single Ruby if statement.
-No network access, no context switches, no delay.  Just one low-calorie lookup:
-`Geolocal.in_spain?(request.remote_ip)`.  500,000 individual lookups
-per second is fairly typical performance.
+No network access, no context switches, no delay,
+just one low-calorie lookup like `Geolocal.in_spain?(request.remote_ip)`.
+
+500,000 individual lookups per second is fairly typical performance.
 
 
 ## Installation
@@ -14,17 +15,23 @@ Add this line to your Gemfile:
 gem 'geolocal'
 ```
 
+And this line to your Rakefile:
+
+```ruby
+require 'geolocal/tasks'
+```
 
 ## Usage
 
 If you're using Rails, run `rails generate geolocal` to create the configuration file.
 Otherwise, crib from [config/geolocal.rb](https://github.com/bronson/geolocal/tree/master/config/geolocal.rb).
 
-The config file describes the ranges you're interested in.
+The configuration file describes the ranges you're interested in.
 Here's an example:
 
 ```ruby
 require 'geolocal/configuration'
+
 Geolocal.configure do |config|
   config.countries = {
     us: 'US',
@@ -40,6 +47,7 @@ creates the desired methods:
 
 ```ruby
 require 'geolocal'
+
 Geolocal.in_us?(request.remote_ip)
 Geolocal.in_spain?('2a05:af06::')  # optional IPv6 support
 Geolocal.in_central_america?('200.16.66.0')
@@ -127,21 +135,26 @@ ruby contrib/benchmark-continents.rb
 
 ## Alternatives
 
-The [Geocoder gem](https://github.com/alexreisner/geocoder) offers
+The [Geocoder gem](https://github.com/alexreisner/geocoder) also offers
 [local database services](https://github.com/alexreisner/geocoder#ip-address-local-database-services).
 It offers more options and more providers than Geolocal, but it's a little more complex and not as fast.
-Geolocal also doesn't add any dependencies to your deploy, potentially making it easier to get working
+Geolocal also doesn't add any dependencies to your deploy, potentially making it easier to get it working
 with oddball environments like Heroku.
 
 
-## TODO
+## Roadmap
+
+* Add support for cities
+* other sources for this data? [MainFacts](http://mainfacts.com/ip-address-space-addresses), [NirSoft](http://www.nirsoft.net/countryip/)
+  Also maybe allow providers to accept their own options?
+* release 1.0!
+* Detect nesting?  Putting in_eu?, in_europe?, and in_france? in your config generates a lot of redundant overlap.
+* Add support for for-pay features like lat/lon and timezones?
+
+
+## License
 
-- [ ] Add support for cities
-- [ ] other sources for this data? [MainFacts](http://mainfacts.com/ip-address-space-addresses), [NirSoft](http://www.nirsoft.net/countryip/)
-      Also maybe allow providers to accept their own options?
-- [ ] release 1.0!
-- [ ] Detect nesting?  Putting in_eu?, in_europe?, and in_france? generates a lot of redundant overlap.
-- [ ] Add support for for-pay features like lat/lon and timezones?
+Pain-free MIT.  Downloaded data is copyrighted by the provider you downloaded it from.
 
 
 ## Contributing

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'geolocal/tasks'
 
 Dir.glob('lib/tasks/*.rake').each { |r| load r}
 

data/lib/geolocal/tasks.rb

@@ -0,0 +1,29 @@
+require 'geolocal/configuration'
+
+namespace :geolocal do
+  def configured_provider
+    # we use this file by default
+    config='config/geolocal'
+
+    # but you can specify the config file on the command line:
+    #     `rake geolocal config=contrib/continents`
+    config=ENV['config'] if ENV['config']
+    puts "loading geolocal configuration from #{config}"
+    require './' + config
+
+    Geolocal.configuration.load_provider.new
+  end
+
+  desc "Downloads the most recent geocoding information"
+  task :download do
+    configured_provider.download
+  end
+
+  desc "Updates your geocoding statements to use new data."
+  task :update => :download do
+    configured_provider.update
+  end
+end
+
+desc "shorthand for running geolocal:update"
+task geolocal: 'geolocal:update'

data/lib/geolocal/version.rb

@@ -1,3 +1,3 @@
 module Geolocal
-  VERSION = "0.9"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geolocal
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: 0.9.2
 platform: ruby
 authors:
 - Scott Bronson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,14 +89,12 @@ files:
 - lib/generators/geolocal/USAGE
 - lib/generators/geolocal/geolocal_generator.rb
 - lib/generators/geolocal/templates/geolocal.rb
-- lib/geolocal.rb
 - lib/geolocal/configuration.rb
 - lib/geolocal/provider/base.rb
 - lib/geolocal/provider/db_ip.rb
 - lib/geolocal/provider/test.rb
-- lib/geolocal/railtie.rb
+- lib/geolocal/tasks.rb
 - lib/geolocal/version.rb
-- lib/tasks/geolocal.rake
 - spec/data/dbip-country.csv.gz
 - spec/geolocal/configuration_spec.rb
 - spec/geolocal/provider/base_spec.rb

data/lib/geolocal.rb

@@ -1,5 +0,0 @@
-# If you're wondering why nothing's here, you probably wanted to require 'geolocal/configuration'
-# Once you define a configuration and generate the geolocation code, this module will have contents.
-module Geolocal
-  require 'geolocal/railtie' if defined? Rails
-end

data/lib/geolocal/railtie.rb

@@ -1,12 +0,0 @@
-require 'geolocal'
-require 'rails'
-
-module Geolocal
-  class Railtie < Rails::Railtie
-    railtie_name :geolocal
-
-    rake_tasks do
-      load "tasks/geolocal.rake"
-    end
-  end
-end

data/lib/tasks/geolocal.rake

@@ -1,26 +0,0 @@
-# Provides geolocal's rake tasks.
-
-# we use this file by default
-config='config/geolocal'
-
-# but you can specify the config file on the command line:
-#     `rake geolocal config=contrib/continents`
-config=ENV['config'] if ENV['config']
-puts "loading geolocal configuration from #{config}"
-require './' + config
-
-
-namespace :geolocal do
-  desc "Downloads the most recent geocoding information"
-  task :download do
-    Geolocal.configuration.load_provider.new.download
-  end
-
-  desc "Updates your geocoding statements to use new data."
-  task :update => :download do
-    Geolocal.configuration.load_provider.new.update
-  end
-end
-
-desc "shorthand for running geolocal:update"
-task geolocal: 'geolocal:update'