enrichment_db 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac1cbd711cda815b1fa1f3b2f9ccb03d3cb3d87
-  data.tar.gz: b148dfebfe4da0ecb2bfea97088645de89c5cd4d
+  metadata.gz: ceeab3783a59c54f74ed47b5068319a203955e2c
+  data.tar.gz: b0fffe8b8f5856086423784b8fac993e4803517c
 SHA512:
-  metadata.gz: 60c6b6d4516375f7de949472233930bed26cde2270bac3c906f32c5e8c4c100b8fdc580c77a7296d62ba12557e6ea548ea300d1a620657d56198c8a2e51d5c6a
-  data.tar.gz: 0f77ea54c9fe29580b8750db699befcdec594533cb470d2eb943c5db149ea337ad28382006aeded2c868d37e1a4c34ef5da8492f3a6a133e09d92880c9d031dd
+  metadata.gz: 454bc5d8e9e609175f6a9292d7b3268a21dcc3c5715617e08bb12c2a9ff6ef9e88c64e98880bd02d69d57b6fd7ef7c9aea08f6ae91d0740e50005dcbbc82b4b3
+  data.tar.gz: 5f16865505cfb6c740654684d4ccf4905a3d936049e1f73146d8ee710fd9282573405e15beadea9f6eee8a107e14e627bb0c5874829a14d7ef6bc4b09408c7f6

data/.gitignore

@@ -0,0 +1,2 @@
+**.DS_Store
+test/reports/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enrichment_db (0.0.1)
+    enrichment_db (0.1.5)
       multi_json (~> 1.3)
       pg
       pr_geohash
@@ -33,7 +33,7 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     multi_json (1.11.2)
-    pg (0.18.2)
+    pg (0.18.3)
     pr_geohash (1.0.0)
     rake (10.4.2)
     ruby-progressbar (1.7.5)

data/lib/enrichment_db/census/datum.rb

@@ -0,0 +1,34 @@
+require 'helper'
+
+class EnrichmentDb::Census::Datum < EnrichmentDb::DatumModel
+  attr_reader :id
+
+  DATABASE_NAME = 'censis'
+
+  def self.by_id(table_name, id)
+    puts "Finding object from #{table_name} with region_id = '#{id}'."
+    query = "SELECT * FROM #{DATABASE_NAME}.#{table_name} where region_id = $1"
+    values = [id]
+    
+    result = EnrichmentDb.request(DATABASE_NAME, query, values)
+    
+    if result.ntuples == 1 
+      puts "Found object with region_id = '#{id}'"
+      format_result(result, id)
+    else 
+      puts "Nothing found"
+      nil
+    end
+  end
+
+  def self.format_result(result, id)
+    result = result[0]
+    result = EnrichmentDb::Helper.hash_float_str_to_float(result)
+    region_type = result['region_type']
+    region_type = region_type[0..-2]
+    region = EnrichmentDb::Geo.const_get(region_type).by_id(id.to_i)
+    region = EnrichmentDb::Helper.hash_float_str_to_float(region)
+    result['region'] = region
+    result
+  end
+end

data/lib/enrichment_db/census.rb

@@ -0,0 +1,6 @@
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}")
+
+module EnrichmentDb::Census
+end
+
+require 'census/datum'

data/lib/enrichment_db/datum.rb

@@ -0,0 +1,20 @@
+require 'helper'
+
+class EnrichmentDb::Datum < EnrichmentDb::DatumModel
+  def self.by_id(schema_name, table_name, condition)
+    puts "Finding object from #{table_name} with condition #{condition}."
+    query = "SELECT * FROM #{schema_name}.#{table_name} where #{condition}"
+    
+    result = EnrichmentDb.request(schema_name, query)
+    
+    if result.ntuples > 0 
+      puts "Found #{result.ntuples} object/s"
+      result.collect do |v|
+        v
+      end
+    else 
+      puts "Nothing found"
+      nil
+    end
+  end
+end

data/lib/enrichment_db/db.rb

@@ -1,10 +1,11 @@
 require 'pg'
 
 module EnrichmentDb
+  
   def self.db_connection
     @__db_connection ||= PGconn.connect(
-      host:'geo-mappings.cfmmyp7uix0j.ap-southeast-2.rds.amazonaws.com', 
-      dbname:'geo', 
+      host: 'geo-mappings.cfmmyp7uix0j.ap-southeast-2.rds.amazonaws.com', 
+      dbname: 'geo', 
       user: 'lexer', 
       password: 'campl3x3r'
     )
@@ -14,11 +15,31 @@ module EnrichmentDb
     @__api_connection = nil
   end
 
-  def self.request(query, values)
+  def self.table_names(schema = 'public')
+    query = "SELECT table_name
+            FROM information_schema.tables
+            WHERE table_schema='#{schema}'
+            AND table_type='BASE TABLE'"
+    request(schema, query).collect do |h|
+      h['table_name']
+    end
+  end
+
+  def self.table_columns(table, schema = 'public')
+    query = "SELECT *
+    FROM information_schema.columns
+    WHERE table_schema = '#{schema}'
+    AND table_name   = '#{table}'"
+    request(schema, query).collect do |h|
+      h['column_name']
+    end
+  end
+
+  def self.request(db, query, values = nil)
     type = request_type(query)
 
     case type
-    when :select, 'select' 
+    when :select, 'select', '\d'
       result = if values
         EnrichmentDb::db_connection.exec(query, values)
       else
@@ -32,7 +53,7 @@ module EnrichmentDb
   end
 
   def self.request_type(query)
-    result = query.downcase.match(/(^(?:drop|select|insert|delete))/)
+    result = query.downcase.match(/(^(?:drop|select|insert|delete|\\d))/)
     return unless result
 
     result[0]

data/lib/enrichment_db/geo/region.rb

@@ -2,6 +2,8 @@ class EnrichmentDb::Geo::Region < EnrichmentDb::DatumModel
   attr_reader :id
   attr_reader :name
 
+  DATABASE_NAME = 'geo'
+
   def initialize(data)
     @id = data['id']
     @name = data['name']
@@ -11,10 +13,10 @@ class EnrichmentDb::Geo::Region < EnrichmentDb::DatumModel
     puts "Finding #{object_type} with id = '#{id}'."
     field_names = fields
     table = make_table_name
-    query = "SELECT #{field_names} FROM #{table} where id = $1"
+    query = "SELECT #{field_names} FROM #{DATABASE_NAME}.#{table} where id = $1"
     values = [id]
     
-    result = EnrichmentDb.request(query, values)
+    result = EnrichmentDb.request(DATABASE_NAME, query, values)
     if result.ntuples == 1 
       puts "Found #{object_type}"
       result[0]
@@ -28,9 +30,9 @@ class EnrichmentDb::Geo::Region < EnrichmentDb::DatumModel
     puts "Finding #{object_type} intersecting with some geohash"
     field_names = fields
     table = make_table_name
-    query = "SELECT #{field_names} FROM #{table} where ST_Within(ST_SetSRID(ST_GeomFromGeoHash($1), 4283), boundary)"
+    query = "SELECT #{field_names} FROM #{DATABASE_NAME}.#{table} where ST_Within(ST_SetSRID(ST_GeomFromGeoHash($1), 4283), boundary)"
 
-    result = EnrichmentDb.request(query, values)
+    result = EnrichmentDb.request(DATABASE_NAME, query, values)
     if result.ntuples == 1 
       puts "Found #{object_type}"
       result[0]

data/lib/enrichment_db/helper.rb

@@ -0,0 +1,17 @@
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}")
+
+module EnrichmentDb::Helper
+	def self.float_str_to_float(str)
+		if str.match(/^[0-9\.-]*$/)
+			str.to_f
+		else
+			str
+		end
+	end
+
+	def self.hash_float_str_to_float(hash)
+		hash.each_with_object({}) do |(k, v), h|
+			h[k] = float_str_to_float(v)
+		end
+	end
+end

data/lib/enrichment_db/version.rb

@@ -1,3 +1,3 @@
 module EnrichmentDb
-  VERSION = "0.1.4"
+  VERSION = '0.1.5'
 end

data/lib/enrichment_db.rb

@@ -35,4 +35,6 @@ module EnrichmentDb
 end
 
 require 'enrichment_db/geo'
+require 'enrichment_db/census'
+require 'datum'
 require 'db'

data/test/census/datum_test.rb

@@ -0,0 +1,10 @@
+require "#{File.dirname(__FILE__)}/../test_helper"
+
+describe EnrichmentDb::Census::Datum do
+  it 'should retrieve correct record' do
+    result = EnrichmentDb::Census::Datum.by_id('selected_medians_and_averages', '3000')
+    assert_equal 3000, result['region_id']
+    assert_equal 'Postcodes', result['region_type']
+    assert_equal 26, result['median_age_of_persons']
+  end
+end

data/test/datum_test.rb

@@ -0,0 +1,12 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+describe EnrichmentDb::Datum do
+  it 'should get correct ato record' do
+  	condition = "region_id = '3000'"
+    result = EnrichmentDb::Datum.by_id('ato', 'taxable_incomes', condition)
+    region = result.first
+    assert_equal '3000', region['region_id']
+    assert_equal 'Postcodes', region['region_type']
+    assert_equal '51948.229', region['taxable_income']
+  end
+end

data/test/db_test.rb

@@ -0,0 +1,27 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+describe EnrichmentDb do
+  it 'should list all table names for geo schema' do
+    result = EnrichmentDb.table_names('geo')
+    geo_table_count = 7
+    assert_equal geo_table_count, result.size
+  end
+
+  it 'should list all table names for census schema' do
+    result = EnrichmentDb.table_names('censis')
+    census_table_count = 33
+    assert_equal census_table_count, result.size
+  end
+
+  it 'should list table columns from geo.sa1 table' do
+    result = EnrichmentDb.table_columns('sa1s', 'geo')
+    sa1s_column_count = 8
+    assert_equal sa1s_column_count, result.size
+  end
+
+  it 'should list table columns from censis.selected_medians_and_averages table' do
+    result = EnrichmentDb.table_columns('selected_medians_and_averages', 'censis')
+    sa1s_column_count = 8
+    assert_equal sa1s_column_count, result.size
+  end
+end

data/test/geo/locator_test.rb

@@ -9,33 +9,31 @@ describe EnrichmentDb::Geo::Locator do
     assert_equal id, result
   end
 
-  it 'should correctly format a has to a latlong' do
+  it 'should correctly format a hash to a latlong' do
     lat = 10
     long = 180
     lat_long = { 'lat' => lat, 'long' => long }
-    geohash = EnrichmentDb::Geo::Locator.format_geo(lat_long)
-    assert_equal 'xczbzurypzpg', geohash
+    begin 
+      geohash = EnrichmentDb::Geo::Locator.format_geo(lat_long)
+    rescue EnrichmentDb::InvalidGeoPointFormat => e
+      # Should get here
+    else
+      flunk('This should have errored out.')
+    end
   end
 
   it 'should break as the lat long format is incorrect' do
     lat = 10
     long = 180
     lat_long = { 'lat' => lat, 'lon' => long }
-    begin 
-      EnrichmentDb::Geo::Locator.format_geo(lat_long)
-    rescue EnrichmentDb::InvalidGeoPointFormat => e
-
-    else
-      flunk('This should have errored out.')
-    end
+    geohash = EnrichmentDb::Geo::Locator.format_geo(lat_long)
+    assert_equal 'xczbzurypzpg', geohash
   end
 
-  it 'should ' do
+  it 'should find region from geohash' do
     geo = 'r1r0g2e'
     result = EnrichmentDb::Geo::Locator.geo_locate(geo)
-    puts result.smallest_region.inspect
-    puts result.name.inspect
-    puts result.inspect
+    assert_equal ':sa4', result.smallest_region.inspect
+    assert_equal 'Melbourne - Inner', result.name
   end
-
 end

data/test/helper_test.rb

@@ -0,0 +1,28 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+describe EnrichmentDb::Helper do
+  it 'should convert float str to float' do
+    result = EnrichmentDb::Helper.float_str_to_float('26')
+    assert_equal 26, result
+  end
+
+  it 'should not convert float str to float' do
+    input = 's26'
+    result = EnrichmentDb::Helper.float_str_to_float(input)
+    assert_equal input, result
+  end
+
+  it 'should convert hash with float str values to float values' do
+    input = { 'er' => '-26', 'rt' => '234567.43' }
+    result = EnrichmentDb::Helper.hash_float_str_to_float(input)
+    expecting = { 'er' => -26, 'rt' => 234567.43 }
+    assert_equal expecting, result
+  end
+
+  it 'should partially convert hash with float str values to float values' do
+    input = { 'er' => '-26', 'rt' => '23s4567.43' }
+    result = EnrichmentDb::Helper.hash_float_str_to_float(input)
+    expecting = { 'er' => -26, 'rt' => '23s4567.43' }
+    assert_equal expecting, result
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enrichment_db
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Aaron Wallis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -58,15 +58,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- enrichment_db-0.1.4.gem
 - enrichment_db.gemspec
 - lib/enrichment_db.rb
 - lib/enrichment_db/.DS_Store
+- lib/enrichment_db/census.rb
+- lib/enrichment_db/census/datum.rb
+- lib/enrichment_db/datum.rb
 - lib/enrichment_db/db.rb
 - lib/enrichment_db/error.rb
 - lib/enrichment_db/geo.rb
@@ -79,8 +83,11 @@ files:
 - lib/enrichment_db/geo/sa4.rb
 - lib/enrichment_db/geo/state.rb
 - lib/enrichment_db/geo/suburb.rb
+- lib/enrichment_db/helper.rb
 - lib/enrichment_db/version.rb
-- test/.DS_Store
+- test/census/datum_test.rb
+- test/datum_test.rb
+- test/db_test.rb
 - test/factories/postcode.rb
 - test/factories/sa1.rb
 - test/factories/sa2.rb
@@ -89,7 +96,7 @@ files:
 - test/factories/state.rb
 - test/factories/suburb.rb
 - test/geo/locator_test.rb
-- test/reports/TEST-EnrichmentDb-Geo-Locator.xml
+- test/helper_test.rb
 - test/test_helper.rb
 homepage: https://github.com/lexerdev/enrichment-db.gem
 licenses:
@@ -116,15 +123,19 @@ signing_key:
 specification_version: 4
 summary: Lexer Enrichment Database Gem
 test_files:
-- ".DS_Store"
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- enrichment_db-0.1.4.gem
 - enrichment_db.gemspec
 - lib/enrichment_db.rb
 - lib/enrichment_db/.DS_Store
+- lib/enrichment_db/census.rb
+- lib/enrichment_db/census/datum.rb
+- lib/enrichment_db/datum.rb
 - lib/enrichment_db/db.rb
 - lib/enrichment_db/error.rb
 - lib/enrichment_db/geo.rb
@@ -137,8 +148,11 @@ test_files:
 - lib/enrichment_db/geo/sa4.rb
 - lib/enrichment_db/geo/state.rb
 - lib/enrichment_db/geo/suburb.rb
+- lib/enrichment_db/helper.rb
 - lib/enrichment_db/version.rb
-- test/.DS_Store
+- test/census/datum_test.rb
+- test/datum_test.rb
+- test/db_test.rb
 - test/factories/postcode.rb
 - test/factories/sa1.rb
 - test/factories/sa2.rb
@@ -147,5 +161,6 @@ test_files:
 - test/factories/state.rb
 - test/factories/suburb.rb
 - test/geo/locator_test.rb
-- test/reports/TEST-EnrichmentDb-Geo-Locator.xml
+- test/helper_test.rb
 - test/test_helper.rb
+has_rdoc: 

data/test/reports/TEST-EnrichmentDb-Geo-Locator.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<testsuite name="EnrichmentDb::Geo::Locator" skipped="0" failures="0" errors="0" tests="4" assertions="2" time="6.202437521191314">
-  <testcase name="test_0004_should " classname="EnrichmentDb::Geo::Locator" assertions="0" time="6.202266245032661">
-  </testcase>
-  <testcase name="test_0003_should break as the lat long format is incorrect" classname="EnrichmentDb::Geo::Locator" assertions="0" time="6.976805161684752e-05">
-  </testcase>
-  <testcase name="test_0002_should correctly format a has to a latlong" classname="EnrichmentDb::Geo::Locator" assertions="1" time="8.18880507722497e-05">
-  </testcase>
-  <testcase name="test_0001_should find id from a hash of hashes" classname="EnrichmentDb::Geo::Locator" assertions="1" time="1.962005626410246e-05">
-  </testcase>
-</testsuite>