dmm-sdk-ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6df74e954230b7b4216498e7a20cbd7d1af3d5d
-  data.tar.gz: e2acbd30f5c4a30c1fb66a379180615dc7c74877
+  metadata.gz: 2edcbc67b2cc049aec978225171450fb251e3957
+  data.tar.gz: d2e134dde4691e75b34aff8446ad185cd1c34073
 SHA512:
-  metadata.gz: a4509bbf5abeb3baa643df5a90d3f6fa9061edcc0d46b596903007d6c6655992cdc1ecc2ef3b509c90b07853790cf1b2a077ac39b5d4118b604affb1622e1d40
-  data.tar.gz: f59d52805e4e531aa87336131f3da0e14dcfaf385beeb71bb832a6df437091e6c8604ca97f0354b740797da918e73a36804430a858ef9027eb647505d643e0ac
+  metadata.gz: ea33d46b46e19a3884e306434978b131482a0e93169bf46d5780ee78634a52ec1b5eec4215d80042c0ac36d1acb0a07df0ca40e93d1c8d7a3c7050a915f259c8
+  data.tar.gz: 01f00104d8029db9e914b5fa74cb96ed12ebf064e67c5f40b12b35dbeb858b4f18dd72bf892450d1a729539262f58b3010a17339ed6efcb411cebd3820cc4e76

data/lib/dmm/core.rb

@@ -6,19 +6,18 @@ module Dmm
   module Configuration
     def initialize(api_id=nil,affiliate_id=nil)
       @url = 'http://affiliate-api.dmm.com/'
-      @api = api_id.nil? ? 'edu1FFKxWMqbHxf1fZFH' : api_id
-      @id = affiliate_id.nil? ? 'penix' : affiliate_id
+      @api = api_id.nil? ? ENV['DMM_API_ID'] : api_id
+      @id = affiliate_id.nil? ? ENV['DMM_AFFILIATE_ID'] : affiliate_id
       @site = 'DMM.co.jp'
       @version = '2.00'
       puts 'initialize ok!!'
+      puts ENV['DMM_API_ID']
+      puts ENV['DMM_AFFILIATE_ID']
     end
   end
 end
-
 module Dmm
-  class Com
-    include Dmm::Configuration
-    
+  module Util
     #### Search
     # 検索
     # @param [String] word 検索キーワード
@@ -67,8 +66,8 @@ module Dmm
       h ||= @hashdoc
       items = get_items(h)
       arr = []
-      items.each do |i|
-        arr << i[:title]
+      items.each do |m|
+        arr << { :title => m[:title], :affiliate_id => m[:affiliate_id] }
       end
       arr
     end
@@ -81,13 +80,12 @@ module Dmm
       h ||= @hashdoc
       arr = []
       items = get_items(h)
-      titles = get_titles(h)
-      items.each_with_index do |m, i|
-        arr << { :title => titles[i], :list => m[:imageURL][:list], :small => m[:imageURL][:small], :large => m[:imageURL][:large] }
+      items.each do |m|
+        arr << { :title => m[:title], :affiliate_id => m[:affiliate_id], :list => m[:imageURL][:list], :small => m[:imageURL][:small], :large => m[:imageURL][:large] }
       end
       arr
     end
-
+    
     # @param [Hash] h DMMAPIのHash化したもの。
     #  nil ok
     # @return [Array] 複数のimageとそのTitleを返す
@@ -95,10 +93,9 @@ module Dmm
     def get_sample_images(h = nil)
       h ||= @hashdoc
       arr = []
-      items = get_items
-      titles = get_titles(h)
-      items.each_with_index do |m, i|
-        arr << { :title => titles[i], :images => m[:sampleImageURL][:sample_s][:image]}
+      items = get_items(h)
+      items.each do |m|
+        arr << { :title => titles[i], :affiliate_id => m[:affiliate_id], :images => m[:sampleImageURL][:sample_s][:image]}
       end
       arr
     end
@@ -121,21 +118,20 @@ module Dmm
       xml = ""
       open(uri) do |o|
         o.each do |l|
-         # if /\<parameter\sname/ =~ l
-         #   # なんでParameterの中に入れるんだろうね(´・ω・｀)
-         #   # 取り出そうよ
-         #   b = l.scan(/\"(.*?)\"/).flatten
-         #   xml << "<#{b[0]}>"
-         #   xml << "#{b[1]}"
-         #   xml << "</#{b[0]}>"
-         #   xml << "\n"
-         # else
+          if /\<parameter\sname/ =~ l
+            # なんでParameterの中に入れるんだろうね(´・ω・｀)
+            # 取り出そうよ
+            b = l.scan(/\"(.*?)\"/).flatten
+            xml << "<#{b[0]}>"
+            xml << "#{b[1]}"
+            xml << "</#{b[0]}>"
+            xml << "\n"
+          else
             xml << l
-         # end
+          end
         end
 
       end
-      #xml.force_encoding("utf-8")
       xml
     end
 
@@ -159,8 +155,21 @@ module Dmm
       end
       { elem.name.to_sym => value }
     end
+  end
+end
 
+module Dmm
+  class R18
+    @site = "DMM.co.jp"
+    include Dmm::Configuration
+    include Dmm::Util
+  end
+end
+
+module Dmm
+  class Com
+    @site = "DMM.com"
+    include Dmm::Configuration
+    include Dmm::Util
   end
 end
-# d = Dmm::Com.new
-# d.keyword 'aa'

data/lib/dmm/version.rb

@@ -1,3 +1,3 @@
 module Dmm
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmm-sdk-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - sutoh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler