ruby-dmm 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05ff67107c04c13451281c2ddce1037f703bc594
-  data.tar.gz: c169bc92ef677da3de5b75d02d93b3bd09cf19da
+  metadata.gz: 79cc74c7709505fc6927020e46facf6b3e220ac7
+  data.tar.gz: 0869a4633cb3da9608f81290a514ba958e57a0a6
 SHA512:
-  metadata.gz: d8c039f51ec9c66217dfba522a124fb1550269ba32178d4c9c7efd7bf9e3a1b02b52e935c76819162266c37d4408fbbe3cb9d539648fa37b3f79a61bf322fc89
-  data.tar.gz: 032538ccbf823e0698bf0e280b37b47f1cd29a0ce7421ebdf4523bfa333c0bb86ce3d361a6527f2dbf8fb07283000b9ee67aa61fab7ca9d457b56da8127134b6
+  metadata.gz: 84d6e48892644274e3728a5a1ab2dd23064f75cf6f3aacd429cbd7d20113a3d82614be035a769fe94acf3e88d424650a8215353a30f1b9cc6b9624c5065334fb
+  data.tar.gz: 5c5e95763c5017e44177a19aade42d7b94cf65b7944a82b420edc0f56c2d29b6cb61f04daf68f6c5f214cd5cf8fdf368c098bf465224bd26226ca531d8bdb2d4

data/lib/ruby-dmm/client/item_list.rb

@@ -30,6 +30,7 @@ module DMM
 
         define_method(key) do |value|
           @params.update(key => value)
+          self
         end
       end
 

data/lib/ruby-dmm/response/item.rb

@@ -39,9 +39,7 @@ module DMM
           else
             self.class.class_eval do
               unless method_defined?(key)
-                define_method "#{key}" do
-                  instance_variable_get("@#{key}")
-                end
+                attr_reader key
                 if name = ALIAS_METHOD_MAP[key.to_sym]
                   alias_method name, key.to_sym
                 end

data/lib/ruby-dmm/response/item_info.rb

@@ -2,36 +2,36 @@
 module DMM
   class Response
     class ItemInfo
-      SINGLE_VALUE_ATTRIBUTES   = [
-        :author,
-        :color,
-        :director,
-        :genre,
-        :label,
-        :maker,
-        :series,
-        :size,
-        :type,
-      ]
-      MULTIPLE_VALUES_ATTRIBUTES = {
-        :actors     => :actor,
-        :actresses  => :actress,
-        :artists    => :artist,
-        :fighters   => :fighter,
-        :keywords   => :keyword,
+
+      # for defining
+      #   alias_method :actors, :actor
+      PLURAL_MAP = {
+        :actor    => :actors,
+        :actress  => :actresses,
+        :artist   => :artists,
+        :author   => :authors,
+        :color    => :colors,
+        :director => :directors,
+        :fighter  => :fighters,
+        :genre    => :genres,
+        :keyword  => :keywords,
+        :label    => :labels,
+        :maker    => :makers,
       }
-      attr_reader *SINGLE_VALUE_ATTRIBUTES
-      attr_reader *MULTIPLE_VALUES_ATTRIBUTES.keys
 
       def initialize(item_info)
-        SINGLE_VALUE_ATTRIBUTES.inject({}) {|h,k| h.merge(k => k)}.merge({}).each do |attribute, key|
-          value = self.class.integrate(item_info[key])
-          value = value.first if value
-          instance_variable_set("@#{attribute}", value)
-        end
-        MULTIPLE_VALUES_ATTRIBUTES.each do |attribute, key|
-          value = self.class.integrate(item_info[key])
-          instance_variable_set("@#{attribute}", value)
+        item_info.each do |key, value|
+          key = key.to_s
+          value = self.class.integrate(value)
+          self.class.class_eval do
+            unless method_defined?(key)
+              attr_reader key
+              if plural = PLURAL_MAP[key.to_sym]
+                alias_method plural, key.to_sym
+              end
+            end
+          end
+          instance_variable_set("@#{key}", value)
         end
       end
 

data/lib/ruby-dmm/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module DMM
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/response/item_info_spec.rb

@@ -0,0 +1,86 @@
+# vim: ts=2 sts=2 et sw=2 ft=ruby fileencoding=utf-8
+require "spec_helper"
+
+describe DMM::Response::ItemInfo do
+
+  def complex_hash
+    {
+      "actor"=> [
+        {"name" => "ダニエル・ラドクリフ",  "id" => "60257"},
+        {"name" => "だにえるらどくりふ",    "id" => "60257_ruby"},
+        {"name" => "メガネ君",              "id" => "60257_classify"},
+        {"name" => "ルパート・グリント",    "id" => "60458"},
+        {"name" => "るぱーとぐりんと",      "id" => "60458_ruby"},
+        {"name" => "リチャード・ハリス",    "id" => "61833"},
+        {"name" => "りちゃーどはりす",      "id" => "61833_ruby"},
+        {"name" => "エマ・ワトソン",        "id" => "60074"},
+        {"name" => "えまわとそん",          "id" => "60074_ruby"},
+      ],
+    }
+  end
+
+  def simple_hash
+    {
+      "label"  => {"name" => "ワーナー・ホーム・ビデオ",  "id" => "60016"},
+      "genre"  => {"name" => "ファンタジー",              "id" => "71009"},
+      "series" => {"name" => "ハリー・ポッター",          "id" => "60029"},
+      "maker"  => {"name" => "ワーナー・ホーム・ビデオ",  "id" => "45578"},
+    }
+  end
+
+  describe '.integrate' do
+    context 'simple_hash' do
+      subject { DMM::Response::ItemInfo.integrate(complex_hash["actor"]) }
+      it 'integrates name and ruby and more (classify etc...) by id' do
+        actor = subject.find {|actor| actor["id"] == "60257" }
+        actor["name"].should     == "ダニエル・ラドクリフ"
+        actor["ruby"].should     == "だにえるらどくりふ"
+        actor["classify"].should == "メガネ君"
+      end
+    end
+
+    context 'simple_hash' do
+      subject { DMM::Response::ItemInfo.integrate(simple_hash["label"]) }
+      it 'runs collectry' do
+        label = subject.first
+        label["id"].should    == "60016"
+        label["name"].should  == "ワーナー・ホーム・ビデオ"
+      end
+    end
+  end
+
+
+  describe 'define method for any keys' do
+    context 'complex_hash' do
+      subject { DMM::Response::ItemInfo.new(complex_hash) }
+      its(:actors) { should_not be_empty }
+      describe 'actors' do
+        it 'integrates name and ruby by id' do
+          actor = subject.actors.find {|actor| actor["id"] == "60257" }
+          actor["name"].should     == "ダニエル・ラドクリフ"
+          actor["ruby"].should     == "だにえるらどくりふ"
+          actor["classify"].should == "メガネ君"
+
+          actor = subject.actors.find {|actor| actor["id"] == "60074" }
+          actor["name"].should == "エマ・ワトソン"
+          actor["ruby"].should == "えまわとそん"
+        end
+      end
+    end
+
+    context 'simple_hash' do
+      subject do
+        DMM::Response::ItemInfo.new(simple_hash)
+      end
+      it { should be }
+
+      describe 'director' do
+        it 'respond to given keys' do
+          simple_hash.keys.each do |key|
+            subject.should respond_to(key)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dmm
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - meganemura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -115,6 +115,7 @@ files:
 - spec/fixtures/r18_rental.xml
 - spec/fixtures/request_error.xml
 - spec/fixtures/zero_items.xml
+- spec/response/item_info_spec.rb
 - spec/response/item_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
@@ -164,6 +165,7 @@ test_files:
 - spec/fixtures/r18_rental.xml
 - spec/fixtures/request_error.xml
 - spec/fixtures/zero_items.xml
+- spec/response/item_info_spec.rb
 - spec/response/item_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb