mkmapi 0.1.5 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 76d56ea114d31220e40af3a570e59ef6249a48e6
-  data.tar.gz: 4f260ba9afb971d22d06165fa86ddf4ae2861758
+SHA256:
+  metadata.gz: c9101bb4606b8e2684c54044a84f492f861365edc2c86d5b8cdbe69956dafd51
+  data.tar.gz: 25963cd9abf9e46f743c5e54e3b83025ca734d556296209e68f9355b993bae60
 SHA512:
-  metadata.gz: b3db8553e23dd6010d5f058640b32f09fac519df1fabe00feffc823979f0906e46a3e46830ad4d1bc5767744d0ebe751d7dba76d1827d5d0ea3c8d0efcf8c76d
-  data.tar.gz: 102d2db33fc036175160c9eb000d326472cd9394df3196b038e9cca057c97335f567422c582de0cb1a955d42dc5415427fd0b677d54b2c309f29fd8e9e2f65d4
+  metadata.gz: e7b29a9c67c22496e787392e3b7c22f80988c8abcd8c87a452259b44bd302d809e410989c52d0afb90d1c62fea5c8f7d9db71aeaf76497641585fd74c8cd087b
+  data.tar.gz: 30cff9098d33b78260f812bd54d260bf75b2007dadd55e9a8ce6ae52f571d2ea3edd963f0f4cd83ee5b65a1a627913ad39b79fed6985df0cef59a6a208d9b81a

data/Gemfile

@@ -1,9 +1,8 @@
 source "http://rubygems.org"
 
-gem "faraday", "~> 0.15.2"
+gem "faraday", "~> 1.1.0"
 gem "oj", "~> 2.18.3"
 gem "simple_oauth", "~> 0.3.1"
-gem "nokogiri", "~> 1.8.2"
 
 group :development do
   gem "rspec"

data/{README → README.md}

@@ -1,16 +1,16 @@
-= Mkmapi
+# Mkmapi
 
-Ruby interface to the magiccardmarket.eu API.
+Ruby interface to the cardmarket.eu
 
-== Usage
+## Usage
 
 You'll need an OAuth credentials for a dedicated app from Mkmapi.
 
-Use with bundler
+**Add to your Gemfile**
 
-    gem 'mkmapi', github: 'cybey/mkmapi'
+    gem 'mkmapi'
 
-Create a session
+**Create a session**
 
     session = Mkmapi.auth({
       consumer_key: "xxxx",
@@ -19,16 +19,16 @@ Create a session
       token_secret: "xxxx",
     })
 
-Retrieve your account's data
+**Retrieve your account's data**
 
     me = session.account # => Mkmapi::Account
     me.id # => 1234
     me.username # => 'your_user_name'
 
-== TODO
+## TODO
 
-* domain models
-* documentation
+* Domain models
+* Documentation
 * Account Management
 * Market Place Information (partially)
 * Order Management
@@ -36,7 +36,7 @@ Retrieve your account's data
 * Stock Management
 * Wants List Management
 
-== Contributing to Mkmapi
+## Contributing to Mkmapi
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
@@ -45,6 +45,10 @@ Retrieve your account's data
 * Commit and push until you are happy with your contribution.
 * Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
 
-== Contributors
+## References
+Cardmarket RESTful API Documentation: https://api.cardmarket.com/ws/documentation/API_2.0:Main_Page
 
-Based on the work done by knaveofdiamonds.
+## Contributors
+
+[<img src="https://github.com/arjenbrandenburgh.png?size=72" alt="arjenbrandenburgh" width="72">](https://github.com/arjenbrandenburgh)
+[<img src="https://github.com/knaveofdiamonds.png?size=72" alt="knaveofdiamonds" width="72">](https://github.com/knaveofdiamonds)

data/lib/mkmapi.rb

@@ -1,18 +1,17 @@
-require 'bundler/setup'
-require 'faraday'
+require "bundler/setup"
+require "faraday"
 
 module Mkmapi
-
   path = ->(basename) {
-    File.expand_path File.join('..', 'mkmapi', basename), __FILE__
+    File.expand_path File.join("..", "mkmapi", basename), __FILE__
   }
-  autoload :Agent,        path['agent']
-  autoload :Session,      path['session']
-  autoload :Base,         path['base']
-  autoload :Account,      path['account']
-  autoload :Marketplace,  path['marketplace']
+  autoload :Agent, path["agent"]
+  autoload :Session, path["session"]
+  autoload :Base, path["base"]
+  autoload :Account, path["account"]
+  autoload :Marketplace, path["marketplace"]
 
-  def self.connect(url = 'https://www.mkmapi.eu/ws/v2.0')
+  def self.connect(url = "https://api.cardmarket.com/ws/v2.0")
     @connection = Faraday.new url, ssl: { verify: false } do |faraday|
       # faraday.response :logger
       faraday.adapter Faraday.default_adapter
@@ -25,5 +24,4 @@ module Mkmapi
   def self.auth(params)
     Session.new connection, params
   end
-
 end

data/lib/mkmapi/agent.rb

@@ -1,43 +1,47 @@
-require 'simple_oauth'
-require 'oj'
+require "simple_oauth"
+require "oj"
 
 module Mkmapi
   class Agent < Struct.new(:connection, :auth)
-
     attr_reader :last
 
-    def get(path)
-      process(:get, path)
+    def get(path, query_params = {})
+      process(:get, path, query_params)
     end
 
     def put(path, body)
       raise NotImplementedError
     end
+
     def post(path, body)
       raise NotImplementedError
     end
+
     def delete(path)
       raise NotImplementedError
     end
 
     private
 
-      def process(method, path)
-        json_path = "output.json/#{ path }"
-        endpoint = connection.url_prefix.to_s + "/" + json_path
-
-        @last = connection.send(method, json_path, {}, authorization: oauth(method, endpoint))
-        Oj.load(@last.body)
-      end
+    def process(method, path, query_params = {})
+      json_path = "output.json/#{path}"
+      endpoint = connection.url_prefix.to_s + "/" + json_path
 
-      def oauth(method, url, options = {}, query = {})
-        header = SimpleOAuth::Header.new(method, url, options, auth)
-
-        signed_attributes = { realm: url }.update(header.signed_attributes)
-        attributes = signed_attributes.map { |(k, v)| %(#{k}="#{v}") }
+      @last = connection.send(method, json_path, query_params, authorization: oauth(method, endpoint, {}, query_params))
+      Oj.load(@last.body)
+    end
 
-        "OAuth #{ attributes * ', ' }"
+    def oauth(method, url, options = {}, query = {})
+      url_with_params = url
+      if (query.present?)
+        url_with_params = url + "?" + query.to_query
       end
+      header = SimpleOAuth::Header.new(method, url_with_params, options, auth)
 
+      signed_attributes = { realm: url }.update(header.signed_attributes)
+      attributes = signed_attributes.map { |(k, v)| %(#{k}="#{v}") }
+
+      "OAuth #{attributes * ", "}"
+    end
   end
 end

data/lib/mkmapi/marketplace.rb

@@ -4,22 +4,21 @@ require "stringio"
 
 module Mkmapi
   class Marketplace < Struct.new(:agent)
-
-    def priceguide
-      json_data = agent.get("priceguide")
+    def priceguide(game_id = 1)
+      json_data = agent.get("priceguide", { "idGame" => game_id })
 
       if (json_data && json_data["priceguidefile"])
         data = Base64.decode64(json_data["priceguidefile"])
         gzip = Zlib::GzipReader.new(StringIO.new(data))
 
-        keys = ["id", "average", "low", "trend", "german_low", "suggested", "foil", "foil_low", "foil_trend", "low_ex" ]
+        keys = ["id", "average", "low", "trend", "german_low", "suggested", "foil", "foil_low", "foil_trend", "low_ex", "avg1", "avg7", "avg30", "foilavg1", "foilavg7", "foilavg30"]
         skip_first = gzip.readline # Skip the header
 
         CSV.parse(gzip.read).map do |a|
           item = keys.zip(a.map(&:to_f))
           item[0][1] = item[0][1].to_i
 
-          Hash[ item ]
+          Hash[item]
         end
       end
     end
@@ -31,7 +30,7 @@ module Mkmapi
         data = Base64.decode64(json_data["productsfile"])
         gzip = Zlib::GzipReader.new(StringIO.new(data))
 
-        keys = ["id", "name", "category_id", "category", "expansion_id", "date_added" ]
+        keys = ["id", "name", "category_id", "category", "expansion_id", "date_added"]
         skip_first = gzip.readline # Skip the header
 
         CSV.parse(gzip.read).map do |a|
@@ -40,14 +39,14 @@ module Mkmapi
           item[2][1] = item[2][1].to_i
           item[4][1] = item[4][1].to_i
           item[5][1] = item[5][1].to_i
-          Hash[ item ]
+          Hash[item]
         end
       end
     end
 
     def expansions(game_id = 1)
       agent.get("games/#{game_id}/expansions")["expansion"].
-        each {|g| g["id"] = g.delete("idExpansion") }
+        each { |g| g["id"] = g.delete("idExpansion") }
     end
 
     def singles(expansion_id = 1)
@@ -56,12 +55,11 @@ module Mkmapi
 
     def games
       agent.get("games")["game"].
-        each {|g| g["id"] = g.delete("idGame") }
+        each { |g| g["id"] = g.delete("idGame") }
     end
 
     def product(product_id)
       agent.get("products/#{product_id}")["product"]
     end
-
   end
 end

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Mkmapi
-  VERSION = "0.1.5"
+  VERSION = "0.1.10"
 end

data/mkmapi.gemspec

@@ -1,26 +1,26 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/version', __FILE__)
+require File.expand_path("../lib/version", __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Arjen Brandenburgh"]
-  gem.email         = ["arjen.brandenburgh@gmail.com"]
-  gem.summary       = "Simple MagicCardMarket API v2.0 (MkmapiAPI) library for Ruby"
-  gem.description   = "Simple MagicCardMarket API v2.0 (MkmapiAPI) library for Ruby"
-  gem.homepage      = "http://github.com/arjenbrandenburgh/mkmapi"
-  gem.license       = "MIT"
+  gem.authors = ["Arjen Brandenburgh"]
+  gem.email = ["arjen.brandenburgh@gmail.com"]
+  gem.summary = "Simple MagicCardMarket API v2.0 (MkmapiAPI) library for Ruby"
+  gem.description = "Simple MagicCardMarket API v2.0 (MkmapiAPI) library for Ruby"
+  gem.homepage = "http://github.com/arjenbrandenburgh/mkmapi"
+  gem.license = "MIT"
 
-  gem.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
-  gem.test_files    = `git ls-files -- test/*`.split("\n")
-  gem.name          = "mkmapi"
+  gem.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(spec)/}) }
+  gem.test_files = `git ls-files -- test/*`.split("\n")
+  gem.name = "mkmapi"
   gem.require_paths = ["lib"]
-  gem.version       = Mkmapi::VERSION
+  gem.version = Mkmapi::VERSION
 
-  gem.add_dependency                  'faraday', '~> 0.11.0'
-  gem.add_dependency                  'oj', '~> 2.18'
-  gem.add_dependency                  'simple_oauth', '~> 0.3'
+  gem.add_dependency "faraday", "~> 1.1.0"
+  gem.add_dependency "oj", "~> 2.18"
+  gem.add_dependency "simple_oauth", "~> 0.3"
 
-  gem.add_development_dependency      'rspec'
-  gem.add_development_dependency      'rdoc'
-  gem.add_development_dependency      'bundler'
-  gem.add_development_dependency      'simplecov'
+  gem.add_development_dependency "rspec"
+  gem.add_development_dependency "rdoc"
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkmapi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.10
 platform: ruby
 authors:
 - Arjen Brandenburgh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ files:
 - ".gitignore"
 - Gemfile
 - LICENSE
-- README
+- README.md
 - Rakefile
 - lib/mkmapi.rb
 - lib/mkmapi/agent.rb
@@ -147,8 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Simple MagicCardMarket API v2.0 (MkmapiAPI) library for Ruby