encrypted_store 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 597b51a7a639daa48f0168cd455614d0badc530d
-  data.tar.gz: 0c3ac74f182c8825f0bf8a2cb40b5c6c1636e221
+  metadata.gz: 1f550704fe41a4ad0a8c31b2fe2090ee30100908
+  data.tar.gz: fdb84fa8b34644b1b1119d42e342760309873db2
 SHA512:
-  metadata.gz: f7abe54066eb6000e60e38ac7e6bf8df46f3b5e50d6d85957b38c56436dde3221e18730a4d21a7076729e96b673f887325856b419cda5be666b02c506168db56
-  data.tar.gz: 8a280ee382d0de6e35f34bbe3b9ec683f57583bddb6a3cd823f0beb10c52e4348f3724f25344b220cb2d836172a0fb8b5c353b80944b24ab12f95a44df69d858
+  metadata.gz: e331f4483533fbf576989aeb3ef96ed5e3c6a43fc6d2d022501cdad49016a9e63d306add78701e4f19a0c014acb97283d99893064440ac98dc84fd6d55cdcfff
+  data.tar.gz: 1e64b1d0861ad3881d914411b79afe9b6e10467ea6b6a441981f3fe7d427219cc47e69fa258a2c3260fbb9383154ea28dfa5ae0b30a93e3928cb077da15d66b3

data/lib/encrypted_store/config.rb

@@ -0,0 +1,132 @@
+require 'yaml'
+
+module EncryptedStore
+  class Config
+    # Putting this here instead of in Errors because I may move this into a
+    # separate gem.
+    class ConfigError < StandardError; end
+    class NotAddableError < ConfigError; end
+
+    class ProcArray < Array
+      def push(*procs)
+        raise ConfigError, "May only add blocks" unless procs.all? { |p| p.is_a?(Proc) }
+        super
+      end
+
+      def call(*args, &block)
+        map { |x| x.call(*args, &block) }
+      end
+    end
+
+    class UndefinedValue
+      def !
+        true
+      end
+    end
+
+    attr_reader :name
+
+    def initialize(name=nil, &block)
+      @name = name
+      define(&block) if block_given?
+    end
+
+    def define(&block)
+      case block.arity
+      when 0 then instance_eval(&block)
+      when 1 then block.call(self)
+      else   raise ConfigError, 'invalid config block arity'
+      end
+    end
+
+    # Deep dup all the values.
+    def dup
+      super.tap do |new_config|
+        new_config.instance_variable_set(
+          :@_nested,
+          Hash[
+            _nested.map { |key, object|
+              [
+                key,
+                object.is_a?(Config) ? object.dup : object
+              ]
+            }
+          ]
+        )
+      end
+    end
+
+    def method_missing(meth, *args, &block)
+      meth_str = meth.to_s
+
+      if /^(\w+)\=$/.match(meth_str)
+        _set($1, *args, &block)
+      elsif args.length > 0 || block_given?
+        _add(meth, *args, &block)
+      elsif /^(\w+)\?$/.match(meth_str)
+        !!_get($1)
+      else
+        _get_or_create_namespace(meth)
+      end
+    end
+
+    def merge_hash!(hash)
+      hash.each { |k, v|
+        if v.is_a?(Hash)
+          send(k).merge_hash!(v)
+        else
+          send("#{k}=", v)
+        end
+      }
+
+      self
+    end
+
+    def merge_config_file!(file)
+      merge_hash!(YAML.load_file(file))
+    end
+
+    private
+    def _get(key)
+      _nested[key.to_sym]
+    end
+
+    def _get_or_create_namespace(key)
+      object = _get(key)
+
+      if object.is_a?(UndefinedValue)
+        object = _set(key, Config.new((name ? "#{name}." : '') + key.to_s))
+      end
+
+      object
+    end
+
+    def _set(key, *args, &block)
+      object = _args_to_object(*args, &block)
+      _nested[key.to_sym] = object
+    end
+
+    def _add(key, *args, &block)
+      raise NotAddableError, self.inspect if @_value && !@_value.is_a?(Array)
+      object = _args_to_object(*args, &block)
+      _set(key, object.is_a?(Proc) ? ProcArray.new : []) if !_get(key)
+      _get(key).push(object)
+    end
+
+    def _args_to_object(*args, &block)
+      if args.length == 1
+        args.first
+      elsif args.length > 1
+        args
+      elsif block_given?
+        block
+      else
+        raise ConfigError, 'must pass value or block'
+      end
+    end
+
+    def _nested
+      @_nested ||= Hash.new { |hash, key| hash[key] = UndefinedValue.new }
+    end
+  end # Config
+end # EncryptedStore

data/lib/{ribbon/encrypted_store → encrypted_store}/crypto_hash.rb

@@ -2,7 +2,7 @@ require 'openssl'
 require 'json'
 require 'zlib'
 
-module Ribbon::EncryptedStore
+module EncryptedStore
   class CryptoHash < Hash
     def initialize(data={})
       super()
@@ -147,4 +147,4 @@ module Ribbon::EncryptedStore
       self.class._calc_crc32(data)
     end
   end # CryptoHash
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/{ribbon/encrypted_store → encrypted_store}/errors.rb

@@ -1,4 +1,4 @@
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Errors
     class Error < StandardError; end
 
@@ -13,4 +13,4 @@ module Ribbon::EncryptedStore
     class InvalidKeySize < CryptoHashError; end
     class UnsupportedVersionError < CryptoHashError; end
   end # Errors
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/{ribbon/encrypted_store → encrypted_store}/instance.rb

@@ -1,7 +1,7 @@
-module Ribbon::EncryptedStore
+module EncryptedStore
   class Instance
     def config(&block)
-      (@__config ||= Ribbon::Config.new).tap { |config|
+      (@__config ||= Config.new).tap { |config|
         if block_given?
           config.define(&block)
         end
@@ -27,4 +27,4 @@ module Ribbon::EncryptedStore
       (@_decrypted_keys ||= {})[key_id] ||= key_model.find(key_id).decrypted_key
     end
   end # Instance
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/{ribbon/encrypted_store → encrypted_store}/mixins/active_record_mixin/encryption_key.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 require 'base64'
 
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Mixins
     module ActiveRecordMixin
       class EncryptionKey < ActiveRecord::Base
@@ -74,4 +74,4 @@ module Ribbon::EncryptedStore
       end # EncryptionKey
     end # ActiveRecordMixin
   end # Mixins
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/{ribbon/encrypted_store → encrypted_store}/mixins/active_record_mixin/encryption_key_salt.rb

@@ -1,6 +1,6 @@
 require 'securerandom'
 
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Mixins
     module ActiveRecordMixin
       class EncryptionKeySalt < ActiveRecord::Base
@@ -25,4 +25,4 @@ module Ribbon::EncryptedStore
       end # EncryptionKeySalt
     end # ActiveRecordMixin
   end # Mixins
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/{ribbon/encrypted_store → encrypted_store}/mixins/active_record_mixin.rb

@@ -1,10 +1,10 @@
 require 'securerandom'
 
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Mixins
     module ActiveRecordMixin
-      autoload(:EncryptionKeySalt, 'ribbon/encrypted_store/mixins/active_record_mixin/encryption_key_salt')
-      autoload(:EncryptionKey,     'ribbon/encrypted_store/mixins/active_record_mixin/encryption_key')
+      autoload(:EncryptionKeySalt, 'encrypted_store/mixins/active_record_mixin/encryption_key_salt')
+      autoload(:EncryptionKey,     'encrypted_store/mixins/active_record_mixin/encryption_key')
 
       class << self
         def included(base)
@@ -91,8 +91,8 @@ module Ribbon::EncryptedStore
             self.encryption_key_id = record.encryption_key_id if record && record.encryption_key_id
           end
 
-          iter_mag = Ribbon::EncryptedStore.config.iteration_magnitude? ?
-                     Ribbon::EncryptedStore.config.iteration_magnitude  :
+          iter_mag = EncryptedStore.config.iteration_magnitude? ?
+                     EncryptedStore.config.iteration_magnitude  :
                      -1
 
           @_reencrypting = false
@@ -105,4 +105,4 @@ module Ribbon::EncryptedStore
       end
     end # ActiveRecordMixin
   end # Mixins
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/encrypted_store/mixins.rb

@@ -0,0 +1,5 @@
+module EncryptedStore
+  module Mixins
+    autoload(:ActiveRecordMixin, 'encrypted_store/mixins/active_record_mixin')
+  end # Mixins
+end # EncryptedStore

data/lib/encrypted_store/railtie.rb

@@ -0,0 +1,21 @@
+require 'encrypted_store'
+require 'rails'
+require 'rails/generators'
+
+module EncryptedStore
+  class Railtie < Rails::Railtie
+    railtie_name :encrypted_store
+
+    rake_tasks do
+      Dir[
+        File.expand_path("../../tasks", __FILE__) + '/**/*.rake'
+      ].each { |rake_file| load rake_file }
+    end
+
+    generators do
+      Dir[
+        File.expand_path("../../generators", __FILE__) + '/**/*.rb'
+      ].each { |generator| require generator }
+    end
+  end # Railtie
+end # EncryptedStore

data/lib/encrypted_store/version.rb

@@ -0,0 +1,3 @@
+module EncryptedStore
+  VERSION = '0.2.1'
+end # EncryptedStore

data/lib/encrypted_store.rb

@@ -0,0 +1,28 @@
+require 'encrypted_store/version'
+
+module EncryptedStore
+  require 'encrypted_store/railtie' if defined?(Rails)
+  autoload(:Config,     'encrypted_store/config')
+  autoload(:CryptoHash, 'encrypted_store/crypto_hash')
+  autoload(:Instance,   'encrypted_store/instance')
+  autoload(:Errors,     'encrypted_store/errors')
+  autoload(:Mixins,     'encrypted_store/mixins')
+
+  class << self
+    def included(base)
+      if defined?(ActiveRecord) && base < ActiveRecord::Base
+        base.send(:include, Mixins::ActiveRecordMixin)
+      else
+        raise Errors::UnsupportedModelError
+      end
+    end
+
+    def method_missing(meth, *args, &block)
+      instance.send(meth, *args, &block)
+    end
+
+    def instance
+      @__instance ||= Instance.new
+    end
+  end # Class Methods
+end # EncryptedStore

data/lib/generators/encrypted_store/encrypt_table/encrypt_table_generator.rb

@@ -1,4 +1,4 @@
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Generators
     class EncryptTableGenerator < Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
@@ -9,4 +9,4 @@ module Ribbon::EncryptedStore
       end
     end # EncryptTableGenerator
   end # Generators
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/generators/encrypted_store/install/install_generator.rb

@@ -1,6 +1,6 @@
 require 'rails/generators/active_record'
 
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Generators
     class InstallGenerator < Rails::Generators::Base
       include Rails::Generators::Migration
@@ -23,4 +23,4 @@ module Ribbon::EncryptedStore
       end
     end # InstallEncryptedStoreGenerator
   end # Generators
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/generators/encrypted_store/install/templates/initializer.rb

@@ -1,6 +1,6 @@
-require 'ribbon/encrypted_store'
+require 'encrypted_store'
 
-Ribbon::EncryptedStore.config {
+EncryptedStore.config {
   encrypt_key { |dek| dek }
   decrypt_key { |dek| dek }
-}
+}

data/lib/generators/encrypted_store/upgrade/ZeroOneFive/zero_one_five_generator.rb

@@ -1,6 +1,6 @@
 require 'rails/generators/active_record'
 
-module Ribbon::EncryptedStore
+module EncryptedStore
   module Generators
     module Upgrade
       class ZeroOneFiveGenerator < Rails::Generators::Base
@@ -21,4 +21,4 @@ module Ribbon::EncryptedStore
       end # ZeroOneFiveGenerator
     end # Upgrade
   end # Generators
-end # Ribbon::EncryptedStore
+end # EncryptedStore

data/lib/tasks/encrypted_store.rake

@@ -1,4 +1,4 @@
-require 'ribbon/encrypted_store'
+require 'encrypted_store'
 
 namespace :encrypted_store do
   task :new_key, [:custom_key] => :environment do |t, args|
@@ -16,4 +16,4 @@ namespace :encrypted_store do
     new_primary_key = EncryptedStore::Mixins::ActiveRecordMixin::EncryptionKey.rotate_keys
     puts "Retired all key_ids and reencrypted records with new primary key: #{new_primary_key.id}"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: encrypted_store
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Honer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt
@@ -31,20 +31,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.3
-- !ruby/object:Gem::Dependency
-  name: ribbon-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -117,12 +103,23 @@ dependencies:
         version: 4.0.0
 description: Provides the EncryptedStore mixin
 email:
-- robert@ribbonpayments.com
-- kayvon@ribbonpayments.com
+- robert@payout.com
+- kayvon@payout.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/encrypted_store.rb
+- lib/encrypted_store/config.rb
+- lib/encrypted_store/crypto_hash.rb
+- lib/encrypted_store/errors.rb
+- lib/encrypted_store/instance.rb
+- lib/encrypted_store/mixins.rb
+- lib/encrypted_store/mixins/active_record_mixin.rb
+- lib/encrypted_store/mixins/active_record_mixin/encryption_key.rb
+- lib/encrypted_store/mixins/active_record_mixin/encryption_key_salt.rb
+- lib/encrypted_store/railtie.rb
+- lib/encrypted_store/version.rb
 - lib/generators/encrypted_store/encrypt_table/encrypt_table_generator.rb
 - lib/generators/encrypted_store/install/install_generator.rb
 - lib/generators/encrypted_store/install/templates/create_encryption_key_salts.rb
@@ -131,18 +128,8 @@ files:
 - lib/generators/encrypted_store/upgrade/ZeroOneFive/templates/upgrade_encryption_key_salts_to_015.rb
 - lib/generators/encrypted_store/upgrade/ZeroOneFive/templates/upgrade_encryption_keys_to_015.rb
 - lib/generators/encrypted_store/upgrade/ZeroOneFive/zero_one_five_generator.rb
-- lib/ribbon/encrypted_store.rb
-- lib/ribbon/encrypted_store/crypto_hash.rb
-- lib/ribbon/encrypted_store/errors.rb
-- lib/ribbon/encrypted_store/instance.rb
-- lib/ribbon/encrypted_store/mixins.rb
-- lib/ribbon/encrypted_store/mixins/active_record_mixin.rb
-- lib/ribbon/encrypted_store/mixins/active_record_mixin/encryption_key.rb
-- lib/ribbon/encrypted_store/mixins/active_record_mixin/encryption_key_salt.rb
-- lib/ribbon/encrypted_store/railtie.rb
-- lib/ribbon/encrypted_store/version.rb
 - lib/tasks/encrypted_store.rake
-homepage: http://github.com/ribbon/encrypted_store
+homepage: http://github.com/payout/encrypted_store
 licenses:
 - BSD
 metadata: {}

data/lib/ribbon/encrypted_store/mixins.rb

@@ -1,5 +0,0 @@
-module Ribbon::EncryptedStore
-  module Mixins
-    autoload(:ActiveRecordMixin, 'ribbon/encrypted_store/mixins/active_record_mixin')
-  end # Mixins
-end # Ribbon::EncryptedStore

data/lib/ribbon/encrypted_store/railtie.rb

@@ -1,23 +0,0 @@
-require 'ribbon/encrypted_store'
-require 'rails'
-require 'rails/generators'
-
-module Ribbon
-  module EncryptedStore
-    class Railtie < Rails::Railtie
-      railtie_name :encrypted_store
-
-      rake_tasks do
-        Dir[
-          File.expand_path("../../../tasks", __FILE__) + '/**/*.rake'
-        ].each { |rake_file| load rake_file }
-      end
-
-      generators do
-        Dir[
-          File.expand_path("../../../generators", __FILE__) + '/**/*.rb'
-        ].each { |generator| require generator }
-      end
-    end # Railtie
-  end # EncryptedStore
-end # Ribbon

data/lib/ribbon/encrypted_store/version.rb

@@ -1,5 +0,0 @@
-module Ribbon
-  module EncryptedStore
-    VERSION = '0.2.0'
-  end # EncryptedStore
-end # Ribbon

data/lib/ribbon/encrypted_store.rb

@@ -1,33 +0,0 @@
-require 'ribbon/encrypted_store/version'
-require 'ribbon/config'
-
-module Ribbon
-  module EncryptedStore
-    require 'ribbon/encrypted_store/railtie' if defined?(Rails)
-    autoload(:CryptoHash, 'ribbon/encrypted_store/crypto_hash')
-    autoload(:Instance,   'ribbon/encrypted_store/instance')
-    autoload(:Errors,     'ribbon/encrypted_store/errors')
-    autoload(:Mixins,     'ribbon/encrypted_store/mixins')
-
-    class << self
-      def included(base)
-        if defined?(ActiveRecord) && base < ActiveRecord::Base
-          base.send(:include, Mixins::ActiveRecordMixin)
-        else
-          raise Errors::UnsupportedModelError
-        end
-      end
-
-      def method_missing(meth, *args, &block)
-        instance.send(meth, *args, &block)
-      end
-
-      def instance
-        @__instance ||= Instance.new
-      end
-    end # Class Methods
-  end # EncryptedStore
-end # Ribbon
-
-# Create a shortcut to the module
-EncryptedStore = Ribbon::EncryptedStore