nicoquery 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3814f14a25adbb1ee71f0844c0b61029fa8f477
-  data.tar.gz: e73736c6c8399eccd015fa1299ecc209d2cfe363
+  metadata.gz: 5c8448da8f6c085baf596a84b21f9f1f72fbbc24
+  data.tar.gz: f99938d2cfd1c46c4d7e357d03b4b1cdff03fc3b
 SHA512:
-  metadata.gz: 40ec35c5bfab9edb7617ca03f8f7c32e22c1aec168b632e9759b23a8274b337eb219d20fabe46c5a5cd297609ae0028a5724e8b9f470e183f2189003f058b988
-  data.tar.gz: 1f3506b3b00bc3e14be66335ce884d7efb05b23580bbe0a30f30c4a0c7b9bdfafeec4881fde7a42cb22736110509feecad51374105282870e9e8f99fb581d0a1
+  metadata.gz: d294a9c3a541503f24680d42e5c261158b1e21ef06d22366a74dfbe1f4d75dcc6a79ed3424524746661aab15c19264ca0cf9d81be3a4a72b31d45ddc9aa9b823
+  data.tar.gz: 666e1083cdf82fc3427180c0b8aaf6e98ec24d55c729adb7779c122b4cfafc0173b9d6ae655ad8fe0a8a3f3b49dd6e8f77c3dce230d76c0287ca93ebd9ea57cd

data/Gemfile.lock

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

data/lib/nicoquery/object/movie.rb

@@ -8,6 +8,8 @@ module NicoQuery
       attr_reader :video_id
 
       [
+        'deleted?',
+
         'title',
         'url',
         # 'thread_id',

data/lib/nicoquery/object_mapper/getthumbinfo.rb

@@ -7,16 +7,26 @@ module NicoQuery
     class GetThumbInfo
       def initialize(xml)
         @xml = xml
-        parser = Nori.new
-        parsed_xml = parser.parse xml
-        @hash = parsed_xml['nicovideo_thumb_response']['thumb']
+        @parser = Nori.new
+        @parsed_xml = @parser.parse xml
+        @hash = @parsed_xml['nicovideo_thumb_response']['thumb']
+      end
+
+      def deleted?
+        if @parsed_xml['nicovideo_thumb_response']["error"].presence
+          @parsed_xml['nicovideo_thumb_response']["error"].presence["code"].presence == "DELETED"
+        else
+          false
+        end
       end
 
       def video_id
+        return nil if @hash == nil
         @hash['video_id']
       end
 
       def title
+        return nil if @hash == nil
         @hash['title']
       end
 
@@ -25,10 +35,12 @@ module NicoQuery
       end
 
       def thumbnail_url
+        return nil if @hash == nil
         @hash['thumbnail_url']
       end
 
       def first_retrieve
+        return nil if @hash == nil
         @hash['first_retrieve'].to_time
       end
 
@@ -37,59 +49,73 @@ module NicoQuery
       end
 
       def length
+        return nil if @hash == nil
         string = @hash['length'].split(':')
         string[0].to_i * 60 + string[1].to_i
       end
 
       def movie_type
+        return nil if @hash == nil
         @hash['movie_type']
       end
 
       def size_high
+        return nil if @hash == nil
         @hash['size_high'].to_i
       end
 
       def size_low
+        return nil if @hash == nil
         @hash['size_low'].to_i
       end
 
       def view_counter
+        return nil if @hash == nil
         @hash['view_counter'].to_i
       end
 
       def comment_num
+        return nil if @hash == nil
         @hash['comment_num'].to_i
       end
 
       def mylist_counter
+        return nil if @hash == nil
         @hash['mylist_counter'].to_i
       end
 
       def last_res_body
+        return nil if @hash == nil
         @hash['last_res_body']
       end
 
       def url
+        return nil if @hash == nil
         @hash['watch_url']
       end
 
       def watch_url
+        return nil if @hash == nil
         @hash['watch_url']
       end
 
       def thumb_type
+        return nil if @hash == nil
         @hash['thumb_type']
       end
 
       def embeddable
+        return nil if @hash == nil
         @hash['embeddable'] == 1
       end
 
       def no_live_play
+        return nil if @hash == nil
         @hash['no_live_play'] == 1
       end
 
       def tags
+        return nil if @hash == nil
         xml = @xml.scan(/\<tags domain=\"jp\">\n.+\n\<\/tags\>/m)[0]
         parsed = Nokogiri::XML xml
         parsed.xpath("//tag").map do |tag_object|
@@ -98,6 +124,7 @@ module NicoQuery
       end
 
       def user_id
+        return nil if @hash == nil
         @hash['user_id'].to_i
       end
 

data/lib/nicoquery/version.rb

@@ -1,3 +1,3 @@
 module NicoQuery
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/spec/fixture/getthumbinfo_deleted.rb

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

data/spec/object/movie_spec.rb

@@ -1,52 +1,93 @@
-require "nicoquery/object/movie"
+require 'nicoquery/object/movie'
+require 'fixture/getthumbinfo_deleted'
+require 'webmock/rspec'
 
 
 describe "NicoQuery::Object::Movie" do
-  before do
-    # mylist:38369702 はテスト用に作ったマイリスト。以下の動画を含んでいる。
-    # sm9 新・豪血寺一族 -煩悩解放 - レッツゴー！陰陽師
-    # sm1097445 【初音ミク】みくみくにしてあげる♪【してやんよ】
-    @movie = NicoQuery::Object::Movie.new('sm9')
-  end
+  context "when specified movie is exist" do
+    before do
+      # mylist:38369702 はテスト用に作ったマイリスト。以下の動画を含んでいる。
+      # sm9 新・豪血寺一族 -煩悩解放 - レッツゴー！陰陽師
+      # sm1097445 【初音ミク】みくみくにしてあげる♪【してやんよ】
+      @movie = NicoQuery::Object::Movie.new('sm9')
+    end
 
-  subject { @movie }
+    subject { @movie }
 
-  describe "title" do
-    it "returns string of title" do
-      expect(subject.title).to eq "新・豪血寺一族 -煩悩解放 - レッツゴー！陰陽師"
+    describe "#deleted?" do
+      subject { @movie.deleted? }
+
+      it "returns false" do
+        expect(subject).to be_false
+      end
     end
-  end
 
-  describe "url" do
-    it "returns string of url" do
-      expect(subject.url).to eq "http://www.nicovideo.jp/watch/sm9"
+    describe "title" do
+      it "returns string of title" do
+        expect(subject.title).to eq "新・豪血寺一族 -煩悩解放 - レッツゴー！陰陽師"
+      end
     end
-  end
 
-  describe "video_id" do
-    it "returns number of mylist_id" do
-      expect(subject.video_id).to eq "sm9"
+    describe "url" do
+      it "returns string of url" do
+        expect(subject.url).to eq "http://www.nicovideo.jp/watch/sm9"
+      end
+    end
+
+    describe "video_id" do
+      it "returns number of mylist_id" do
+        expect(subject.video_id).to eq "sm9"
+      end
+    end
+
+    # describe "description" do
+    #   subject { @movie }
+    #   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 "tags" do
+      subject { @movie.tags }
+
+      it "returns object array" do
+        expect(subject).to be_an_instance_of Array
+      end
+
+      specify "each object has text and lock key-value" do
+        expect(subject).to include(text: '陰陽師', lock: true)
+      end
     end
   end
 
-  # describe "description" do
-  #   subject { @movie }
-  #   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
+  context "when specified movie is deleted" do
+    before do
+      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 => {})
 
-  describe "tags" do
-    subject { @movie.tags }
+      @movie = NicoQuery::Object::Movie.new('sm999999')
+    end
+
+    subject { @movie }
 
-    it "returns object array" do
-      expect(subject).to be_an_instance_of Array
+    describe "#deleted?" do
+      subject { @movie.deleted? }
+
+      it "returns true" do
+        expect(subject).to be_true
+      end
     end
 
-    specify "each object has text and lock key-value" do
-      expect(subject).to include(text: '陰陽師', lock: true)
+    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
-p

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nicoquery
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Masami Yonehara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -253,6 +253,7 @@ files:
 - spec/api/video_array_spec.rb
 - spec/crawler/bulk_scraping_spec.rb
 - spec/crawler/tag_search_spec.rb
+- spec/fixture/getthumbinfo_deleted.rb
 - spec/fixture/getthumbinfo_sm20415650.rb
 - spec/fixture/mylist_rss_18266317.rb
 - spec/fixture/mylist_rss_403.rb
@@ -300,6 +301,7 @@ test_files:
 - spec/api/video_array_spec.rb
 - spec/crawler/bulk_scraping_spec.rb
 - spec/crawler/tag_search_spec.rb
+- spec/fixture/getthumbinfo_deleted.rb
 - spec/fixture/getthumbinfo_sm20415650.rb
 - spec/fixture/mylist_rss_18266317.rb
 - spec/fixture/mylist_rss_403.rb