restful_json 3.4.0 → 3.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjgzMjdmNjljNDk3NmVjMGY1MGY4ZWIxMTdhNzQ5OTM1MTA5YTJkYQ==
+    OTc4OTM4YTFiYWVhNjNjM2RkZTI4ZDY4YmFjZDBiOWIwM2EwOWZhOA==
   data.tar.gz: !binary |-
-    ODgwNzg5ODUwMTQwNjBhOTIyZjNlNDNlY2U0ZWY1ZDYxNjE5NmU5Mw==
+    YmIzYWYzMDZlNTNiM2YzMThjNmYzYjA5ZDI5MDJhOGI5ZjkwODQ4Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGYwZjQ5ZjljOWJmZTUzN2RlYTM0OGNmNGI5ZDViNDIzNDMxOTFlNjQ5YmMx
-    NzY5MTdhMzk0YmQ0MGNmZmJkMjQwMDMwNGYzYjllNDg0OWM3Y2ZmZjkyMDI2
-    NjVlN2ZhMTRhMTljZGE3NWI3YzNjYWYxMjBhODhlNTk3MTYwZmQ=
+    MTRhZDlmN2Q3Zjk4MmYxZjE4ZTg1MWRhNDU3Yjc3ZGE3NDZjZTJmNjc5OTBi
+    MzMwZTBjMjFlYjZlMTNiNzhiOWYyNTIzNGI4ZjY4NGRmYzVkYjcyOThiNmI0
+    N2YxNzhjYmRiYTJjYTkxNjIwZDI1YmE3MzQxNTZlMjI3ZGFjZWY=
   data.tar.gz: !binary |-
-    YTVjM2YyNjNhYjAyMDdiMzM3M2JlNGExMWYwODRjYWExZGM5NWQxZDU1MmM5
-    NzAyYTU3MjY3MWFiYzM1NjYzYTUyNTlmNWRjNjEzODljYzNkZmU4NzRkYTI1
-    MDE1MTFkNGYxMDNiZDc1ZWU5ZTc0YjYzZDk2MzczNDVlMmU2MDE=
+    OWVmZmQ1ODExODFiMmQ2ZTY4ZDc3NmYyMzAwYzM0MzU3M2E2Y2M4MzViZDNl
+    MTU1MGM0YTM1NjBhZjQ2ZDZmYmNmNTI3YmUzZWU2YzFkMjY5NjY2MzRmMTA0
+    NjM5NTEzYWRjOTZhNDhmMTYxNWYyM2ExZDkxYmEwNzhlMDU4ZTI=

data/README.md

@@ -1,6 +1,6 @@
 # Restful JSON [![Build Status](https://secure.travis-ci.org/rubyservices/restful_json.png?branch=master)](http://travis-ci.org/rubyservices/restful_json)
 
-Develop declarative, featureful JSON RESTful-ish service controllers to use with modern Javascript MVC frameworks like AngularJS, Ember, etc. with much less code.
+Develop declarative, featureful RESTful-ish JSON service controllers to use with modern Javascript MVC frameworks like AngularJS, Ember, etc. with much less code. (I say "RESTful-ish" instead of RESTful, to differentiate them from true-REST, hypermedia-driven projects, but restful_json controllers are RESTful by the existing Rails definition of being RESTful, using the same actions and resourceful routes, but with more abilities.)
 
 What does that mean? It means you typically won't have to write index, create, update, destroy, etc. methods in your controllers to filter, sort, and do complex queries.
 
@@ -26,16 +26,16 @@ An example app using an older version of restful_json with AngularJS is [employe
 
 In your Rails app's `Gemfile`:
 
-    gem 'restful_json', '~> 3.3.0'
+    gem 'restful_json', '~> 3.4.0'
 
 And if you go with the defaults to use ActiveModel::Serializers and Permitters (using Strong Parameters and Cancan):
 
     # comment this out if you don't want to use Strong Parameters or Permitters, or if you are using Rails 4, which includes it
-    gem 'strong_parameters', '~> 0.1.6'
+    gem 'strong_parameters', '~> 0.2.0'
     # comment this out if you don't plan to use Permitters
-    gem 'cancan', '~> 1.6.8'
+    gem 'cancan', '~> 1.6.9'
     # comment this out if you don't plan to use ActiveModel::Serializers
-    gem 'active_model_serializers', '~> 0.6.0'
+    gem 'active_model_serializers', '~> 0.7.0'
     
 Then:
 

data/lib/restful_json/config.rb

@@ -36,11 +36,24 @@ RestfulJson.configure do
   self.return_error_data = true
   # Set to nil to reraise StandardError in rescue vs. calling render_error(e) to render using restful_json
   self.rescue_class = StandardError
-  # Ordered array of handlers to handle rescue of self.rescue_class or sub types. Can use optional i18n_key for message, but will default to e.message if not found.
-  # Eventually may support [DataMapper::ObjectNotFoundError], [MongoMapper::DocumentNotFound], etc.
-  # If no exception_classes or exception_ancestor_classes provided, it will always match self.rescue_class.
-  self.rescue_handlers = [
-    {exception_classes: [ActiveRecord::RecordNotFound], status: :not_found, i18n_key: 'api.not_found'.freeze},
-    {status: :internal_server_error, i18n_key: 'api.internal_server_error'.freeze}
-  ]
+  self.rescue_handlers = []
+  # support 404 error for ActiveRecord::RecordNotFound if using ActiveRecord
+  # errors not loaded yet, so we need to try to require
+  begin
+    require 'active_record/errors'
+    RestfulJson.configure do
+      # Ordered array of handlers to handle rescue of self.rescue_class or sub types. Can use optional i18n_key for message, but will default to e.message if not found.
+      # Eventually may support [DataMapper::ObjectNotFoundError], [MongoMapper::DocumentNotFound], etc.
+      # If no exception_classes or exception_ancestor_classes provided, it will always match self.rescue_class.
+      # Important note: if you specify classes in your configuration, do not specify as strings unless the RestfulJson railtie
+      # will have a chance to convert it to constants/class objects. See railtie for more info.
+      self.rescue_handlers = [
+        {exception_classes: [ActiveRecord::RecordNotFound], status: :not_found, i18n_key: 'api.not_found'.freeze},
+      ]
+    end
+  rescue LoadError, NameError
+  end
+
+  # add default 500 errors last
+  self.rescue_handlers << {status: :internal_server_error, i18n_key: 'api.internal_server_error'.freeze}
 end

data/lib/restful_json/controller.rb

@@ -1,9 +1,3 @@
-#require 'restful_json/config'
-#require 'twinturbo/controller'
-#require 'active_model_serializers'
-#require 'strong_parameters'
-#require 'cancan'
-
 # The restful_json controller module. This module (RestfulJson::Controller) is included on ActionController
 # and then each individual controller should call acts_as_restful_json.
 #
@@ -197,12 +191,6 @@ module RestfulJson
       value && NILS.include?(value) ? nil : value
     end
 
-    def safe_i18n_t(i18n_key)
-      I18n.t(i18n_key)
-    rescue => e
-      logger.debug "failed to get i18n message for #{i18n_key.inspect}: #{e.message}\n#{e.backtrace.join('\n')}" if self.debug
-    end
-
     # Returns self.return_error_data by default. To only return error_data in dev and test, use this:
     # `def enable_long_error?; Rails.env.development? || Rails.env.test?; end`
     def include_error_data?
@@ -254,17 +242,17 @@ module RestfulJson
     # It handles any format in theory that is supported by respond_to and has a `to_(some format)` method.
     def render_error(e, handling_data)
       i18n_key = handling_data[:i18n_key]
-      msg = i18n_key ? safe_i18n_t(i18n_key) : e.message
+      msg = result = t(i18n_key, default: e.message)
       status = handling_data[:status] || :internal_server_error
       if include_error_data?
         respond_to do |format|
           format.html { render notice: msg }
-          format.any { render request.format.to_sym => {:status => status, error: msg, error_data: {type: e.class.name, message: e.message, trace: Rails.backtrace_cleaner.clean(e.backtrace)}}, status: status }
+          format.any { render request.format.to_sym => {status: status, error: msg, error_data: {type: e.class.name, message: e.message, trace: Rails.backtrace_cleaner.clean(e.backtrace)}}, status: status }
         end
       else
         respond_to do |format|
           format.html { render notice: msg }
-          format.any { render request.format.to_sym => {:status => status, error: msg}, status: status }
+          format.any { render request.format.to_sym => {status: status, error: msg}, status: status }
         end
       end
       # return exception so we know it was handled
@@ -276,7 +264,7 @@ module RestfulJson
         # 404/not found is just for update (not destroy, because idempotent destroy = no 404)
         if success_code == :not_found
           respond_to do |format|
-            format.html { render :file => "#{Rails.root}/public/404.html", :status => :not_found }
+            format.html { render file: "#{Rails.root}/public/404.html", status: :not_found }
             format.any  { head :not_found }
           end
         elsif !@value.nil? && ((read_only_action && RestfulJson.return_resource) || RestfulJson.avoid_respond_with)

data/lib/restful_json/railtie.rb

@@ -3,9 +3,17 @@ require 'restful_json'
 module RestfulJson
   class Railtie < ::Rails::Railtie
     initializer "restful_json.action_controller" do
+      # provide deprecated acts_as_restful_json method on controller
       ActiveSupport.on_load(:action_controller) do
         include ::RestfulJson::BaseController
       end
     end
+
+    #TODO: split permitters out into their own gem, and then can always add to autoload path if gem loaded
+    initializer "restful_json.autoload_paths", after: :load_config_initializers do
+      if RestfulJson.use_permitters
+        ActiveSupport::Dependencies.autoload_paths << "#{Rails.root}/app/permitters" unless ActiveSupport::Dependencies.autoload_paths.include?("#{Rails.root}/app/permitters")
+      end
+    end
   end
 end

data/lib/restful_json/version.rb

@@ -1,3 +1,3 @@
 module RestfulJson
-  VERSION = '3.4.0'
+  VERSION = '3.4.1'
 end

data/lib/restful_json.rb

@@ -5,5 +5,4 @@ require 'twinturbo/controller'
 require 'restful_json/base_controller'
 require 'restful_json/controller'
 require 'restful_json/default_controller'
-
-ActiveSupport::Dependencies.autoload_paths << "#{Rails.root}/app/permitters" unless ActiveSupport::Dependencies.autoload_paths.include?("#{Rails.root}/app/permitters")
+require 'restful_json/railtie' if defined? ::Rails::Railtie

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_json
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Gary S. Weaver
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement