ebisu-rb 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73be7cfe94ae2eb8803c1046493c047e1648120855da3ab8a11f283e83f203a1
-  data.tar.gz: cb72bee775809f72dd09f2419968cdcc280ad54ebdb4d7bdbef60c62fcdba1b0
+  metadata.gz: 5f46b04483bf3756a33dbd2be54e8c581cc270333b78d130d4aaf0cc13beeff1
+  data.tar.gz: 753bbfa6b7d3aeadf529ac34a7735d611e831fda0f2c47213b1ccc9a1822d70f
 SHA512:
-  metadata.gz: '097f719a02b3b7e7d1a2bf98c9d57c3b3ce17f92729ea8ab1dbe8ee3ee06edc7d1a7e5ceb1e3e8eca911cee6660041b741c4277f0335e9e8b7de5001e7447aea'
-  data.tar.gz: 279e173c317ee4792510893ff04500ed82c420c535a906e07e9f9b865b34fcc4cbcf1be5e0da1cd8b6750922c1008f81ce6a99c420bec9007e883e15fd6ae95c
+  metadata.gz: 7432a083e370ff8e4737575d84a2ebea500741d9afe16d85a8602f165db27ea280aa26406e5472648ff8e26778ffca348c61fb5645dcb252e8b364a83c2b49b3
+  data.tar.gz: 50675cbc6d2ecd1ba825a8862f27a9fd6744f7f4ab77eb33b25264f4802a624f7c79f87ede6c2b273980ddef27819598ea5214d782c11d1edb893171f4b6e7c7

data/ebisu.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "multi_xml"
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'mysql2'
-  spec.add_development_dependency "bundler", "~> 1.17"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
 end

data/lib/ebisu.rb

@@ -1,15 +1,17 @@
-require "ebisu/version"
-require "logger"
-require "nokogiri"
-require "multi_xml"
-require "faraday"
-require "faraday_middleware"
-require "ebisu/faraday/request"
-require "ebisu/faraday/connection"
-require "ebisu/apis/category_search"
-require "ebisu/apis/item_search"
-require "ebisu/apis"
-require "ebisu/client"
+# frozen_string_literal: true
+
+require 'ebisu/version'
+require 'logger'
+require 'nokogiri'
+require 'multi_xml'
+require 'faraday'
+require 'faraday_middleware'
+require 'ebisu/faraday/request'
+require 'ebisu/faraday/connection'
+require 'ebisu/apis/category_search'
+require 'ebisu/apis/item_search'
+require 'ebisu/apis'
+require 'ebisu/client'
 
 module Ebisu
   class Error < StandardError; end

data/lib/ebisu/apis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   module Apis
     include CategorySearch

data/lib/ebisu/apis/category_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ebisu/models/category_search_response'
 module Ebisu
   module Apis
@@ -10,7 +12,7 @@ module Ebisu
       # @option options [String] :callback JSONPの場合のコールバック
       def category_search(category_id, options = {})
         options.merge!(category_id: category_id)
-        Ebisu::CategorySearchResponse.new get('categorySearch', options)
+        Ebisu::CategorySearchResponse.new get('V1/categorySearch', options)
       end
     end
   end

data/lib/ebisu/apis/item_search.rb

@@ -1,25 +1,30 @@
+# frozen_string_literal: true
+
 require 'ebisu/models/item_search_response'
 module Ebisu
   module Apis
     module ItemSearch
       # @param [Hash] options
+      # @option options [String] :affiliate_type バリューコマースアフィリエイト(vc)
+      # @option options [String] :affiliate_id バリューコマースアフィリエイトのID
       # @option options [String] :query
-      # @option options [String] :category_id
-      # @option options [String] :product_id
-      # @option options [String] :person_id
+      # @option options [Integer] :jan_code JANコード
+      # @option options [Integer] :isbn ISBNコード
+      # @option options [Integer] :image_size 画像サイズ. 76, 106, 132, 146, 300, 600
+      # @option options [Integer] :genre_category_id カテゴリID.カンマ区切りで複数指定
       # @option options [String] :brand_id
-      # @option options [String] :store_id
+      # @option options [String] :seller_id
       # @option options [Integer] :price_from
       # @option options [Integer] :price_to
-      # @option options [Float] :affiliate_from
-      # @option options [Float] :affiliate_to
-      # @option options [Integer] :preorder
+      # @option options [Float] :affiliate_rate_from
+      # @option options [Float] :affiliate_rate_to
+      # @option options [Boolean] :preorder
       # @option options [Integer] :hits
-      # @option options [Integer] :offset
+      # @option options [Integer] :start
       # @option options [String] :module priceranges/subcategories
-      # @option options [Integer] :availability
-      # @option options [Integer] :discount
-      # @option options [Integer] :shipping (1/2)
+      # @option options [Boolean] :in_stock
+      # @option options [Boolean] :is_discounted
+      # @option options [String] :shipping (free/conditional_free)
       # @option options [String] :payment
       #   ウォレット対応カード：yahoowallet
       #   クレジットカード：creditcard
@@ -30,22 +35,20 @@ module Ebisu
       #   ペイジー：payeasy
       #   Yahoo!マネー/預金払い：yahoomoney
       #   コンビニ：convenience
-      # @option options [String] :license diamond/platinum/gold/silver/bronze/guest
-      # @option options [String] :salestart_from
-      # @option options [String] :salestart_to
-      # @option options [String] :saleend_from
-      # @option options [String] :saleend_to
-      # @option options [String] :seller (all/store/consumer)
+      # @option options [String] :user_rank diamond/platinum/gold/silver/bronze/guest
+      # @option options [Integer] :sale_end_from
+      # @option options [Integer] :sale_end_to
+      # @option options [Integer] :sale_start_from
+      # @option options [Integer] :sale_start_to
+      # @option options [String] :delivery_area
+      # @option options [Integer] :delivery_day
+      # @option options [Integer] :delivery_deadline
       # @option options [String] :sort (商品価格：price/ストア名：name/おすすめ順：score（デフォルト）/ レビュー数順：review_count)
       # @option options [String] :condition (all/new/used)
-      # @option options [String] :output 出力形式 ( xml, php, jsonp )
-      # @option options [String] :affiliate_type バリューコマースアフィリエイト(vc)
-      # @option options [String] :affiliate_id バリューコマースアフィリエイトのID
-      # @option options [String] :callback JSONPの場合のコールバック
       #
       # @return [Ebisu::ItemSearchResponse]
       def item_search(options = {})
-        Ebisu::ItemSearchResponse.new(get('itemSearch', options))
+        Ebisu::ItemSearchResponse.new(get('V3/itemSearch', options))
       end
     end
   end

data/lib/ebisu/client.rb

@@ -5,7 +5,6 @@ module Ebisu
     extend self
 
     ATTRIBUTES = %i[
-      api_version
       user_agent
       endpoint
       appid
@@ -20,8 +19,7 @@ module Ebisu
     end
 
     def reset
-      self.api_version = 'V1'
-      self.endpoint = "https://shopping.yahooapis.jp/ShoppingWebService/#{api_version}/"
+      self.endpoint = 'https://shopping.yahooapis.jp/ShoppingWebService/'
       self.user_agent = "YahooShopping Ruby Client/#{Ebisu::VERSION}"
       self.appid = nil
       self.proxy = nil

data/lib/ebisu/faraday/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   module Faraday
     module Connection
@@ -5,7 +7,7 @@ module Ebisu
 
       def connection
         options = {
-            headers: { 'Accept' => 'application/xml' }
+          headers: { 'Accept' => 'application/xml,application/json' }
         }
 
         options[:headers]['User-Agent'] = user_agent if user_agent
@@ -19,7 +21,8 @@ module Ebisu
         ::Faraday::Connection.new(endpoint, options) do |connection|
           connection.use ::Faraday::Request::UrlEncoded
           connection.use ::Faraday::Response::RaiseError
-          connection.use ::FaradayMiddleware::ParseXml
+          connection.response :xml,  content_type: /\bxml$/
+          connection.response :json, content_type: /\bjson$/
           require 'logger'
           connection.response :logger, logger if logger
           connection.adapter ::Faraday.default_adapter

data/lib/ebisu/models/brands.rb

@@ -1,17 +1,17 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Brands
     # @!attribute name
     #   @return [String]
     attr_reader :name
 
-    # @!attribute path
-    #   @return [String]
-    attr_reader :path
+    # @!attribute id
+    #   @return [Integer]
+    attr_reader :id
     def initialize(brands)
-      @name = brands.dig('Name')
-      @path = brands.dig('Path', 'Brand')
+      @id = brands.dig('id')
+      @name = brands.dig('name')
     end
   end
 end
-
-

data/lib/ebisu/models/category.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class YCategory
     IDAndName = Struct.new(:id, :name)
@@ -7,8 +9,8 @@ module Ebisu
     attr_reader :current
     def initialize(category)
       @current = IDAndName.new(
-          category.dig('Current', 'Id'),
-          category.dig('Current', 'Name')
+        category.dig('id'),
+        category.dig('name')
       )
     end
   end
@@ -33,4 +35,3 @@ module Ebisu
     end
   end
 end
-

data/lib/ebisu/models/category_id_path.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 module Ebisu
   class CategoryIdPath
     # @!attribute path
     #   @return [Array[String]]
     attr_reader :path
     def initialize(data)
-      category = data['Category']
-      @path = case category
+      @path = case data
               when Array
-                category.map { |x| x['Id'] }
+                data.map { |x| x['id'] }
               else
                 []
               end

data/lib/ebisu/models/ex_image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class ExImage
     # @!attribute url
@@ -15,10 +17,9 @@ module Ebisu
     def initialize(image)
       return unless image
 
-      @url = image.dig('Url')
-      @width = image.dig('Width')
-      @height = image.dig('Height')
+      @url = image.dig('url')
+      @width = image.dig('width')
+      @height = image.dig('height')
     end
   end
 end
-

data/lib/ebisu/models/image.rb

@@ -1,22 +1,23 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Image
     # @!attribute id
     #   @return [String]
     attr_reader :id
-    
+
     # @!attribute small
     #   @return [String]
     attr_reader :small
-    
+
     # @!attribute medium
     #   @return [String]
     attr_reader :medium
 
-    def initialize(data)
-      @id = data["Id"]
-      @small = data["Small"]
-      @medium = data["Medium"]
+    def initialize(id, data)
+      @id = id
+      @small = data['small']
+      @medium = data['medium']
     end
   end
 end
-

data/lib/ebisu/models/item.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Item
     # @!attribute name
@@ -24,14 +26,6 @@ module Ebisu
     #   @return [String]
     attr_reader :code
 
-    # @!attribute person_id
-    #   @return [String]
-    attr_reader :person_id
-
-    # @!attribute product_id
-    #   @return [String]
-    attr_reader :product_id
-
     # @!attribute image
     #   @return [Ebisu::Image]
     attr_reader :image
@@ -92,16 +86,13 @@ module Ebisu
     #   @return [Ebisu::Store]
     attr_reader :store
 
+    # @!attribute affiliate_rate
+    #   @return [Float]
+    attr_reader :affiliate_rate
+
     class Availability
-      def initialize(v)
-        case v
-        when 'instock'
-          @available = true
-        when 'outofstock'
-          @available = false
-        else
-          @available = false
-        end
+      def initialize(in_stock)
+        @available = in_stock
       end
 
       # @return [True|False]
@@ -110,30 +101,30 @@ module Ebisu
       end
     end
 
+    # @param [Hash] hit
     def initialize(hit)
-      @name = hit.dig('Name')
-      @description = hit.dig('Description')
-      @headline = hit.dig('Headline')
-      @url = hit.dig('Url')
-      @availability = Availability.new(hit.dig('Availability'))
-      @code = hit.dig('Code')
-      @person_id = hit.dig('PersonId')
-      @product_id = hit.dig('ProductId')
-      @price = Ebisu::Price.new(hit.dig('Price'))
-      @price_label = Ebisu::PriceLabel.new(hit.dig('PriceLabel'))
-      @jan_code = hit.dig('JanCode')
-      @model = hit.dig('Model')
-      @isbn_code = hit.dig('IsbnCode')
-      @release_date = hit.dig('ReleaseDate')
-      @image = Ebisu::Image.new(hit.dig('Image'))
-      @ex_image = Ebisu::ExImage.new(hit.dig('ExImage'))
-      @review = Ebisu::Review.new(hit.dig('Review'))
-      @point = Ebisu::Point.new(hit.dig('Point'))
-      @shipping = Ebisu::Shipping.new(hit.dig('Shipping'))
-      @category = Ebisu::YCategory.new(hit.dig('Category'))
-      @category_id_path = Ebisu::CategoryIdPath.new(hit.dig('CategoryIdPath'))
-      @brands = Ebisu::Brands.new(hit.dig('Brands'))
-      @store = Ebisu::Store.new(hit.dig('Store'))
+      @name = hit.dig('name')
+      @description = hit.dig('description')
+      @headline = hit.dig('headLine')
+      @url = hit.dig('url')
+      @availability = Availability.new(hit.dig('inStock'))
+      @code = hit.dig('code')
+      @price = Ebisu::Price.new(hit.dig('price'))
+      @price_label = Ebisu::PriceLabel.new(hit.dig('priceLabel'))
+      @jan_code = hit.dig('janCode')
+      @model = hit.dig('model')
+      @isbn_code = hit.dig('isbnCode')
+      @release_date = hit.dig('releaseDate')
+      @image = Ebisu::Image.new(hit.dig('imageId'), hit.dig('image'))
+      @ex_image = Ebisu::ExImage.new(hit.dig('exImage')) if hit.dig('exImage')
+      @review = Ebisu::Review.new(hit.dig('review'))
+      @affiliate_rate = hit.dig('affiliateRate')
+      @point = Ebisu::Point.new(hit.dig('point'))
+      @shipping = Ebisu::Shipping.new(hit.dig('shipping'))
+      @category = Ebisu::YCategory.new(hit.dig('genreCategory'))
+      @category_id_path = Ebisu::CategoryIdPath.new(hit.dig('parentGenreCategories'))
+      @brands = Ebisu::Brands.new(hit.dig('brand'))
+      @store = Ebisu::Store.new(hit.dig('seller'))
     end
   end
 end

data/lib/ebisu/models/item_search_response.rb

@@ -29,7 +29,7 @@ module Ebisu
     end
 
     def result_set
-      @original_response['ResultSet']
+      @original_response
     end
 
     # @return [Integer] 検索総HIT数
@@ -49,25 +49,7 @@ module Ebisu
 
     # @return [Array<Ebisu::Item>] 検索結果のアイテムのリスト
     def hits
-      result_hit = result_set['Result']['Hit']
-      case result_hit
-      when Array
-        result_hit.map{|hit| Ebisu::Item.new(hit)}
-      when Hash
-        # 結果がないとき
-        if result_hit['index'].to_i == 0
-          [].map{|hit| Ebisu::Item.new(hit)}
-
-        # 結果が1件だけのとき
-        else
-          [result_hit].map{|hit| Ebisu::Item.new(hit)}
-        end
-      when NilClass
-        [].map{|hit| Ebisu::Item.new(hit)}
-      end
+      (result_set['hits'] || []).map { |hit| Ebisu::Item.new(hit) }
     end
-
   end
-
 end
-

data/lib/ebisu/models/payment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Payment
     # @!attribute method
@@ -15,4 +17,3 @@ module Ebisu
     end
   end
 end
-

data/lib/ebisu/models/payment_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class PaymentMethod
     # @!attribute code
@@ -13,4 +15,3 @@ module Ebisu
     end
   end
 end
-

data/lib/ebisu/models/point.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Point
     # @!attribute amount
@@ -6,19 +8,10 @@ module Ebisu
     # @!attribute times
     #   @return [Integer]
     attr_reader :times
-    # @!attribute premium_amount
-    #   @return [Integer]
-    attr_reader :premium_amount
-    # @!attribute premium_times
-    #   @return [Integer]
-    attr_reader :premium_times
 
     def initialize(point)
-      @amount = point.dig('Amount').to_i
-      @times = point.dig('Times').to_i
-      @premium_amount = point.dig('PremiumAmount').to_i
-      @premium_times = point.dig('PremiumTimes').to_i
+      @amount = point.dig('amount').to_i
+      @times = point.dig('times').to_i
     end
   end
-
 end

data/lib/ebisu/models/price.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Price
     # @!attribute value

data/lib/ebisu/models/price_label.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class PriceLabel
     # @!attribute is_inclusive
@@ -33,15 +35,12 @@ module Ebisu
     attr_reader :period_end
 
     def initialize(price_label)
-      @is_inclusive = price_label['taxIncluded'] == 'true'
-      @fixed_price = price_label['FixedPrice']
-      @default_price = price_label['DefaultPrice']
-      @sale_price = price_label['SalePrice']
-      @base_fixed_price = price_label['BaseFixedPrice']
-      @base_sale_price = price_label['BaseSalePrice']
-      @period_start = price_label['PeriodStart']
-      @period_end = price_label['PeriodEnd']
+      @is_inclusive = price_label['taxable']
+      @fixed_price = price_label['fixedPrice']
+      @default_price = price_label['defaultPrice']
+      @sale_price = price_label['salePrice']
+      @period_start = price_label['periodStart']
+      @period_end = price_label['periodEnd']
     end
   end
 end
-

data/lib/ebisu/models/review.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Review
     # @!attribute rate
@@ -18,5 +20,4 @@ module Ebisu
       @url = review.dig('Url')
     end
   end
-
 end

data/lib/ebisu/models/shipping.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class Shipping
     # @!attribute code
@@ -9,9 +11,8 @@ module Ebisu
     attr_reader :name
 
     def initialize(shipping)
-      @code = shipping.dig('Code')
-      @name = shipping.dig('Name')
+      @code = shipping.dig('code')
+      @name = shipping.dig('name')
     end
   end
 end
-

data/lib/ebisu/models/store.rb

@@ -16,16 +16,24 @@ module Ebisu
     #   @return [True|False]
     attr_reader :is_best_store
 
+    # @!attribute ratings
+    #   @return [Ebisu::StoreRatings]
+    attr_reader :ratings
+
+    # @!attribute image_id
+    #   @return [String]
+    attr_reader :image_id
+
     # @!attribute ratings
     #   @return [Ebisu::StoreRatings]
     attr_reader :ratings
     def initialize(data)
-      @id = data.dig('Id')
-      @name = data.dig('Name')
-      @payment = Ebisu::Payment.new(data.dig('Payment'))
-      @is_best_store = data.dig('IsBestStore') == 'true'
-      @ratings = Ebisu::StoreRatings.new(data.dig('Ratings'))
-      @image = Ebisu::StoreImage.new(data.dig('Image'))
+      @id = data.dig('sellerId')
+      @name = data.dig('name')
+      @payment = Ebisu::Payment.new(data.dig('payment'))
+      @is_best_store = data.dig('isBestSeller')
+      @ratings = Ebisu::StoreRatings.new(data.dig('review'))
+      @image_id = data.dig('imageId')
     end
   end
 end

data/lib/ebisu/models/store_image.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class StoreImage
     # @!attribute id
@@ -13,4 +15,3 @@ module Ebisu
     end
   end
 end
-

data/lib/ebisu/models/store_ratings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
   class StoreRatings
     # @!attribute rate
@@ -8,9 +10,8 @@ module Ebisu
     #   @return [Integer]
     attr_reader :count
     def initialize(data)
-      @rate = data.dig('Rate').to_f
-      @count = data.dig('Count').to_i
+      @rate = data.dig('rate').to_f
+      @count = data.dig('reviewCount').to_i
     end
   end
 end
-

data/lib/ebisu/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ebisu
-  VERSION = "0.1.1"
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ebisu-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - totem3
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -84,16 +84,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -162,10 +162,10 @@ files:
 - lib/ebisu/models/store_image.rb
 - lib/ebisu/models/store_ratings.rb
 - lib/ebisu/version.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: yahoo api client
 test_files: []