From 56ae62e8478abf3ed0e1b4fdceb1ead9319e71a1 Mon Sep 17 00:00:00 2001
From: eMancu <emiliano.mancuso@gmail.com>
Date: Mon, 17 Feb 2014 10:42:39 -0300
Subject: [PATCH 1/2] Update Ork gem to version 0.1.4

---
 .gems                  | 2 +-
 ork-encryption.gemspec | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gems b/.gems
index be20815..618a755 100644
--- a/.gems
+++ b/.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
diff --git a/ork-encryption.gemspec b/ork-encryption.gemspec
index e4c44f0..eb443d5 100644
--- a/ork-encryption.gemspec
+++ b/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'

From 6bcc7370446dd01015dad46fa008fa273664c9f9 Mon Sep 17 00:00:00 2001
From: eMancu <emiliano.mancuso@gmail.com>
Date: Mon, 17 Feb 2014 10:43:33 -0300
Subject: [PATCH 2/2] Update error classes

---
 lib/ork/encryption.rb | 5 +++--
 lib/ork/errors.rb     | 8 --------
 test/encrypt_test.rb  | 3 +--
 3 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 lib/ork/errors.rb

diff --git a/lib/ork/encryption.rb b/lib/ork/encryption.rb
index 55acb11..27d8a06 100644
--- a/lib/ork/encryption.rb
+++ b/lib/ork/encryption.rb
@@ -1,5 +1,4 @@
 require_relative 'cipher'
-require_relative 'errors'
 require_relative 'serializers/json'
 
 module Ork
@@ -7,7 +6,7 @@ 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
diff --git a/lib/ork/errors.rb b/lib/ork/errors.rb
deleted file mode 100644
index 9186448..0000000
--- a/lib/ork/errors.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-module Ork
-  module Encryption
-
-    class NotAnOrkDocument < StandardError; end
-    class MissingConfig < StandardError; end
-  end
-end
-
diff --git a/test/encrypt_test.rb b/test/encrypt_test.rb
index fd42ee3..16386e2 100644
--- a/test/encrypt_test.rb
+++ b/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