pgcrypto 0.2.7 → 0.3.1

data/CHANGES.md

@@ -0,0 +1,68 @@
+# CHANGELOG
+## 0.3.1
+- Finally solved a large bug with a very simple fix. Looks
+  like we're approaching stability, folks!
+
+## 0.3.0
+- Finally solved a large bug with a very simple fix. Looks
+  like we're approaching stability, folks!
+
+## 0.2.7
+- So, about that library I arrogantly included? Turns out we
+  should require it in code before expecting anything of it.
+
+## 0.2.6
+- We now use the BigSpoon library to hook into reload, because
+  it's SO MUCH MORE AWESOME THAN THE GARBAGE MOST PEOPLE USE.
+  Welp. It's been nice coding with y'all.
+
+## 0.2.5
+- PGCrypto now hooks into ActiveRecord::Base#reload in order to
+  reset encrypted column values as expected when calling reload.
+
+## 0.2.2
+- Don't try to load columns on new records; should further reduce
+  unnecessary database calls!
+
+## 0.2.1
+- Added ActiveModel::Dirty support, so you can now call *_changed?
+  on your models tracking pgcrypto columns.
+
+## 0.2.0
+- Overhauled key system. Unfortunately, for performance reasons
+  and due to the insanely hacked nature of PGCrypto, multiple keys
+  are NO LONGER SUPPORTED. I'm working to bring them back, but
+  this was the only solution to get fully performant and functional
+  without any disasters.
+
+## 0.1.2
+- Added automatic installation of the pgcrypto extension if'n it
+  doesn't already exist. Helpful, but doesn't fully make the 
+  `rake db:test:prepare` cut yet. Still working on that bit...
+
+## 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
+  which provides dramatic speed improvements when a record's
+  encrypted attributes aren't needed most of the time.
+
+## 0.0.4
+- Compatibility fix between ActiveRecord ## 3.2.1 and ## 3.2.2
+
+## 0.0.3
+- Fixed a join bug on SELECT statements
+
+## 0.0.2
+- Fixed a number of key-related bugs discovered in testing with our
+  second production app with encrypted columns. Also duck-typed AREL
+  statement types in a few places.
+
+## 0.0.1
+- INSERT, SELECT, and UPDATE statements are working. But I wrote this
+  while testing with a production app, and thus haven't written
+  specific tests, so don't get your panties in a twist.

data/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'activerecord', '>= 3.2', :require => 'active_record'
-gem 'big_spoon'
+gem 'big_spoon', '>= 0.2.0'
 
 group :development do
   gem 'jeweler'

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.1

data/lib/pgcrypto.rb

@@ -57,6 +57,7 @@ module PGCrypto
             remove_instance_variable("@_pgcrypto_#{column_name}") if defined?(@_pgcrypto_#{column_name})
           else
             @_pgcrypto_#{column_name} ||= pgcrypto_columns.select{|column| column.name == "#{column_name}"}.first || pgcrypto_columns.new(:name => "#{column_name}")
+            pgcrypto_columns.push(@_pgcrypto_#{column_name})
             @_pgcrypto_#{column_name}.value = value
           end
         end
@@ -91,9 +92,9 @@ module PGCrypto
       pgcrypto_column_finder = pgcrypto_columns
       if key = PGCrypto.keys[:private]
         pgcrypto_column_finder = pgcrypto_column_finder.select([
-          %("#{PGCrypto::Column.table_name}"."id"),
+          %w(id owner_id owner_type owner_table).map {|column| %("#{PGCrypto::Column.table_name}"."#{column}")},
           %[pgp_pub_decrypt("#{PGCrypto::Column.table_name}"."value", pgcrypto_keys.#{key.name}#{", '#{key.password}'" if key.password}) AS "value"]
-        ]).joins(%[CROSS JOIN (SELECT #{key.dearmored} AS "#{key.name}") AS pgcrypto_keys])
+        ].flatten).joins(%[CROSS JOIN (SELECT #{key.dearmored} AS "#{key.name}") AS pgcrypto_keys])
       end
       pgcrypto_column_finder.where(:name => column_name).first
     rescue ActiveRecord::StatementInvalid => e

data/lib/pgcrypto/column.rb

@@ -4,6 +4,8 @@ module PGCrypto
     before_save :set_owner_table
     belongs_to :owner, :autosave => false, :inverse_of => :pgcrypto_columns, :polymorphic => true
 
+    default_scope select(%w(id owner_id owner_type owner_table))
+
     protected
     def set_owner_table
       self.owner_table = self.owner.class.table_name

data/pgcrypto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pgcrypto"
-  s.version = "0.2.7"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-08-12"
+  s.date = "2012-08-14"
   s.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    "
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".rspec",
     ".simplecov",
-    "CHANGES",
+    "CHANGES.md",
     "Gemfile",
     "Guardfile",
     "LICENSE",
@@ -53,16 +53,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 3.2"])
-      s.add_runtime_dependency(%q<big_spoon>, [">= 0"])
+      s.add_runtime_dependency(%q<big_spoon>, [">= 0.2.0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.2"])
-      s.add_dependency(%q<big_spoon>, [">= 0"])
+      s.add_dependency(%q<big_spoon>, [">= 0.2.0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.2"])
-    s.add_dependency(%q<big_spoon>, [">= 0"])
+    s.add_dependency(%q<big_spoon>, [">= 0.2.0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end

data/spec/lib/pgcrypto_spec.rb

@@ -4,83 +4,98 @@ 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
-      model.test_column.should == 'but now i am a different column, son'
-    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 "should be retrievable at update" do
-      model = PGCryptoTestModel.create!(:test_column => 'i will update')
-      model.test_column.should == 'i will update'
-      model.update_attributes!(:test_column => 'i updated')
-      model.test_column.should == 'i updated'
-    end
-
-    it "should be retrievable without update" do
-      model = PGCryptoTestModel.create!(:test_column => 'i will update')
-      model.test_column.should == 'i will update'
-      model.test_column = 'i updated'
-      model.test_column.should == 'i updated'
-    end
-
-    it "be searchable" do
-      model = PGCryptoTestModel.create!(:test_column => 'i am findable!')
-      PGCryptoTestModel.where(:test_column => model.test_column).count.should == 1
-    end
-
-    it "should track changes" do
-      model = PGCryptoTestModel.create!(:test_column => 'i am clean')
-      model.test_column = "now i'm not!"
-      model.test_column_changed?.should be_true
-    end
-
-
-    it "should not be dirty if unchanged" do
-      model = PGCryptoTestModel.create!(:test_column => 'i am clean')
-      model.test_column = 'i am clean'
-      model.test_column_changed?.should_not be_true
-    end
-
-    it "should reload with the class" do
-      model = PGCryptoTestModel.create!(:test_column => 'i am clean')
-      model.test_column = 'i am dirty'
-      model.reload
-      model.test_column.should == 'i am clean'
-      model.test_column_changed?.should_not be_true
-    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
+    model.test_column.should == 'but now i am a different column, son'
+  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 "should be retrievable at update" do
+    model = PGCryptoTestModel.create!(:test_column => 'i will update')
+    model.test_column.should == 'i will update'
+    model.update_attributes!(:test_column => 'i updated')
+    model.test_column.should == 'i updated'
+  end
+  
+  it "should be retrievable without update" do
+    model = PGCryptoTestModel.create!(:test_column => 'i will update')
+    model.test_column.should == 'i will update'
+    model.test_column = 'i updated'
+    model.test_column.should == 'i updated'
+  end
+  
+  it "be searchable" do
+    model = PGCryptoTestModel.create!(:test_column => 'i am findable!')
+    PGCryptoTestModel.where(:test_column => model.test_column).count.should == 1
+  end
+  
+  it "should track changes" do
+    model = PGCryptoTestModel.create!(:test_column => 'i am clean')
+    model.test_column = "now i'm not!"
+    model.test_column_changed?.should be_true
+  end
+  
+  it "should not be dirty if unchanged" do
+    model = PGCryptoTestModel.create!(:test_column => 'i am clean')
+    model.test_column = 'i am clean'
+    model.test_column_changed?.should_not be_true
+  end
+  
+  it "should reload with the class" do
+    model = PGCryptoTestModel.create!(:test_column => 'i am clean')
+    model.test_column = 'i am dirty'
+    model.reload
+    model.test_column.should == 'i am clean'
+    model.test_column_changed?.should_not be_true
+  end
+  
+  it "should allow direct setting of values as well" do
+    model = PGCryptoTestModel.create!(:test_column => 'one')
+    model.test_column.should == 'one'
+    model.test_column = 'two'
+    model.save!.should be_true
+    model.select_pgcrypto_column(:test_column).value.should == 'two'
+  end
+  
+  it "should delete the column when I set the value to nil" do
+    model = PGCryptoTestModel.create!(:test_column => 'one')
+    model.test_column = nil
+    model.save!
+    model.select_pgcrypto_column(:test_column).should be_nil
+  end
+  
+  it "plz work" do
+    model = PGCryptoTestModel.find(PGCryptoTestModel.create!(:test_column => 'one'))
+    model.test_column = 'two'
+    model.save!
+    model.select_pgcrypto_column(:test_column).value.should == 'two'
   end
 end

data/spec/spec_helper.rb

@@ -51,18 +51,15 @@ RSpec.configure do |config|
   end
 
   config.before :each do
-    if example.metadata[:transaction] == false
-      DatabaseCleaner.strategy = :truncation
-      DatabaseCleaner.clean_with :truncation
-    else
-      DatabaseCleaner.strategy = :transaction
-    end
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with :transaction
     DatabaseCleaner.start
 
     ActiveRecord::Base.establish_connection(database_config)
 
     class PGCryptoTestModel < ActiveRecord::Base
       self.table_name = :pgcrypto_test_models
+      pgcrypto :test_column
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgcrypto
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-12 00:00:00.000000000 Z
+date: 2012-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +71,7 @@ extra_rdoc_files:
 files:
 - .rspec
 - .simplecov
-- CHANGES
+- CHANGES.md
 - Gemfile
 - Guardfile
 - LICENSE
@@ -108,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1948913524412133892
+      hash: -1773161376728593818
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/CHANGES

@@ -1,59 +0,0 @@
-0.2.7
-  * So, about that library I arrogantly included? Turns out we
-    should require it in code before expecting anything of it.
-
-0.2.6
-  * We now use the BigSpoon library to hook into reload, because
-    it's SO MUCH MORE AWESOME THAN THE GARBAGE MOST PEOPLE USE.
-    Welp. It's been nice coding with y'all.
-
-0.2.5
-  * PGCrypto now hooks into ActiveRecord::Base#reload in order to
-    reset encrypted column values as expected when calling reload.
-
-0.2.2
-  * Don't try to load columns on new records; should further reduce
-    unnecessary database calls!
-
-0.2.1
-  * Added ActiveModel::Dirty support, so you can now call *_changed?
-    on your models tracking pgcrypto columns.
-
-0.2.0
-  * Overhauled key system. Unfortunately, for performance reasons
-    and due to the insanely hacked nature of PGCrypto, multiple keys
-    are NO LONGER SUPPORTED. I'm working to bring them back, but
-    this was the only solution to get fully performant and functional
-    without any disasters.
-
-0.1.2
-  * Added automatic installation of the pgcrypto extension if'n it
-    doesn't already exist. Helpful, but doesn't fully make the 
-    `rake db:test:prepare` cut yet. Still working on that bit...
-
-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
-	  which provides dramatic speed improvements when a record's
-	  encrypted attributes aren't needed most of the time.
-
-0.0.4
-	* Compatibility fix between ActiveRecord 3.2.1 and 3.2.2
-
-0.0.3
-	* Fixed a join bug on SELECT statements
-
-0.0.2
-  * Fixed a number of key-related bugs discovered in testing with our
-    second production app with encrypted columns. Also duck-typed AREL
-    statement types in a few places.
-
-0.0.1
-  * INSERT, SELECT, and UPDATE statements are working. But I wrote this
-    while testing with a production app, and thus haven't written
-    specific tests, so don't get your panties in a twist.