rocket_pants 1.6.0.rc1 → 1.6.1

data/lib/rocket_pants.rb

@@ -38,10 +38,11 @@ module RocketPants
   autoload :FormatVerification, 'rocket_pants/controller/format_verification'
   autoload :UrlFor,             'rocket_pants/controller/url_for'
 
-  mattr_accessor :caching_enabled, :header_metadata
+  mattr_accessor :caching_enabled, :header_metadata, :serializers_enabled
 
-  self.caching_enabled = false
-  self.header_metadata = false
+  self.caching_enabled     = false
+  self.header_metadata     = false
+  self.serializers_enabled = true
 
   mattr_writer :cache
 
@@ -54,8 +55,9 @@ module RocketPants
   end
 
   class << self
-    alias caching_enabled? caching_enabled
-    alias header_metadata? header_metadata
+    alias caching_enabled?     caching_enabled
+    alias header_metadata?     header_metadata
+    alias serializers_enabled? serializers_enabled
 
     def cache
       @@cache ||= (MONETA_LEGACY ? Moneta::Memory : Moneta::Adapters::Memory).new
@@ -70,6 +72,16 @@ module RocketPants
       @@env = value
     end
 
+    def show_exception_message?
+      @@show_exception_message = default_show_exception_message if !defined?(@@show_exception_message) || @@show_exception_message.nil?
+      @@show_exception_message
+    end
+    alias show_exception_message show_exception_message?
+
+    def show_exception_message=(value)
+      @@show_exception_message = value
+    end
+
     def default_env
       env = Rails.env.to_s if defined?(Rails.env)
       env ||= ENV['RAILS_ENV'].presence || ENV['RACK_ENV'].presence || "development"
@@ -80,6 +92,10 @@ module RocketPants
       env.development? || env.test?
     end
 
+    def default_show_exception_message
+      env.development? || env.test?
+    end
+
     def pass_through_errors
       if defined?(@@pass_through_errors) && [true, false].include?(@@pass_through_errors)
         @@pass_through_errors

data/lib/rocket_pants/controller/error_handling.rb

@@ -53,11 +53,19 @@ module RocketPants
     def lookup_error_message(exception)
       # TODO: Add in notification hooks for non-standard exceptions.
       name    = lookup_error_name(exception)
-      message = (exception.message == exception.class.name) ? 'An unknown error has occurred.' : exception.message
+      message = default_message_for_exception exception
       context = lookup_error_context(exception).reverse_merge(:scope => :"rocket_pants.errors", :default => message)
       I18n.t name, context.except(:metadata)
     end
 
+    def default_message_for_exception(exception)
+      if !RocketPants.show_exception_message? || exception.message == exception.class.name
+        'An unknown error has occurred.'
+      else
+        exception.message
+      end
+    end
+
     # Lookup error name will automatically handle translating errors to a
     # simpler, symbol representation. It's implemented like this to make it
     # possible to override to a simple format.

data/lib/rocket_pants/controller/instrumentation.rb

@@ -5,7 +5,7 @@ module RocketPants
   module Instrumentation
     extend  ActiveSupport::Concern
     include AbstractController::Logger
-    
+
     def process_action(action, *args)
       raw_payload = {
         :controller => self.class.name,
@@ -24,7 +24,7 @@ module RocketPants
         result
       end
     end
-    
+
   end
   ActionController::LogSubscriber.attach_to :rocket_pants
 end

data/lib/rocket_pants/controller/respondable.rb

@@ -69,6 +69,7 @@ module RocketPants
     end
 
     def self.normalise_to_serializer(object, options)
+      return object unless RocketPants.serializers_enabled?
       serializer = options.delete(:serializer)
       serializer = object.active_model_serializer if object.respond_to?(:active_model_serializer) && serializer.nil?
       return object unless serializer

data/lib/rocket_pants/railtie.rb

@@ -5,6 +5,7 @@ module RocketPants
     config.rocket_pants.use_caching         = nil
     config.rocket_pants.header_metadata     = nil
     config.rocket_pants.pass_through_errors = nil
+    config.rocket_pants.pass_through_errors = nil
 
     config.i18n.railties_load_path << File.expand_path('../locale/en.yml', __FILE__)
 
@@ -13,11 +14,13 @@ module RocketPants
     end
 
     initializer "rocket_pants.configuration" do |app|
-      rp_config                       = app.config.rocket_pants
-      rp_config.use_caching           = Rails.env.production? if rp_config.use_caching.nil?
-      RocketPants.caching_enabled     = rp_config.use_caching
-      RocketPants.header_metadata     = rp_config.header_metadata unless rp_config.header_metadata.nil?
-      RocketPants.pass_through_errors = rp_config.pass_through_errors unless rp_config.pass_through_errors.nil?
+      rp_config                          = app.config.rocket_pants
+      rp_config.use_caching              = Rails.env.production? if rp_config.use_caching.nil?
+      RocketPants.caching_enabled        = rp_config.use_caching
+      RocketPants.header_metadata        = rp_config.header_metadata unless rp_config.header_metadata.nil?
+      RocketPants.serializers_enabled    = rp_config.serializers_enabled unless rp_config.serializers_enabled.nil?
+      RocketPants.show_exception_message = rp_config.show_exception_message unless rp_config.show_exception_message.nil?
+      RocketPants.pass_through_errors    = rp_config.pass_through_errors unless rp_config.pass_through_errors.nil?
       # Set the rocket pants cache if present.
       RocketPants.cache = rp_config.cache if rp_config.cache
     end

metadata

@@ -1,248 +1,209 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rocket_pants
-version: !ruby/object:Gem::Version
-  version: 1.6.0.rc1
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 6
+  - 1
+  version: 1.6.1
 platform: ruby
-authors:
+authors: 
 - Darcy Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-02 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-24 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: railties
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: will_paginate
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: hashie
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: api_smith
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: moneta
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 4
+        version: "2.4"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: reversible_data
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        version: "1.0"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: kaminari
   prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-description: Rocket Pants adds JSON API love to Rails and ActionController, making
-  it simpler to build API-oriented controllers.
-email:
+  version_requirements: *id014
+description: Rocket Pants adds JSON API love to Rails and ActionController, making it simpler to build API-oriented controllers.
+email: 
 - sutto@sutto.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/rocket_pants/active_record.rb
 - lib/rocket_pants/base.rb
 - lib/rocket_pants/cache_middleware.rb
@@ -268,28 +229,37 @@ files:
 - lib/rocket_pants/tasks/rocket_pants.rake
 - lib/rocket_pants/test_helper.rb
 - lib/rocket_pants.rb
+has_rdoc: true
 homepage: http://github.com/filtersquad
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-  none: false
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
-  none: false
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: JSON API love for Rails and ActionController
 test_files: []
+