copy_tuner_client 0.1.1.beta16 → 0.1.1.beta17

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    copy_tuner_client (0.1.1.beta16)
+    copy_tuner_client (0.1.1.beta17)
       i18n (>= 0.5.0)
       json
 
@@ -70,7 +70,7 @@ GEM
       multi_json (~> 1.3)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)

data/lib/copy_tuner_client/copyray_middleware.rb

@@ -8,12 +8,21 @@ module CopyTunerClient
 
     def call(env)
       status, headers, response = @app.call(env)
-      if should_inject_xray?(status, headers, response)
-        body = append_css!(response)
+      if html_headers?(status, headers) && body = response_body(response)
+        body = append_css!(body)
         body = append_js!(body)
-        headers['Content-Length'] = body.bytesize.to_s
+        content_length = body.bytesize.to_s
+        if ActionDispatch::Response === response
+          response.body = [body]
+          response.headers['Content-Length'] = content_length
+          response.to_a
+        else
+          headers['Content-Length'] = content_length
+          [status, headers, [body]]
+        end
+      else
+        [status, headers, response]
       end
-      [status, headers, (body ? [body] : response)]
     end
 
     private
@@ -22,8 +31,8 @@ module CopyTunerClient
       ActionController::Base.helpers
     end
 
-    def append_css!(response)
-      response.body.sub(/<body[^>]*>/) { "#{$~}\n#{css_tag}" }
+    def append_css!(html)
+      html.sub(/<body[^>]*>/) { "#{$~}\n#{css_tag}" }
     end
 
     def append_js!(html)
@@ -47,37 +56,20 @@ module CopyTunerClient
       helpers.stylesheet_link_tag :copyray
     end
 
-    def should_inject_xray?(status, headers, response)
-      status == 200 &&
-      html_request?(headers, response) &&
-      !empty?(response) &&
-      !file?(headers) &&
-      !response.body.frozen?
-    end
-
-    def empty?(response)
-      # response may be ["Not Found"], ["Move Permanently"], etc.
-      (response.is_a?(Array) && response.size <= 1) ||
-        !response.respond_to?(:body) || response.body.empty?
-    end
-
     def file?(headers)
       headers["Content-Transfer-Encoding"] == "binary"
     end
 
-    def html_request?(headers, response)
+    def html_headers?(status, headers)
+      status == 200 &&
       headers['Content-Type'] &&
       headers['Content-Type'].include?('text/html') &&
-      response_body(response).include?("<html")
+      !file?(headers)
     end
 
     def response_body(response)
       body = ''
-      if response.is_a?(Array)
-        response.each { |s| body << s }
-      else
-        body = response
-      end
+      response.each { |s| body << s.to_s }
       body
     end
   end

data/lib/copy_tuner_client/version.rb

@@ -1,6 +1,6 @@
 module CopyTunerClient
   # Client version
-  VERSION = '0.1.1.beta16'
+  VERSION = '0.1.1.beta17'
 
   # API version being used to communicate with the server
   API_VERSION = '2.0'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1.beta16
+  version: 0.1.1.beta17
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1380294734623962063
+      hash: -4147796897350930747
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: