nicoquery 0.0.2.4 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81ac089c860870da51b14e2e9f852a23bd3314e2
-  data.tar.gz: 63dcef0f7b49cead8df352afdbfc1d51ca3e68e4
+  metadata.gz: bce8798710bea5f5abebc2d7aeb1bc6256a82fe6
+  data.tar.gz: fffd05d8efd7d3ed0c62a5ff5049a3606ddd262d
 SHA512:
-  metadata.gz: 1d6b1ccf1315bc232109657ca2c8f7d0a13f7509837384b18c409cabbf0142d71a879419f31833c0b57b5ac4e82e4fe964e9e75c558c056cf164f35e935c1b18
-  data.tar.gz: d089b1b6b92025c96f5f1b39a4c5095736edfaa301fcf36e4723f18bbc5eeb1af6cdf7aa302b1887440b30b59c11cf3cd92152ba0c94a2f84a96524f8ba84a48
+  metadata.gz: e4cca4072ed5a0e1f01acee683de6f77143004f210a0ab1a8429188392444a92a5acba844e420146875464d7a09c9e0091f2de3e1831a751617c29549503b91e
+  data.tar.gz: f1290e333fc053d9a989ea5aeeba403a90553145ef73ea94d7e0d85703ef4abe32177a277fb9c21106332ed33ed4f9d592462dba23e9b5a1ea6ac68f8cea9f2f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nicoquery (0.0.2.4)
+    nicoquery (0.0.3)
       activesupport (~> 4.0.0)
       i18n
       nicoapi
@@ -18,10 +18,29 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    addressable (2.3.5)
     atomic (1.1.13)
     coderay (1.0.9)
+    crack (0.4.1)
+      safe_yaml (~> 0.9.0)
     diff-lcs (1.2.4)
+    ffi (1.9.0)
+    formatador (0.2.4)
+    guard (1.8.2)
+      formatador (>= 0.2.4)
+      listen (>= 1.0.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-rspec (3.0.2)
+      guard (>= 1.8)
+      rspec (~> 2.13)
     i18n (0.6.5)
+    listen (1.3.0)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.4)
     method_source (0.8.2)
     mime-types (1.24)
     mini_portile (0.5.1)
@@ -39,6 +58,11 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rake (10.1.0)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.1)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
@@ -49,19 +73,27 @@ GEM
     rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
+    safe_yaml (0.9.5)
     slop (3.4.6)
+    thor (0.18.1)
     thread_safe (0.1.2)
       atomic
     tzinfo (0.3.37)
     watchr (0.7)
+    webmock (1.13.0)
+      addressable (>= 2.2.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.3)
+  guard
+  guard-rspec
   nicoquery!
   pry
   rake
   rspec
   watchr
+  webmock

data/Guardfile

@@ -0,0 +1,57 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+
+
+guard 'spork', :cucumber_env => { 'RAILS_ENV' => 'test' }, :rspec_env => { 'RAILS_ENV' => 'test' } do
+  watch('config/application.rb')
+  watch('config/environment.rb')
+  watch('config/environments/test.rb')
+  watch(%r{^config/initializers/.+\.rb$})
+  watch('Gemfile.lock')
+  watch('spec/spec_helper.rb') { :rspec }
+  watch('test/test_helper.rb') { :test_unit }
+  watch(%r{features/support/}) { :cucumber }
+end
+
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+
+  # Rails example
+  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
+  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
+  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch('config/routes.rb')                           { "spec/routing" }
+  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+
+  # Capybara features specs
+  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
+
+  # Turnip features and steps
+  watch(%r{^spec/acceptance/(.+)\.feature$})
+  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
+end
+

data/lib/nicoquery/api/base.rb

@@ -26,7 +26,12 @@ module NicoQuery
       end
 
       def get
-        RestClient.get uri.to_s
+        RestClient.get uri.to_s do |response, request, result, &block|
+          case response.code
+          when 200 || 403
+            response
+          end
+        end
       end
     end
   end

data/lib/nicoquery/api/mylist_rss.rb

@@ -21,7 +21,7 @@ module NicoQuery
       end
 
       def params_array
-        [format]
+        [format, 'numbers=1']
       end
 
       def format

data/lib/nicoquery/object/mylist.rb

@@ -25,8 +25,10 @@ module NicoQuery
         @movies = []
         @mylist_id = mylist_id
         source = (NicoQuery::Api::MylistRSS.new mylist_id).get
+
         @hash = NicoQuery::ObjectMapper::MylistRSS.new source
 
+        return if @hash.items.nil?
         @hash.items.map do |item|
           movie = NicoQuery::Object::Movie.new item.video_id
           movie.set_mylist_rss_source item

data/lib/nicoquery/object_mapper/getthumbinfo.rb

@@ -20,7 +20,7 @@ module NicoQuery
       end
 
       def description
-        @hash['description']
+        @_description ||= Description.new @hash['description']
       end
 
       def thumbnail_url
@@ -91,7 +91,7 @@ module NicoQuery
       def tags
         xml = @xml.scan(/\<tags domain=\"jp\">\n.+\n\<\/tags\>/m)[0]
         parsed = Nokogiri::XML xml
-        parsed.xpath("//tag").map do |tag_object| 
+        parsed.xpath("//tag").map do |tag_object|
           generate_tag_hash_by tag_object
         end
       end
@@ -100,6 +100,7 @@ module NicoQuery
         @hash['user_id'].to_i
       end
 
+      private
       def generate_tag_hash_by(nokogiri_xml)
         text = nokogiri_xml.text
 
@@ -111,6 +112,35 @@ module NicoQuery
 
         { text: text, lock: lock }
       end
+
+      class Description
+        attr_reader :raw_text
+
+        def initialize(raw_text)
+          @raw_text = raw_text.to_s
+        end
+
+        def text
+          @raw_text
+        end
+
+        def movie_references
+          # is this the high road?
+          text.scan(/((sm|nm)\d{1,})/).map {|e| e[0]}
+        end
+
+        def mylist_references
+          text.scan(/(?<=mylist\/)\d{1,}/).map(&:to_i)
+        end
+
+        def community_references
+          text.scan(/co\d{1,}/)
+        end
+
+        def seiga_references
+          text.scan(/im\d{1,}/)
+        end
+      end
     end
   end
 end

data/lib/nicoquery/object_mapper/mylist_rss.rb

@@ -5,17 +5,21 @@ module NicoQuery
   module ObjectMapper
     class MylistRSS
       attr_reader :meta, :items
+
       def initialize(xml)
         parser = Nori.new
         parsed_xml = parser.parse xml
         entire = parsed_xml['rss']['channel']
 
-        @meta = Meta.new entire, title_prefix        # noriは子要素が複数の場合は配列に変換するが、1つの場合には配列にしない。
-        # しかし、MylistRSSはitemsが配列であること前提にしているので、item要素が
-        # 1つだけの場合にも配列に変換する。
+        @meta = Meta.new entire, title_prefix
         if entire['item'].is_a? Array
           @items = entire['item'].map { |item| Item.new item }
+        elsif entire['item'].nil?
+          @items = []
         else
+        # noriは子要素が複数の場合は配列に変換するが、1つの場合には配列にしない。
+        # しかし、MylistRSSはitemsが配列であること前提にしているので、item要素が
+        # 1つだけの場合にも配列に変換する必要がある。
           @items = [ Item.new(entire['item']) ]
         end
       end
@@ -66,15 +70,6 @@ module NicoQuery
       end
 
       class Item
-
-        # <item>
-        #   <title>【初音ミク】みくみくにしてあげる♪【してやんよ】</title>
-        #   <link>http://www.nicovideo.jp/watch/sm1097445</link>
-        #   <guid isPermaLink="false">tag:nicovideo.jp,2007-09-20:/watch/1190218917</guid>
-        #   <pubDate>Sat, 17 Aug 2013 22:54:20 +0900</pubDate>
-        #   <description><![CDATA[<p class="nico-thumbnail"><img alt="【初音ミク】みくみくにしてあげる♪【してやんよ】" src="http://tn-skr2.smilevideo.jp/smile?i=1097445" width="94" height="70" border="0"/></p><p class="nico-description">おまえら、みっくみくにしてやんよ。歌詞はhttp://ikamo.hp.infoseek.co.jp/mikumiku.txt（9/20 1:55修正）。上げている他のもの→mylist/1450136</p><p class="nico-info"><small><strong class="nico-info-length">1:38</strong>｜<strong class="nico-info-date">2007年09月20日 01：22：02</strong> 投稿</small></p><p class="nico-numbers"><small>再生：<strong class="nico-numbers-view">10,643,217</strong>&nbsp;&#x20;コメント：<strong class="nico-numbers-res">2,726,450</strong>&nbsp;&#x20;マイリスト：<strong class="nico-numbers-mylist">210,310</strong></small></p>]]></description>
-        # </item>
-
         def initialize(parsed_xml)
           @hash = parsed_xml
         end
@@ -144,7 +139,7 @@ module NicoQuery
           end
 
           def mylist_references
-            text.scan /(?<=mylist\/)\d{1,}/
+            text.scan(/(?<=mylist\/)\d{1,}/).map(&:to_i)
           end
 
           def community_references

data/lib/nicoquery/version.rb

@@ -1,3 +1,3 @@
 module NicoQuery
-  VERSION = "0.0.2.4"
+  VERSION = "0.0.3"
 end

data/nicoquery.gemspec

@@ -30,4 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "watchr"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-rspec"
+  spec.add_development_dependency "webmock"
 end

data/spec/api/mylist_rss_spec.rb

@@ -1,16 +1,39 @@
 require 'nicoquery/api/mylist_rss'
+require 'fixture/mylist_rss_18266317'
+require 'webmock/rspec'
 
 
 describe "mylist_rss" do
-  before do
-    @instance = NicoQuery::Api::MylistRSS.new 18266317
-  end
+  describe "when access an existing and public mylist" do
+    before do
+      @mylist_id = 18266317
+      @uri = "http://www.nicovideo.jp/mylist/#{@mylist_id}?rss=2.0&numbers=1"
+      @instance = NicoQuery::Api::MylistRSS.new @mylist_id
+      WebMock.stub_request :get, @uri
+      # WebMock.reset!
+    end
+
+    after(:all) do
+      WebMock.disable!
+    end
+
+    describe "get" do
+      before do
+        @instance.get
+      end
 
-  describe "uri" do
-    subject { @instance.uri }
+      it "should GET mylist rss resource" do
+        WebMock.should have_requested :get, @uri
+      end
+    end
 
-    specify { expect(subject).to match /http:\/\/www\.nicovideo\.jp\/mylist/ }
-    specify { expect(subject).to match /18266317/ }
-    specify { expect(subject).to match /rss\=2\.0/ }
+    describe "uri" do
+      subject { @instance.uri }
+
+      specify { expect(subject).to match /http:\/\/www\.nicovideo\.jp\/mylist/ }
+      specify { expect(subject).to match /18266317/ }
+      specify { expect(subject).to match /rss\=2\.0/ }
+    end
   end
-end
+end
+

data/spec/fixture/getthumbinfo_sm20415650.rb

@@ -0,0 +1,42 @@
+module Fixture
+  def self.getthumbinfo_sm20415650
+    <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<nicovideo_thumb_response status="ok">
+<thumb>
+<video_id>sm20415650</video_id>
+<title>【Minecraft】まったりクラフター生活 ～最終日～【ゆっくり実況】</title>
+<description>最終日。ひっそりまったり通常営業...かな？ついにきました最終日。最後に最長の尺...画質が悪いかもです＞＜今まで本当にありがとうございました！最後にゆっくりまったりしていってね（*´ヮ｀*）シード値：－2086770116使用MOD1.Opti Fine2.MinecraftIM3.PlayerFormLittleMaid4.Audiotori r25.littleMaidMob＋りばいあ製MOD×2(らいちんぐすてっき・ゆかり＆らいちロボ)sm20221817←２９日目⇔新シリーズ→sm21615389シリーズまとめ→mylist/29017292他に作ったもの→mylist/29022355twitter⇒http://twitter.com/raichi_Jコミュco1590050いただいたイラストclip/577830ゆかりテクスチャim2807664moyuさん作・ゆかりさんと私のメイドモデルim2466837</description>
+<thumbnail_url>http://tn-skr3.smilevideo.jp/smile?i=20415650</thumbnail_url>
+<first_retrieve>2013-03-23T23:10:32+09:00</first_retrieve>
+<length>24:29</length>
+<movie_type>mp4</movie_type>
+<size_high>102398723</size_high>
+<size_low>77315257</size_low>
+<view_counter>25027</view_counter>
+<comment_num>2171</comment_num>
+<mylist_counter>722</mylist_counter>
+<last_res_body>宿さんw wwwwww うっかりww チェーンソーwww wwww by武藤遊戯 部屋の隅に積まれたゲ </last_res_body>
+<watch_url>http://www.nicovideo.jp/watch/sm20415650</watch_url>
+<thumb_type>video</thumb_type>
+<embeddable>1</embeddable>
+<no_live_play>0</no_live_play>
+<tags domain="jp">
+<tag category="1" lock="1">ゲーム</tag>
+<tag lock="1">Minecraft</tag>
+<tag lock="1">ゆっくり実況プレイ</tag>
+<tag lock="1">VOICEROID+_結月ゆかり</tag>
+<tag lock="1">VOICEROID+_民安ともえ</tag>
+<tag lock="1">らいち♪</tag>
+<tag>ゆっくり実況プレイ最終回リンク</tag>
+<tag>ゆかりお母さん</tag>
+<tag>納得の感動</tag>
+<tag>ラストを飾る壮大なうっかり</tag>
+<tag>ゆかりさんの中の人巡回済み</tag>
+</tags>
+<user_id>4957110</user_id>
+</thumb>
+</nicovideo_thumb_response>
+    EOS
+  end
+end