enrichment_db 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ced6e9cc62c6dd68ec83db0abe2684b6c3c4535a
-  data.tar.gz: 0f1fcffaef04c8d30c74f73892b0893379ada295
+  metadata.gz: 4df9713d1120be2a7dbe8af63a95a05d21912d05
+  data.tar.gz: 7cd8617b5f062ab74b72a6c15856a93637ad678a
 SHA512:
-  metadata.gz: aac6db9cd446762db07c085673c20d3953995c09c749dfaa8829061440b5ac6a1ed30dd25379f719712e80b0bb6c70dec5822d28128f6aeca9cd46e61948b490
-  data.tar.gz: 07e674766a38fb0f94344f0e8400e745a79a0823fe2b198a8c9ec20a2f764eb94856c6a3495d726010bc64ebe1104fa496ef6ba7bed4499a6c4ac7dd0eef89a0
+  metadata.gz: b6c80bd4ffca67734aadcbd11bc46b9ada5411d62800900ecec2205eff23ca3f87fd36c696ba27292611a147d896d1f4014777de6c5c0d3a1d1148ea4b940f33
+  data.tar.gz: b9685ff855a8305f7b1f0b294e7b2cd4296e0fe6e019df91b0cf0f0b6352c83497d4ba4ff9d0f57c014f26e4e128537f319f32d437784aa02739790c280191bb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enrichment_db (0.1.7)
+    enrichment_db (0.1.11)
       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.3)
+    pg (0.18.4)
     pr_geohash (1.0.0)
     rake (10.4.2)
     ruby-progressbar (1.7.5)

data/lib/enrichment_db/cache.rb

@@ -0,0 +1,17 @@
+$LOAD_PATH.unshift("#{File.dirname(__FILE__)}")
+
+module EnrichmentDb::Cache
+	def self.get(query, values = nil)
+    query_cache(query, values)
+	end
+
+  def self.set(query, values = nil, result = nil)
+    query_cache(query, values, result)
+  end
+
+  def self.query_cache(query, values, result = nil)
+    key = query + values.to_s
+    @query_cache ||= {}
+    @query_cache[key] ||= result
+  end
+end

data/lib/enrichment_db/db.rb

@@ -1,4 +1,5 @@
 require 'pg'
+require 'cache'
 
 module EnrichmentDb
   
@@ -40,11 +41,7 @@ module EnrichmentDb
 
     case type
     when :select, 'select', '\d'
-      result = if values
-        EnrichmentDb::db_connection.exec(query, values)
-      else
-        EnrichmentDb::db_connection.exec(query)
-      end
+      get_or_request(query, values)
     when :insert, :drop, :delete, 'insert', 'drop', 'delete'
       fail EnrichmentDb::RequestError, "Postgres method '#{type}' is unsupported"
     else
@@ -52,6 +49,18 @@ module EnrichmentDb
     end
   end
 
+  def self.get_or_request(query, values = nil)
+      result = EnrichmentDb::Cache.get(query, values)
+      return result unless result.nil?
+
+      result = if values
+        EnrichmentDb::db_connection.exec(query, values)
+      else
+        EnrichmentDb::db_connection.exec(query)
+      end
+      EnrichmentDb::Cache.set(query, values, result)
+  end
+
   def self.request_type(query)
     result = query.downcase.match(/(^(?:drop|select|insert|delete|\\d))/)
     return unless result

data/lib/enrichment_db/geo/region.rb

@@ -32,13 +32,21 @@ class EnrichmentDb::Geo::Region < EnrichmentDb::DatumModel
     table = make_table_name
     query = "SELECT #{field_names} FROM #{DATABASE_NAME}.#{table} where ST_Within(ST_SetSRID(ST_GeomFromGeoHash($1), 4283), boundary)"
 
-    result = EnrichmentDb.request(DATABASE_NAME, query, values)
-    if result.ntuples == 1 
-      puts "Found #{object_type}"
-      result[0]
-    else 
-      puts "Nothing found"
-      nil
+    begin
+      result = EnrichmentDb.request(DATABASE_NAME, query, values)
+
+      if result.ntuples == 1 
+        puts "Found #{object_type}"
+        result[0]
+      else 
+        puts "Nothing found"
+        nil
+      end
+    rescue PG::InternalError => e
+      # This usually is GEOSContains: TopologyException: side location conflict at #{lat} #{long}
+      LexerAPI.error e.class
+      LexerAPI.error e.message
+      return nil
     end
   end
   

data/lib/enrichment_db/helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift("#{File.dirname(__FILE__)}")
 
 module EnrichmentDb::Helper
 	def self.float_str_to_float(str)
+    return if str.nil?
 		if str.match(/^[0-9\.-]*$/)
 			str.to_f
 		else

data/lib/enrichment_db/language/datum.rb

@@ -10,7 +10,10 @@ class EnrichmentDb::Language::Datum < EnrichmentDb::DatumModel
       end.sort_by do |h|
       	h['value']
       end.each_with_object({}) do |record, h|
-        h[record.fetch('value')] = record.fetch('language')
+        h[record.fetch('value')] ||= []
+        h[record.fetch('value')] << record.fetch('language')
+      end.each_with_object({}) do |(key, values), h|
+        h[key] = values.join('|')
       end
     else
       puts "Nothing found"

data/lib/enrichment_db/version.rb

@@ -1,3 +1,3 @@
 module EnrichmentDb
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

data/test/cache_test.rb

@@ -0,0 +1,31 @@
+require "#{File.dirname(__FILE__)}/test_helper"
+
+describe EnrichmentDb::Cache do
+  before do
+    EnrichmentDb::Cache.instance_variable_set(:@query_cache, nil)
+  end
+
+  it 'should return nil as value hasn\'t been set when no values' do
+    query = 'do stuff'
+    assert_nil EnrichmentDb::Cache.get(query)
+  end
+
+  it 'should return nil as value hasn\'t been set when non-empty values' do
+    query = 'do stuff'
+    values = ['er']
+    assert_nil EnrichmentDb::Cache.get(query, values)
+  end
+
+  it 'should set value on cache and get it' do
+    query = 'do stuff'
+    values = ['er']
+    record = 'This here is a gut dang it record'
+    set_result = EnrichmentDb::Cache.set(query, values, record)
+
+    get_result = EnrichmentDb::Cache.set(query, values)
+
+    refute_nil set_result
+    refute_nil get_result
+    assert_equal set_result, get_result
+  end
+end

data/test/datum_test.rb

@@ -3,7 +3,7 @@ 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)
+    result = EnrichmentDb::Datum.by_lambda('ato', 'taxable_incomes', condition)
     region = result.first
     assert_equal '3000', region['region_id']
     assert_equal 'Postcodes', region['region_type']

data/test/language/datum_test.rb

@@ -9,4 +9,15 @@ describe EnrichmentDb::Language::Datum do
     expecting = 'Acer'
     assert_equal expecting, test_result
   end
+
+  it 'should retrieve correct record via a lambda' do
+  	table_name = 'location_countries'
+  	schema_name = 'bio'
+  	value = 'Australia'
+  	lambda = "value = '#{value}'"
+    result = EnrichmentDb::Language::Datum.by_lambda(schema_name, table_name, lambda)
+    test_result = result.keys.first
+    expecting = 'Australia'
+    assert_equal expecting, test_result
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enrichment_db
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Aaron Wallis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2016-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -69,6 +69,7 @@ files:
 - lib/enrichment_db.rb
 - lib/enrichment_db/.DS_Store
 - lib/enrichment_db/ato/datum.rb
+- lib/enrichment_db/cache.rb
 - lib/enrichment_db/census.rb
 - lib/enrichment_db/census/datum.rb
 - lib/enrichment_db/datum.rb
@@ -88,6 +89,7 @@ files:
 - lib/enrichment_db/language.rb
 - lib/enrichment_db/language/datum.rb
 - lib/enrichment_db/version.rb
+- test/cache_test.rb
 - test/census/datum_test.rb
 - test/datum_test.rb
 - test/db_test.rb
@@ -138,6 +140,7 @@ test_files:
 - lib/enrichment_db.rb
 - lib/enrichment_db/.DS_Store
 - lib/enrichment_db/ato/datum.rb
+- lib/enrichment_db/cache.rb
 - lib/enrichment_db/census.rb
 - lib/enrichment_db/census/datum.rb
 - lib/enrichment_db/datum.rb
@@ -157,6 +160,7 @@ test_files:
 - lib/enrichment_db/language.rb
 - lib/enrichment_db/language/datum.rb
 - lib/enrichment_db/version.rb
+- test/cache_test.rb
 - test/census/datum_test.rb
 - test/datum_test.rb
 - test/db_test.rb