oop_rails_server 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f07bd13a4e1384b5c4aaead8af1b980892fa6de8
-  data.tar.gz: 2d8a3a3a3af8fd99a6247bafcf9d4af731a1c583
+  metadata.gz: 140913824859d2e60dac03fd6dcf65dea5a08583
+  data.tar.gz: 5f2868f6c2eb0c022e58a8662482df1a977999dd
 SHA512:
-  metadata.gz: 96d680a1199a5aa1eb124e1ea2bbc2efbec0c7ccd85a0e76f6e10d79ec4c1fb2a3f32f0e4a769eb96274700fe4a8040a0052c48d01b364bdb716e27737f0eb61
-  data.tar.gz: f9302281fcb1216edaf939e2dab8c6341f468f0272130ab1c9817ec5c5e8c2ad7e32055a5fccb3083be0a92fe9e6c956f2e1ba273d1522c2ef79b5072a995a0d
+  metadata.gz: b7571e1382081033e21809caff1f082d7b72137c752063e99a008470b57c47c6e5b4f57f393dd422232561a20026cadca1ad0e8717ffd0fb45de4ec0014a255f
+  data.tar.gz: ae4e5afc2c61b4154833537c1c2e4c49993165343101bc67fea02d4d9a2954e015ddfe088df8023eaa662fd5e648410ef1ea8dc9beb3f017d33e7a157cde9c87

data/CHANGES.md

@@ -1,5 +1,10 @@
 # `oop_rails_server` Releases
 
+## 0.0.20, 27 September 2016
+
+* If exceptions have a `cause`, nest that inside the JSON returned on error.
+* Pass 'Accept: text/html' by default when fetching from a Rails server, unless specified otherwise.
+
 ## 0.0.19, 20 September 2016
 
 * Significant internal refactor to how Gemfiles get modified that's much more reliable; changes

data/lib/oop_rails_server/helpers.rb

@@ -58,6 +58,8 @@ module OopRailsServer
       expect(json['exception']).to be
       expect(json['exception']['class']).to eq(class_name.to_s)
       expect(json['exception']['message']).to match(message)
+
+      json
     end
 
     def rails_template_name

data/lib/oop_rails_server/rails_server.rb

@@ -94,11 +94,16 @@ module OopRailsServer
     end
 
     def get_response(path_or_uri, options = { })
-      options.assert_valid_keys(:ignore_status_code, :nil_on_not_found, :query, :no_layout)
+      options.assert_valid_keys(:ignore_status_code, :nil_on_not_found, :query, :no_layout, :accept_header)
 
       uri = uri_for(path_or_uri, options[:query])
-      # say "[fetch '#{uri}']"
-      data = Net::HTTP.get_response(uri)
+      data = nil
+      accept_header = options.fetch(:accept_header, 'text/html')
+      Net::HTTP.start(uri.host, uri.port) do |http|
+        request = Net::HTTP::Get.new(uri)
+        request['Accept'] = accept_header if accept_header
+        data = http.request(request)
+      end
 
       if (data.code.to_s != '200')
         if options[:ignore_status_code]
@@ -106,7 +111,7 @@ module OopRailsServer
         elsif options[:nil_on_not_found]
           data = nil
         else
-          raise "'#{uri}' returned #{data.code.inspect}, not 200; body was: #{data.body.strip}"
+          raise "'#{uri}' returned #{data.code.inspect}, not 200; body was: #{data.body.inspect}"
         end
       end
       data

data/lib/oop_rails_server/version.rb

@@ -1,3 +1,3 @@
 module OopRailsServer
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/templates/oop_rails_server_base/app/controllers/application_controller.rb

@@ -5,11 +5,22 @@ class ApplicationController < ActionController::Base
 
   rescue_from Exception do |exception|
     render :json => {
-      :exception => {
-        :class => exception.class.name,
-        :message => exception.message,
-        :backtrace => exception.backtrace
-      }
+      :exception => exception_to_hash(exception)
     }
   end
+
+  private
+  def exception_to_hash(exception)
+    out = {
+      :class => exception.class.name,
+      :message => exception.message,
+      :backtrace => exception.backtrace
+    }
+
+    if exception.cause && (! exception.cause.equal?(exception))
+      out[:cause] = exception_to_hash(exception.cause)
+    end
+
+    out
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oop_rails_server
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Andrew Geweke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-20 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json