perpetuity-postgres 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84195d183dd75f856a69ea888e133407ab33596c
-  data.tar.gz: a08c32b762b10d9d33b26b099703b6521af12930
+  metadata.gz: 558b498d177b994d2d6ff89101aba27d040a4fdf
+  data.tar.gz: e69cfe6e5454170c6565c7018eb002f5d2e3e161
 SHA512:
-  metadata.gz: 58737d3a8d9f9a7e462037189df2d8c500367f59b7f2d5505d22cb25bc2060f7557e6208bf4ef79f392660e842989c2c97a2ac49456885a4c7dce113458d41ec
-  data.tar.gz: c39806552ea5979a1902f0a9eaec465e5d65f4bfa0e0690aee06fcf5f84572c3a695d8b18d06d53235cf13616d2b007576d80eb002bb9ea08496eb6df491ee0c
+  metadata.gz: 39653126b7754933a22d9ba8fd8dac82436c71340c298954245783a84bd1868c6a566937ead0d5379d300fd98becd7c773c9f143d1db43f9bcf9e8879817647d
+  data.tar.gz: 4bb4d6b025ed091a7b975b379d45bd7514215960771fc1b2f3a5ac4fc9cbd03cfa63e264057d36ea7d64f944ec61cc066dc3c10b798ac2d1d81533c4db7fe821

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - 1.9.3
+  - rbx
+  - 2.0.0
+  - 2.1.1
+matrix:
+  allow_failures:
+    - rvm: rbx
+addons:
+  postgresql: 9.3
+before_script:
+  - psql -c 'create database perpetuity_gem_test;' -U postgres

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## Version 0.0.5
+
+- Name indexes explicitly based on table and attributes. Previously we were counting on the PostgreSQL naming convention, but that could break in future versions of Postgres.
+- Fixed a bug that was causing duplicate indexes to be built
+- Deserialize booleans. They should be declared in the mapper as `TrueClass` or `FalseClass`.
+- Fixed a bug that choked when you tried to save an attribute for an object  if that column was not yet added.
+- Allow deleting an array of objects
+- Removed VARCHAR conversion. VARCHAR and TEXT are stored exactly the same in PostgreSQL. There's no reason to limit yourself to a VARCHAR unless you're using table constraints, which are far more flexible.
+
 ## Version 0.0.4
 
 - Set minimum logging from the database to warnings. This silences info messages like those from `DROP TABLE IF NOT EXISTS ...` when the table doesn't exist.

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/lib/perpetuity/postgres/index.rb

@@ -49,7 +49,7 @@ module Perpetuity
       end
 
       def table
-        name.gsub("_#{attributes.map(&:to_s).join('_')}_idx", '')
+        name.gsub("_#{attributes.map(&:to_s).join('_')}_index", '')
       end
 
       def == other
@@ -62,6 +62,10 @@ module Perpetuity
       def eql? other
         self == other
       end
+
+      def hash
+        name.to_s.hash
+      end
     end
   end
 end

data/lib/perpetuity/postgres/serialized_data.rb

@@ -15,6 +15,11 @@ module Perpetuity
         "(#{column_names.join(',')}) VALUES #{value_strings}"
       end
 
+      def [] key
+        index = column_names.index(key.to_s)
+        values.first[index]
+      end
+
       def []= column, value
         value = TextValue.new(value)
         if column_names.include? column

data/lib/perpetuity/postgres/serializer.rb

@@ -63,6 +63,8 @@ module Perpetuity
               value = value.to_i
             elsif attribute.type == Time
               value = TimestampValue.from_sql(value).to_time
+            elsif [TrueClass, FalseClass].include? attribute.type
+              value = value.downcase.start_with? 't'
             end
           end
 

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

@@ -9,6 +9,19 @@ module Perpetuity
         NoDefaultValue = Module.new
         UUID = Module.new
 
+        SQL_TYPE_MAP = {
+          String => 'TEXT',
+          Integer => 'BIGINT',
+          Fixnum =>  'BIGINT',
+          Bignum =>     'NUMERIC',
+          BigDecimal => 'NUMERIC',
+          Float => 'FLOAT',
+          UUID => 'UUID',
+          Time => 'TIMESTAMPTZ',
+          TrueClass => 'BOOLEAN',
+          FalseClass => 'BOOLEAN'
+        }.tap{|m| m.default = 'JSON' }
+
         def initialize name, type, options={}
           @name = name
           @type = type
@@ -18,25 +31,7 @@ module Perpetuity
         end
 
         def sql_type
-          if type == String
-            if max_length
-              "VARCHAR(#{max_length})"
-            else
-              'TEXT'
-            end
-          elsif type == Integer or type == Fixnum
-            'BIGINT'
-          elsif type == Bignum or type == BigDecimal
-            'NUMERIC'
-          elsif type == Float
-            'FLOAT'
-          elsif type == UUID
-            'UUID'
-          elsif type == Time
-            'TIMESTAMPTZ'
-          else
-            'JSON'
-          end
+          SQL_TYPE_MAP[type]
         end
 
         def sql_declaration

data/lib/perpetuity/postgres/version.rb

@@ -1,5 +1,5 @@
 module Perpetuity
   class Postgres
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/perpetuity/postgres.rb

@@ -70,11 +70,23 @@ module Perpetuity
       raise
     end
 
-    def delete id, klass
+    def delete ids, klass
+      ids = Array(ids)
       table = TableName.new(klass)
-      id_string = TextValue.new(id)
-      sql = "DELETE FROM #{table} WHERE id = #{id_string}"
-      connection.execute(sql).to_a
+
+      if ids.one?
+        id_string = TextValue.new(ids.first)
+        sql = "DELETE FROM #{table} WHERE id = #{id_string}"
+
+        connection.execute(sql).to_a
+      elsif ids.none?
+        # Do nothing, we weren't given anything to delete
+      else
+        id_string = ids.map { |id| TextValue.new(id) }
+        sql = "DELETE FROM #{table} WHERE id IN (#{id_string.join(',')})"
+
+        connection.execute(sql).to_a
+      end
     end
 
     def count klass, query='TRUE', options={}, &block
@@ -128,10 +140,19 @@ module Perpetuity
     def update klass, id, attributes
       sql = SQLUpdate.new(klass, id, attributes).to_s
       connection.execute(sql).to_a
+    rescue PG::UndefinedColumn => e
+      if e.message =~ /column "(.*)" of relation "(.*)" does not exist/
+        column_name = $1
+        table_name = $2
+        add_column table_name, column_name, [Attribute.new(column_name, attributes[column_name].class)]
+        retry
+      else
+        raise e
+      end
     end
 
     def index klass, attributes, options={}
-      name = "#{klass}_#{Array(attributes).map(&:name).join('_')}_idx"
+      name = "#{klass}_#{Array(attributes).map(&:name).join('_')}_index"
       index = Index.new(name: name,
                         attributes: Array(attributes),
                         unique: !!options[:unique],
@@ -142,13 +163,18 @@ module Perpetuity
 
     def indexes klass
       @indexes ||= {}
-      @indexes[klass] ||= IndexCollection.new(klass)
+      @indexes[klass] ||= active_indexes(klass)
     end
 
     def activate_index! index
+      return if index.active?
+
+      attribute_names = index.attribute_names.join('_')
+      index_name = "#{index.table}_#{attribute_names}_index"
       sql = "CREATE "
       sql << "UNIQUE " if index.unique?
-      sql << "INDEX ON #{TableName.new(index.table)} (#{index.attribute_names.join(',')})"
+      sql << "INDEX \"#{index_name}\" "
+      sql << "ON #{TableName.new(index.table)} (#{attribute_names})"
       connection.execute(sql)
       index.activate!
     rescue PG::UndefinedTable => e
@@ -168,7 +194,7 @@ module Perpetuity
              pg_index.indisready AS active
       FROM pg_class
       INNER JOIN pg_index ON pg_class.oid = pg_index.indexrelid
-      WHERE pg_class.relname ~ '^#{table}.*idx$'
+      WHERE pg_class.relname ~ '^#{table}.*index$'
       SQL
 
       indexes = connection.execute(sql).map do |index|

data/spec/perpetuity/postgres/index_spec.rb

@@ -5,7 +5,7 @@ module Perpetuity
     describe Index do
       it 'can be generated from SQL results' do
         index_hash = {
-          "name"=>"Object_id_name_idx",
+          "name"=>"Object_id_name_index",
           "attributes"=>"{id,name}",
           "unique"=>"t",
           "active"=>"t"
@@ -13,7 +13,7 @@ module Perpetuity
 
         index = Index.from_sql(index_hash)
         index.attribute_names.should == ['id', 'name']
-        index.name.should == 'Object_id_name_idx'
+        index.name.should == 'Object_id_name_index'
         index.table.should == 'Object'
         index.should be_unique
         index.should be_active
@@ -47,7 +47,7 @@ module Perpetuity
         it 'is not equal to an index with different attributes' do
           new_index = Index.new(attributes: [:lol],
                                 name: name,
-                                unique: false)
+                                unique: unique)
 
           new_index.should_not == index
         end

data/spec/perpetuity/postgres/serialized_data_spec.rb

@@ -55,6 +55,11 @@ module Perpetuity
           [['name', "'Jamie'"], ['age', 31]]
       end
 
+      it 'accesses values like a hash' do
+        serialized['age'].should == 31
+        serialized[:age].should == 31
+      end
+
       it 'equals another with the same data' do
         original = SerializedData.new([:a, :b], [1, 2])
         duplicate = SerializedData.new([:a, :b], [1, 2])

data/spec/perpetuity/postgres/serializer_spec.rb

@@ -125,12 +125,13 @@ module Perpetuity
 
         let(:article_class) do
           Class.new do
-            attr_reader :title, :body, :views, :published_at
+            attr_reader :title, :body, :views, :published_at, :published
             def initialize attributes={}
               @title = attributes[:title]
               @body = attributes[:body]
               @views = attributes.fetch(:views) { 0 }
               @published_at = attributes.fetch(:published_at) { Time.now }
+              @published = attributes.fetch(:published) { false }
             end
 
             def == other
@@ -138,7 +139,8 @@ module Perpetuity
               other.title == title &&
               other.body == body &&
               other.views == views &&
-              other.published_at == published_at
+              other.published_at == published_at &&
+              other.published == published
             end
           end
         end
@@ -151,6 +153,7 @@ module Perpetuity
             attribute :body, type: String
             attribute :views, type: Integer
             attribute :published_at, type: Time
+            attribute :published, type: TrueClass
           end.new(registry)
         end
 
@@ -161,14 +164,16 @@ module Perpetuity
             'title' => 'Title',
             'body' => 'Body',
             'views' => '0',
-            'published_at' => '2013-01-02 03:04:05.123456-05'
+            'published_at' => '2013-01-02 03:04:05.123456-05',
+            'published' => 't'
           }
 
           article = article_class.new(
             title: 'Title',
             body: 'Body',
             views: 0,
-            published_at: Time.new(2013, 1, 2, 3, 4, 5.123456, '-05:00')
+            published_at: Time.new(2013, 1, 2, 3, 4, 5.123456, '-05:00'),
+            published: true
           )
           serializer.unserialize(serialized_article).should == article
         end

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

@@ -5,7 +5,7 @@ module Perpetuity
   class Postgres
     class Table
       describe Attribute do
-        let(:title)  { Attribute.new('title', String, max_length: 40) }
+        let(:title)  { Attribute.new('title', String) }
 
         it 'knows its name' do
           title.name.should == 'title'
@@ -44,7 +44,6 @@ module Perpetuity
           let(:body) { Attribute.new('body', String, default: 'foo') }
 
           it 'converts to the proper SQL type' do
-            title.sql_type.should == 'VARCHAR(40)'
             body.sql_type.should == 'TEXT'
           end
 
@@ -81,6 +80,13 @@ module Perpetuity
           end
         end
 
+        describe 'booleans' do
+          it 'is stored in a BOOLEAN column' do
+            Attribute.new(:true,  TrueClass).sql_type.should == 'BOOLEAN'
+            Attribute.new(:false, FalseClass).sql_type.should == 'BOOLEAN'
+          end
+        end
+
         describe 'non-serializable types' do
           let(:author) { Attribute.new('author', Object) }
 

data/spec/perpetuity/postgres/table_spec.rb

@@ -26,7 +26,7 @@ module Perpetuity
 
       it 'generates proper SQL to create itself' do
         table.create_table_sql.should ==
-          'CREATE TABLE IF NOT EXISTS "Article" (id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), title VARCHAR(40), body TEXT, author JSON, published_at TIMESTAMPTZ, views BIGINT)'
+          '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
 
       describe 'id column' do

data/spec/perpetuity/postgres_spec.rb

@@ -141,12 +141,6 @@ module Perpetuity
         postgres.retrieve('Article', 'TRUE').should == []
       end
 
-      it 'deletes all records' do
-        postgres.insert 'User', data, attributes
-        postgres.delete_all 'User'
-        postgres.count('User').should == 0
-      end
-
       it 'updates a specific record' do
         id = postgres.insert('User', data, attributes).first
         postgres.update 'User', id, name: 'foo'
@@ -155,9 +149,30 @@ module Perpetuity
         retrieved.first['name'].should == 'foo'
       end
 
-      it 'deletes a record with a specific id' do
+      it 'updates a record when a column does not currently exist' do
         id = postgres.insert('User', data, attributes).first
-        expect { postgres.delete id, 'User' }.to change { postgres.count 'User' }.by -1
+        postgres.update 'User', id, Postgres::SerializedData.new(['foo'], ["'bar'"])
+
+        retrieved = postgres.retrieve('User', "id = '#{id}'")
+        retrieved.first['foo'].should == 'bar'
+      end
+
+      describe 'deletion' do
+        it 'deletes all records' do
+          postgres.insert 'User', data, attributes
+          postgres.delete_all 'User'
+          postgres.count('User').should == 0
+        end
+
+        it 'deletes a record with a specific id' do
+          id = postgres.insert('User', data, attributes).first
+          expect { postgres.delete id, 'User' }.to change { postgres.count 'User' }.by -1
+        end
+
+        it 'deletes records with specific ids' do
+          ids = Array.new(3) { postgres.insert('User', data, attributes).first }
+          expect { postgres.delete ids.take(2), 'User' }.to change { postgres.count 'User' }.by -2
+        end
       end
 
       describe 'incrementing/decrementing' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perpetuity-postgres
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jamie Gaskins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -178,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: PostgreSQL adapter for Perpetuity