perpetuity-postgres 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45cd2bfa1345abc08e97eda5e929c3ef1c4b7c23
-  data.tar.gz: 2cab12a23a5f25a0f114b76494f283793f7213be
+  metadata.gz: 1674c0daefbd7dcfaad9351b6e653f22b0ade171
+  data.tar.gz: b2b4e9059b515c61f3bfa0bcfda1f460c167cc51
 SHA512:
-  metadata.gz: 79578054a8adc0164fd5e5197f6b52f0ed337c8af13b6910dfef79060dedea6c6e08f8310c9ad26b01fc70e756896996820ea695bf2ee9a70a1a16037fba2ba8
-  data.tar.gz: a0d72ba46bff515cc6d7c222fd68e63ea780aee5fcf2f534a4c9f8963f1afa54f15739c5335aa8e15591d43fe8f52e8a2e1d76d351c421e1e85ba119901b4c44
+  metadata.gz: f142288f17ca1ac7ad7b6a9c3f8e874e64276cb2a40d08b6f03c6733d1357763a2d97c95f56a3df3ffcea98106530bceb60f721277c32a81daffbe7baeb6ef77
+  data.tar.gz: b624021e54ec0dc4632eb51b5ed56b56fe965fe63f7d559333da4b4f5260dc55b5907bccca3b0efbd3fe7070130e16d01cf0bf7409fdbe4f3eac8500a321609b

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.0.3
+
+- Require the `bigdecimal` library to avoid undefined constant error: BigDecimals are converted to the Postgres `numeric` data type. In 1.9, it needs to be required explicitly. — [Avdi Grimm](https://github.com/avdi)
+- Properly return the connection to the connection pool if an exception is raised in the query.
+
 ## Version 0.0.2
 
 - Make DB creation call out to remote DB to create it instead of calling on localhost.

data/README.md

@@ -21,7 +21,7 @@ Or install it yourself as:
 To configure Perpetuity to use your PostgreSQL database, you can use the same parameters as you would with the MongoDB adapter, except substitute `:postgres` in for `:mongodb`:
 
 ```ruby
-require 'perpetuity-postgres' # Unnecessary if using Rails
+require 'perpetuity/postgres' # Unnecessary if using Rails
 Perpetuity.data_source :postgres, 'my_perpetuity_database'
 ```
 

data/lib/perpetuity/postgres/connection_pool.rb

@@ -17,10 +17,10 @@ module Perpetuity
       def lend_connection
         if block_given?
           connection = connections.pop
-          result = yield connection
-          connections << connection
-          result
+          yield connection
         end
+      ensure
+        connections << connection
       end
 
       def execute sql

data/lib/perpetuity/postgres/json_array.rb

@@ -1,31 +1,39 @@
-require 'perpetuity/postgres/numeric_value'
 require 'perpetuity/postgres/json_string_value'
-require 'perpetuity/postgres/json_hash'
+require 'perpetuity/postgres/sql_value'
 
 module Perpetuity
   class Postgres
     class JSONArray
-      def initialize value
+      def initialize value, position=:outer
         @value = value
+        @position = position
       end
 
       def to_s
-        "'[#{serialize_elements}]'"
+        if @position == :outer
+          "'#{to_inner_array}'"
+        else
+          to_inner_array
+        end
+      end
+
+      def to_inner_array
+        "[#{serialize_elements}]"
       end
 
       def serialize_elements
         @value.map do |element|
-          if element.is_a? Numeric
-            NumericValue.new(element)
-          elsif element.is_a? String
+          if element.is_a? String
             JSONStringValue.new(element)
-          elsif element.is_a? Hash
-            JSONHash.new(element, :inner)
-          elsif element.is_a? JSONHash
-            JSONHash.new(element.to_hash, :inner)
+          else
+            SQLValue.new(element)
           end
         end.join(',')
       end
+
+      def to_a
+        @value
+      end
     end
   end
 end

data/lib/perpetuity/postgres/json_hash.rb

@@ -1,5 +1,5 @@
+require 'perpetuity/postgres/sql_value'
 require 'perpetuity/postgres/json_string_value'
-require 'perpetuity/postgres/numeric_value'
 
 module Perpetuity
   class Postgres
@@ -26,20 +26,14 @@ module Perpetuity
           string = ''
           string << JSONStringValue.new(key) << ':'
 
-          string << if value.is_a? Numeric
-                      NumericValue.new(value)
-          elsif value.is_a? String
-            JSONStringValue.new(value)
-          elsif value.is_a? Hash
-            JSONHash.new(value, :inner)
-          elsif value.is_a? Class
+          string << if [String, Class].include? value.class
             JSONStringValue.new(value.to_s)
           elsif [true, false].include? value
             value.to_s
           elsif value.nil?
             'null'
           else
-            value
+            SQLValue.new(value).to_s
           end
         end.join(',')
       end

data/lib/perpetuity/postgres/query_attribute.rb

@@ -41,6 +41,10 @@ METHOD
       def to_s
         name.to_s
       end
+
+      def to_db
+        (self != nil).to_db
+      end
     end
   end
 end

data/lib/perpetuity/postgres/serialized_data.rb

@@ -34,7 +34,7 @@ module Perpetuity
       end
 
       def any?
-        values.any?
+        values.flatten.any?
       end
 
       def each

data/lib/perpetuity/postgres/serializer.rb

@@ -109,6 +109,8 @@ module Perpetuity
           SQLValue.new(value)
         elsif value.is_a? Array
           serialize_array(object)
+        elsif value.is_a? Hash
+          serialize_hash(object)
         elsif !object.embedded?
           serialize_reference(value)
         elsif object.embedded?
@@ -131,6 +133,10 @@ module Perpetuity
         JSONArray.new(array)
       end
 
+      def serialize_hash object
+        JSONHash.new(object)
+      end
+
       def serialize_to_hash value
         Hash[
           mapper.attribute_set.map do |attribute|

data/lib/perpetuity/postgres/sql_value.rb

@@ -3,6 +3,8 @@ require 'perpetuity/postgres/timestamp_value'
 require 'perpetuity/postgres/numeric_value'
 require 'perpetuity/postgres/null_value'
 require 'perpetuity/postgres/boolean_value'
+require 'perpetuity/postgres/json_hash'
+require 'perpetuity/postgres/json_array'
 
 module Perpetuity
   class Postgres
@@ -17,6 +19,10 @@ module Perpetuity
                    TimestampValue.new(value)
                  when Fixnum, Float
                    NumericValue.new(value)
+                 when Hash, JSONHash
+                   JSONHash.new(value.to_hash, :inner)
+                 when Array, JSONArray
+                   JSONArray.new(value.to_a, :inner)
                  when nil
                    NullValue.new
                  when true, false

data/lib/perpetuity/postgres/table/attribute.rb

@@ -1,3 +1,5 @@
+require "bigdecimal"
+
 module Perpetuity
   class Postgres
     class Table

data/lib/perpetuity/postgres/version.rb

@@ -1,5 +1,5 @@
 module Perpetuity
   class Postgres
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/perpetuity/postgres/json_array_spec.rb

@@ -23,6 +23,10 @@ module Perpetuity
         JSONArray.new([JSONHash.new(a: 1)]).to_s.should == %q{'[{"a":1}]'}
       end
 
+      it 'serializes arrays of arrays' do
+        JSONArray.new([[1], ['foo']]).to_s.should == %q{'[[1],["foo"]]'}
+      end
+
       it 'serializes elements of arrays' do
         JSONArray.new([1,'a']).to_s.should == %q{'[1,"a"]'}
       end

data/spec/perpetuity/postgres/json_hash_spec.rb

@@ -31,6 +31,11 @@ module Perpetuity
         JSONHash.new({a: 1, b: 'c'}).to_s.should == %q{'{"a":1,"b":"c"}'}
       end
 
+      it 'serializes a hash with array values' do
+        JSONHash.new({foo: ['bar', 'baz', 'quux']}).to_s.should ==
+          %q{'{"foo":["bar","baz","quux"]}'}
+      end
+
       it 'converts back to a hash' do
         JSONHash.new({a: 1}).to_hash.should == { a: 1 }
       end

data/spec/perpetuity/postgres/query_attribute_spec.rb

@@ -51,6 +51,10 @@ module Perpetuity
       it 'checks for nil' do
         attribute.nil?.should be_a QueryExpression
       end
+
+      it 'checks for truthiness' do
+        attribute.to_db.should == 'attribute_name IS NOT NULL'
+      end
     end
   end
 end

data/spec/perpetuity/postgres/serialized_data_spec.rb

@@ -46,6 +46,8 @@ module Perpetuity
 
       it 'checks whether there are any objects' do
         serialized.any?.should be_true
+        serialized.values.clear << []
+        serialized.any?.should be_false
       end
 
       it 'iterates like a hash' do

data/spec/perpetuity/postgres/serializer_spec.rb

@@ -84,6 +84,10 @@ module Perpetuity
         it 'serializes an array as JSON' do
           serializer.serialize_attribute([1, 'foo']).should == %q{'[1,"foo"]'}
         end
+
+        it 'serializes a hash as JSON' do
+          serializer.serialize_attribute(a: 1, foo: ['bar']).should == %q{'{"a":1,"foo":["bar"]}'}
+        end
       end
 
       describe 'unserialization AKA deserialization' do

data/spec/perpetuity/postgres/sql_value_spec.rb

@@ -29,6 +29,23 @@ module Perpetuity
         SQLValue.new(false).should == "FALSE"
       end
 
+      it 'converts hashes' do
+        SQLValue.new({ a: 1, b: 'foo'}).should == %q({"a":1,"b":"foo"})
+      end
+
+      it 'converts arrays' do
+        SQLValue.new([1, 'foo', { a: 1 }]).should == %q([1,"foo",{"a":1}])
+      end
+
+      it 'converts JSONHashes' do
+        SQLValue.new(JSONHash.new(a: 1)).should == %q({"a":1})
+      end
+
+      it 'converts JSONArrays' do
+        SQLValue.new(JSONArray.new([1, 'foo', [1, 'foo']])).should ==
+          %q([1,"foo",[1,"foo"]])
+      end
+
       it 'converts Time objects' do
         time = Time.new(2013, 1, 2, 3, 4, 5.1234567, '+05:30')
         SQLValue.new(time).should == "'2013-01-02 03:04:05.123456+0530'::timestamptz"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler