perpetuity-postgres 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e26e3fe68009d265b58369daac0505ea33923e54
-  data.tar.gz: 0c78137c119589349a4ad4aa27efc5a19917f66e
+  metadata.gz: 131881bc7b24a361b04326b0fac2699ca1ca2c22
+  data.tar.gz: 57dc7bd53e485500524439604ceaa517f5990215
 SHA512:
-  metadata.gz: c6a27b6627af877519f3c95e2b18bb0afa0df15a73c995e6dd01ee7c097aa4b16acc24221d6a057120e67efbcc3a1ff1134583190afc6adfe232ac7a7d428404
-  data.tar.gz: 9936e242b444565acc5651779667531fe5d50c2641484b017f3fadd01ed5800abd35d4a3f3337e7d0b0fcdc3d6db7c9ffa183665730d5e90c0902fd48c28e9f3
+  metadata.gz: e1c978801cc9d1a5c4bc888c899ce27ff15166bb396ad4eb5b95212664b408e76f13afb57175220072b532b6beaeb598794c67c0f1de809cb893bad71de49e8a
+  data.tar.gz: 5645ce0e3ebca3602b789515db6762ca0713c958dd915502dea87d8137df67f1c55b8b53bd9a632e081c55ce8ee767a12984a294a74db2992150ef48c8b32a68

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 0.0.7
+
+- Allow for querying within a range: `mapper.select { |o| o.value.in (1..3) }`
+- Serialize Ruby `Date` objects
+
 ## Version 0.0.6
 
 - Depend on [perpetuity](https://github.com/jgaskins/perpetuity) 1.0 final

data/lib/perpetuity/postgres/date_value.rb

@@ -0,0 +1,29 @@
+require 'date'
+
+module Perpetuity
+  class Postgres
+    class DateValue
+      attr_reader :date
+
+      def initialize date
+        @date = date
+      end
+
+      def self.from_sql date_string
+        new(Date.parse(date_string))
+      end
+
+      def to_date
+        date
+      end
+
+      def to_s
+        "'#{date.to_s}'::date"
+      end
+
+      def value
+        date
+      end
+    end
+  end
+end

data/lib/perpetuity/postgres/query_expression.rb

@@ -66,7 +66,12 @@ module Perpetuity
       end
 
       def in
-        "#{attribute} IN #{sql_value}"
+        case sql_value
+        when Range
+          "#{attribute} BETWEEN #{SQLValue.new(sql_value.min)} AND #{SQLValue.new(sql_value.max)}"
+        else
+          "#{attribute} IN #{sql_value}"
+        end
       end
 
       def =~

data/lib/perpetuity/postgres/serializer.rb

@@ -12,7 +12,7 @@ module Perpetuity
     class Serializer
       include DataInjectable
 
-      SERIALIZABLE_CLASSES = Set[Fixnum, Float, String, Time, TrueClass, FalseClass, NilClass]
+      SERIALIZABLE_CLASSES = Set[Fixnum, Float, String, Time, Date, TrueClass, FalseClass, NilClass]
       attr_reader :mapper, :mapper_registry
 
       def initialize mapper

data/lib/perpetuity/postgres/sql_value.rb

@@ -1,5 +1,6 @@
 require 'perpetuity/postgres/text_value'
 require 'perpetuity/postgres/timestamp_value'
+require 'perpetuity/postgres/date_value'
 require 'perpetuity/postgres/numeric_value'
 require 'perpetuity/postgres/null_value'
 require 'perpetuity/postgres/boolean_value'
@@ -17,6 +18,8 @@ module Perpetuity
                    TextValue.new(value)
                  when Time
                    TimestampValue.new(value)
+                 when Date
+                   DateValue.new(value)
                  when Fixnum, Float
                    NumericValue.new(value)
                  when Hash, JSONHash

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

@@ -18,6 +18,7 @@ module Perpetuity
           Float => 'FLOAT',
           UUID => 'UUID',
           Time => 'TIMESTAMPTZ',
+          Date => 'DATE',
           TrueClass => 'BOOLEAN',
           FalseClass => 'BOOLEAN'
         }.tap{|m| m.default = 'JSON' }
@@ -26,7 +27,11 @@ module Perpetuity
           @name = name
           @type = type
           @max_length = options[:max_length]
-          @primary_key = options.fetch(:primary_key) { false }
+          @primary_key = if @name.to_s == 'id'
+                           true
+                         else
+                           options.fetch(:primary_key) { false }
+                         end
           @default = options.fetch(:default) { NoDefaultValue }
         end
 

data/lib/perpetuity/postgres/version.rb

@@ -1,5 +1,5 @@
 module Perpetuity
   class Postgres
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/perpetuity/postgres/connection_pool_spec.rb

@@ -6,7 +6,7 @@ module Perpetuity
       let(:pool) { ConnectionPool.new }
 
       it 'defaults to 5 connections' do
-        pool.should have(5).connections
+        expect(pool.connections.size).to eq 5
       end
 
       describe 'lending a connection' do
@@ -20,9 +20,9 @@ module Perpetuity
 
         it 'lends a connection for the duration of a block' do
           pool.lend_connection do |connection|
-            pool.should have(4).connections
+            expect(pool.connections.size).to eq 4
           end
-          pool.should have(5).connections
+          expect(pool.connections.size).to eq 5
         end
 
         it 'returns the value of the block' do
@@ -48,7 +48,7 @@ module Perpetuity
           pool.lend_connection { |c| connections << c }
         end
 
-        connections.uniq.should have(pool.size).items
+        expect(connections.uniq.size).to eq pool.size
       end
     end
   end

data/spec/perpetuity/postgres/date_value_spec.rb

@@ -0,0 +1,24 @@
+require 'perpetuity/postgres/date_value'
+
+module Perpetuity
+  class Postgres
+    describe DateValue do
+      it 'converts to a SQL string' do
+        date = Date.new(2014, 8, 25)
+        DateValue.new(date).to_s.should == "'2014-08-25'::date"
+      end
+
+      describe 'conversion from a SQL value string' do
+        it 'converts GMT-X times' do
+          actual = DateValue.from_sql('2013-12-01')
+          expected = Date.new(2013, 12, 1)
+          actual.to_date.should == expected
+        end
+      end
+
+      it 'returns its wrapped value' do
+        DateValue.new(:foo).value.should == :foo
+      end
+    end
+  end
+end

data/spec/perpetuity/postgres/query_attribute_spec.rb

@@ -4,9 +4,10 @@ module Perpetuity
   class Postgres
     describe QueryAttribute do
       let(:attribute) { QueryAttribute.new :attribute_name }
-      subject { attribute }
 
-      its(:name) { should == :attribute_name }
+      it 'returns its name' do
+        attribute.name.should == :attribute_name
+      end
 
       it 'checks for equality' do
         (attribute == 1).should be_a QueryExpression

data/spec/perpetuity/postgres/query_expression_spec.rb

@@ -57,6 +57,12 @@ module Perpetuity
           expression.to_db.should == "attribute IN (1,2,3)"
         end
 
+        it 'checks for inclusion in a range' do
+          expression.comparator = :in
+          expression.value = (1..3)
+          expression.to_db.should == "attribute BETWEEN 1 AND 3"
+        end
+
         it 'checks for inclusion of strings' do
           expression.comparator = :in
           expression.value = ['abc', '123']

data/spec/perpetuity/postgres/serialized_data_spec.rb

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

data/spec/perpetuity/postgres/serializer_spec.rb

@@ -81,6 +81,11 @@ module Perpetuity
           serializer.serialize_attribute(time).should == "'2000-01-02 03:04:05.123456-0400'::timestamptz"
         end
 
+        it 'serializes Date objects' do
+          date = Date.new(2014, 8, 25)
+          serializer.serialize_attribute(date).should == "'2014-08-25'::date"
+        end
+
         it 'serializes an array as JSON' do
           serializer.serialize_attribute([1, 'foo']).should == %q{'[1,"foo"]'}
         end
@@ -181,25 +186,25 @@ module Perpetuity
 
       describe 'identifying embedded/referenced objects as foreign' do
         it 'sees hashes with metadata keys as foreign objects' do
-          serializer.foreign_object?({'__metadata__' => 'lol'}).should be_true
+          serializer.foreign_object?({'__metadata__' => 'lol'}).should be_truthy
         end
 
         it 'sees hashes without metadata keys as simple hashes' do
-          serializer.foreign_object?({ 'name' => 'foo' }).should be_false
+          serializer.foreign_object?({ 'name' => 'foo' }).should be_falsey
         end
       end
 
       describe 'identifying possible JSON strings' do
         it 'identifies JSON objects' do
-          serializer.possible_json_value?('{"name":"foo"}').should be_true
+          serializer.possible_json_value?('{"name":"foo"}').should be_truthy
         end
 
         it 'identifies JSON arrays' do
-          serializer.possible_json_value?('[{"name":"foo"}]').should be_true
+          serializer.possible_json_value?('[{"name":"foo"}]').should be_truthy
         end
 
         it 'rejects things it does not detect as either of the above' do
-          serializer.possible_json_value?('foo is my name').should be_false
+          serializer.possible_json_value?('foo is my name').should be_falsey
         end
       end
 

data/spec/perpetuity/postgres/sql_select_spec.rb

@@ -8,9 +8,17 @@ module Perpetuity
                                   limit: 4) }
       subject { query }
 
-      its(:table) { should == 'foo' }
-      its(:where) { should == "name = 'foo'" }
-      its(:limit) { should == 4 }
+      it 'returns its table name' do
+        query.table.should == 'foo'
+      end
+
+      it 'returns its WHERE clause' do
+        query.where.should == "name = 'foo'"
+      end
+
+      it 'returns its limit' do
+        query.limit.should == 4
+      end
 
       it 'generates a SQL query' do
         query.to_s.should == %Q{SELECT * FROM "foo" WHERE name = 'foo' LIMIT 4}

data/spec/perpetuity/postgres/sql_value_spec.rb

@@ -50,6 +50,11 @@ module Perpetuity
         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"
       end
+
+      it 'converts Date objects' do
+        date = Date.new(2014, 8, 25)
+        SQLValue.new(date).should == "'2014-08-25'::date"
+      end
     end
   end
 end

data/spec/perpetuity/postgres/table/attribute_spec.rb

@@ -80,6 +80,14 @@ module Perpetuity
           end
         end
 
+        describe 'dates' do
+          let(:date) { Attribute.new('anniversary_date', Date) }
+
+          it 'converts to the SQL DATE type' do
+            date.sql_type.should == 'DATE'
+          end
+        end
+
         describe 'booleans' do
           it 'is stored in a BOOLEAN column' do
             Attribute.new(:true,  TrueClass).sql_type.should == 'BOOLEAN'

data/spec/perpetuity/postgres/table_spec.rb

@@ -29,6 +29,14 @@ module Perpetuity
           'CREATE TABLE IF NOT EXISTS "Article" (id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), title TEXT, body TEXT, author JSON, published_at TIMESTAMPTZ, views BIGINT)'
       end
 
+      it 'sets the id as PRIMARY KEY even if specified in attributes' do
+        attributes = self.attributes.dup
+        attributes.unshift Table::Attribute.new(:id, String)
+        table = Table.new('Article', attributes)
+        table.create_table_sql.should ==
+          'CREATE TABLE IF NOT EXISTS "Article" (id TEXT PRIMARY KEY, title TEXT, body TEXT, author JSON, published_at TIMESTAMPTZ, views BIGINT)'
+      end
+
       describe 'id column' do
         context 'when there is an id attribute' do
           it 'uses the attribute type for the column type' do

data/spec/perpetuity/postgres_spec.rb

@@ -25,25 +25,36 @@ module Perpetuity
             password:  password
           )
         end
-        subject { postgres }
-
-        its(:host)      { should == host }
-        its(:port)      { should == port }
-        its(:db)        { should == db }
-        its(:pool_size) { should == pool_size }
-        its(:username)  { should == username }
-        its(:password)  { should == password }
+
+        [:host, :port, :db, :pool_size, :username, :password].each do |attribute|
+          it "returns its #{attribute}" do
+            postgres.public_send(attribute).should == send(attribute)
+          end
+        end
       end
 
       context 'default values' do
         let(:postgres) { Postgres.new(db: 'my_db') }
-        subject { postgres }
 
-        its(:host)      { should == 'localhost' }
-        its(:port)      { should == 5432 }
-        its(:pool_size) { should == 5 }
-        its(:username)  { should == ENV['USER'] }
-        its(:password)  { should be_nil }
+        it 'defaults to host = localhost' do
+          postgres.host.should == 'localhost'
+        end
+
+        it 'defaults to port = 5432 (Postgres default)' do
+          postgres.port.should == 5432
+        end
+
+        it "defaults to username = #{ENV['USER']}" do
+          postgres.username.should == ENV['USER']
+        end
+
+        it 'defaults to a blank password' do
+          postgres.password.should be nil
+        end
+
+        it 'defaults to pool_size = 5' do
+          postgres.pool_size.should == 5
+        end
       end
     end
 
@@ -108,7 +119,7 @@ module Perpetuity
           Postgres::SerializedData.new([:name], ["'Kevin'"])
           ids = postgres.insert('User', data, attributes)
           ids.should be_a Array
-          ids.should have(3).items
+          expect(ids.count).to eq 3
         end
 
         it 'returns numeric ids when numeric ids are specified' do
@@ -128,7 +139,7 @@ module Perpetuity
       it 'counts objects with a string query' do
         insert = proc { postgres.insert 'User', data, attributes }
         expect(&insert).to     change { postgres.count('User', "name = 'Jamie'") }.by 1
-        expect(&insert).not_to change { postgres.count('User', "name = 'Jessica'") }.by 1
+        expect(&insert).not_to change { postgres.count('User', "name = 'Jessica'") }
       end
 
       it 'returns a count of 0 when the table does not exist' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,6 +98,7 @@ files:
 - lib/perpetuity/postgres/boolean_value.rb
 - lib/perpetuity/postgres/connection.rb
 - lib/perpetuity/postgres/connection_pool.rb
+- lib/perpetuity/postgres/date_value.rb
 - lib/perpetuity/postgres/expression.rb
 - lib/perpetuity/postgres/index.rb
 - lib/perpetuity/postgres/index_collection.rb
@@ -130,6 +131,7 @@ files:
 - spec/perpetuity/postgres/boolean_value_spec.rb
 - spec/perpetuity/postgres/connection_pool_spec.rb
 - spec/perpetuity/postgres/connection_spec.rb
+- spec/perpetuity/postgres/date_value_spec.rb
 - spec/perpetuity/postgres/expression_spec.rb
 - spec/perpetuity/postgres/index_collection_spec.rb
 - spec/perpetuity/postgres/index_spec.rb
@@ -187,6 +189,7 @@ test_files:
 - spec/perpetuity/postgres/boolean_value_spec.rb
 - spec/perpetuity/postgres/connection_pool_spec.rb
 - spec/perpetuity/postgres/connection_spec.rb
+- spec/perpetuity/postgres/date_value_spec.rb
 - spec/perpetuity/postgres/expression_spec.rb
 - spec/perpetuity/postgres/index_collection_spec.rb
 - spec/perpetuity/postgres/index_spec.rb