nicoquery 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 892894c341bcd1e2a22b5483cdd92a4fa403e04c
-  data.tar.gz: aac4c5d4c0922f346d6edb4952b0361eabb71bf1
+  metadata.gz: 1d97bc8ec57f8b66e8c9ea690e626108d4623e93
+  data.tar.gz: 83772ec763bc93b2f188101582fda451d4b1b6eb
 SHA512:
-  metadata.gz: b307defe02cbee30fe4e253bfbf67c6a320a5507e8ae9ec700008c1d81a88207de01a0cdd55d38a7fccddc5fbbd51bbd9ddb88bd4846d260fcb39a7b27a8aa60
-  data.tar.gz: fa01f1f31a6b5200d74be4612c46ca2cc65ed7ab785c725d09ad5d19ecaa738e0bd59145329042d2f3a72a8051356411ab96691c98851b9fbfffe737adc998c4
+  metadata.gz: 8ea629c1510df67bf7932eeca3787f79bd3b827e3e9864a6e9134d8c04cbb51a65466e75a6c62735c114231c4c8dc194bd4c42e5955eeb1c114096a251b4e05d
+  data.tar.gz: eddde06634911d353a717a9fc7c93f13e4cffb7dcd8a8843a85187688ea5896b988317b0bf6d19dea5916ada42e274e4341e4c3ff517c37df321783af90fedea

data/.rspec

@@ -0,0 +1,2 @@
+--require spec_helper
+--color

data/Gemfile.lock

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

data/lib/nicoquery/object/mylist.rb

@@ -18,21 +18,21 @@ module NicoQuery
         'last_build_date',
         'creator',
       ].each do |field_name|
-        define_method(field_name) { @hash.meta.send field_name }
+        define_method(field_name) do
+          if available?
+            @source_object.meta.send field_name
+          else
+            nil
+          end
+        end
       end
 
       def initialize(mylist_id)
         @movies = []
         @mylist_id = mylist_id
-        @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|
-          movie = NicoQuery::Object::Movie.new item.video_id.presence || item.thread_id
-          movie.set_mylist_rss_source item
-          @movies.push movie
-        end
+        @response_xml = (NicoQuery::Api::MylistRSS.new mylist_id).get
+        @source_object = source_object
+        set_hash_items
       end
 
       def available?
@@ -40,11 +40,48 @@ module NicoQuery
       end
 
       def forbidden?
-        @response[:status_code] == 403
+        @response_xml[:status_code] == 403
       end
 
       def exist?
-        @response[:status_code] != 404
+        @response_xml[:status_code] != 404
+      end
+
+      private
+
+      def source_object
+        NicoQuery::ObjectMapper::MylistRSS.new @response_xml[:body].presence || null_response_xml
+      end
+
+      def set_hash_items
+        @source_object.items.each do |item|
+          movie = NicoQuery::Object::Movie.new item.video_id.presence || item.thread_id
+          movie.set_mylist_rss_source item
+          @movies.push movie
+        end
+      end
+
+      def null_response_xml
+        <<-EOS
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0"
+     xmlns:dc="http://purl.org/dc/elements/1.1/"
+     xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title></title>
+    <link></link>
+    <atom:link rel="self" type="application/rss+xml" href="http://www.nicovideo.jp/mylist/38350049?rss=2.0"/>
+    <description></description>
+    <pubDate></pubDate>
+    <lastBuildDate></lastBuildDate>
+    <generator></generator>
+    <dc:creator></dc:creator>
+    <language></language>
+    <copyright></copyright>
+    <docs></docs>
+  </channel>
+</rss>
+        EOS
       end
     end
   end

data/lib/nicoquery/version.rb

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

data/spec/api/mylist_rss_spec.rb

@@ -6,15 +6,14 @@ require 'webmock/rspec'
 describe "mylist_rss" do
   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!
+      WebMock.enable!
+      WebMock.stub_request(:get, "http://www.nicovideo.jp/mylist/18266317?numbers=1&rss=2.0").
+        with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+        to_return(:status => 200, :body => Fixture.mylist_rss_18266317, :headers => {})
+
+      mylist_id = 18266317
+      @uri = "http://www.nicovideo.jp/mylist/#{mylist_id}?rss=2.0&numbers=1"
+      @instance = NicoQuery::Api::MylistRSS.new mylist_id
     end
 
     describe "get" do

data/spec/crawler/bulk_scraping_spec.rb

@@ -5,7 +5,7 @@ describe "NicoQuery::Crawler" do
   describe "VideoArray" do
     before do
       @acquired_movies = []
-
+      WebMock.disable! # TODO: WebMockを利用する。
       NicoQuery::Crawler::BulkScraping.execute(['sm20415650', 'sm9']) do |result|
         @acquired_movies.push result
       end

data/spec/crawler/tag_search_spec.rb

@@ -1,4 +1,6 @@
 require "nicoquery/crawler/tag_search"
+require "fixture/tag_search_yukkuri_page1"
+require "fixture/tag_search_yukkuri_page2"
 
 
 describe "NicoQuery:Crawler" do
@@ -7,6 +9,14 @@ describe "NicoQuery:Crawler" do
       counter = 0
       @acquired_movies = []
 
+      WebMock.stub_request(:get, "http://www.nicovideo.jp/tag/%E3%82%86%E3%81%A3%E3%81%8F%E3%82%8A%E5%AE%9F%E6%B3%81%E3%83%97%E3%83%AC%E3%82%A4?numbers=1&order=a&page=1&rss=2.0&sort=f").
+         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+         to_return(:status => 200, :body => Fixture.tag_search_yukkuri_page1, :headers => {})
+
+      WebMock.stub_request(:get, "http://www.nicovideo.jp/tag/%E3%82%86%E3%81%A3%E3%81%8F%E3%82%8A%E5%AE%9F%E6%B3%81%E3%83%97%E3%83%AC%E3%82%A4?numbers=1&order=a&page=2&rss=2.0&sort=f").
+         with(:headers => {'Accept'=>'*/*; q=0.5, application/xml', 'Accept-Encoding'=>'gzip, deflate', 'User-Agent'=>'Ruby'}).
+         to_return(:status => 200, :body => Fixture.tag_search_yukkuri_page2, :headers => {})
+
       NicoQuery::Crawler::TagSearch.execute( tag: "ゆっくり実況プレイ",
                                              sort: :published_at,
                                              order: :asc
@@ -17,6 +27,10 @@ describe "NicoQuery:Crawler" do
       end
     end
 
+    specify "it returns NicoQuery::Object::Movie instance in the block" do
+      expect(@acquired_movies[0]).to be_an_instance_of NicoQuery::Object::Movie
+    end
+
     it "should sorted by published date" do
       expect(@acquired_movies[0].publish_date).to be < @acquired_movies[1].publish_date
     end