ey-core 3.1.4 → 3.1.5

data/lib/ey-core/client/mock.rb

@@ -108,6 +108,7 @@ class Ey::Core::Client::Mock
                {
                  :account_referrals           => {},
                  :accounts                    => {},
+                 :account_trials              => {},
                  :addons                      => {},
                  :addresses                   => {},
                  :agents                      => {},
@@ -205,6 +206,14 @@ class Ey::Core::Client::Mock
                             found
                           end
 
+        @current_user ||= begin
+                            _,token = self.data[:tokens].detect{|k,v| v["auth_id"] == options[:token]}
+                            if token
+                              user_id = token["on_behalf_of"].split("/").last
+                              self.data[:users][user_id]
+                            end
+                          end
+
         # FIXME(rs) get rid of this and the implicit Josh Lane creation entirely
         @current_user ||= begin
                             _,found = self.data[:users].detect{|k,v| v["email"] == "jlane@engineyard.com"}

data/lib/ey-core/requests/get_account_trial.rb

@@ -14,13 +14,14 @@ class Ey::Core::Client
 
       find(:accounts, account_id)
 
-      resource = {
+      resource = self.data[:account_trials][account_id]
+      resource ||= {
         "id"         => Cistern::Mock.random_numbers(4),
         "duration"   => 500,
         "used"       => 30,
         "created_at" => Time.now.to_s,
-        "account"    => url_for("/accounts/#{account_id}")
       }
+      resource["account"] = url_for("/accounts/#{account_id}")
 
       response(
         :body   => {"account_trial" => resource},

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.1.4"
+    VERSION = "3.1.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable