pgcrypto 0.3.3 → 0.3.4

data/CHANGES.md

@@ -1,4 +1,7 @@
 # CHANGELOG
+## 0.3.3
+- Solved a mass-assignment issue thanks to Brett Levine
+
 ## 0.3.2
 - Upgrade big_spoon dependency to solve annoying generator bug.
 

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/pgcrypto.rb

@@ -93,7 +93,7 @@ module PGCrypto
       if key = PGCrypto.keys[:private]
         pgcrypto_column_finder = pgcrypto_column_finder.select([
           %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"]
+          %[pgp_pub_decrypt("#{PGCrypto::Column.table_name}"."value", pgcrypto_keys.#{key.name}#{key.password?}) AS "value"]
         ].flatten).joins(%[CROSS JOIN (SELECT #{key.dearmored} AS "#{key.name}") AS pgcrypto_keys])
       end
       pgcrypto_column_finder.where(:name => column_name).first

data/lib/pgcrypto/active_record.rb

@@ -54,7 +54,7 @@ ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
           next unless encrypted_columns[child.left.name.to_s]
           joins.push(child.left.name.to_s) unless joins.include?(child.left.name.to_s)
           child.left = Arel::Nodes::SqlLiteral.new(%[
-            pgp_pub_decrypt("#{PGCrypto::Column.table_name}_#{child.left.name}"."value", pgcrypto_keys.#{key.name})
+            pgp_pub_decrypt("#{PGCrypto::Column.table_name}_#{child.left.name}"."value", pgcrypto_keys.#{key.name}#{key.password?})
           ])
         end if where.respond_to?(:children)
       end

data/lib/pgcrypto/key.rb

@@ -22,6 +22,10 @@ module PGCrypto
       "#{'dearmor(' if armored?}'#{self}'#{')' if armored?}"
     end
 
+    def encrypt(value)
+      %[pgp_pub_encrypt('#{value}', #{dearmored})]
+    end
+
     def initialize(options = {})
       if options.is_a?(String)
         self.value = options
@@ -32,6 +36,10 @@ module PGCrypto
       end
     end
 
+    def password?
+      ", '#{password}'" if password
+    end
+
     def path=(keyfile)
       keyfile = File.expand_path(keyfile)
       raise PGCrypto::Error, "#{keyfile} does not exist!" unless File.file?(keyfile)

data/pgcrypto.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pgcrypto"
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2012-08-21"
+  s.date = "2012-08-22"
   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 = [
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "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",
@@ -41,7 +40,9 @@ Gem::Specification.new do |s|
     "spec/lib/pgcrypto_spec.rb",
     "spec/spec_helper.rb",
     "spec/support/private.key",
-    "spec/support/public.key"
+    "spec/support/private.password.key",
+    "spec/support/public.key",
+    "spec/support/public.password.key"
   ]
   s.homepage = "http://github.com/Plinq/pgcrypto"
   s.require_paths = ["lib"]

data/spec/lib/pgcrypto_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
-describe PGCrypto do
+# require 'logger'
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+specs = proc do
   it "should extend ActiveRecord::Base" do
     PGCryptoTestModel.should respond_to(:pgcrypto)
   end
@@ -37,7 +40,7 @@ describe PGCrypto 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'
@@ -52,9 +55,9 @@ describe PGCrypto do
     model.test_column.should == 'i updated'
   end
   
-  it "be searchable" do
+  it "should be searchable" do
     model = PGCryptoTestModel.create!(:test_column => 'i am findable!')
-    PGCryptoTestModel.where(:test_column => model.test_column).count.should == 1
+    PGCryptoTestModel.where(:test_column => model.test_column).should == [model]
   end
   
   it "should track changes" do
@@ -92,10 +95,31 @@ describe PGCrypto do
     model.select_pgcrypto_column(:test_column).should be_nil
   end
   
-  it "plz work" do
+  it "should 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
+
+keypath = File.expand_path(File.join(File.dirname(__FILE__), '..', 'support'))
+describe PGCrypto do
+  describe "without password-protected keys" do
+    before :all do
+      PGCrypto.keys[:private] = {:path => File.join(keypath, 'private.key')}
+      PGCrypto.keys[:public] = {:path => File.join(keypath, 'public.key')}
+    end
+
+    # instance_eval(&specs)
+  end
+
+  describe "with password-protected keys" do
+    before :each do
+      PGCrypto.keys[:private] = {:path => File.join(keypath, 'private.password.key'), :password => 'password'}
+      PGCrypto.keys[:public] = {:path => File.join(keypath, 'public.password.key'), :password => 'password'}
+    end
+
+    instance_eval(&specs)
+  end
+end

data/spec/spec_helper.rb

@@ -11,8 +11,6 @@ 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'}

data/spec/support/private.password.key

@@ -0,0 +1,42 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+
+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
+=+qjx
+-----END PGP PRIVATE KEY BLOCK-----

data/spec/support/public.password.key

@@ -0,0 +1,39 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (Darwin)
+
+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
+LYrUQ/uHaSPVpl6O5g==
+=XIMO
+-----END PGP PUBLIC KEY BLOCK-----

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgcrypto
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -78,7 +78,6 @@ files:
 - 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
@@ -93,7 +92,9 @@ files:
 - spec/lib/pgcrypto_spec.rb
 - spec/spec_helper.rb
 - spec/support/private.key
+- spec/support/private.password.key
 - spec/support/public.key
+- spec/support/public.password.key
 homepage: http://github.com/Plinq/pgcrypto
 licenses: []
 post_install_message: 
@@ -106,9 +107,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1863524219335446530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/autotest/discover.rb

@@ -1,14 +0,0 @@
-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