enrichment_db 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a737f15fb5aadd35c06a71fc51b3ef9405263b4f
-  data.tar.gz: efa874a6971330e778cbc7208de3570bb9506a77
+  metadata.gz: 784632b18200a93e79ba0e9411dad4fa8fbba1f7
+  data.tar.gz: 22e53ab18054544013097f19600306f030bb270a
 SHA512:
-  metadata.gz: 3a02a38e45100ecb1384ada2e32378d7f8344a0284f6d3b3487b33044b1db1e6e8b423549082a994d122f7f0f57bbb4df627b88735c6aeb19485d0897fbf6faf
-  data.tar.gz: 1d5fa5bc513ff0f9988a7ccd6422ea889154d15d7f9745d7223be2b5db4c7de6eb53cbd6337f0d8d087a5f227cc36c9db63690a2c150ef13148472923891e480
+  metadata.gz: 1c16290deff38ea9f34469e63227a9f20a80821217d106e4371cfcfbbeb91f93e3a66b77f889f991de05ef1fd6baf9d4854afa4ed68150303682748bc678151b
+  data.tar.gz: ecd9cd06d69fc6356b9042fdc300291f46a8c06bfa2fc16e74b869357e2d9508b57b46dc96a74a9baa567503a2118b6dbe558cd0b0d1682ce22c6623abe803c7

data/lib/enrichment_db/db.rb

@@ -41,7 +41,9 @@ module EnrichmentDb
 
     case type
     when :select, 'select', '\d'
-      get_or_request(query, values)
+      return EnrichmentDb::db_connection.exec(query, values) if values
+      
+      EnrichmentDb::db_connection.exec(query)
     when :insert, :drop, :delete, 'insert', 'drop', 'delete'
       fail EnrichmentDb::RequestError, "Postgres method '#{type}' is unsupported"
     else
@@ -49,18 +51,6 @@ 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/version.rb

@@ -1,3 +1,3 @@
 module EnrichmentDb
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enrichment_db
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Aaron Wallis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -69,7 +69,6 @@ files:
 - lib/enrichment_db/.DS_Store
 - lib/enrichment_db/ato.rb
 - 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
@@ -89,7 +88,6 @@ 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
@@ -140,7 +138,6 @@ test_files:
 - lib/enrichment_db/.DS_Store
 - lib/enrichment_db/ato.rb
 - 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
@@ -160,7 +157,6 @@ 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

data/lib/enrichment_db/cache.rb

@@ -1,17 +0,0 @@
-$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/test/cache_test.rb

@@ -1,31 +0,0 @@
-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