Skip to content

Commit

Permalink
refactor to just serializer
Browse files Browse the repository at this point in the history
  • Loading branch information
randysecrist committed Mar 3, 2013
1 parent c108f93 commit ed3bd66
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions lib/ripple-encryption/activation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module Encryption
# When mixed into a Ripple::Document class, this will encrypt the
# serialized form before it is stored in Riak. You must register
# a serializer that will perform the encryption.
# @see EncryptedSerializer
# @see Serializer
extend ActiveSupport::Concern

@@is_activated = false
Expand Down Expand Up @@ -36,7 +36,7 @@ def self.activate(path)
unless Riak::Serializers['application/x-json-encrypted']
begin
config = YAML.load_file(path)[ENV['RACK_ENV']]
encryptor = Ripple::Encryption::EncryptedSerializer.new(OpenSSL::Cipher.new(config['cipher']), 'application/x-json-encrypted', path)
encryptor = Ripple::Encryption::Serializer.new(OpenSSL::Cipher.new(config['cipher']), 'application/x-json-encrypted', path)
rescue Exception => e
handle_invalid_encryption_config(e.message, e.backtrace)
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module Encryption
# end
#
# @see Encryption
class EncryptedSerializer
class Serializer
# @return [String] The Content-Type of the internal format,
# generally "application/json"
attr_accessor :content_type
Expand Down

0 comments on commit ed3bd66

Please sign in to comment.