Merge 6bcc737 into 9bd854d

.gems

@@ -1,4 +1,4 @@
-ork -v 0.1.3
+ork -v 0.1.4
 riak-client -v 1.4.3
 coveralls -v 0.6.7
 protest -v 0.5.1

lib/ork/encryption.rb

@@ -1,13 +1,12 @@
 require_relative 'cipher'
-require_relative 'errors'
 require_relative 'serializers/json'
 
 module Ork
   module Encryption
     VERSION = '0.0.1'
 
     def self.included(klass)
-      raise NotAnOrkDocument unless klass.included_modules.include? Ork::Document
+      raise Ork::NotOrkObject unless klass.included_modules.include? Ork::Document
       klass.content_type Serializers::Json.content_type
     end
 
@@ -34,5 +33,7 @@ def self.encryption_config(config = nil)
       Ork::Encryption::Cipher.validate_config @encryption_config = config
     end
 
+    # Errors
+    class MissingConfig < StandardError; end
   end
 end

ork-encryption.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.test_files = Dir['test/*.*']
 
   s.add_runtime_dependency 'riak-client', '~> 1.4'
-  s.add_runtime_dependency 'ork', '~> 0.1', '>= 0.1.3'
+  s.add_runtime_dependency 'ork', '~> 0.1', '>= 0.1.4'
   s.add_development_dependency 'protest', '~> 0'
   s.add_development_dependency 'mocha', '~> 0'
   s.add_development_dependency 'coveralls', '~> 0'

test/encrypt_test.rb

@@ -1,6 +1,5 @@
 require_relative 'helper'
 require 'mocha/api'
-# require 'json'
 
 include(Mocha::API)
 
@@ -20,7 +19,7 @@ class Event
 Protest.describe 'Ork::Encryption' do
   context 'include Ork::Encryption' do
     test 'raise an error if it is not a Ork::Document' do
-      assert_raise Ork::Encryption::NotAnOrkDocument do
+      assert_raise Ork::NotOrkObject do
         class NotADocument
           include Ork::Encryption
         end