ruby-dmm 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 403ce570cb0430ed5a1e0b5bc7412c715a4d0cf5
-  data.tar.gz: 923c8c937a288036beea2da4d3e7abb24ae0c20f
+  metadata.gz: b1f5de77476b1e6e8ed597018fec625d738551d3
+  data.tar.gz: be8c16c990d71f2090cc60b28ff14b64c0c8ba28
 SHA512:
-  metadata.gz: 662149fa1ae1228108b6f403582db0810709641a20ac02c2fbf2cf7514023bc7af63def56e7b56f91bd845da64038b6f5d3da07c3d4dd372ef5a020422d9f3a2
-  data.tar.gz: 7b3ff9d7badbb13b54c1426e0bee31a7da03ce5cd89c263d1fa278e33a4662048f88034dfe698dbed7685333e3d1afeee5a5c110acbc3de22fba58470dfb5811
+  metadata.gz: 6dc509405bae84c500837f1639408d2e7f49ea9b7e247c82d230c03074012be59e22074f8bad14238b32775652e371e64c75c6edcf5c46a9a054cceeec024e14
+  data.tar.gz: 2da0d30029e1e13406576dd0414d1d69ca14444de7251b0aa55e763f20a68e8643a9ee0a5645df850b83e8e9f5a1c1593df301642add03f5738ea322976859aa

data/.rubocop.yml

@@ -1,58 +1 @@
-Style/HashSyntax:
-  EnforcedStyle: hash_rockets
-
-Lint/AmbiguousOperator:
-  Enabled: true
-
-Lint/AssignmentInCondition:
-  Enabled: true
-
-Lint/UnusedBlockArgument:
-  Enabled: true
-
-Lint/UnusedMethodArgument:
-  Enabled: true
-
-Style/ClassAndModuleChildren:
-  Enabled: true
-
-Style/CollectionMethods:
-  Enabled: true
-  PreferredMethods:
-    reduce: 'inject'
-
-Style/EmptyLinesAroundBody:
-  Enabled: true
-
-Style/FileName:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: true
-
-Style/SignalException:
-  Enabled: true
-  EnforcedStyle: only_raise
-
-Style/SingleLineBlockParams:
-  Enabled: false
-
-Style/SingleSpaceBeforeFirstArg:
-  Enabled: true
-
-Style/SpaceInsideHashLiteralBraces:
-  Enabled: true
-
-Style/SpecialGlobalVars:
-  Enabled: true
-
-Style/StringLiterals:
-  Enabled: true
-
-Style/TrailingComma:
-  Enabled: false
-
-Style/UnneededPercentQ:
-  Enabled: true
-
 inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -1,41 +1,76 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2014-07-12 00:25:45 +0900 using RuboCop version 0.24.1.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2016-05-21 21:44:17 +0900 using RuboCop version 0.40.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 1
-Style/CyclomaticComplexity:
-  Max: 11
+# Cop supports --auto-correct.
+Lint/Debugger:
+  Exclude:
+    - 'test.rb'
 
-# Offense count: 14
+# Offense count: 1
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 93
+
+# Offense count: 7
+Style/AsciiComments:
+  Exclude:
+    - 'lib/ruby-dmm/client.rb'
+
+# Offense count: 3
 Style/Documentation:
-  Enabled: false
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/ruby-dmm.rb'
+    - 'lib/ruby-dmm/client.rb'
+    - 'lib/ruby-dmm/response.rb'
 
 # Offense count: 1
-Style/DoubleNegation:
-  Enabled: false
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: empty_lines, no_empty_lines
+Style/EmptyLinesAroundClassBody:
+  Exclude:
+    - 'lib/ruby-dmm/client.rb'
 
 # Offense count: 1
-Style/EachWithObject:
-  Enabled: false
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts.
+Style/FileName:
+  Exclude:
+    - 'lib/ruby-dmm.rb'
 
-# Offense count: 12
-# Configuration parameters: AllowURI.
-Style/LineLength:
-  Max: 141
+# Offense count: 4
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+# SupportedStyles: ruby19, ruby19_no_mixed_keys, hash_rockets
+Style/HashSyntax:
+  Enabled: false
 
-# Offense count: 7
-# Configuration parameters: CountComments.
-Style/MethodLength:
-  Max: 23
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'lib/ruby-dmm/version.rb'
 
 # Offense count: 1
-# Configuration parameters: SupportedStyles.
-Style/RaiseArgs:
-  EnforcedStyle: compact
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, ConsistentQuotesInMultiline.
+# SupportedStyles: single_quotes, double_quotes
+Style/StringLiterals:
+  Enabled: false
 
-# Offense count: 2
-Style/RegexpLiteral:
-  MaxSlashes: 0
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# SupportedStyles: comma, consistent_comma, no_comma
+Style/TrailingCommaInLiteral:
+  Exclude:
+    - 'lib/ruby-dmm/client.rb'
+    - 'spec/ruby-dmm/client_spec.rb'

data/.travis.yml

@@ -1,6 +1,8 @@
+cache: bundler
 language: ruby
-script: rake ci
+script: bundle exec rake ci
+sudo: false
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0

data/Guardfile

@@ -1,6 +1,6 @@
 # vim: ts=2 sts=2 et sw=2 ft=ruby
 
-ENV['GUARD_TEST'] = "true"
+ENV['GUARD_TEST'] = 'true'
 
 guard 'rspec', :all_after_pass => false, :all_on_start => false do
   watch(%r{spec/.+_spec\.rb$})

data/README.md

@@ -1,11 +1,11 @@
 # ruby-dmm
-[![Gem Version](https://img.shields.io/gem/v/ruby-dmm.svg)](http://badge.fury.io/rb/ruby-dmm)
-[![Build Status](https://travis-ci.org/meganemura/ruby-dmm.svg?branch=master)](https://travis-ci.org/meganemura/ruby-dmm)
-[![Coverage Status](https://img.shields.io/coveralls/meganemura/ruby-dmm.svg)](https://coveralls.io/r/meganemura/ruby-dmm?branch=master)
-[![Code Climate](https://img.shields.io/codeclimate/github/meganemura/ruby-dmm.svg)](https://codeclimate.com/github/meganemura/ruby-dmm)
-[![Dependency Status](https://gemnasium.com/meganemura/ruby-dmm.svg)](https://gemnasium.com/meganemura/ruby-dmm)
+[![Gem Version](https://img.shields.io/gem/v/ruby-dmm.svg?style=flat)](http://badge.fury.io/rb/ruby-dmm)
+[![Build Status](https://img.shields.io/travis/meganemura/ruby-dmm.svg?style=flat)](https://travis-ci.org/meganemura/ruby-dmm)
+[![Coverage Status](https://img.shields.io/coveralls/meganemura/ruby-dmm.svg?style=flat)](https://coveralls.io/r/meganemura/ruby-dmm?branch=master)
+[![Code Climate](https://img.shields.io/codeclimate/github/meganemura/ruby-dmm.svg?style=flat)](https://codeclimate.com/github/meganemura/ruby-dmm)
+[![Dependency Status](https://img.shields.io/gemnasium/meganemura/ruby-dmm.svg?style=flat)](https://gemnasium.com/meganemura/ruby-dmm)
 
-Client for the DMM Web Service API 2.0.
+Client for the DMM Web Service API v3
 
 ## Installation
 
@@ -24,30 +24,32 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-client = DMM.new(:api_id => "your_api_id", :affiliate_id => "your_affiliate_id", :result_only => true)
-response = client.order("date").limit(5).item_list("妄想")
-response.items.map {|item| item.title }
-# => ["ココロ@ファンクション！",
-#     "やらせてっ！てぃーちゃー学園旅行〜やらてぃーが学園を飛び出したァ！？〜（DVDPG）",
-#     "彫刻ボディ 瀧川花音",
-#     "目が奪われる瞬間 vol.02",
-#     "彫刻ボディ 瀧川花音"]
+client = DMM.new(:api_id => "YOUR-API-ID", :affiliate_id => "YOUR-AFFILIATE-ID")
+response = cli.product(:site => 'DMM.com', :keyword => '超能力', :sort => 'rank')
+response.result[:items].map {|x| x[:title] }
+# => ["僕のヒーローアカデミア",
+#     "みんな！エスパーだよ！-欲望だらけのラブ・ウォーズ-",
+#     "血界戦線 Vol.6 （ブルーレイディスク）",
+#     "エルフェンリート",
+#     "学園アリス",
+#     "ストレイヤーズ・クロニクル",
+#     "Honey Bitter",
+#     "MONSTERZ モンスターズ",
+#     "AREA D 異能領域",
+#     "十十虫は夢を見る",
+#     "蝶戦士ピンクフューリーS",
+#     "バビル2世 ザ・リターナー",
+#     "とある科学の超電磁砲",
+#     "裸心の十字架",
+#     "菊池俊輔 作曲50周年 CD-BOX Composer SHUNSUKE KIKUCHI 50th Anniversary",
+#     "アライブ 最終進化的少年",
+#     "恋は光",
+#     "ホムンクルス",
+#     "目隠しの国",
+#     "AKIRA"]
 ```
 
-### Choose your favorite XML Parser
-
-You can use `ox`, `libxml`, `nokogiri` through `multi_xml`.
-
-Add 'ox' and 'nokogiri' to your Gemfile, then it works below.
-
-```ruby
-> require 'ruby-dmm'
-> MultiXml.parser # => MultiXml::Parsers::Ox
-> MultiXml.parser = :nokogiri
-> MultiXml.parser # => MultiXml::Parsers::Nokogiri
-```
-
-See [multi_xml documents](http://rdoc.info/gems/multi_xml).
+DMM::Client interface is very similar to (dmm-js-sdk](https://github.com/DMMcomLabo/dmm-js-sdk).
 
 ## Contributing
 

data/lib/ruby-dmm.rb

@@ -1,24 +1,9 @@
 # encoding: utf-8
-require 'ruby-dmm/configuration'
-require 'ruby-dmm/error'
+
 require 'ruby-dmm/client'
 
 module DMM
-  extend Configuration
-
-  class << self
-    def new(options = {})
-      DMM::Client.new(options)
-    end
-
-    # Delegate to DMM::Client.new
-    def method_missing(method, *args, &block)
-      return super unless new.respond_to?(method)
-      new.send(method, *args, &block)
-    end
-
-    def respond_to?(method, include_private = false)
-      new.respond_to?(method, include_private) || super(method, include_private)
-    end
+  def self.new(options = {})
+    DMM::Client.new(options)
   end
 end

data/lib/ruby-dmm/client.rb

@@ -1,83 +1,66 @@
 # encoding: utf-8
+
 require 'faraday'
-require 'faraday/response/raise_dmm_error'
 require 'faraday_middleware'
-require 'faraday_middleware/response/dmm_rashify'
-require 'multi_xml_tweaks'
 require 'ruby-dmm/response'
-require 'ruby-dmm/client/item_list'
+require 'ruby-dmm/version'
 
 module DMM
-  DEFAULT_API_VERSION   = '2.00'.freeze
-  SITE_DMM_CO_JP        = 'DMM.co.jp'.freeze
-  SITE_DMM_COM          = 'DMM.com'.freeze
-  DEFAULT_SITE          = SITE_DMM_CO_JP
-
   class Client
-    include DMM::Client::ItemList
-
-    attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
-    attr_accessor :params
-    attr_reader :last_response
-
-    def initialize(params = {})
-      DMM.options.each do |key, value|
-        # fall back to `DMM::Configuration` module defaults
-        send("#{key}=", params[key] || value)
-      end
-
-      # Symbolize keys
-      params = params.inject({}) do |hash, (key, value)|
-        hash.merge(key.to_sym => value)
-      end
 
-      @result_only = !!params.delete(:result_only)  # Set true to get response.result only.
-      @params = {
-        :api_id       => ENV['DMM_API_ID']        || params[:api_id],       # your own api_id
-        :affiliate_id => ENV['DMM_AFFILIATE_ID']  || params[:affiliate_id], # your own affiliate_id
-        :operation    => nil,
-        :version      => DEFAULT_API_VERSION,
-        :timestamp    => Time.now.strftime('%F %T'),
-        :site         => DEFAULT_SITE,
-      }.merge(params)
+    BASE_URL = 'https://api.dmm.com/affiliate/v3/'.freeze
+    DEFAULT_USER_AGENT = "ruby-dmm gem #{DMM::VERSION}".freeze
 
-      @encode_options = params[:encode_options] || {}
+    def initialize(options = {})
+      @api_id       = (ENV['DMM_API_ID']       || options[:api_id])
+      @affiliate_id = (ENV['DMM_AFFILIATE_ID'] || options[:affiliate_id])
+      @user_agent   = (ENV['DMM_USER_AGENT']   || options[:user_agent] || DEFAULT_USER_AGENT)
     end
 
-    def operation(value)
-      @params.update(:operation => value)
-    end
+    API_MAP = {
+      product: 'ItemList',      # 商品情報
+      floor:   'FloorList',     # フロア
+      actress: 'ActressSearch', # 女優検索
+      genre:   'GenreSearch',   # ジャンル検索
+      maker:   'MakerSearch',   # メーカー検索
+      series:  'SeriesSearch',  # シリーズ検索
+      author:  'AuthorSearch',  # 作者検索
+    }.freeze
 
-    def all
-      @params[:operation] ? get('/', @params) : nil
+    API_MAP.each do |method, path|
+      define_method method do |params = {}|
+        get(path, credentials.merge(params))
+      end
     end
 
     private
 
-    def get(_path, options = {})
-      encode_params!
-      @last_response = connection.get('/', options)
-      @last_response.body
+    def credentials
+      {
+        api_id:       @api_id,
+        affiliate_id: @affiliate_id,
+      }
     end
 
-    def connection(options = {})
-      # TODO: not to create on every request.
-      connection = Faraday.new(api_endpoint, options) do |faraday|
-        faraday.adapter(adapter)
-        faraday.request(:url_encoded)
-        faraday.response(:xml, :content_type => 'text/xml; charset=euc-jp')
-        faraday.use(FaradayMiddleware::DMMRashify)
-        faraday.use(FaradayMiddleware::ParseXml)
-        faraday.use(Faraday::Response::RaiseDMMError)
-      end
-      connection.headers[:user_agent] = user_agent
-      connection
+    def get(path, options = {})
+      Response.new(connection.get(path, options))
     end
 
-    def encode_params!
-      @params.each do |_key, value|
-        value.encode!(Encoding::EUC_JP, @encode_options) if value.is_a?(String) && !value.frozen?
+    def connection
+      @connection ||= Faraday.new(faraday_options) do |faraday|
+        faraday.adapter  Faraday.default_adapter
+        faraday.request  :url_encoded
+        faraday.response :json
       end
     end
+
+    def faraday_options
+      {
+        url: BASE_URL,
+        headers: {
+          user_agent: @user_agent,
+        },
+      }
+    end
   end
 end

data/lib/ruby-dmm/response.rb

@@ -1,43 +1,29 @@
 # encoding: utf-8
-require 'ruby-dmm/response/item'
+
+require 'active_support/core_ext/hash/keys'
 
 module DMM
   class Response
-    attr_reader :request, :result
+    def initialize(faraday_response)
+      @original_response = faraday_response
+    end
+
+    attr_reader :original_response
 
-    def initialize(response)
-      @request = response[:request][:parameters][:parameter].inject({}) { |hash, params| hash.merge(params[:name].to_sym => params[:value]) }
-      if response[:result][:message] && response[:result][:errors]
-        @result  = response[:result]
-      else
-        @result  = DMM::Response::Result.new(response[:result])
-      end
+    def body
+      @body ||= original_response.body.deep_symbolize_keys
     end
 
-    class Result
-      RESULT_KEYS = [
-        :first_position,
-        :items,
-        :result_count,
-        :total_count,
-      ]
-      attr_reader(*RESULT_KEYS)
-      alias_method :offset,     :first_position
-      alias_method :per_result, :result_count
+    def headers
+      original_response.headers
+    end
+
+    def status
+      original_response.status
+    end
 
-      def initialize(result)
-        RESULT_KEYS.each do |key|
-          case key
-          when :items
-            @items = [result[:items][:item]].flatten.map do |item|
-              DMM::Response::Item.new(item)
-            end if result.key?(:items)
-            @items ||= []
-          else
-            instance_variable_set("@#{key}", result[key].to_i)
-          end
-        end
-      end
+    def result
+      body[:result]
     end
   end
 end