pgcrypto 0.1.0 → 0.1.1

data/.rspec

@@ -1 +1,3 @@
+--backtrace
 --colour
+--format Fuubar

data/.simplecov

@@ -0,0 +1,4 @@
+SimpleCov.start  do
+  add_filter "test.rb"
+  add_filter "/spec/"
+end

data/CHANGES

@@ -1,3 +1,8 @@
+0.1.1
+  * Rebuilt the WHERE clause stuff to make sure finders AND setters
+    both worked. It's fragile and hackish at this time, but we'll get
+    there, folks!
+
 0.1.0
 	* Overhauled the underpinnings to rely on a separate column. Adds
 	  on-demand loading of encrypted attributes from a central table

data/Gemfile

@@ -1 +1,16 @@
-gem 'activerecord', '>= 3.2'
+source 'http://rubygems.org'
+
+gem 'activerecord', '>= 3.2', :require => 'active_record'
+
+group :test do
+  gem 'autotest'
+  gem 'database_cleaner', '>= 0.7'
+  gem 'fuubar'
+  gem 'pg', '>= 0.11'
+  gem 'rspec', rspec_version = '>= 2.6'
+  gem 'simplecov', :require => false
+  if RUBY_PLATFORM =~ /darwin/
+    gem 'autotest-fsevent', '>= 0.2'
+    gem 'autotest-growl', '>= 0.2'
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/autotest/discover.rb

@@ -0,0 +1,14 @@
+require 'autotest/fsevent'
+require 'autotest/growl'
+
+Autotest.add_discovery { "rspec2" }
+
+Autotest.add_hook :initialize do |autotest|
+  autotest.add_mapping %r(^lib/**/*\.rb$) do |file, _|
+    Dir['spec/**/*.rb']
+  end
+
+  autotest.add_mapping %r(^spec/support/*\.rb$) do |file, _|
+    Dir['spec/**/*.rb']
+  end
+end

data/lib/generators/pgcrypto/install/templates/migration.rb

@@ -2,7 +2,8 @@ class InstallPgcrypto < ActiveRecord::Migration
   def up
     create_table :pgcrypto_columns do |t|
       t.belongs_to :owner, :polymorphic => true
-      t.string :name, :limit => 64
+      t.string :owner_table, :limit => 32
+      t.string :name, :limit => 32
       t.binary :value
     end
     add_index :pgcrypto_columns, [:owner_id, :owner_type, :name], :name => :pgcrypto_column_finder

data/lib/pgcrypto/active_record.rb

@@ -9,6 +9,8 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     case arel
     when Arel::InsertManager
       pgcrypto_tweak_insert(arel, *args)
+    when Arel::SelectManager
+      pgcrypto_tweak_select(arel)
     when Arel::UpdateManager
       pgcrypto_tweak_update(arel)
     end
@@ -35,6 +37,47 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
     end
   end
 
+  def pgcrypto_tweak_select(arel)
+    # We start by looping through each "core," which is just
+    # a SelectStatement and correcting plain-text queries
+    # against an encrypted column...
+    joins = {}
+    table_name = nil
+    arel.ast.cores.each do |core|
+      # Yeah, I'm lazy. Whatevs.
+      next unless core.is_a?(Arel::Nodes::SelectCore) && !(columns = PGCrypto[table_name = core.source.left.name]).empty?
+
+      # We loop through each WHERE specification to determine whether or not the
+      # PGCrypto column should be JOIN'd upon; in which case, we, like, do it.
+      core.wheres.each do |where|
+        # Now loop through the children to encrypt them for the SELECT
+        where.children.each do |child|
+          if options = columns[child.left.name]
+            if key = PGCrypto.keys[options[:private_key] || :private]
+              join_name = "pgcrypto_column_#{child.left.name}"
+              joins[join_name] ||= {:column => child.left.name, :key => "#{key.dearmored} AS #{key.name}_key"}
+              child.left = Arel::Nodes::SqlLiteral.new(%[pgp_pub_decrypt("#{join_name}"."value", keys.#{key.name}_key)])
+            end
+          end
+        end if where.respond_to?(:children)
+      end
+    end
+    unless joins.empty?
+      key_joins = []
+      joins.each do |key_name, join|
+        key_joins.push(join[:key])
+        column = quote_string(join[:column].to_s)
+        arel.join(Arel::Nodes::SqlLiteral.new(%[
+          JOIN "pgcrypto_columns" AS "pgcrypto_column_#{column}" ON
+            "pgcrypto_column_#{column}"."owner_id" = "#{table_name}"."id"
+            AND "pgcrypto_column_#{column}"."owner_table" = '#{quote_string(table_name)}'
+            AND "pgcrypto_column_#{column}"."name" = '#{column}'
+        ]))
+      end
+      arel.join(Arel::Nodes::SqlLiteral.new("CROSS JOIN (SELECT #{key_joins.join(', ')}) AS keys"))
+    end
+  end
+
   def pgcrypto_tweak_update(arel)
     if arel.ast.relation.name == PGCrypto::Column.table_name
       # Loop through the assignments and make sure we take care of that whole

data/lib/pgcrypto/column.rb

@@ -1,6 +1,12 @@
 module PGCrypto
   class Column < ActiveRecord::Base
     self.table_name = 'pgcrypto_columns'
+    before_save :set_owner_table
     belongs_to :owner, :autosave => false, :inverse_of => :pgcrypto_columns, :polymorphic => true
+
+    protected
+    def set_owner_table
+      self.owner_table = self.owner.class.table_name
+    end
   end
 end

data/lib/pgcrypto/key.rb

@@ -24,7 +24,7 @@ module PGCrypto
 
     def initialize(options = {})
       if options.is_a?(String)
-        self.value = key
+        self.value = options
       elsif options.is_a?(Hash)
         options.each do |key, value|
           send("#{key}=", value)
@@ -34,7 +34,7 @@ module PGCrypto
 
     def path=(keyfile)
       keyfile = File.expand_path(keyfile)
-      raise PGCrypto::Error, "\#{keyfile} does not exist!" unless File.file?(keyfile)
+      raise PGCrypto::Error, "#{keyfile} does not exist!" unless File.file?(keyfile)
       @path = keyfile
       self.value = File.read(keyfile)
     end

data/pgcrypto.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "pgcrypto"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
@@ -18,12 +18,14 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".rspec",
+    ".simplecov",
     "CHANGES",
     "Gemfile",
     "LICENSE",
     "README.markdown",
     "Rakefile",
     "VERSION",
+    "autotest/discover.rb",
     "lib/generators/pgcrypto/install/USAGE",
     "lib/generators/pgcrypto/install/install_generator.rb",
     "lib/generators/pgcrypto/install/templates/initializer.rb",
@@ -34,7 +36,11 @@ Gem::Specification.new do |s|
     "lib/pgcrypto/column.rb",
     "lib/pgcrypto/key.rb",
     "lib/pgcrypto/table_manager.rb",
-    "pgcrypto.gemspec"
+    "pgcrypto.gemspec",
+    "spec/lib/pgcrypto_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/support/private.key",
+    "spec/support/public.key"
   ]
   s.homepage = "http://github.com/Plinq/pgcrypto"
   s.require_paths = ["lib"]

data/spec/lib/pgcrypto_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+describe PGCrypto do
+  it "should extend ActiveRecord::Base" do
+    PGCryptoTestModel.should respond_to(:pgcrypto)
+  end
+
+  describe "attributes" do
+    before :each do
+      PGCryptoTestModel.pgcrypto :test_column
+    end
+
+    it "should have readers and writers" do
+      model = PGCryptoTestModel.new
+      model.should respond_to(:test_column)
+      model.should respond_to(:test_column=)
+    end
+
+    it "be settable on create" do
+      model = PGCryptoTestModel.new(:test_column => 'this is a test')
+      model.save!.should be_true
+    end
+
+    it "be settable on update" do
+      model = PGCryptoTestModel.create!
+      model.test_column = 'this is another test'
+      model.save!.should be_true
+    end
+
+    it "be update-able" do
+      model = PGCryptoTestModel.create!(:test_column => 'i am test column')
+      model.update_attributes!(:test_column => 'but now i am a different column, son').should be_true
+    end
+
+    it "be retrievable at create" do
+      model = PGCryptoTestModel.create!(:test_column => 'i am test column')
+      model.test_column.should == 'i am test column'
+    end
+
+    it "be retrievable after create" do
+      model = PGCryptoTestModel.create!(:test_column => 'i should return to you')
+      PGCryptoTestModel.find(model.id).test_column.should == 'i should return to you'
+    end
+
+    it "be searchable" do
+      model = PGCryptoTestModel.create!(:test_column => 'i am findable!')
+      PGCryptoTestModel.where(:test_column => model.test_column).count.should == 1
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,79 @@
+# Add lib/ to the load path
+$LOAD_PATH.unshift(File.expand_path(File.join('..', 'lib'), File.dirname(__FILE__)))
+
+# Load up our Gemfile
+require 'rubygems'
+require 'bundler/setup'
+Bundler.require(:default, :test)
+
+# Enable coverage reporting
+require 'simplecov'
+
+# Requier and configure PGCrypto
+require 'pgcrypto'
+PGCrypto.keys[:private] = {:path => File.join(File.dirname(__FILE__), 'support', 'private.key')}
+PGCrypto.keys[:public] = {:path => File.join(File.dirname(__FILE__), 'support', 'public.key')}
+
+RSpec.configure do |config|
+  database_config = {:adapter => 'postgresql', :database => 'pgcrypto_test', :encoding => 'utf8', :host => 'localhost'}
+  postgres_config = database_config.merge(:database => 'postgres', :schema_search_path => 'public')
+
+  # Set up the database to handle pgcrypto functions and the schema for
+  # our tests
+  config.before :all do
+    # Connect to the local postgres schema database
+    ActiveRecord::Base.establish_connection(postgres_config)
+
+    # Create the test database if we can
+    ActiveRecord::Base.connection.create_database(database_config[:database]) rescue nil
+
+    # Now connect to the newly created database
+    ActiveRecord::Base.establish_connection(database_config)
+
+
+    silence_stream(STDOUT) do
+      # ...and load in the pgcrypto extension
+      ActiveRecord::Base.connection.execute(%[CREATE EXTENSION pgcrypto])
+
+      # ...and then set up the pgcrypto_columns and pgcrypto_test_models fun
+      ActiveRecord::Schema.define do
+        create_table :pgcrypto_columns, :force => true do |t|
+          t.belongs_to :owner, :polymorphic => true
+          t.string :owner_table, :limit => 32
+          t.string :name, :limit => 64
+          t.binary :value
+        end
+
+        create_table :pgcrypto_test_models, :force => true do |t|
+          t.string :name, :limit => 32
+        end
+      end
+    end
+  end
+
+  config.before :each do
+    if example.metadata[:transaction] == false
+      DatabaseCleaner.strategy = :truncation
+      DatabaseCleaner.clean_with :truncation
+    else
+      DatabaseCleaner.strategy = :transaction
+    end
+    DatabaseCleaner.start
+
+    ActiveRecord::Base.establish_connection(database_config)
+
+    class PGCryptoTestModel < ActiveRecord::Base
+      self.table_name = :pgcrypto_test_models
+    end
+  end
+
+  config.after :all do
+    # Drop the database when we exist
+    ActiveRecord::Base.establish_connection(postgres_config)
+    ActiveRecord::Base.connection.drop_database(database_config[:database]) rescue nil
+  end
+
+  config.after :each do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/private.key

@@ -0,0 +1,34 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+
+lQHYBE9ydVABBADfTmLU+G19Vz8iugTZfuxYG2KWI5+UEvW0APE0XF9R9bRca84m
++TbMmhs0hHWvH+5xmPgBN8atx1PAJj65LZufLQipXb4ZLYOi2OWPh7umlMaoSrwY
+UI7SHxL/zqRkdwHiricxTlfqv4lPc7kxDjwfked8nDWcVkCreZVLTwwUfwARAQAB
+AAP6Ay+UG2O79CjVfsJWpV+5MXyaiHfTpAItPTcyOcQDnCC8RQFIvKebj4m3T6WA
+JFJ5TWeYSjQognwwhrJE/NFYwgLH698fEw3TEHyvXm6hdb3Aqv7wCc52pZx9E3OL
+AvSQArTypTO4WsGsYIBVbpvsQervA03gxEo025q7QGPQYoECAOcC9eTlKznjDj09
+5AOueWE1s3NZDlESGkq6qEM+xIHurEvgX7jHLe0bRQWfo/Z/D5uplTrFkPTgtA/a
+lwKej78CAPd2DYocgmCQ44e1Dc8Z8XSeKuMmmZqbFszDr8+4LM40irmFeiSb1S6p
+rj1h2WKFhnar568tMSvxrZmu5dZ7q0EB/1kVXLAJK6PS7IhOnFMbMMQcWmQLfQ7I
+pgEuUF6DG9drSbj8r5oU+PUejGmurl5ZqVWbCGHnlbTU/QsRhp8VvdegMLQ0Rmxp
+cCBTYXNzZXIgKERlbGlnaHRmdWwgV2lkZ2V0cykgPGZsaXBAZ2V0cGxpbnEuY29t
+Poi4BBMBAgAiBQJPcnVQAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRBI
+6kAcpRMrn741BACT09j5TEG7YnjFf9eoXfh5JpYWv+xdnAJZjMdl+cMZ5CxZB+vx
+zNhOX2OwCWu5fEh2wKbbRuLWHna6SebRjFzY62Ld0ijqVyRPzvz/v7Vn8pBqsTvJ
+PgXUmrMmK9OAMAAM64NwRPiAxSkQtc3qG2uacDyCEI10uK9MT/zNmC6ISJ0B2ARP
+cnVQAQQA9MEq2zMJtfWLZ2HfkTYkHemesc4XB+xCLfldNdmUwQ4o+GXfxe6VXYCc
+KPpyx+qXSP6q7OxR8QKk8wbIord2/w6iIkn+ULvHQw1KMaCQW3JuQPB+IMWA3kY8
+eQ3uibc2vk3ZFMtlU9HCxcRBPnMsCaBXYH1EkQ0+JVyuAotFOksAEQEAAQAD+gJY
+HhfdLGDv4G08KXIdTlZANRMBGGss6GtcgcSKXqh3540nG9Z4+2xBI/3Br4fzp43j
+ub5gLkUixqXfPdyB6Yokc+U0AQVuKZPXbFAROigD2gzpnDWaLeByL4Ua6FV6zNsl
+gTLIS++r81KJBkiw0yhgqfNt44Gbta7y6nPXdMGRAgD1j+wyfvrhoAGgNkZR1h6U
+A+enlaK5+TdeDFljJKo8w3io/s9abOLnVBE4rRsdZtJmK5q0rjeMNKzOsohk9EHR
+AgD/KHTbvTsvrH6kcKpdCHGjyEnYAndxVbjoclHR7NRz6QlhqdNKGI0FbwmPcf7p
+WOSXJX6j8u4dHrx1wZTcDMVbAf9/VsMOkzYnSQEzDV2ixunvkYmfNuD1NbYERgyG
+4Zd+TWKLPx98y/+VW8js5FkH46XgoOsYkEGjl3ZJb5kPth1rog2InwQYAQIACQUC
+T3J1UAIbDAAKCRBI6kAcpRMrn/w6BADN0x89vP0LGRpnwK2Z8AVIXilcPNxe8ckq
+xx0XIU5X13d6DtvNClhIu2N2fA0M2/PR7/MG8+zGoZLZUvC0D+WUNq3Y5hQb2K7J
+IAVPNYVH+R05/1tWGsH/8h/eH9PvldQ8tjQV4jgLJqx5/PNrSb6WdSUmoKQrgORB
+QNXpHhBr6g==
+=sN2M
+-----END PGP PRIVATE KEY BLOCK-----

data/spec/support/public.key

@@ -0,0 +1,20 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+
+mI0ET3J1UAEEAN9OYtT4bX1XPyK6BNl+7FgbYpYjn5QS9bQA8TRcX1H1tFxrzib5
+NsyaGzSEda8f7nGY+AE3xq3HU8AmPrktm58tCKldvhktg6LY5Y+Hu6aUxqhKvBhQ
+jtIfEv/OpGR3AeKuJzFOV+q/iU9zuTEOPB+R53ycNZxWQKt5lUtPDBR/ABEBAAG0
+NEZsaXAgU2Fzc2VyIChEZWxpZ2h0ZnVsIFdpZGdldHMpIDxmbGlwQGdldHBsaW5x
+LmNvbT6IuAQTAQIAIgUCT3J1UAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
+CgkQSOpAHKUTK5++NQQAk9PY+UxBu2J4xX/XqF34eSaWFr/sXZwCWYzHZfnDGeQs
+WQfr8czYTl9jsAlruXxIdsCm20bi1h52uknm0Yxc2Oti3dIo6lckT878/7+1Z/KQ
+arE7yT4F1JqzJivTgDAADOuDcET4gMUpELXN6htrmnA8ghCNdLivTE/8zZguiEi4
+jQRPcnVQAQQA9MEq2zMJtfWLZ2HfkTYkHemesc4XB+xCLfldNdmUwQ4o+GXfxe6V
+XYCcKPpyx+qXSP6q7OxR8QKk8wbIord2/w6iIkn+ULvHQw1KMaCQW3JuQPB+IMWA
+3kY8eQ3uibc2vk3ZFMtlU9HCxcRBPnMsCaBXYH1EkQ0+JVyuAotFOksAEQEAAYif
+BBgBAgAJBQJPcnVQAhsMAAoJEEjqQBylEyuf/DoEAM3THz28/QsZGmfArZnwBUhe
+KVw83F7xySrHHRchTlfXd3oO280KWEi7Y3Z8DQzb89Hv8wbz7MahktlS8LQP5ZQ2
+rdjmFBvYrskgBU81hUf5HTn/W1Yawf/yH94f0++V1Dy2NBXiOAsmrHn882tJvpZ1
+JSagpCuA5EFA1ekeEGvq
+=XKvD
+-----END PGP PUBLIC KEY BLOCK-----

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgcrypto
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70130059262260 !ruby/object:Gem::Requirement
+  requirement: &70275631246800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70130059262260
+  version_requirements: *70275631246800
 description: ! "\n      PGCrypto is an ActiveRecord::Base extension that allows you
   to asymmetrically\n      encrypt PostgreSQL columns with as little trouble as possible.
   It's totally\n      freaking rad.\n    "
@@ -33,12 +33,14 @@ extra_rdoc_files:
 - README.markdown
 files:
 - .rspec
+- .simplecov
 - CHANGES
 - Gemfile
 - LICENSE
 - README.markdown
 - Rakefile
 - VERSION
+- autotest/discover.rb
 - lib/generators/pgcrypto/install/USAGE
 - lib/generators/pgcrypto/install/install_generator.rb
 - lib/generators/pgcrypto/install/templates/initializer.rb
@@ -50,6 +52,10 @@ files:
 - lib/pgcrypto/key.rb
 - lib/pgcrypto/table_manager.rb
 - pgcrypto.gemspec
+- spec/lib/pgcrypto_spec.rb
+- spec/spec_helper.rb
+- spec/support/private.key
+- spec/support/public.key
 homepage: http://github.com/Plinq/pgcrypto
 licenses: []
 post_install_message: