fix: add lazy load hook on client and small fixes

https://jira.railsc.ru/browse/PC4-15271
imhouston · Aug 5, 2015 · eba14a6 · eba14a6
1 parent 015c863
commit eba14a6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/app/models/apress/api/client.rb b/app/models/apress/api/client.rb
@@ -53,6 +53,8 @@ def generate_refresh_token
       def set_refresh_token_expiration
         self.refresh_token_expire_at = Rails.application.config.api[:refresh_token_ttl].from_now
       end
+
+      ActiveSupport.run_load_hooks(:"apress/api/client", self)
     end
   end
 end
diff --git a/apress-api.gemspec b/apress-api.gemspec
@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "rails", ">= 3.1.0"
-  spec.add_runtime_dependency "pg", ">= 0.18.2"
+  spec.add_runtime_dependency "pg", ">= 0.16"
   spec.add_runtime_dependency "api-auth", ">= 1.3.1"
-  spec.add_runtime_dependency "oj", ">= 2.12.10"
+  spec.add_runtime_dependency "oj", ">= 2.9.9"
   spec.add_runtime_dependency "multi_json", ">= 1.11.2"
   spec.add_runtime_dependency "jbuilder", ">= 2.3.1"
   spec.add_runtime_dependency "attr_extras", ">= 4.4.0"

diff --git a/lib/apress/api/api_controller/compatibility.rb b/lib/apress/api/api_controller/compatibility.rb
@@ -30,6 +30,8 @@ def allow_forgery_protection=(*); end
         def helper_method(*); end
 
         def helper(*); end
+
+        def include_all_helpers=(*); end
         # :nocov:
       end
     end

diff --git a/lib/apress/api/api_controller/rescue.rb b/lib/apress/api/api_controller/rescue.rb
@@ -5,7 +5,7 @@ module Rescue
         extend ActiveSupport::Concern
 
         included do
-          rescue_from "Exception", :server_error if Rails.env.production?
+          rescue_from "Exception", with: :server_error if Rails.env.production?
 
           rescue_from(
             "ActiveRecord::RecordNotFound",