enrichment_db 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceeab3783a59c54f74ed47b5068319a203955e2c
-  data.tar.gz: b0fffe8b8f5856086423784b8fac993e4803517c
+  metadata.gz: 8e761011e4c6ae8f32a932c1c349730ce112ef66
+  data.tar.gz: 39cd9b7f3bd62161f202e13fe3e33e576292d0a7
 SHA512:
-  metadata.gz: 454bc5d8e9e609175f6a9292d7b3268a21dcc3c5715617e08bb12c2a9ff6ef9e88c64e98880bd02d69d57b6fd7ef7c9aea08f6ae91d0740e50005dcbbc82b4b3
-  data.tar.gz: 5f16865505cfb6c740654684d4ccf4905a3d936049e1f73146d8ee710fd9282573405e15beadea9f6eee8a107e14e627bb0c5874829a14d7ef6bc4b09408c7f6
+  metadata.gz: 2d67d7ba3d10a5bac786ae0d3353fc8e32a3850284eac00306ff14bdfbbd026e6fbd7edba7445e6ffa015ff2157f838640e0ec1ee93beb6025a1bd1df3877cea
+  data.tar.gz: cbced204ad097551a74f375c5b0a597fc5f063a902ecc83392ae136891b2e6cc86a219cba0ee45824d614ba684f2259be354c836f0ce30c8e9024caa8d69646a

data/lib/enrichment_db.rb

@@ -1,5 +1,6 @@
 require 'enrichment_db/error'
 require 'enrichment_db/version'
+require 'enrichment_db/helper'
 
 module EnrichmentDb
   module_function
@@ -24,6 +25,41 @@ module EnrichmentDb
       end
     end
 
+    def self.by_id(table_name, id)
+      schema_name = self::DATABASE_NAME
+      uid_name = self::UID_NAME
+      puts "Finding object from #{table_name} with #{uid_name} = '#{id}'."
+      query = "SELECT * FROM #{schema_name}.#{table_name} where #{uid_name} = $1"
+      values = [id]
+      
+      result = EnrichmentDb.request(schema_name, query, values).collect do |record|
+        record
+      end
+
+      format_result(result)
+    end
+
+    def self.all(table_name, schema_name = nil)
+      schema_name = schema_name || self::DATABASE_NAME
+      puts "Finding all objects from #{table_name}"
+      query = "SELECT * FROM #{schema_name}.#{table_name}"
+      
+      result = EnrichmentDb.request(schema_name, query).collect do |record|
+        record
+      end
+
+      format_result(result)
+    end
+
+    def self.format_result(result)
+      if result.size > 0 
+        puts "Found #{result.size} object/s"
+        result
+      else
+        puts "Nothing found"
+      end
+    end
+
     # Initializes a new Base object
     #
     # @param attrs [Hash]
@@ -35,6 +71,7 @@ module EnrichmentDb
 end
 
 require 'enrichment_db/geo'
+require 'enrichment_db/language'
 require 'enrichment_db/census'
 require 'datum'
 require 'db'

data/lib/enrichment_db/census/datum.rb

@@ -4,31 +4,9 @@ class EnrichmentDb::Census::Datum < EnrichmentDb::DatumModel
   attr_reader :id
 
   DATABASE_NAME = 'censis'
+  UID_NAME = 'region_id'
 
-  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
+  def self.format_result(result)
+    EnrichmentDb::Helper.format_geo_result(result)
   end
 end

data/lib/enrichment_db/datum.rb

@@ -5,16 +5,10 @@ class EnrichmentDb::Datum < EnrichmentDb::DatumModel
     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
+    result = EnrichmentDb.request(schema_name, query).collect do |record|
+      record
     end
+
+    format_result(result)
   end
 end

data/lib/enrichment_db/helper.rb

@@ -14,4 +14,23 @@ module EnrichmentDb::Helper
 			h[k] = float_str_to_float(v)
 		end
 	end
+
+  def self.format_geo_result(result)
+    if result.size == 1 
+      puts "Found object"
+      result = result.first
+  	  id = result['region_id']
+      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
+    elsif result.size > 1
+      puts "More than 1 object found. Only wanted 1 object."
+    else 
+      puts "Nothing found"
+    end
+  end
 end

data/lib/enrichment_db/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enrichment_db
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Aaron Wallis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json