flex_pg 0.0.0 → 0.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ebdf95739af9dde6360e3d3c2d416fe6ef9a04e
-  data.tar.gz: eb369e8b9d698029ac3057664a25fc8f8ed4ce78
+  metadata.gz: 567e7383b14fe7e98276875433e62ee982ae9aa9
+  data.tar.gz: e29094c0796ab94fbb34a46981e19d6a40566c9f
 SHA512:
-  metadata.gz: 57cf0e76f1124e9f920e92276624e776f45a95324e7dde9626600f781e9ac07a82aa73cad324c14db690a0a77313bbc3882d1b690a29627427be15121eb08029
-  data.tar.gz: f97ce42d87a21d198767fafef01b7960df12859f1c8c0f302a5c1d25146732cbbe3bf1c95f6cb328607a0890775e57882a57b088003558721f6f8ec8b5b42ae3
+  metadata.gz: ee7e0fec0d9a8c4c9c8680697385c4992bc78765602550c5e5e4f9cd05661ba2da9bcae6b1c5e367a0e571b8a59fb53c3a6af3e4f61f24656baebec12f620fd0
+  data.tar.gz: 212824eb17b1bc644e932cad0b8a215b2b6cbb12ddba9ab1b08daf5852e996e9823aed28727de3f44bb42d78e4b6e67c88fa3587412c2b06ea3626d467698a0d

data/lib/flex_pg.rb

@@ -1,11 +1,30 @@
+require 'flex_config'
+require 'flex_pg/sequel_mods'
 require 'sequel'
 
 class FlexPG
 
   def initialize (args)
-    @db = Sequel.postgres(args)
+    details = args
+    if details.keys.include?(:local_user)
+
+      if details[:local_user] == ENV['USER']
+
+        details[:host] = 'localhost'
+        details[:user] = details.delete(:local_user)
+        details.delete(:password)
+
+        @db = Sequel.postgres(details)
+      else
+        @db = Sequel.postgres(args)
+      end
+    else
+      @db = Sequel.postgres(args)
+    end
+
     @db.extension :pg_array
     @db.extension :pg_hstore
+    @db_details = args
   end
 
   def method_missing (method, *args, &block)
@@ -13,7 +32,7 @@ class FlexPG
   end
 
   def [] (symbol)
-    FlexDS.new({db: @db, table: symbol})
+    FlexDS.new({ db: @db, table: symbol })
   end
 
 end
@@ -23,7 +42,7 @@ class FlexPG
   class FlexDS
 
     def initialize (args)
-      @database = args[:db]
+      @database   = args[:db]
       @table_name = args[:table]
     end
 
@@ -32,24 +51,28 @@ class FlexPG
       outcome = table.insert_ignore.insert(details)
 
       unless outcome.nil?
-        puts 'insert successful'
+        # puts 'insert successful'
         return outcome
       end
 
-      puts 'possible conflict...'
+      # puts 'possible conflict...'
 
       columns = @database.indexes(@table_name).to_a.first.to_a[1][:columns]
+      if columns.nil?
+        p_key = primary_key
+        conflict_id = details[p_key]
+      else
+        selector    = columns.inject({}) { |acc, key|
+          acc.store(key, details[key])
+          acc
+        }
+        p_key       = primary_key
+        conflict_id = @database[@table_name].where(selector).first[p_key]
+      end
 
-      selector = columns.inject({}) { |acc, key|
-        acc.store(key, details[key])
-        acc
-      }
-      p_key = primary_key
-      conflict_id = @database[@table_name].where(selector).first[p_key]
-      outcome = table.where(p_key => conflict_id).update(details)
-      puts 'update successful' unless outcome == 0
+      outcome     = table.where(p_key => conflict_id).returning(p_key).update(details).first[p_key]
+      # puts 'update successful' unless outcome.nil?
       outcome
-
     end
 
     def primary_key
@@ -66,4 +89,8 @@ class FlexPG
 
   end
 
-end
+end
+
+Sequel.extension :core_extensions
+Sequel.extension :pg_array_ops
+Sequel.extension :pg_hstore_ops

data/lib/flex_pg/sequel_mods.rb

@@ -0,0 +1,11 @@
+require 'sequel'
+
+module Sequel
+  class Dataset
+
+    def get_key (**conditions)
+      self[conditions][:id] || self.insert(conditions)
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flex_pg
 version: !ruby/object:Gem::Version
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors:
 - Eugene Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2016-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -31,6 +31,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/flex_pg.rb
+- lib/flex_pg/sequel_mods.rb
 homepage: 
 licenses: []
 metadata: {}