lib/open311/client/connection.rb in open311-0.2.3 vs lib/open311/client/connection.rb in open311-0.3.0

@@ -1,33 +1,31 @@
 require 'faraday_middleware'
-require 'faraday/response/raise_error'
+require 'open311/response/raise_error'
 
 module Open311
   class Client
     # @private
     module Connection
-      private
+    private
 
-      def connection(raw=false)
-        options = {
+      def options
+        {
           # :headers => {'Accept' => "*/#{format}", 'User-Agent' => user_agent},
-          :proxy => proxy,
-          :ssl => {:verify => false},
-          :url => endpoint
+          proxy: proxy,
+          ssl: {verify: false},
+          url: endpoint,
         }
+      end
 
+      def connection
         Faraday.new(options) do |connection|
           connection.use Faraday::Request::Multipart
-          unless raw
-            connection.use Faraday::Response::Mashify
-            case format.to_s.downcase
-            when 'json'
-              connection.use Faraday::Response::ParseJson
-            when 'xml'
-              connection.use Faraday::Response::ParseXml
-            end
+          connection.use Faraday::Response::Mashify
+          case format.to_s.downcase
+          when 'json' then connection.use Faraday::Response::ParseJson
+          when 'xml' then connection.use Faraday::Response::ParseXml
           end
-          connection.use Faraday::Response::RaiseError
+          connection.use Open311::Response::RaiseError
           connection.adapter(adapter)
         end
       end
     end
   end