dmm 0.0.3 → 0.0.4

data/.gitignore

@@ -15,4 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
-config/
+config/
+*.DS_Store

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.8.7"
+  - "1.9.2"
+  - "1.9.3"
+  - "2.0.0"
+matrix:
+  allow_failures:
+    - rvm: 1.8.7

data/Gemfile

@@ -1,4 +1,8 @@
 source 'https://rubygems.org'
 
+gem 'rake'
+gem 'json', '~> 1.7.7'
+gem 'coveralls', require:false
+
 # Specify your gem's dependencies in dmm.gemspec
 gemspec

data/Rakefile

@@ -3,4 +3,4 @@ require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new('spec')
-task :default => :spec
+task :default => :spec

data/dmm.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'faraday_middleware', '~> 0.8'
   gem.add_dependency 'nokogiri', '~> 1.5.6'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'webmock', '1.10.1'
   gem.add_development_dependency 'simplecov'
-end
+end

data/lib/dmm/client.rb

@@ -25,6 +25,7 @@ module Dmm
       OPTIONS.each do |id|
         send("#{id}=", options[id])
       end
+      @time = Time.now.to_s
     end
 
     # Perform an HTTP GET request
@@ -62,8 +63,8 @@ module Dmm
         :affiliate_id => @affiliate_id,
         :operation    => 'ItemList',
         :version      => API_VERSION,
-        :timestamp    => Time.now.to_s,
-        :site         => 'DMM.co.jp',
+        :timestamp    => @time,
+        :site         => Dmm::R18,
       }
       options.each_value {|val| val.encode! 'euc-jp' if val.kind_of? String}
       params.merge!(options)

data/lib/dmm/error.rb

@@ -4,5 +4,8 @@ module Dmm
   class Unauthorized < Error; end # 401
   class Forbidden < Error; end # 403
   class NotFound < Error; end # 404
+  class NotAcceptable < Error; end # 406
+  class UnprocessableEntity < Error; end # 422
   class InternalServerError < Error; end # 500
+  class ServiceUnavailable < Error; end # 503
 end

data/lib/dmm/iteminfo.rb

@@ -2,7 +2,7 @@ require 'dmm/base'
 
 module Dmm
   class Iteminfo < Dmm::Base
-    def method_missing(method)
+    def method_missing(method, *args)
       if method.to_s =~ /^(series|maker|label)$/
         return nil unless @attrs[method.to_sym]
         @attrs[method.to_sym][:name]

data/lib/dmm/price.rb

@@ -27,7 +27,7 @@ module Dmm
       @delivery_types
     end
 
-    def method_missing(method)
+    def method_missing(method, *args)
       if method.to_s =~ /^price_(\w+)$/
         array = deliveries.select{ |hash| hash[:type] == $1 }
         array.first[:price].to_i unless array.empty?

data/lib/dmm/version.rb

@@ -1,3 +1,3 @@
 module Dmm
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/faraday/response/raise_dmm_error.rb

@@ -26,6 +26,7 @@ module Faraday
     private
 
     def error_message(response)
+      return 'Response body not exists.' if response[:body].nil?
       message = response[:body]['error']
       return message unless message.empty?
       "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}"

data/spec/dmm/api/items_spec.rb

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Dmm::API::Items do
+  context 'request with wrong affiliate id' do
+    before do
+      @client = wrong_client(
+        :api_id       => 'API_ID',
+        :affiliate_id => 'WRONG_AFFILIATE_ID',
+        :fixture      => 'request_with_wrong_affiliate_id.xml')
+    end
+
+    subject { @client }
+
+    it "should raise Dmm::Error with error message 'RequestError: Parameter not found (affiliate_id)'" do
+      error_msg = 'RequestError: Parameter not found (affiliate_id)'
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error(Dmm::Error, error_msg)
+    end
+  end
+
+  context 'request with wrong api id' do
+    before do
+      @client = wrong_client(
+        :api_id       => 'WRONG_API_ID',
+        :affiliate_id => 'AFFILIATE_ID',
+        :fixture      => 'request_with_wrong_api_id.xml')
+    end
+
+    subject { @client }
+
+    it "should raise Dmm::Error with error message 'LoginError: No existing account (login)'" do
+      error_msg = 'LoginError: No existing account (login)'
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error(Dmm::Error, error_msg)
+    end
+  end
+
+  context 'request with illegal parameter' do
+    before do
+      @client = client_with_illegal_param
+    end
+
+    subject { @client }
+
+    it "should raise Dmm::Error 'RequestError: Parameter illegal (site)'" do
+      error_msg = 'RequestError: Parameter illegal (site)'
+      lambda { subject.item_list(:site => 'illegalparameter') }.should raise_error(Dmm::Error, error_msg)
+    end
+  end
+end

data/spec/dmm/error_spec.rb

@@ -0,0 +1,100 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+
+describe Dmm::Error do
+  context 'with response status code is 400' do
+    before do
+      @client = response_with_error([400, "Bad Request"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::BadRequest
+    end
+  end
+
+  context 'with response status code is 401' do
+    before do
+      @client = response_with_error([401, "Unauthorized"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::Unauthorized
+    end
+  end
+
+  context 'with response status code is 403' do
+    before do
+      @client = response_with_error([403, "Frobidden"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::Forbidden
+    end
+  end
+
+  context 'with response status code is 404' do
+    before do
+      @client = response_with_error([404, "Not Found"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::NotFound
+    end
+  end
+
+  context 'with response status code is 406' do
+    before do
+      @client = response_with_error([406, "Not Acceptable"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::NotAcceptable
+    end
+  end
+
+  context 'with response status code is 422' do
+    before do
+      @client = response_with_error([422, "Unprocessable Entity"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::UnprocessableEntity
+    end
+  end
+
+  context 'with response status code is 500' do
+    before do
+      @client = response_with_error([500, "Internal Server Error"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::InternalServerError
+    end
+  end
+
+  context 'with response status code is 503' do
+    before do
+      @client = response_with_error([503, "Service Unavailable"])
+    end
+
+    subject { @client }
+
+    it 'should raise Dmm::InternalServerError' do
+      lambda { subject.item_list(:keyword => '巨乳') }.should raise_error Dmm::ServiceUnavailable
+    end
+  end
+end

data/spec/dmm/item_spec.rb

@@ -2,86 +2,37 @@
 require 'spec_helper'
 
 describe Dmm::Item do
+  context 'with valid response' do
+    before(:all) do
+      @items = sample_response.items
+    end
 
-  subject do
-    Dmm::Item.new({:service_name=>"動画",
-            :floor_name=>"ビデオ",
-            :category_name=>"ビデオ (動画)",
-            :content_id=>"118mas00093",
-            :product_id=>"118mas00093",
-            :title=>"絶対的美少女、お貸しします。 ACT.25",
-            :URL=>
-             "http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=118mas00093/",
-            :affiliateURL=>
-             "http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=118mas00093/#{ENV['AFFILIATE_ID']}",
-            :imageURL=>
-             {:list=>
-               "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093pt.jpg",
-              :small=>
-               "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093ps.jpg",
-              :large=>
-               "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093pl.jpg"},
-            :sampleImageURL=>
-             {:sample_s=>
-               {:image=>
-                 ["http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-1.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-2.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-3.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-4.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-5.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-6.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-7.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-8.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-9.jpg",
-                  "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-10.jpg"]}},
-            :prices=>
-             {:price=>"1980~",
-              :deliveries=>
-               {:delivery=>
-                 [{:type=>"stream", :price=>"1980"},
-                  {:type=>"download", :price=>"1980"}]}},
-            :date=>"2013-01-12 10:01:00",
-            :iteminfo=>
-             {:keyword=>
-               [{:name=>"顔射", :id=>"5023"},
-                {:name=>"単体作品", :id=>"4025"},
-                {:name=>"美少女", :id=>"1027"}],
-              :series=>{:name=>"絶対的美少女、お貸しします。", :id=>"79983"},
-              :maker=>{:name=>"プレステージ", :id=>"40136"},
-              :actress=>
-               [{:name=>"あやみ旬果", :id=>"1016835"},
-                {:name=>"あやみしゅんか", :id=>"1016835_ruby"},
-                {:name=>"av", :id=>"1016835_classify"}],
-              :label=>{:name=>"ます。", :id=>"20940"}}})
-  end
+    context 'with first item' do
+      subject { @items.first }
+
+      its(:service_name)     { should eq '動画' }
+      its(:floor_name)       { should eq 'ビデオ' }
+      its(:category_name)    { should eq 'ビデオ (動画)' }
+      its(:content_id)       { should eq 'club00025' }
+      its(:product_id)       { should eq 'club00025' }
+      its(:title)            { should eq '東京都港区白金セレブ人妻ナンパエステ' }
+      its(:url)              { should eq 'http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=club00025/' }
+      its(:affiliate_url)    { should eq 'http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=club00025/AFFILIATE_ID' }
+      its(:image_url)        { should eq Hash[:list=>"http://pics.dmm.co.jp/digital/video/club00025/club00025pt.jpg", :small=>"http://pics.dmm.co.jp/digital/video/club00025/club00025ps.jpg", :large=>"http://pics.dmm.co.jp/digital/video/club00025/club00025pl.jpg"] }
+      its(:sample_image_url) { should eq ["http://pics.dmm.co.jp/digital/video/club00025/club00025-1.jpg", "http://pics.dmm.co.jp/digital/video/club00025/club00025-2.jpg", "http://pics.dmm.co.jp/digital/video/club00025/club00025-3.jpg"] }
+      its(:date)             { should eq '2013-01-26 10:00:11'}
+      its(:prices)           { should be_kind_of Dmm::Price }
+      its(:iteminfo)         { should be_kind_of Dmm::Iteminfo }
 
-  its(:service_name) { should eq '動画' }
-  its(:floor_name) { should eq 'ビデオ' }
-  its(:category_name) { should eq 'ビデオ (動画)' }
-  its(:content_id) { should eq '118mas00093' }
-  its(:product_id) { should eq '118mas00093' }
-  its(:title) { should eq '絶対的美少女、お貸しします。 ACT.25' }
-  its(:url) { should eq 'http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=118mas00093/' }
-  its(:affiliateURL) { should eq "http://www.dmm.co.jp/digital/videoa/-/detail/=/cid=118mas00093/#{ENV['AFFILIATE_ID']}" }
-  its(:sample_image_url) { should eq ["http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-1.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-2.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-3.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-4.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-5.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-6.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-7.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-8.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-9.jpg",
-                                      "http://pics.dmm.co.jp/digital/video/118mas00093/118mas00093-10.jpg"] }
-  its(:prices) { should be_a_kind_of Dmm::Price }
-  its(:iteminfo) { should be_a_kind_of Dmm::Iteminfo }
+      describe 'method_missing' do
+        it 'delegates to Dmm::Price' do
+          subject.min_price.should eq 500
+        end
 
-  its(:keyword) { should eq ['顔射', '単体作品', '美少女'] }
-  its(:price) { should eq '1980~' }
-  its(:min_price) { should eq 1980 }
-  its(:price_stream) { should eq 1980 }
-  its(:price_download) { should eq 1980 }
-  its(:price_androiddl) { should be_nil }
-  its(:deliveries) { should eq [{:type=>"stream", :price=>"1980"},{:type=>"download", :price=>"1980"}] }
-  its(:delivery_types) { should eq ['stream', 'download'] }
+        it 'delegates to Dmm::Iteminfo' do
+          subject.maker.should eq '変態紳士倶楽部'
+        end
+      end
+    end
+  end
 end

data/spec/dmm/iteminfo_spec.rb

@@ -1,57 +1,26 @@
-#encoding: utf-8
-
+# -*- encoding: utf-8 -*-
 require 'spec_helper'
 
 describe Dmm::Iteminfo do
-
-  describe '#method_missing' do
-    subject { Dmm::Iteminfo.new({:keyword =>[{:name => "顔射", :id => "5023"},{:name =>"単体作品", :id =>"4025"},{:name =>"美少女", :id =>"1027"}],:series => {:name => "絶対的美少女、お貸しします。", :id => "79983"},:maker => {:name => "プレステージ", :id => "40136"},:actress =>[{:name => "あやみ旬果", :id => "1016835"},{:name => "あやみしゅんか", :id => "1016835_ruby"},{:name => "av", :id => "1016835_classify"}],:label => {:name => "ます。", :id => "20940"}})}
-
-    context 'with argument :keyword' do
-      its(:keyword) { should eq ['顔射', '単体作品', '美少女']}
-    end
-
-    context 'with argument :series' do
-      its(:series) { should eq '絶対的美少女、お貸しします。' }
+  context 'with valid response' do
+    before(:all) do
+      @items = sample_response.items
     end
 
-    context 'with argument :maker' do
-      its(:maker) { should eq 'プレステージ' }
-    end
-
-    context 'with argument :actress' do
-      its(:actress) { should eq ['あやみ旬果'] }
-    end
-
-    context 'with argument :director' do
-      its(:director) { should be_nil }
-    end
+    context 'with first item' do
+      subject { @items.first.iteminfo }
 
-    context 'with argument :label' do
-      its(:label) { should eq 'ます。' }
-    end
-
-    context 'with argument :undefined_method' do
-      it { proc{ subject.undefined_method }.should raise_error NoMethodError }
-    end
-  end
-
-  describe '#keyword' do
-    context 'has one keyword' do
-      subject { Dmm::Iteminfo.new(:keyword => {:name => "顔射"}) }
-
-      its(:keyword) { should eq ['顔射'] }
-    end
-    context 'has no keyword' do
-      subject { Dmm::Iteminfo.new }
-      its(:keyword) { should be_nil }
-    end
-  end
+      its(:keyword) { should eq ['エステ', 'ナンパ', '人妻', '痴女', '巨乳', '独占配信', 'ハイビジョン'] }
+      its(:maker)   { should eq '変態紳士倶楽部' }
+      its(:label)   { should eq '変態紳士倶楽部' }
 
-  describe '#respond_to?' do
-    subject { Dmm::Iteminfo.new }
-    it 'return true with argument :keyword' do
-      subject.respond_to?(:keyword).should be_true
+      describe 'respond_to?' do
+        %w(series maker label keyword actress director author).each do |method|
+          it "should be ture with argument #{method.to_sym}" do
+            subject.respond_to?(method.to_sym).should be_true
+          end
+        end
+      end
     end
   end
 end