4 files changed, 8 insertions, 18 deletions
diff --git a/lib/evernote/client.rb b/lib/evernote/client.rb
index e6962dc..1522d59 100644
--- a/lib/evernote/client.rb
+++ b/lib/evernote/client.rb
@@ -1,7 +1,6 @@
-require 'forwardable'
-
 module Evernote
   class Client
+    attr_reader :client
 
     THRIFT_DEFAULTS = {
       :transport => Thrift::HTTPClientTransport
@@ -11,9 +10,5 @@ module Evernote
       thrift_opts = THRIFT_DEFAULTS.merge(thrift_client_options)
       @client = ThriftClient.new(klass, url, thrift_opts)
     end
-
-    def method_missing(name, *args, &block)
-      @client.send(name, *args, &block)
-    end
   end
 end
diff --git a/lib/evernote/user_store.rb b/lib/evernote/user_store.rb
index 2b60756..b9ccc17 100644
--- a/lib/evernote/user_store.rb
+++ b/lib/evernote/user_store.rb
@@ -25,7 +25,11 @@ module Evernote
     end
 
     def version_valid?
-      @client.checkVersion("Ruby EDAMTest", Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR, Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
+      checkVersion("Ruby EDAMTest", Evernote::EDAM::UserStore::EDAM_VERSION_MAJOR, Evernote::EDAM::UserStore::EDAM_VERSION_MINOR)
+    end
+
+    def method_missing(name, *args, &block)
+      @client.client.send(name, *args, &block)
     end
   end
 end
diff --git a/spec/evernote/client_spec.rb b/spec/evernote/client_spec.rb
index 2a75a74..5d3d08c 100644
--- a/spec/evernote/client_spec.rb
+++ b/spec/evernote/client_spec.rb
@@ -8,13 +8,4 @@ describe "Evernote::Client" do
     
     Evernote::Client.new(klass, "https://www.example.com")
   end
-
-  it "delegates method calls to the underlying ThriftClient" do
-    client = Evernote::Client.new(Evernote::EDAM::UserStore::UserStore::Client, "https://www.example.com")
-    internal_client = client.instance_variable_get(:@client)
-    internal_client.stub(:checkVersion)
-    internal_client.should_receive(:checkVersion)
-
-    client.checkVersion
-  end
 end
diff --git a/spec/evernote/user_store_spec.rb b/spec/evernote/user_store_spec.rb
index 6196ffe..7b0127e 100644
--- a/spec/evernote/user_store_spec.rb
+++ b/spec/evernote/user_store_spec.rb
@@ -7,14 +7,14 @@ describe "Evernote::UserStore" do
   end
 
   it "initializes an Evernote::Client and validate the client code version" do
-    client = mock("client", :checkVersion => true)
+    client = mock("Evernote::Client", :client => mock("ThriftClient", :checkVersion => true))
     Evernote::Client.should_receive(:new).with(Evernote::EDAM::UserStore::UserStore::Client, "https://sandbox.evernote.com/edam/user", {}).and_return(client)
 
     Evernote::UserStore.new("https://sandbox.evernote.com/edam/user", @opts, @thrift_client_opts)
   end
 
   it "should raise an error on init if the version is not up to date" do
-    client = mock("client", :checkVersion => false)
+    client = mock("Evernote::Client", :client => mock("ThriftClient", :checkVersion => false))
     Evernote::Client.should_receive(:new).with(Evernote::EDAM::UserStore::UserStore::Client, "https://sandbox.evernote.com/edam/user", {}).and_return(client)
 
     lambda {