almodovar 1.5.5 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a448fa0cdfe039788aceb6f53b3b35031d28abc
-  data.tar.gz: 509dde0cf8288ea98456fb8f5a13d00784298d37
+  metadata.gz: bc546c375c4b0197063352e38e055f4c51366768
+  data.tar.gz: 929c83c4e93004697e980ec92688598c681640ec
 SHA512:
-  metadata.gz: c8b7c9fc75d8ad40f85cd28462cc6cf587b8a777cf1f0475d4099b7cf33d1d39dbd7f86859bd77762f1ef375d3b1cc4ba11acf90f8364584d1baf0352fc9e320
-  data.tar.gz: 14ac57d90bf7534247eeb235a508bcffc9418746ad704bad8c3441cfd7e35ba3c17353aaa9a0903604253d21f3eaee8c01b87d53d3a428fcb0501f09f5ed1f89
+  metadata.gz: 40563773b89f684fc4564c77d436ded0d58e479ecdcb622d5742ce49a430cbea6d1864d634caab50967efd0fb2d35b39c2ac5521652312c200de2c8d87794a12
+  data.tar.gz: b939721c3185ac43dc70b6d667ddfe00552877a7712e4d785876111148962597320893144b458bd35991423d3dcdea435ba6908de93374cee5a66daf0c82f7bb

data/lib/almodovar/errors.rb

@@ -3,10 +3,12 @@ module Almodovar
     attr_reader :response_status, :response_body
 
     # Children of this class must not override the initialize method
-    def initialize(response, url)
+    def initialize(response, url, query_params = {})
       @response_status = response.status
       @response_body = response.body
-      super("Status code #{response.status} on resource #{url}")
+      message = "Status code #{response.status} on resource #{url}"
+      message += " with params: #{query_params.inspect}" if query_params.present?
+      super(message)
     end
   end
 

data/lib/almodovar/http_accessor.rb

@@ -2,17 +2,15 @@ module Almodovar
   module HttpAccessor
     def xml
       @xml ||= begin
-        response = http.get(url_with_params)
-        check_errors(response, url_with_params)
+        response = http.get(@url, query_params)
+        check_errors(response, @url, query_params)
         Nokogiri::XML.parse(response.body).root
       end
     end
 
-    def url_with_params
+    def query_params
       @options[:expand] = @options[:expand].join(",") if @options[:expand].is_a?(Array)
-      params = @options.map { |k, v| "#{k}=#{v}" }.join("&")
-      params = "?#{params}" unless params.empty?
-      @url + params
+      @options
     end
 
     def http
@@ -31,10 +29,10 @@ module Almodovar
       end
     end
 
-    def check_errors(response, url)
+    def check_errors(response, url, query_params = {})
       if response.status >= 400
         http_error_klass = Almodovar::HTTP_ERRORS[response.status] || Almodovar::HttpError
-        raise http_error_klass.new(response, url)
+        raise http_error_klass.new(response, url, query_params)
       end
     end
   end

data/lib/almodovar/http_client.rb

@@ -1,3 +1,4 @@
+require 'addressable/uri'
 require 'httpclient'
 
 module Almodovar
@@ -13,26 +14,26 @@ module Almodovar
              :send_timeout=,
              :receive_timeout=,
              :force_basic_auth=,
-             :to => :client
+             to: :client
 
     def initialize
       @client = HTTPClient.new
     end
 
-    def get(uri, headers = {})
-      request(:get, uri, :headers => merge_headers(headers))
+    def get(uri, query = {}, headers = {})
+      request(:get, uri, query: query, headers: merge_headers(headers))
     end
 
-    def post(uri, data, headers = {})
-      request(:post, uri, :body => data, :headers => merge_headers(headers))
+    def post(uri, data, query = {}, headers = {})
+      request(:post, uri, body: data, query: query, headers: merge_headers(headers))
     end
 
-    def put(uri, data, headers = {})
-      request(:put, uri, :body => data, :headers => merge_headers(headers))
+    def put(uri, data, query = {}, headers = {})
+      request(:put, uri, body: data, query: query, headers: merge_headers(headers))
     end
 
-    def delete(uri, headers = {})
-      request(:delete, uri, :headers => merge_headers(headers))
+    def delete(uri, query = {}, headers = {})
+      request(:delete, uri, query: query, headers: merge_headers(headers))
     end
 
     private
@@ -68,12 +69,18 @@ module Almodovar
     end
 
     def request(method, uri, options = {})
-      uri = URI.parse(URI.escape(URI.unescape(uri)))
+      uri = Addressable::URI.parse(uri)
       if (requires_auth?)
         domain = domain_for(uri)
         set_client_auth(domain)
       end
-      client.request(method, uri, :body => options[:body], :header => options[:headers].stringify_keys || {}, :follow_redirect => true)
+      request_options = {
+        body: options[:body],
+        header: options[:headers].stringify_keys || {},
+        follow_redirect: true
+      }
+      request_options[:query] = options[:query] if options[:query].present?
+      client.request(method, uri, request_options)
     rescue HTTPClient::SendTimeoutError => e
       raise SendTimeoutError.new(e)
     rescue HTTPClient::ReceiveTimeoutError => e

data/lib/almodovar/resource.rb

@@ -5,7 +5,7 @@ module Almodovar
     undef_method :id if instance_methods.include?("id")
     undef_method :type if instance_methods.include?("type")
 
-    delegate :inspect, :to => :get!
+    delegate :inspect, to: :get!
 
     def self.from_xml(xml, auth = nil)
       new(nil, auth, Nokogiri::XML.parse(xml).root)

data/lib/almodovar/resource_collection.rb

@@ -2,10 +2,10 @@ module Almodovar
   class ResourceCollection
     include HttpAccessor
     include Enumerable
-    
+
     PAGINATION_ENTITIES = ["self::total-entries", "self::link[@rel='next']", "self::link[@rel='prev']"].join('|').freeze
 
-    delegate :inspect, :to => :resources
+    delegate :inspect, to: :resources
 
     def initialize(url, auth, xml = nil, options = {})
       @url = url
@@ -13,12 +13,12 @@ module Almodovar
       @xml = xml if options.empty?
       @options = options
     end
-    
+
     def create(attrs = {})
       raise ArgumentError.new("You must specify one only root element which is the type of resource (e.g. `:project => { :name => 'Wadus' }` instead of just `:name => 'Wadus'`)") if attrs.size > 1
       root, body = attrs.first
-      response = http.post(url_with_params, body.to_xml(:root => root, :convert_links => true, :skip_links_one_level => true), "Content-Type" => "application/xml")
-      check_errors(response, url_with_params)
+      response = http.post(@url, body.to_xml(root: root, convert_links: true, skip_links_one_level: true), query_params, { "Content-Type" => "application/xml" })
+      check_errors(response, @url, query_params)
       Resource.new(nil, @auth, Nokogiri::XML.parse(response.body).root)
     end
 
@@ -41,18 +41,18 @@ module Almodovar
     def prev_page
       Resource.new(prev_url, @auth) if prev_url
     end
-    
+
     private
-    
+
     def resources
       @resources ||= begin
         xml.xpath("./*[not(#{PAGINATION_ENTITIES})]").
           map { |subnode| Resource.new(subnode.at_xpath("./link[@rel='self']").try(:[], "href"), @auth, subnode, @options) }
       end
     end
-    
+
     def method_missing(meth, *args, &blk)
       resources.send(meth, *args, &blk)
     end
   end
-end
+end

data/lib/almodovar/single_resource.rb

@@ -15,7 +15,7 @@ module Almodovar
     def update(attrs = {})
       raise ArgumentError.new("You must specify one only root element which is the type of resource (e.g. `:project => { :name => 'Wadus' }` instead of just `:name => 'Wadus'`)") if attrs.size > 1
       root, body = attrs.first
-      response = http.put(@url, body.to_xml(:root => root), "Content-Type" => "application/xml")
+      response = http.put(@url, body.to_xml(root: root), {}, { "Content-Type" => "application/xml" })
       check_errors(response, @url)
       @xml = Nokogiri::XML.parse(response.body).root
     end
@@ -41,7 +41,7 @@ module Almodovar
       end
     end
 
-    delegate :to_xml, :to => :xml
+    delegate :to_xml, to: :xml
     alias_method :inspect, :to_xml
 
     def [](key) # for resources with type "document"

data/lib/almodovar/to_xml.rb

@@ -6,15 +6,15 @@ module Almodovar
 
     def to_xml_with_links(options = {}, &block)
       return to_xml_without_links(options, &block) if !options[:convert_links] || options.delete(:skip_links_one_level)
-      options[:builder].tag!(:link, :rel => options[:root]) do |xml|
-        to_xml_without_links options.merge(:skip_links_one_level => self.is_a?(Array)), &block
+      options[:builder].tag!(:link, rel: options[:root]) do |xml|
+        to_xml_without_links options.merge(skip_links_one_level: self.is_a?(Array)), &block
       end
     end
   end
   
   class Resource
     def to_xml(options = {})
-      options[:builder].tag!(:link, :rel => options[:root], :href => url)
+      options[:builder].tag!(:link, rel: options[:root], href: url)
     end
   end
 end

data/lib/almodovar/version.rb

@@ -1,3 +1,3 @@
 module Almodovar
-  VERSION = '1.5.5'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almodovar
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.6.0
 platform: ruby
 authors:
 - BeBanjo S.L.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: BeBanjo API client