kauplus 0.1.1 → 0.1.2

data/lib/kauplus.rb

@@ -2,8 +2,9 @@ require 'kauplus/api'
 require 'kauplus/client'
 require 'kauplus/config'
 require 'kauplus/constants'
+require 'kauplus/params'
 require 'kauplus/error'
-require "kauplus/version"
+require 'kauplus/version'
 
 module Kauplus
 end

data/lib/kauplus/client.rb

@@ -45,15 +45,7 @@ module Kauplus
     # and parses the json response.
     #
     def self.post(resource_method, payload)
-      parse_json RestClient.post(url_for_resource_method(resource_method), payload.to_query)
-    end
-    
-    #
-    # Sends an HTTP MULTIPART POST Request to the Kauplus Web Services
-    # and parses the json response.
-    #
-    def self.multipart_post(resource_method, payload)
-      self.post(resource_method, payload.merge(:multipart => true))
+      parse_json RestClient.post(url_for_resource_method(resource_method), Params.generate(payload))        
     end
 
     #
@@ -61,7 +53,7 @@ module Kauplus
     # and parses the json response.
     #
     def self.put(resource_method, payload)
-      parse_json RestClient.put(url_for_resource_method(resource_method), payload.to_query)
+      parse_json RestClient.put(url_for_resource_method(resource_method), Params.generate(payload))
     end
 
     #
@@ -96,7 +88,7 @@ module Kauplus
     # Returns the URL for consuming a specific resource_method.
     #
     def self.url_for_resource_method(resource_method)
-      "https://shop.kauplus.com.br/#{resource_method}"
+      "https://shop.kauplus.com.br/#{resource_method}"     
     end
     
     #
@@ -107,7 +99,11 @@ module Kauplus
       parsed_response = JSON.load(body)
       if Kauplus.config.process_response
         if parsed_response['code'].to_s[0] == '6'
-          parsed_response = parsed_response['data']
+          if parsed_response['summary']
+            parsed_response = {'data' => parsed_response['data'], 'summary' => parsed_response['summary']}
+          else
+            parsed_response = parsed_response['data']
+          end
         else
           raise Kauplus::Error.new(
                     :code => parsed_response['code'],

data/lib/kauplus/params.rb

@@ -0,0 +1,49 @@
+module Kauplus
+  
+  #
+  # Deals with post/put parameters, generating parameters with
+  # the correct keys. If our pull request to RestClient is accepted, 
+  # this won't be needed anymore.
+  #
+  class Params
+
+    def self.generate payload
+      (payload.is_a? Hash) ? generate_params_list(payload) : payload
+    end
+    
+    def self.generate_params_list payload
+      parameters = []
+      # Build array with all parameter values
+      values = extract_values(payload)
+      
+      # Generate query string with the correct keys
+      # and extract each key-value pair of the form 
+      # "name=value" as key_value
+      payload.to_query.split('&').each do |key_value|
+        unless key_value.blank?
+          key, value = key_value.split('=')
+          index = values.find_index{|v| v.to_query(nil).split('=')[1] == value}
+          if index
+            parameters << [URI.unescape(key), values.delete_at(index)]
+          else
+            raise "Could not find representation for #{URI.unescape(key)}"
+          end
+        end
+      end
+      parameters
+    end
+    
+    def self.extract_values(payload, values=[])
+      if payload.is_a? Hash
+        payload.each {|k, v| extract_values(v, values)}
+      elsif payload.is_a? Array
+        payload.each {|v| extract_values(v, values)}
+      else
+        values << payload
+      end
+      values
+    end
+    
+  end
+  
+end

data/lib/kauplus/version.rb

@@ -1,3 +1,3 @@
 module Kauplus
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,46 +1,50 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: kauplus
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Kauplus Social Commerce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-23 00:00:00 -02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &2152725640 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.6.6
   type: :runtime
-  prerelease: false
-  version_requirements: *2152725640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2152724940 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2152724940
-description: Esta gem é um cliente que permite desenvolvedores se conectarem aos web
-  services do Kauplus.
-email:
+  version_requirements: *id002
+description: "Esta gem \xC3\xA9 um cliente que permite desenvolvedores se conectarem aos web services do Kauplus."
+email: 
 - suporte@kauplus.com.br
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - README
@@ -52,29 +56,35 @@ files:
 - lib/kauplus/config.rb
 - lib/kauplus/constants.rb
 - lib/kauplus/error.rb
+- lib/kauplus/params.rb
 - lib/kauplus/version.rb
+has_rdoc: true
 homepage: http://dev.kauplus.com.br/
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: kauplus
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Kauplus - Cliente da API
 test_files: []
+