ipligence 0.0.3 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73cbbfbc628ac5f8f87cc5693319cf118e42753c
-  data.tar.gz: 689e803487cb2c23bd2981bc124726caa961f293
+  metadata.gz: b9e6ec61058d4ad2b8da18aa620783724890b7ee
+  data.tar.gz: a065074b9ff4dba16f1fc84b816774d904be3a27
 SHA512:
-  metadata.gz: 87c536d5c19d587590dcf240edf92772eb9044d17897b344481f788c3c5838f4374f3c13a1d171edbd8eab279c8547fdd582ce3162b80c0a135c972722b765be
-  data.tar.gz: 4b6b9b1e90d82f4231609afaecf4db837328421bf1af658e2953cac6ec38f09425017848eac075595d600a44b3054ee4e4b4894ef2c12433ea17af8878fa6579
+  metadata.gz: 6679a0bf3eb446bc17eeb238555f2e995a19de2b64a6230cdd74365c5b7213a50a2739f4938c085b026af2b9dbb09e90970c9dbcbdfa994951d02307892f96bf
+  data.tar.gz: 6b44581fc33ad7fd0315082a19f7978c8665cbcc55fd8e0d303a69fd04cf4f26cfcbb65972dd33a507c821863f1fc3aa789a5c67b3945f33824ec1c6e23a0f14

data/README.md

@@ -26,7 +26,14 @@ Or install it yourself as:
 
 The gem needs an IPligence database. After you create it you can configure the `Ipligence::Client`:
 
-    client = Ipligence::Client.new("adapter", "database", "username", "password")
+    client =
+        Ipligence::Client.new(
+            :adapter => "adapter",
+            :host => "host.it.com"
+            :database => "database",
+            :username => "username",
+            :password => "password"
+        )
 
 Then, you can get a hash with the geodata for a given IP using the client's `data` method:
 
@@ -36,7 +43,7 @@ For example, querying for `195.130.124.1` returns the following hash:
 
     => {:ip_from=>"3280108544", :ip_to=>"3280109567", :country_code=>"GR", :country_name=>"GREECE",
         :continent_code=>"EU", :continent_name=>"EUROPE", :time_zone=>"GMT+2", :region_code=>"",
-        :region_name=>"", :owner=>"IONIAN UNIVERSITY", :city_name=>"CORFU", :county_name=>"",
+        :region_name=>"", :owner=>"IONIAN UNIVERSITY", :city_name=>"CORFU", :country_name=>"",
         :post_code=>"", :area_code=>"", :metro_code=>"", :latitude=>"39.62", :longitude=>"19.9197"}
 
 ## Contributing

data/lib/ipligence.rb

@@ -1,5 +1,6 @@
 require_relative "ipligence/version"
 require_relative "ipligence/utils"
+require_relative "ipligence/db_connection"
 require_relative "ipligence/client"
 
 module Ipligence

data/lib/ipligence/client.rb

@@ -2,15 +2,10 @@ require "active_record"
 
 class Ipligence::Client
 
-  attr_accessor :db
+  attr_reader :connection
 
-  def initialize(adapter, database, username = "root", password = "")
-    self.db = ActiveRecord::Base.establish_connection(
-      :adapter => adapter,
-      :database => database,
-      :username => username,
-      :password => password
-    ).connection
+  def initialize(opts)
+    @connection = Ipligence::DBConnection.establish_connection(opts).connection
   end
 
   def data(ip)
@@ -42,7 +37,7 @@ class Ipligence::Client
       long_ip = Ipligence::Utils.convert_dotted_to_long(ip).to_s
       data_fields = "ip_from, ip_to, country_code, country_name, continent_code, continent_name, time_zone, region_code, region_name, owner, city_name, county_name, post_code, area_code, metro_code, latitude, longitude"
       sql_query = "select #{data_fields} from ipligence2 where ip_from <= '#{long_ip}' and '#{long_ip}' <= ip_to"
-      self.db.exec_query(sql_query).first
+      connection.exec_query(sql_query).first
     end
 
 end

data/lib/ipligence/db_connection.rb

@@ -0,0 +1,3 @@
+class Ipligence::DBConnection < ActiveRecord::Base
+  @abstract_class = true
+end

data/lib/ipligence/version.rb

@@ -1,3 +1,3 @@
 module Ipligence
-  VERSION = "0.0.3"
+  VERSION = "0.0.7"
 end

data/test/client_test.rb

@@ -5,23 +5,16 @@ class ClientTest < MiniTest::Test
   end
 
   def test_initialize
-    connection_params = {
-      :adapter => "ADAPTER",
-      :database => "DATABASE",
-      :username => "USERNAME",
-      :password => "PASSWORD"
-    }
-
     adapter_mock = mock(:connection => "CONNECTION")
 
-    ActiveRecord::Base.expects(:establish_connection).with(connection_params).returns(adapter_mock)
-    client = Ipligence::Client.new("ADAPTER", "DATABASE", "USERNAME", "PASSWORD")
+    ActiveRecord::Base.expects(:establish_connection).with("OPTS").returns(adapter_mock)
+    client = Ipligence::Client.new("OPTS")
 
-    assert_equal("CONNECTION", client.db)
+    assert_equal("CONNECTION", client.connection)
   end
 
   def test_data
-    client = Ipligence::Client.new("sqlite3", "#{File.dirname(__FILE__)}/db/ipligence.sqlite")
+    client = Ipligence::Client.new(:adapter => "sqlite3", :database => "#{File.dirname(__FILE__)}/db/ipligence.sqlite")
 
     data = client.data("2.84.170.255")
     assert_equal(39102976, data[:ip_from])

data/test/schema.rb

@@ -13,8 +13,8 @@ ActiveRecord::Schema.define :version => 0 do
     t.string   :city_name,                     null: false
     t.string   :county_name,                   null: false
     t.string   :post_code,                     null: false
-    t.string   :area_code,                     null: false
     t.string   :metro_code,                    null: false
+    t.string   :area_code,                     null: false
     t.decimal  :latitude,                      null: false
     t.decimal  :longitude,                     null: false
   end

data/test/test_helper.rb

@@ -15,7 +15,7 @@ load("#{File.dirname(__FILE__)}/schema.rb")
 
 CSV.foreach("#{File.dirname(__FILE__)}/fixtures/ipligence_test.csv") do |row|
   insert_query =
-    "INSERT INTO ipligence2 (ip_from, ip_to, country_code, country_name, continent_code, continent_name, time_zone, region_code, region_name, owner, city_name, county_name, post_code, area_code, metro_code, latitude, longitude)
+    "INSERT INTO ipligence2 (ip_from, ip_to, country_code, country_name, continent_code, continent_name, time_zone, region_code, region_name, owner, city_name, county_name, post_code, metro_code, area_code, latitude, longitude)
     VALUES (#{row[0]}, #{row[1]}, '#{row[2]}', '#{row[3]}', '#{row[4]}', '#{row[5]}', '#{row[6]}', '#{row[7]}', '#{row[8]}', '#{row[9]}', '#{row[10]}', '#{row[11]}', '#{row[12]}', '#{row[13]}', '#{row[14]}', #{row[15]}, #{row[16]})"
   @db.connection.execute(insert_query)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ipligence
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
 platform: ruby
 authors:
 - Sebastian Komianos, Fernando Guillen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,6 +109,7 @@ files:
 - ipligence.gemspec
 - lib/ipligence.rb
 - lib/ipligence/client.rb
+- lib/ipligence/db_connection.rb
 - lib/ipligence/utils.rb
 - lib/ipligence/version.rb
 - test/client_test.rb