attr_encryption 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acd5e4eab70392658a813fc269594f9172725646
-  data.tar.gz: b517d95ae98b5cd7537ff0cf40ed52275c632b85
+  metadata.gz: 33fa4e0a2ea08d7944beeaccc72375d423323211
+  data.tar.gz: 604463429d71957f5a018bdb978a255016114fb7
 SHA512:
-  metadata.gz: caf52c3ef1935397886f25c58290c78a3344632c8373bd223a9cbd5d1398a87ed1be5351fbd4fb33142f892ff7c86761a50fc57b935e9f1c61a0026ee0a2373c
-  data.tar.gz: 87e5a93df2785e93b0d83af5bee82808cff9753f755ff8e27fbb3fe3083751070752c9adafa5f6f8d7a1f27d0a4220493244378cb797440e026aa811b966c36b
+  metadata.gz: b045b50352b1d37810708c50406a1b64a50cf74f9a58f4b33c7950346d0c0b16e2abf33d60f177e123a7a9c74dd96d3c262b25f91c9e5708a785d4e4206729bc
+  data.tar.gz: 84f8ed41f05e49acb68d00601f60adc1af6b0c2de46d6d6b3c558312c0e56b48eec7a4c6ee6965c13b6f327dfe36c626af84c47a568e142a65509bb3a621642a

data/Gemfile

@@ -7,7 +7,7 @@ gem "activesupport", ">= 3.2.14"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec"
-  gem "rdoc", "~> 3.12"
+  gem "rdoc", "~> 4.1"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.8.7"
 end

data/Gemfile.lock

@@ -1,15 +1,18 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.14)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    addressable (2.3.5)
+    activesupport (4.1.4)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
     builder (3.2.2)
-    diff-lcs (1.2.4)
-    faraday (0.8.8)
+    diff-lcs (1.2.5)
+    faraday (0.8.9)
       multipart-post (~> 1.2.0)
-    git (1.2.6)
+    git (1.2.8)
     github_api (0.10.1)
       addressable
       faraday (~> 0.8.1)
@@ -17,11 +20,10 @@ GEM
       multi_json (~> 1.4)
       nokogiri (~> 1.5.2)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.19)
-    httpauth (0.2.0)
-    i18n (0.6.5)
-    jeweler (1.8.7)
+    hashie (3.2.0)
+    highline (1.6.21)
+    i18n (0.6.11)
+    jeweler (1.8.8)
       builder
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -30,32 +32,38 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.0)
-    jwt (0.1.8)
-      multi_json (>= 1.5)
-    multi_json (1.8.0)
+    json (1.8.1)
+    jwt (1.0.0)
+    minitest (5.4.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
-    oauth2 (0.9.2)
-      faraday (~> 0.8)
-      httpauth (~> 0.2)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
-    rake (10.1.0)
-    rdoc (3.12.2)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
@@ -64,5 +72,5 @@ DEPENDENCIES
   activesupport (>= 3.2.14)
   bundler (~> 1.0)
   jeweler (~> 1.8.7)
-  rdoc (~> 3.12)
+  rdoc (~> 4.1)
   rspec

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/attr_encryption.gemspec

@@ -0,0 +1,69 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: attr_encryption 0.1.2 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "attr_encryption"
+  s.version = "0.1.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Dave Sieh"]
+  s.date = "2014-08-15"
+  s.description = "Provides an extension for Ruby and rails object to support a flexible means of encrypting attributes."
+  s.email = "dave.sieh@providigm.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "attr_encryption.gemspec",
+    "lib/attr_encryption.rb",
+    "lib/attr_encryption/adapters/active_record.rb",
+    "lib/attr_encryption/date_extensions.rb",
+    "lib/attr_encryption/mysql_encryption.rb",
+    "lib/attr_encryption/mysql_encryptor.rb",
+    "spec/mysql_encryption_spec.rb",
+    "spec/mysql_encryptor_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = "http://github.com/GitHubAdmin/attr_encryption"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "Extends Object and ActiveRecord::Base objects to support encrypted attributes"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.2.14"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
+    else
+      s.add_dependency(%q<activesupport>, [">= 3.2.14"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<rdoc>, ["~> 4.1"])
+      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+    end
+  else
+    s.add_dependency(%q<activesupport>, [">= 3.2.14"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<rdoc>, ["~> 4.1"])
+    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
+  end
+end
+

data/lib/attr_encryption.rb

@@ -24,7 +24,7 @@ module AttrEncryption
   #                        one attribute to encrypt at a time or when the :prefix and :suffix options
   #                        aren't enough. Defaults to nil.
   #
-  #   :type             => The data type of the value to be encrypted/decrypted. Can be 'date', 'datetime', 'binary' or 'text'.
+  #   :type             => The data type of the value to be encrypted/decrypted. Can be 'date', 'datetime', 'binary', 'text' or json.
   #                        When encrypting, all values will use their string value (value.to_s). When decrypting,
   #                        the type of the value will determine what is returned. For example:
   #                 
@@ -32,6 +32,7 @@ module AttrEncryption
   #                          type = 'time': DateTime.parse(decrypted_value)
   #                          type = 'binary': decrypted_value
   #                          type = 'text': decrypted_value.force_encoding('utf-8')
+  #                          type = 'json': JSON.parse(decrypted_value)
   #
   #   :prefix           => A prefix used to generate the name of the referenced encrypted attributes.
   #                        For example <tt>attr_accessor :email, :password, :prefix => 'crypted_'</tt> would
@@ -143,13 +144,25 @@ module AttrEncryption
 
       define_method(attribute) do
         cached_value = instance_variable_get("@#{attribute}")
-        value = cached_value && options[:type] == 'date' && cached_value.is_a?(Date) ? cached_value : nil
+        if cached_value
+          case options[:type]
+          when 'date'
+            value = cached_value.is_a?(Date) ? cached_value : nil
+          when 'json'
+            value = cached_value.is_a?(Hash) || cached_value.is_a?(Array) ? cached_value : nil
+          else
+            value = cached_value
+          end
+        else
+          value = nil
+        end
         value || instance_variable_set("@#{attribute}", decrypt(attribute, send(encrypted_attribute_name)))
-        # instance_variable_get("@#{attribute}") || instance_variable_set("@#{attribute}", decrypt(attribute, send(encrypted_attribute_name)))
       end
 
       define_method("#{attribute}=") do |value|
-        send("#{encrypted_attribute_name}=", encrypt(attribute, value))
+        value_to_encrypt = options[:type] == 'json' ? value.to_json : value
+        
+        send("#{encrypted_attribute_name}=", encrypt(attribute, value_to_encrypt))
         instance_variable_set("@#{attribute}", value)
       end
 

data/lib/attr_encryption/mysql_encryptor.rb

@@ -20,6 +20,8 @@ class MySQLEncryptor
       DateTime.parse(decrypted_value)
     when 'binary'
       decrypted_value # no processing
+    when 'json'
+      JSON.parse(decrypted_value)
     else
       raise "Invalid type specified for post-processing decrypted value"
     end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: attr_encryption
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dave Sieh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
 description: Provides an extension for Ruby and rails object to support a flexible
@@ -89,14 +89,15 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
-- .rspec
+- ".document"
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- attr_encryption.gemspec
 - lib/attr_encryption.rb
 - lib/attr_encryption/adapters/active_record.rb
 - lib/attr_encryption/date_extensions.rb
@@ -115,17 +116,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Extends Object and ActiveRecord::Base objects to support encrypted attributes