magento_rest_api 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73ba74c77a3a36dc898dfac85949b7d0909ff33c
-  data.tar.gz: b6b6564d80b61938c9439d6074265f74fd84c4cc
+  metadata.gz: a0e8c3cdf41552bb9172c55fac3e7f2f2f269806
+  data.tar.gz: 3d61c7b791bd136b5cac503db6d3a3049266c600
 SHA512:
-  metadata.gz: 1053e0e363796d3ab263b61684ac22109e1ca9d1b93721d3912a2edc246a2b971d49b7637f5d2d523635efc34f88c19e6afa9c978643179469a8d1e7a463a51a
-  data.tar.gz: 33b81e6728bc54aea595dd6f6a14758306cc6cf29fd53db49072b235874ee5f7fbead044529eded5ad1476608fb199aed4d159daa9979e09e5f99a1465e02bce
+  metadata.gz: 578905f627b379febf0ea2a9404d0284fa13853ded6c02b7e360edac90b538ed75ec4d96933921dc6db19239017ac571bbc52e19d8d7cfd8bf6d8fcd392aaea4
+  data.tar.gz: 13473b048d6169c1a1bcb9a9dfb43c0ddd2cee728b24e6bf1c3816f7c58a84b6ca95bf62b42d5e85e45d01b370208d857867c9ad8f0ab401daf4f8f5deb3a1a0

data/README.md

@@ -32,19 +32,24 @@ GET request (get product information):
 
 ```irb
 % irb
-   >> keys = {"consumer_key"=>"your_consumer_key", "consumer_secret"=>"your_consumer_secret", "token"=>"your_token", "token_secret"=>"your_token_secret"}
-   >> json_response = MagentoRestApi::connect('GET','https://your magento/api/rest/products/200', keys)
+   >> require 'restfull_oauth'
+   >> service = MagentoRestApi::Connection.new({"consumer_key"=>"your_consumer_key", "consumer_secret"=>"your_consumer_secret", "token"=>"your_token", "token_secret"=>"your_token_secret"})
+   >> send_data = {'foo' => 'bar' }
+   >> response = service.connect('GET','https://your magento/api/rest/products', keys, send_data)
    => #<Net::HTTPOK 200 OK readbody=true>
+   >> puts JSON.parse(response.body).to_yaml
 ```
 
 POST request (assign product to website):
 
 ```irb
 % irb
-   >> keys = {"consumer_key"=>"your_consumer_key", "consumer_secret"=>"your_consumer_secret", "token"=>"your_token", "token_secret"=>"your_token_secret"}
-   >> post_data = {'website_id' => 1 }.to_json
-   >> json_response = MagentoRestApi::connect('POST','https://your magento/api/rest/products/200/websites', keys, post_data)
+   >> require 'restfull_oauth'
+   >> service = MagentoRestApi::Connection.new({"consumer_key"=>"your_consumer_key", "consumer_secret"=>"your_consumer_secret", "token"=>"your_token", "token_secret"=>"your_token_secret"})
+   >> send_data = {'foo' => 'bar' }
+   >> response = RestfullOauth::connect('POST','https://your magento/api/rest/products/200/websites', send_data)
    => #<Net::HTTPOK 200 OK readbody=true>
+   >> puts JSON.parse(response.body).to_yaml
 ```
 
 PUT requests work in the same way as POST requests
@@ -52,6 +57,11 @@ PUT requests work in the same way as POST requests
 more information about magento's REST API: http://devdocs.magento.com/guides/m1x/api/rest/introduction.html
 I cannot stress enough to first find out if the API provides enough information for you.
 
+## Changes
+
+- post_data is jsonified inside gem no need to do it yourself
+- get now also supports parameters the get way
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/magento_rest_api/version.rb

@@ -1,3 +1,3 @@
 module MagentoRestApi
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/magento_rest_api.rb

@@ -30,6 +30,11 @@ module MagentoRestApi
     end
 
     def connect(method, uri, post_data=nil)
+      if (method == "GET")
+        access_token  = prepare_access_token(uri,keys)
+        params = post_data ? "?" + URI.encode_www_form(post_data) : ""
+        return access_token.request(:get, uri + params)
+      end
       params = params(@config['consumer_key'], @config['token'] )
       signature_base_string = signature_base_string(method, uri.to_s, params)
       signing_key = @config['consumer_secret'] + '&' + @config['token_secret']
@@ -78,25 +83,32 @@ module MagentoRestApi
       header.slice(0..-2)
     end
 
-    def request_data(header, uri, method, post_data=nil)
+    def prepare_access_token(uri, keys)
+      uri = URI(uri)
+      consumer = OAuth::Consumer.new(keys['consumer_key'], keys['consumer_secret'], { :site => uri.host, :scheme => :header })
+      token_hash = { :oauth_token => keys['token'], :oauth_token_secret => keys['token_secret'] }
+      access_token = OAuth::AccessToken.from_hash(consumer, token_hash )
+      return access_token
+    end
+
+    def request_data(header, uri, method, send_data=nil)
       uri                   = URI(uri)
       http                  = Net::HTTP.new(uri.host, uri.port)
       if (uri.port == 443)
         http.use_ssl          = true
         http.verify_mode      = OpenSSL::SSL::VERIFY_NONE
       end
-      if method == 'POST'
-        resp, data = http.post(uri.path, post_data, { 'Authorization' => header, "Content-Type" => "application/json; charset=utf-8" })
+      if method == 'DELETE'
       elsif method == 'PUT'
         request = Net::HTTP::Put.new(uri.path)
         headers = { 'Authorization' => header, "Content-Type" => "application/json" }
         headers.keys.each do |key|
           request[key] = headers[key]
         end
-        request.body = post_data
+        request.body = send_data
         resp, data = http.request(request)
       else
-        resp, data = http.get(uri.path, { 'Authorization' => header, "Content-Type" => "application/json; charset=utf-8" })
+        resp, data = http.post(uri.path, send_data, { 'Authorization' => header, "Content-Type" => "application/json; charset=utf-8" })
       end
       resp
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magento_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Daniel.van.den.Oord
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-14 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler