24 Commits

Author SHA1 Message Date
Dan Milne
09e635fc6f Version bump. Make sure the console uses local paapi 2023-04-20 15:41:26 +10:00
Dan Milne
9297799555 Add net-http-persistent as a dependency. Remove code to determine which HTTP client to use. Cleanup spacing 2022-11-01 18:04:09 +11:00
Dan Milne
5d8fd3ffff Version bump with bug fix 2022-09-04 14:12:14 +10:00
Dan Milne
bba10e75fa Merge pull request #8 from crisdias/master
Missing comma in MARKETPLACES.
2022-09-04 14:11:32 +10:00
Cris Dias
72b413a40e Missing comma in MARKETPLACES.
Requests were failing for Brazil.
2022-09-03 11:26:53 -03:00
Dan Milne
ae3577a9fc Bump version 2022-08-10 12:09:06 +10:00
Dan Milne
11694b567e More safe operator 2022-08-10 12:07:38 +10:00
Dan Milne
a6a5cf45c3 Remove byebug 2022-08-10 12:04:31 +10:00
Dan Milne
761df379cf Fix depracation message 2022-08-10 12:02:45 +10:00
Dan Milne
6105ea621c Debugging 2022-08-10 12:00:10 +10:00
Dan Milne
d09be5f131 Migrate to just HTTP 2022-08-10 11:52:18 +10:00
Dan Milne
7aebd186a5 Bugfixing 2022-08-10 11:47:30 +10:00
Dan Milne
e04d258b07 Testing use of native http 2022-08-10 11:42:28 +10:00
Dan Milne
b66dda8d79 Use safe operator 2022-08-10 11:31:18 +10:00
Dan Milne
02057fb0d0 Typo 2020-08-26 14:22:32 +10:00
Dan Milne
8c4f4337a3 Merge branch 'add_condition' into master 2020-08-21 22:55:07 +10:00
Dan Milne
316e71ee46 Merge branch 'master' into add_condition 2020-08-21 22:38:57 +10:00
Dan Milne
ba6a52ce9c Paapi will always use HTTPS 2020-08-21 18:06:00 +10:00
Dan Milne
747e76fe8f Require net/http and set the body to JSON 2020-08-21 17:58:56 +10:00
Dan Milne
6115f72119 Move the HTTP request code into a method and remove references to the HTTP gem 2020-08-21 17:45:47 +10:00
Dan Milne
e47add0064 Comment out unused Gem 2020-08-21 16:58:18 +10:00
Dan Milne
a86acb1ef9 Merge branch 'master' into net_http 2020-08-21 16:55:54 +10:00
side Feng
8bd8ba1e84 Add Condition Parameter 2020-08-11 14:48:33 +08:00
Dan Milne
706a9fb377 Investigate a plain net::http client for less dependancies 2020-01-10 15:37:36 +11:00
8 changed files with 54 additions and 21 deletions

View File

@@ -1,3 +1,10 @@
## 0.1.7 ( Unreleased )
- Add gem 'net-http-persistent' for connection persistance
- Remove the code which would use other http clients if available
## 0.1.3
- Dropped the HTTP gem and moved to Ruby's Net::HTTP
- Merged a branch which adds the Condtion parameter.
## 0.1.2 ## 0.1.2
- Use Contributor RoleType, rather than Role. RoleType uses lowercase, rather than capitalised. - Use Contributor RoleType, rather than Role. RoleType uses lowercase, rather than capitalised.

View File

@@ -4,7 +4,7 @@
[![Build Status](https://travis-ci.org/dkam/paapi.svg?branch=master)](https://travis-ci.org/dkam/paapi) [![Build Status](https://travis-ci.org/dkam/paapi.svg?branch=master)](https://travis-ci.org/dkam/paapi)
If this gem doesn't meet your needs, try the [Vacumm gem](https://github.com/hakanensari/vacuum). If this gem doesn't meet your needs, try the [Vacuum gem](https://github.com/hakanensari/vacuum).
## Installation ## Installation
@@ -87,6 +87,14 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
If you create a file `config.rb`, it will be loaded by `bin/console`, allowing you to configure keys and markets. If you create a file `config.rb`, it will be loaded by `bin/console`, allowing you to configure keys and markets.
```ruby
Paapi.configure do |config|
config.access_key = 'access_key'
config.secret_key = 'secret_key'
config.partner_market = {au: 'au_tag', us: 'us_tag', uk: 'uk_tag', ca: 'ca_tag_'}
end
```
To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org). To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
## Contributing ## Contributing

View File

@@ -1,7 +1,8 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
require 'bundler/setup' require 'bundler/setup'
require 'paapi' #require 'paapi'
require './lib/paapi.rb'
# You can add fixtures and/or initialization code here to make experimenting # You can add fixtures and/or initialization code here to make experimenting
# with your gem easier. You can also use a different console, if you like. # with your gem easier. You can also use a different console, if you like.

View File

@@ -11,6 +11,7 @@ module Paapi
SEARCH_PARAMS = %i[keywords actor, artist, author, brand title].freeze SEARCH_PARAMS = %i[keywords actor, artist, author, brand title].freeze
DEFAULT_PARTNER_TYPE = 'Associates' DEFAULT_PARTNER_TYPE = 'Associates'
DEFAULT_MARKET = :us DEFAULT_MARKET = :us
DEFAULT_CONDITION = 'Any'
DEFAULT_RESOURCES = [ DEFAULT_RESOURCES = [
'Images.Primary.Large', 'Images.Primary.Large',
'ItemInfo.ByLineInfo', 'ItemInfo.ByLineInfo',
@@ -41,7 +42,7 @@ module Paapi
MARKETPLACES = { MARKETPLACES = {
au: Locale.new(:au, 'Australia', 'webservices.amazon.com.au', 'us-west-2'), au: Locale.new(:au, 'Australia', 'webservices.amazon.com.au', 'us-west-2'),
br: Locale.new(:br, 'Brazil', 'webservices.amazon.com.br' 'us-east-1'), br: Locale.new(:br, 'Brazil', 'webservices.amazon.com.br', 'us-east-1'),
ca: Locale.new(:ca, 'Canada', 'webservices.amazon.ca', 'us-east-1'), ca: Locale.new(:ca, 'Canada', 'webservices.amazon.ca', 'us-east-1'),
fr: Locale.new(:fr, 'France', 'webservices.amazon.fr', 'eu-west-1'), fr: Locale.new(:fr, 'France', 'webservices.amazon.fr', 'eu-west-1'),
de: Locale.new(:de, 'Germany', 'webservices.amazon.de', 'eu-west-1'), de: Locale.new(:de, 'Germany', 'webservices.amazon.de', 'eu-west-1'),
@@ -72,6 +73,7 @@ module Paapi
:partner_type, :partner_type,
:market, :market,
:partner_market, :partner_market,
:condition,
:resources, :resources,
:test_mode :test_mode

View File

@@ -1,17 +1,18 @@
require 'http' require 'net/http/persistent'
require 'aws-sigv4' require 'aws-sigv4'
module Paapi module Paapi
class Client class Client
attr_accessor :partner_tag, :marketplace, :resources attr_accessor :partner_tag, :marketplace, :resources, :condition
attr_reader :partner_type, :access_key, :secret_key, :market attr_reader :partner_type, :access_key, :secret_key, :market, :http
def initialize(access_key: Paapi.access_key, def initialize(access_key: Paapi.access_key,
secret_key: Paapi.secret_key, secret_key: Paapi.secret_key,
partner_tag: Paapi.partner_tag, partner_tag: Paapi.partner_tag,
market: Paapi.market || DEFAULT_MARKET, market: Paapi.market || DEFAULT_MARKET,
resources: Paapi.resources || DEFAULT_RESOURCES, condition: Paapi.condition || DEFAULT_CONDITION,
resources: Paapi.resources || DEFAULT_RESOURCES,
partner_type: DEFAULT_PARTNER_TYPE partner_type: DEFAULT_PARTNER_TYPE
) )
raise ArgumentError unless MARKETPLACES.keys.include?(market.to_sym) raise ArgumentError unless MARKETPLACES.keys.include?(market.to_sym)
@@ -20,9 +21,11 @@ module Paapi
@secret_key = secret_key @secret_key = secret_key
@partner_type = partner_type @partner_type = partner_type
@resources = resources unless resources.nil? @resources = resources unless resources.nil?
@condition = condition
self.market = market self.market = market
@partner_tag = partner_tag if !partner_tag.nil? @partner_tag = partner_tag if !partner_tag.nil?
@http = Net::HTTP::Persistent.new name: 'paapi'
end end
def market=(a_market) def market=(a_market)
@@ -43,7 +46,7 @@ module Paapi
request(op: :get_variations, payload: payload) request(op: :get_variations, payload: payload)
end end
# TODO: Currently we assume Keywords, but we need one of the follow: [Keywords Actor Artist Author Brand Title ] # TODO: Currently we assume Keywords, but we need one of the following: [Keywords Actor Artist Author Brand Title ]
def search_items(keywords: nil, **options ) def search_items(keywords: nil, **options )
raise ArgumentError("Missing keywords") unless (options.keys | SEARCH_PARAMS).length.positive? raise ArgumentError("Missing keywords") unless (options.keys | SEARCH_PARAMS).length.positive?
@@ -63,7 +66,7 @@ module Paapi
def request(op:, payload:) def request(op:, payload:)
raise ArguemntError unless Paapi::OPERATIONS.keys.include?(op) raise ArguemntError unless Paapi::OPERATIONS.keys.include?(op)
operation = OPERATIONS[op] operation = OPERATIONS[op]
headers = { headers = {
@@ -72,6 +75,7 @@ module Paapi
} }
default_payload = { default_payload = {
'Condition' => condition,
'PartnerTag' => partner_tag, 'PartnerTag' => partner_tag,
'PartnerType' => partner_type, 'PartnerType' => partner_type,
'Marketplace' => marketplace.site 'Marketplace' => marketplace.site
@@ -98,9 +102,20 @@ module Paapi
headers['Authorization'] = signature.headers['authorization'] headers['Authorization'] = signature.headers['authorization']
headers['Content-Type'] = 'application/json; charset=utf-8' headers['Content-Type'] = 'application/json; charset=utf-8'
Response.new( HTTP.headers(headers).post(endpoint, json: payload ) ) Response.new( post(url: endpoint, body: payload, headers: headers))
end
def post(url:, body:, headers:)
uri = URI.parse(url)
post_request = Net::HTTP::Post.new(uri.path)
post_request.content_type = 'application/json; charset=UTF-8'
headers.each { |k, v| post_request[k] = v }
post_request.body = body.to_json
http.request uri, post_request
end end
end end
end end

View File

@@ -128,22 +128,22 @@ module Paapi
def height def height
data = get(%w{ItemInfo ProductInfo ItemDimensions Height}) data = get(%w{ItemInfo ProductInfo ItemDimensions Height})
[data.dig('DisplayValue'), data.dig('Unit')].join(' ') [data&.dig('DisplayValue'), data&.dig('Unit')].join(' ')
end end
def length def length
data = get(%w{ItemInfo ProductInfo ItemDimensions Length}) data = get(%w{ItemInfo ProductInfo ItemDimensions Length})
[data.dig('DisplayValue'), data.dig('Unit')].join(' ') [data&.dig('DisplayValue'), data&.dig('Unit')].join(' ')
end end
def width def width
data = get(%w{ItemInfo ProductInfo ItemDimensions Width}) data = get(%w{ItemInfo ProductInfo ItemDimensions Width})
[data.dig('DisplayValue'), data.dig('Unit')].join(' ') [data&.dig('DisplayValue'), data&.dig('Unit')].join(' ')
end end
def weight def weight
data = get(%w{ItemInfo ProductInfo ItemDimensions Weight}) data = get(%w{ItemInfo ProductInfo ItemDimensions Weight})
[data.dig('DisplayValue'), data.dig('Unit')].join(' ') [data&.dig('DisplayValue'), data&.dig('Unit')].join(' ')
end end
def kindle? def kindle?

View File

@@ -1,3 +1,3 @@
module Paapi module Paapi
VERSION = '0.1.2' VERSION = '0.1.8'
end end

View File

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
spec.metadata['homepage_uri'] = spec.homepage spec.metadata['homepage_uri'] = spec.homepage
spec.metadata['source_code_uri'] = spec.homepage spec.metadata['source_code_uri'] = spec.homepage
#spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here." spec.metadata["changelog_uri"] = "https://github.com/dkam/paapi/blob/master/CHANGELOG.md"
# Specify which files should be added to the gem when it is released. # Specify which files should be added to the gem when it is released.
# The `git ls-files -z` loads the files in the RubyGem that have been added into git. # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -31,6 +31,6 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'byebug', '~> 11' spec.add_development_dependency 'byebug', '~> 11'
spec.add_development_dependency 'awesome_print', '~> 1.8' spec.add_development_dependency 'awesome_print', '~> 1.8'
spec.add_dependency 'http', '~> 4'
spec.add_dependency 'aws-sigv4', '~> 1' spec.add_dependency 'aws-sigv4', '~> 1'
spec.add_dependency 'net-http-persistent', '~> 4.0', '>= 4.0.1'
end end