diff options
| author | Luc Donnet | 2015-05-04 21:44:06 +0200 | 
|---|---|---|
| committer | Luc Donnet | 2015-05-04 21:44:06 +0200 | 
| commit | 1d62f2651f12e551d5ee514c00c512ed3a2ef06a (patch) | |
| tree | 1832f96bf3a3884e1d69f2ee9bb3028416d29703 /lib | |
| parent | 57512d0919a8305853434c2aa497f71f5622ae17 (diff) | |
| download | chouette-core-1d62f2651f12e551d5ee514c00c512ed3a2ef06a.tar.bz2 | |
Fix iev serializer
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ievkit/client.rb | 6 | ||||
| -rw-r--r-- | lib/ievkit/client/jobs.rb | 2 | ||||
| -rw-r--r-- | lib/ievkit/default.rb | 2 | ||||
| -rw-r--r-- | lib/ievkit/serializer.rb | 2 | 
4 files changed, 5 insertions, 7 deletions
| diff --git a/lib/ievkit/client.rb b/lib/ievkit/client.rb index 5df3ca1d2..137a7d47c 100644 --- a/lib/ievkit/client.rb +++ b/lib/ievkit/client.rb @@ -149,10 +149,8 @@ module Ievkit      # Hypermedia agent for the Iev API      #      # @return [Sawyer::Agent] -    def multipart_agent -      sawyer_options[:serializer] = Ievkit::Serializer.multipart -       -      @agent ||= Sawyer::Agent.new(api_endpoint, sawyer_options) do |http| +    def multipart_agent       +      @multipart_agent ||= Sawyer::Agent.new(api_endpoint, sawyer_options.merge({ :serializer => Ievkit::Serializer.multipart}) ) do |http|          http.headers[:accept] = default_media_type          http.headers[:content_type] = "multipart/form-data"          http.headers[:user_agent] = user_agent diff --git a/lib/ievkit/client/jobs.rb b/lib/ievkit/client/jobs.rb index 09bb8ff4b..91cd860bf 100644 --- a/lib/ievkit/client/jobs.rb +++ b/lib/ievkit/client/jobs.rb @@ -52,7 +52,7 @@ module Ievkit        # @return [Boolean] Success        # @example        #   client.delete_jobs("test") -      def delete_jobs(referential) +      def delete_jobs(referential, options = {})          boolean_from_response :delete, "referentials/#{referential}/jobs", options        end diff --git a/lib/ievkit/default.rb b/lib/ievkit/default.rb index fff1c1d50..b68befe0d 100644 --- a/lib/ievkit/default.rb +++ b/lib/ievkit/default.rb @@ -27,7 +27,7 @@ module Ievkit      # Default Faraday middleware stack      MIDDLEWARE = RACK_BUILDER_CLASS.new do |builder|                          builder.use Faraday::Request::Multipart -      builder.use Faraday::Request::UrlEncoded +              builder.use Ievkit::Response::RaiseError        builder.use FaradayMiddleware::FollowRedirects        builder.use Faraday::Response::Logger diff --git a/lib/ievkit/serializer.rb b/lib/ievkit/serializer.rb index a0475cee5..cc22dd86f 100644 --- a/lib/ievkit/serializer.rb +++ b/lib/ievkit/serializer.rb @@ -61,7 +61,7 @@ module Ievkit      #      # Returns an encoded String.      def encode(data) -      data #@dump.call(encode_object(data)) +      @dump.call(encode_object(data))      end      alias dump encode | 
