nicoquery 0.1.6.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f536040bdecbefc5e1020bca164f1a3ac7e50d16
-  data.tar.gz: a1a5632d64f80134ce8b020c7fa3d6dc84deb7cc
+  metadata.gz: 892894c341bcd1e2a22b5483cdd92a4fa403e04c
+  data.tar.gz: aac4c5d4c0922f346d6edb4952b0361eabb71bf1
 SHA512:
-  metadata.gz: a790a669ca96dabfaa84a43fb1beb46cd6e6978f4d3658ca43b1e73122e5b3fca24e54af6680df60d8457ba2b7afa3d17c8e4528719e9e82fd5672c4c7474d74
-  data.tar.gz: f83e339558fcc22ef3a3a100f10ca0a71a589ea0f20d2ddc99aefafc02af057337332b4544ba82bf6f23554b143084d0c96ffe86b231ab34ba158a061a6137a2
+  metadata.gz: b307defe02cbee30fe4e253bfbf67c6a320a5507e8ae9ec700008c1d81a88207de01a0cdd55d38a7fccddc5fbbd51bbd9ddb88bd4846d260fcb39a7b27a8aa60
+  data.tar.gz: fa01f1f31a6b5200d74be4612c46ca2cc65ed7ab785c725d09ad5d19ecaa738e0bd59145329042d2f3a72a8051356411ab96691c98851b9fbfffe737adc998c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nicoquery (0.1.6.1)
+    nicoquery (0.1.7)
       activesupport (~> 4.0.0)
       i18n
       nicoapi

data/lib/nicoquery/api/base.rb

@@ -29,16 +29,13 @@ module NicoQuery
       end
 
       def get
-        RestClient.get uri.to_s do |response, request, result, &block|
-          case response.code
-          when 200
-            @forbidden = false
-            response
-          when 403
-            @forbidden = true
-            response
-          end
+        res = nil
+
+        RestClient.get uri.to_s do |response|
+          res = response
         end
+
+        { body: res.to_s, headers: res.headers, status_code: res.code }
       end
     end
   end

data/lib/nicoquery/crawler/bulk_scraping.rb

@@ -10,8 +10,8 @@ module NicoQuery
     module BulkScraping
       def execute(id_array, &block)
         @movies = []
-        source = (NicoQuery::Api::VideoArray.new id_array).get
-        @hash = NicoQuery::ObjectMapper::VideoArray.new source
+        response = (NicoQuery::Api::VideoArray.new id_array).get
+        @hash = NicoQuery::ObjectMapper::VideoArray.new response[:body]
 
         @hash.movies.each do |movie|
           m = NicoQuery::Object::Movie.new movie.video_id

data/lib/nicoquery/object/movie.rb

@@ -8,8 +8,6 @@ module NicoQuery
       attr_reader :video_id
 
       [
-        'deleted?',
-
         'title',
         'url',
         'thread_id',
@@ -21,15 +19,11 @@ module NicoQuery
       ].each do |field_name|
         define_method(field_name) do
           source =
-            @source['mylist_rss'].presence ||
-            @source['tag_search_rss'].presence ||
-            @source['video_array'].presence ||
-            @source['gethumbinfo'].presence ||
-            Proc.new do
-              source = (NicoQuery::Api::GetThumbInfo.new(@video_id || @thread_id)).get
-              set_getthumbinfo_source(NicoQuery::ObjectMapper::GetThumbInfo.new source)
-            end.call
-
+            @source[:mylist_rss].presence ||
+            @source[:tag_search_rss].presence ||
+            @source[:video_array].presence ||
+            @source[:getthumbinfo].presence ||
+            Proc.new { get_and_set_getthumbinfo_source; @source[:getthumbinfo] }.call
           source.send field_name
         end
       end
@@ -47,40 +41,75 @@ module NicoQuery
       ].each do |field_name|
         define_method(field_name) do
           source =
-            @source['gethumbinfo'].presence ||
-            @source['video_array'].presence ||
-            Proc.new do
-              source = (NicoQuery::Api::GetThumbInfo.new(@video_id || @thread_id)).get
-              set_getthumbinfo_source(NicoQuery::ObjectMapper::GetThumbInfo.new source)
-            end.call
+            @source[:getthumbinfo].presence ||
+            @source[:video_array].presence ||
+            Proc.new { get_and_set_getthumbinfo_source; @source[:getthumbinfo] }.call
 
           source.send field_name
         end
       end
 
-      def initialize(video_id_of_thread_id)
+      def initialize(video_id_or_thread_id)
         @source = {}
-        if video_id_of_thread_id.to_s.match(/sm|nm/)
-          @video_id = video_id_of_thread_id
+        @response = {}
+
+        if video_id_or_thread_id.to_s.match(/sm|nm/)
+          @video_id = video_id_or_thread_id
         else
-          @thread_id = video_id_of_thread_id
+          @thread_id = video_id_or_thread_id
+        end
+      end
+
+      def available?
+        [exist?, !deleted?].all?
+      end
+
+      def community?
+        unless @source[:video_array].present?
+          get_and_set_video_array_source
+        end
+        @source[:video_array].community?
+      end
+
+      def deleted?
+        unless @source[:getthumbinfo].present?
+          get_and_set_getthumbinfo_source
+        end
+        @source[:getthumbinfo].deleted?
+      end
+
+      def exist?
+        unless @source[:getthumbinfo].present?
+          get_and_set_getthumbinfo_source
         end
+        @source[:getthumbinfo].exist?
       end
 
       def set_getthumbinfo_source(source_object)
-        @source['getthumbinfo'] ||= source_object
+        @source[:getthumbinfo] ||= source_object
       end
 
       def set_mylist_rss_source(source_object)
-        @source['mylist_rss'] ||= source_object
+        @source[:mylist_rss] ||= source_object
       end
 
       def set_tag_search_rss_source(source_object)
-        @source['tag_search_rss'] ||= source_object
+        @source[:tag_search_rss] ||= source_object
       end
 
       def set_video_array_source(source_object)
-        @source['video_array'] ||= source_object
+        @source[:video_array] ||= source_object
+      end
+
+      def get_and_set_getthumbinfo_source
+        @response[:getthumbinfo] = (NicoQuery::Api::GetThumbInfo.new(@video_id || @thread_id)).get
+        set_getthumbinfo_source(NicoQuery::ObjectMapper::GetThumbInfo.new @response[:getthumbinfo][:body])
+      end
+
+      def get_and_set_video_array_source
+        @response[:video_array] = (NicoQuery::Api::VideoArray.new([@video_id || @thread_id])).get
+        parsed = (NicoQuery::ObjectMapper::VideoArray.new @response[:video_array][:body])
+        set_video_array_source parsed.movies[0]
       end
     end
   end

data/lib/nicoquery/object/mylist.rb

@@ -24,8 +24,8 @@ module NicoQuery
       def initialize(mylist_id)
         @movies = []
         @mylist_id = mylist_id
-        @source = NicoQuery::Api::MylistRSS.new mylist_id
-        @hash = NicoQuery::ObjectMapper::MylistRSS.new @source.get
+        @response = (NicoQuery::Api::MylistRSS.new mylist_id).get
+        @hash = NicoQuery::ObjectMapper::MylistRSS.new @response[:body]
 
         return if @hash.items.nil?
         @hash.items.map do |item|
@@ -36,11 +36,15 @@ module NicoQuery
       end
 
       def available?
-        [!forbidden?].all?
+        [exist?, !forbidden?].all?
       end
 
       def forbidden?
-        @source.forbidden
+        @response[:status_code] == 403
+      end
+
+      def exist?
+        @response[:status_code] != 404
       end
     end
   end

data/lib/nicoquery/object/tag_search.rb

@@ -22,8 +22,8 @@ module NicoQuery
 
       def initialize(tag: tag, sort: sort, order: order, page: page)
         @movies = []
-        source = (NicoQuery::Api::TagSearchRss.new(tag: tag, sort: sort, order: order, page: page)).get
-        @hash = NicoQuery::ObjectMapper::TagSearchRss.new source
+        response = (NicoQuery::Api::TagSearchRss.new(tag: tag, sort: sort, order: order, page: page)).get
+        @hash = NicoQuery::ObjectMapper::TagSearchRss.new response[:body]
 
         @hash.items.map do |item|
           movie = NicoQuery::Object::Movie.new item.video_id

data/lib/nicoquery/object_mapper/getthumbinfo.rb

@@ -20,6 +20,22 @@ module NicoQuery
         end
       end
 
+      def community?
+        if @parsed_xml['nicovideo_thumb_response']["error"].presence
+          @parsed_xml['nicovideo_thumb_response']["error"].presence["code"].presence == "COMMUNITY"
+        else
+          false
+        end
+      end
+
+      def exist?
+        if @parsed_xml['nicovideo_thumb_response']["error"].presence
+          @parsed_xml['nicovideo_thumb_response']["error"].presence["code"].presence != "NOT_FOUND"
+        else
+          false
+        end
+      end
+
       def video_id
         return nil if @hash == nil
         @hash['video_id']

data/lib/nicoquery/object_mapper/video_array.rb

@@ -31,6 +31,10 @@ module NicoQuery
           @hash = parsed_xml
         end
 
+        def community?
+          @hash['thread']['community_id'].present?
+        end
+
         def video_id
           @hash['video']['id']
         end
@@ -84,6 +88,10 @@ module NicoQuery
           @hash['video']['size_low'].to_i
         end
 
+        def community_id
+          @hash['thread']['community_id'].to_i
+        end
+
         def tags
           @hash['tags']['tag_info'].each_with_object([]) do |tag, array|
             array << { text: tag['tag'] }

data/lib/nicoquery/version.rb

@@ -1,3 +1,3 @@
 module NicoQuery
-  VERSION = "0.1.6.1"
+  VERSION = "0.1.7"
 end

data/spec/fixture/getthumbinfo_community.rb

@@ -0,0 +1,7 @@
+module Fixture
+  def self.getthumbinfo_community
+    <<-EOS
+<?xml version="1.0" encoding="UTF-8"?><nicovideo_thumb_response status="fail"><error><code>COMMUNITY</code><description>community</description></error></nicovideo_thumb_response>
+    EOS
+  end
+end

data/spec/fixture/getthumbinfo_notfound.rb

@@ -0,0 +1,13 @@
+module Fixture
+  def self.getthumbinfo_notfound
+    <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<nicovideo_thumb_response status="fail">
+<error>
+<code>NOT_FOUND</code>
+<description>not found or invalid</description>
+</error>
+</nicovideo_thumb_response>
+    EOS
+  end
+end

data/spec/fixture/video_array_community.rb

@@ -0,0 +1,9 @@
+module Fixture
+  def self.video_array_community
+    <<-EOS
+<?xml version="1.0" encoding="UTF-8"?>
+<nicovideo_video_response status="ok"><count>1</count><video_info><video><id>sm19642625</id><deleted>0</deleted><title>BW2ランダムフリー戦記外伝・とうふサラダ抗争・前半【VSひややっこ氏】</title><description>最終回？ナンノコトカナー。今回はフレ戦の模様を余すことなくお送りいたします！&lt;br /&gt;試験的にゆっくりさんを導入！前半は、2試合目までの内容となっております&lt;br /&gt;相手様視点：【sm19641464】&lt;br /&gt;&lt;br /&gt;&lt;br /&gt;とぅいったー　　https://twitter.com/musabe2　　動画投稿の情報はこちらで！&lt;br /&gt;前回【sm19479023】　マイリスト【mylist/32528876】　後半【sm19643040】</description><length_in_seconds>1118</length_in_seconds><size_low>55446451</size_low><movie_type>mp4</movie_type><thumbnail_url>http://tn-skr2.smilevideo.jp/smile?i=19642625</thumbnail_url><upload_time/><first_retrieve>2012-12-22T21:24:18+09:00</first_retrieve><default_thread>1356179058</default_thread><view_counter>493</view_counter><mylist_counter>1</mylist_counter><option_flag_ichiba>0</option_flag_ichiba><option_flag_community>0</option_flag_community><option_flag_domestic>0</option_flag_domestic><option_flag_comment_type>0</option_flag_comment_type><option_flag_adult>0</option_flag_adult><option_flag_mobile>0</option_flag_mobile><option_flag_economy_mp4>1</option_flag_economy_mp4><option_flag_middle_video>0</option_flag_middle_video><option_flag_mobile_ng_apple>0</option_flag_mobile_ng_apple></video><thread><id>1356179347</id><public>1</public><num_res>14</num_res><community_id>1233029</community_id></thread><tags><tag_info><tag>ゲーム</tag><area>jp</area></tag_info><tag_info><tag>ポケモンBW2</tag><area>jp</area></tag_info><tag_info><tag>ポケモンBW2対戦リンク</tag><area>jp</area></tag_info><tag_info><tag>ロズレイド</tag><area>jp</area></tag_info><tag_info><tag>ゆっくり実況プレイ</tag><area>jp</area></tag_info><tag_info><tag>ぬるぽｖｓガッ</tag><area>jp</area></tag_info><tag_info><tag>ゆっくりスボミー</tag><area>jp</area></tag_info></tags></video_info></nicovideo_video_response>
+    EOS
+  end
+end
+

data/spec/object/movie_spec.rb

@@ -1,5 +1,8 @@
 require 'nicoquery/object/movie'
 require 'fixture/getthumbinfo_deleted'
+require 'fixture/getthumbinfo_community'
+require 'fixture/video_array_community'
+require 'fixture/getthumbinfo_notfound'
 require 'webmock/rspec'
 
 
@@ -15,10 +18,8 @@ describe "NicoQuery::Object::Movie" do
     subject { @movie }
 
     describe "#deleted?" do
-      subject { @movie.deleted? }
-
       it "returns false" do
-        expect(subject).to be_false
+        expect(subject.deleted?).to be_false
       end
     end
 
@@ -61,7 +62,7 @@ describe "NicoQuery::Object::Movie" do
     end
   end
 
-  context "when specified video id and this movie is exist" do
+  context "when specified thread id and this movie is exist" do
     before do
       # thread_id:1173108780 == video_id:sm9
       @movie = NicoQuery::Object::Movie.new(1173108780)
@@ -78,6 +79,7 @@ describe "NicoQuery::Object::Movie" do
 
   context "when specified movie is deleted" do
     before do
+      WebMock.enable!
       WebMock.stub_request(:get, "http://ext.nicovideo.jp/api/getthumbinfo/sm999999?").
         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
         to_return(:status => 200, :body => Fixture.getthumbinfo_deleted, :headers => {})
@@ -85,13 +87,51 @@ describe "NicoQuery::Object::Movie" do
       @movie = NicoQuery::Object::Movie.new('sm999999')
     end
 
+    after do
+      WebMock.disable!
+    end
+
     subject { @movie }
 
     describe "#deleted?" do
-      subject { @movie.deleted? }
+      it "returns true" do
+        expect(subject.deleted?).to be_true
+      end
+    end
+
+    describe "getter methods" do
+      specify "all returns nil" do
+        expect(subject.title).to be_nil
+        expect(subject.url).to be_nil
+        expect(subject.view_counter).to be_nil
+        expect(subject.tags).to be_nil
+      end
+    end
+  end
+
+  context "when specified movie belongs to community" do
+    before do
+      WebMock.enable!
+      WebMock.stub_request(:get, "http://ext.nicovideo.jp/api/getthumbinfo/sm99999901?").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => Fixture.getthumbinfo_community, :headers => {})
+
+      WebMock.stub_request(:get, "http://i.nicovideo.jp/v3/video.array?v=sm99999901").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => Fixture.video_array_community, :headers => {})
+
+      @movie = NicoQuery::Object::Movie.new('sm99999901')
+    end
+
+    after do
+      WebMock.disable!
+    end
+
+    subject { @movie }
 
+    describe "#community?" do
       it "returns true" do
-        expect(subject).to be_true
+        expect(subject.community?).to be_true
       end
     end
 
@@ -103,6 +143,37 @@ describe "NicoQuery::Object::Movie" do
         expect(subject.tags).to be_nil
       end
     end
+  end
+
+  context "when specified movie doesn't exist" do
+    before do
+      WebMock.enable!
+      WebMock.stub_request(:get, "http://ext.nicovideo.jp/api/getthumbinfo/sm99999901?").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => Fixture.getthumbinfo_notfound, :headers => {})
+
+      @movie = NicoQuery::Object::Movie.new('sm99999901')
+    end
+
+    after do
+      WebMock.disable!
+    end
+
+    subject { @movie }
 
+    describe "#exist?" do
+      it "returns false" do
+        expect(subject.exist?).to be_false
+      end
+    end
+
+    describe "getter methods" do
+      specify "all returns nil" do
+        expect(subject.title).to be_nil
+        expect(subject.url).to be_nil
+        expect(subject.view_counter).to be_nil
+        expect(subject.tags).to be_nil
+      end
+    end
   end
 end

data/spec/object/mylist_spec.rb

@@ -11,41 +11,51 @@ describe "NicoQuery::Object::Mylist" do
       @mylist = NicoQuery::Object::Mylist.new(38369702)
     end
 
+    subject { @mylist }
+
     describe "movies" do
       it "returns movie instances" do
-        expect(@mylist.movies).to be_an_instance_of Array
-        expect(@mylist.movies[0]).to be_an_instance_of NicoQuery::Object::Movie
+        expect(subject.movies).to be_an_instance_of Array
+        expect(subject.movies[0]).to be_an_instance_of NicoQuery::Object::Movie
       end
     end
 
     describe "title" do
-      subject { @mylist }
       it "returns string of title" do
         expect(subject.title).to eq "to_test"
       end
     end
 
     describe "url" do
-      subject { @mylist }
       it "returns string of url" do
         expect(subject.url).to eq "http://www.nicovideo.jp/mylist/38369702"
       end
     end
 
     describe "mylist_id" do
-      subject { @mylist }
       it "returns number of mylist_id" do
         expect(subject.mylist_id).to eq 38369702
       end
     end
 
     describe "description" do
-      subject { @mylist }
       it "returns string of title" do
         # mylistのrssでは、descriptionの全文取得はできず、頭から256文字までしか取得できない。
         expect(subject.description).to eq "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nam cursus. Morbi ut mi. Nullam enim leo, egestas id, condimentum at, laoreet mattis, massa. Sed eleifend nonummy diam. Praesent mauris ante, elementum et, bibendum at, posuere sit amet, nibh. Duis "
       end
     end
+
+    describe "#available?" do
+      it "returns true" do
+        expect(subject.available?).to be_true
+      end
+    end
+
+    describe "#exist?" do
+      it "returns true" do
+        expect(subject.exist?).to be_true
+      end
+    end
   end
 
   context "when access for specified mylist is forbidden" do
@@ -75,6 +85,12 @@ describe "NicoQuery::Object::Mylist" do
       end
     end
 
+    describe "#exist?" do
+      it "returns true" do
+        expect(subject.exist?).to be_true
+      end
+    end
+
     describe "getter methods" do
       specify "all returns nil" do
         # タイトルだけは非公開でも取得できる？

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nicoquery
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Masami Yonehara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-16 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -253,7 +253,9 @@ files:
 - spec/api/video_array_spec.rb
 - spec/crawler/bulk_scraping_spec.rb
 - spec/crawler/tag_search_spec.rb
+- spec/fixture/getthumbinfo_community.rb
 - spec/fixture/getthumbinfo_deleted.rb
+- spec/fixture/getthumbinfo_notfound.rb
 - spec/fixture/getthumbinfo_sm20415650.rb
 - spec/fixture/mylist_rss_18266317.rb
 - spec/fixture/mylist_rss_403.rb
@@ -261,6 +263,7 @@ files:
 - spec/fixture/tag_search_403.rb
 - spec/fixture/tag_search_item.rb
 - spec/fixture/tag_search_meta.rb
+- spec/fixture/video_array_community.rb
 - spec/fixture/video_array_sm20415650_sm9.rb
 - spec/nicoquery_spec.rb
 - spec/object/movie_spec.rb
@@ -301,7 +304,9 @@ test_files:
 - spec/api/video_array_spec.rb
 - spec/crawler/bulk_scraping_spec.rb
 - spec/crawler/tag_search_spec.rb
+- spec/fixture/getthumbinfo_community.rb
 - spec/fixture/getthumbinfo_deleted.rb
+- spec/fixture/getthumbinfo_notfound.rb
 - spec/fixture/getthumbinfo_sm20415650.rb
 - spec/fixture/mylist_rss_18266317.rb
 - spec/fixture/mylist_rss_403.rb
@@ -309,6 +314,7 @@ test_files:
 - spec/fixture/tag_search_403.rb
 - spec/fixture/tag_search_item.rb
 - spec/fixture/tag_search_meta.rb
+- spec/fixture/video_array_community.rb
 - spec/fixture/video_array_sm20415650_sm9.rb
 - spec/nicoquery_spec.rb
 - spec/object/movie_spec.rb