rdmm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe940e5aad4abe9b0e14b6079c65e56cd6dd1aa5
-  data.tar.gz: eafea0273111151c1e2d81db7dc75961afe931cb
+  metadata.gz: a98d46defda3eadf067187d2ed36c66011a4969c
+  data.tar.gz: e5e0f5665647578e2eb3beb620841f17e6f0d617
 SHA512:
-  metadata.gz: 34aa24a950848b870d755ee50411482c2839e31aa9a10e61ea90ce5d7f86c9a0333434d1f06be7b2174e1c0e96246efb15edb346e0650ea142373374905a5e2c
-  data.tar.gz: 22d6e35a24d8d9f7c6c14735ceb5dc472526c861d1c94a0dbef22c7df98c5f73081aacadd91bf7133486267dfb4385c5d29f8f2feb844300f7d35e407e5a81a4
+  metadata.gz: d2c9517b6cbcbb39e41e53b50a55bb9fe84f28867c09027abea0d6753a522db3e5ae2489e81eb2bdb4fef0a66964095f3c97c2eaa74b0b51c4b29c306153b86e
+  data.tar.gz: 0e0bb2b5ba4be165a802a6adcd9d0e5f0eb570e9486d2844d3f9af3d43da05a446a8c0c644408671055c0188c957c635723db5fba1913577865d6e2d31d78c5d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+- Add some methods to `Rdmm::Responses::BaseResponse` for error handling
+- Rename `:floor` to `:floor_code` on `Rdmm::Client#list_items`
+- Rename `:service` to `:service_code` on `Rdmm::Client#list_items`
+
 ## 0.1.0
 
 - Add `Rdmm::Client#list_actresses`

data/README.md

@@ -46,16 +46,21 @@ client = Rdmm::Client.new(affiliate_id: "dummy", api_id: "dummy")
 Available options:
 
 - `:id`
-- `:birthday`
-- `:bust`
-- `:height`
-- `:hip`
+- `:birthday_from`
+- `:birthday_to`
+- `:bust_from`
+- `:bust_to`
+- `:height_from`
+- `:height_to`
+- `:hip_from`
+- `:hip_to`
 - `:hits`
 - `:initial`
 - `:keyword`
 - `:offset`
 - `:sort`
-- `:waist`
+- `:waist_from`
+- `:waist_to`
 
 ```ruby
 client.list_actresses
@@ -108,14 +113,14 @@ Available options:
 - `:article`
 - `:article_id`
 - `:content_id`
-- `:floor`
+- `:floor_code`
 - `:hits`
 - `:keyword`
 - `:mono_stock`
 - `:offset`
 - `:released_from`
 - `:released_to`
-- `:service`
+- `:service_code`
 - `:site`
 - `:sort`
 
@@ -155,199 +160,121 @@ client.list_series(floor_id: 27)
 
 `https://api.dmm.com/affiliate/v3/SeriesSearch?affiliate_id=dummy&api_id=dummy&floor_id=27`
 
-### Rdmm::Responses::BaseResponse#each
+### Rdmm::Responses::BaseResponse
 
-This class implements `Enumerable` module.
+Available methods:
 
-```ruby
-client.list_items(site: "DMM.com").map(&:title)
-```
-
-<details>
-<summary>output</summary>
-
-```ruby
-["キングダム",
- "ハドソン川の奇跡",
- "ミュージカル『刀剣乱舞』 〜真剣乱舞祭 2016〜",
- "back number/アンコール",
- "パンフレット 舞台『刀剣乱舞』虚伝 燃ゆる本能寺（再演）",
- "終末のハーレム セミカラー版",
- "VOICEROID＋ 東北きりたん EX ダウンロード版",
- "CHAOS；CHILD",
- "【8〜14泊】Travel house 軽量 TSAロック付き 4輪 93L スーツケース レッド",
- "ミュージカル『刀剣乱舞』真剣乱舞祭 2016 （ブルーレイディスク）",
- "シン・ゴジラ",
- "東京タラレバ娘",
- "舞台『刀剣乱舞』虚伝 燃ゆる本能寺 〜再演〜",
- "キングダム",
- "宇多田ヒカル/Fantome（SHM-CD）",
- "エルダー・スクロールズ・オンライン 日本語版 （インペリアルエディション）",
- "自炊・電子書籍化キット プラス裁断機PK-513L＆ScanSnap iX500 FI-IX500A",
- "VOICEROID＋ 結月ゆかり EX ダウンロード版",
- "映画 闇金ウシジマくんthe Final",
- "トレーディングブロマイド 25枚セット 舞台『刀剣乱舞』虚伝 燃ゆる本能寺（再演）"]
-```
-
-</details>
-
-### Rdmm::Responses::BaseResponse#first_position
-
-```ruby
-client.list_items(site: "DMM.com").first_position
-```
-
-<details>
-<summary>output</summary>
-
-```ruby
-1
-```
-
-</details>
-
-### Rdmm::Responses::BaseResponse#has_next_page?
-
-```ruby
-client.list_items(site: "DMM.com").has_next_page?
-```
-
-<details>
-<summary>output</summary>
-
-```ruby
-true
-```
-
-</details>
-
-### Rdmm::Responses::BaseResponse#result_count
-
-```ruby
-client.list_items(site: "DMM.com").result_count
-```
-
-<details>
-<summary>output</summary>
-
-```ruby
-20
-```
-
-</details>
-
-### Rdmm::Responses::BaseResponse#total_count
-
-```ruby
-client.list_items(site: "DMM.com").total_count
-```
-
-<details>
-<summary>output</summary>
-
-```ruby
-50000
-```
-
-</details>
+- `#body`
+- `#each`
+- `#errors`
+- `#first_position`
+- `#has_error?`
+- `#has_next_page?`
+- `#headers`
+- `#message`
+- `#next_page_offset`
+- `#resources`
+- `#result_count`
+- `#status`
+- `#total_count`
 
 ### Rdmm::Resources::ActressResource
 
 Available attributes:
 
-- `birthday`
-- `blood_type`
-- `bust`
-- `cup`
-- `height`
-- `hobbies`
-- `id`
-- `image_url_large`
-- `image_url_small`
-- `list_url_digital`
-- `list_url_mono`
-- `list_url_monthly`
-- `list_url_ppm`
-- `list_url_rental`
-- `name`
-- `prefectures`
-- `ruby`
-- `waist`
+- `#birthday`
+- `#blood_type`
+- `#bust`
+- `#cup`
+- `#height`
+- `#hobbies`
+- `#id`
+- `#image_url_large`
+- `#image_url_small`
+- `#list_url_digital`
+- `#list_url_mono`
+- `#list_url_monthly`
+- `#list_url_ppm`
+- `#list_url_rental`
+- `#name`
+- `#prefectures`
+- `#ruby`
+- `#waist`
 
 ### Rdmm::Resources::AuthorResource
 
 Available attributes:
 
-- `another_name`
-- `id`
-- `list_url`
-- `name`
-- `ruby`
+- `#another_name`
+- `#id`
+- `#list_url`
+- `#name`
+- `#ruby`
 
 ### Rdmm::Resources::FloorResource
 
 Available attributes:
 
-- `code`
-- `id`
-- `name`
-- `service_code`
-- `service_name`
-- `site_code`
-- `site_name`
+- `#code`
+- `#id`
+- `#name`
+- `#service_code`
+- `#service_name`
+- `#site_code`
+- `#site_name`
 
 ### Rdmm::Resources::GenreResource
 
 Available attributes:
 
-- `id`
-- `list_url`
-- `name`
-- `ruby`
+- `#id`
+- `#list_url`
+- `#name`
+- `#ruby`
 
 ### Rdmm::Resources::ItemResource
 
 Available attributes:
 
-- `actors`
-- `actresses`
-- `affiliate_url`
-- `authors`
-- `category_name`
-- `content_id`
-- `directors`
-- `floor_code`
-- `floor_name`
-- `genres`
-- `labels`
-- `makers`
-- `prices`
-- `product_id`
-- `released_at`
-- `review_average`
-- `review_count`
-- `series`
-- `service_code`
-- `service_name`
-- `title`
-- `url`
-- `volume`
+- `#actors`
+- `#actresses`
+- `#affiliate_url`
+- `#authors`
+- `#category_name`
+- `#content_id`
+- `#directors`
+- `#floor_code`
+- `#floor_name`
+- `#genres`
+- `#labels`
+- `#makers`
+- `#prices`
+- `#product_id`
+- `#released_at`
+- `#review_average`
+- `#review_count`
+- `#series`
+- `#service_code`
+- `#service_name`
+- `#title`
+- `#url`
+- `#volume`
 
 ### Rdmm::Resources::MakerResource
 
 Available attributes:
 
-- `id`
-- `list_url`
-- `name`
-- `ruby`
+- `#id`
+- `#list_url`
+- `#name`
+- `#ruby`
 
 
 ### Rdmm::Resources::SeriesResource
 
 Available attributes:
 
-- `id`
-- `list_url`
-- `name`
-- `ruby`
+- `#id`
+- `#list_url`
+- `#name`
+- `#ruby`

data/lib/rdmm/client.rb

@@ -24,7 +24,6 @@ module Rdmm
       @connection ||= ::Faraday::Connection.new(url: BASE_URL) do |connection|
         connection.adapter :net_http
         connection.response :json
-        connection.response :raise_error
       end
     end
 

data/lib/rdmm/queries/list_items_query.rb

@@ -36,10 +36,9 @@ module Rdmm
         options[:content_id]
       end
 
-      # @note floor code
       # @return [String, nil]
       def floor
-        options[:floor]
+        options[:floor_code]
       end
 
       # @return [String, nil]
@@ -81,10 +80,9 @@ module Rdmm
         options[:offset]
       end
 
-      # @note service code
       # @return [String, nil]
       def service
-        options[:service]
+        options[:service_code]
       end
 
       # @note One of the following values:

data/lib/rdmm/responses/base_response.rb

@@ -18,6 +18,16 @@ module Rdmm
         resources.each(&block)
       end
 
+      # @return [Hash, nil]
+      def errors
+        body["result"]["errors"]
+      end
+
+      # @return [Boolean]
+      def has_error?
+        status != 200
+      end
+
       # @return [Integer]
       def first_position
         body["result"]["first_position"]
@@ -33,6 +43,11 @@ module Rdmm
         faraday_response.headers
       end
 
+      # @return [String, nil]
+      def message
+        body["result"]["message"]
+      end
+
       # @return [Integer, nil]
       def next_page_offset
         if has_next_page?
@@ -40,9 +55,11 @@ module Rdmm
         end
       end
 
-      # @return [Rdmm::Resources::BaseResource]
+      # @return [Array<Rdmm::Resources::BaseResource>]
       def resources
-        raise ::NotImplementedError
+        (sources || []).map do |source|
+          resource_class.new(source)
+        end
       end
 
       # @return [Integer]
@@ -62,10 +79,23 @@ module Rdmm
 
       private
 
+      # @private
       # @return [Faraday::Response]
       def faraday_response
         @faraday_response
       end
+
+      # @private
+      # @return [Class]
+      def resource_class
+        raise ::NotImplementedError
+      end
+
+      # @private
+      # @return [Array<Hash>, nil]
+      def sources
+        raise ::NotImplementedError
+      end
     end
   end
 end

data/lib/rdmm/responses/list_actresses_response.rb

@@ -1,11 +1,16 @@
 module Rdmm
   module Responses
     class ListActressesResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
-        body["result"]["actress"].map do |source|
-          ::Rdmm::Resources::ActressResource.new(source)
-        end
+      def resource_class
+        ::Rdmm::Resources::ActressResource
+      end
+
+      # @note Override
+      def sources
+        body["result"]["actress"]
       end
     end
   end

data/lib/rdmm/responses/list_authors_response.rb

@@ -1,11 +1,16 @@
 module Rdmm
   module Responses
     class ListAuthorsResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
-        (body["result"]["author"] || []).map do |source|
-          ::Rdmm::Resources::AuthorResource.new(source)
-        end
+      def resource_class
+        ::Rdmm::Resources::AuthorResource
+      end
+
+      # @note Override
+      def sources
+        body["result"]["author"]
       end
     end
   end

data/lib/rdmm/responses/list_floors_response.rb

@@ -1,18 +1,23 @@
 module Rdmm
   module Responses
     class ListFloorsResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
+      def resource_class
+        ::Rdmm::Resources::FloorResource
+      end
+
+      # @note Override
+      def sources
         body["result"]["site"].flat_map do |site_source|
           site_source["service"].flat_map do |service_source|
             service_source["floor"].map do |source|
-              ::Rdmm::Resources::FloorResource.new(
-                source.merge(
-                  "site_code" => site_source["code"],
-                  "site_name" => site_source["name"],
-                  "service_code" => service_source["code"],
-                  "service_name" => service_source["name"],
-                ),
+              source.merge(
+                "site_code" => site_source["code"],
+                "site_name" => site_source["name"],
+                "service_code" => service_source["code"],
+                "service_name" => service_source["name"],
               )
             end
           end

data/lib/rdmm/responses/list_genres_response.rb

@@ -1,11 +1,16 @@
 module Rdmm
   module Responses
     class ListGenresResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
-        body["result"]["genre"].map do |source|
-          ::Rdmm::Resources::GenreResource.new(source)
-        end
+      def resource_class
+        ::Rdmm::Resources::GenreResource
+      end
+
+      # @note Override
+      def sources
+        body["result"]["genre"]
       end
     end
   end

data/lib/rdmm/responses/list_items_response.rb

@@ -1,11 +1,16 @@
 module Rdmm
   module Responses
     class ListItemsResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
-        body["result"]["items"].map do |source|
-          ::Rdmm::Resources::ItemResource.new(source)
-        end
+      def resource_class
+        ::Rdmm::Resources::ItemResource
+      end
+
+      # @note Override
+      def sources
+        body["result"]["items"]
       end
     end
   end

data/lib/rdmm/responses/list_makers_response.rb

@@ -1,11 +1,16 @@
 module Rdmm
   module Responses
     class ListMakersResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
-        body["result"]["maker"].map do |source|
-          ::Rdmm::Resources::MakerResource.new(source)
-        end
+      def resource_class
+        ::Rdmm::Resources::MakerResource
+      end
+
+      # @note Override
+      def sources
+        body["result"]["maker"]
       end
     end
   end

data/lib/rdmm/responses/list_series_response.rb

@@ -1,11 +1,16 @@
 module Rdmm
   module Responses
     class ListSeriesResponse < BaseResponse
+      private
+
       # @note Override
-      def resources
-        body["result"]["series"].map do |source|
-          ::Rdmm::Resources::SeriesResource.new(source)
-        end
+      def resource_class
+        ::Rdmm::Resources::SeriesResource
+      end
+
+      # @note Override
+      def sources
+        body["result"]["series"]
       end
     end
   end

data/lib/rdmm/version.rb

@@ -1,3 +1,3 @@
 module Rdmm
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rdmm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday