nicoquery 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8448da8f6c085baf596a84b21f9f1f72fbbc24
-  data.tar.gz: f99938d2cfd1c46c4d7e357d03b4b1cdff03fc3b
+  metadata.gz: 468c589049232e4268150e999a970d8e812145e3
+  data.tar.gz: 88775876e1ba25744db70c6ca01fccf970afd1d8
 SHA512:
-  metadata.gz: d294a9c3a541503f24680d42e5c261158b1e21ef06d22366a74dfbe1f4d75dcc6a79ed3424524746661aab15c19264ca0cf9d81be3a4a72b31d45ddc9aa9b823
-  data.tar.gz: 666e1083cdf82fc3427180c0b8aaf6e98ec24d55c729adb7779c122b4cfafc0173b9d6ae655ad8fe0a8a3f3b49dd6e8f77c3dce230d76c0287ca93ebd9ea57cd
+  metadata.gz: ea35f1f24febbeec5aa5c4805394058254b03ac211003818cc1ab096b38e2c02ba1df9d61246621cea4f40060961751ca7cd8735289fe440e4871bf56ff47dbc
+  data.tar.gz: 17189a95674986b03b9eaf1dd6cea57445cdb825612730acd320984324266d2c5a00c417ad18a3de3878e896625710a97ec1af2349b2b7c58ca33b68181c4a3b

data/Gemfile.lock

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

data/lib/nicoquery/api/base.rb

@@ -5,6 +5,8 @@ require 'active_support/all'
 module NicoQuery
   module Api
     class Base
+      attr_reader :forbidden
+
       def scheme
         'http'
       end
@@ -29,7 +31,11 @@ module NicoQuery
       def get
         RestClient.get uri.to_s do |response, request, result, &block|
           case response.code
-          when 200 || 403
+          when 200
+            @forbidden = false
+            response
+          when 403
+            @forbidden = true
             response
           end
         end

data/lib/nicoquery/api/mylist_rss.rb

@@ -11,6 +11,10 @@ module NicoQuery
         @params_array = params_array
       end
 
+      def forbidden?
+        @forbidden == true
+      end
+
       private
       def host
         'www.nicovideo.jp'

data/lib/nicoquery/object/mylist.rb

@@ -24,9 +24,8 @@ module NicoQuery
       def initialize(mylist_id)
         @movies = []
         @mylist_id = mylist_id
-        source = (NicoQuery::Api::MylistRSS.new mylist_id).get
-
-        @hash = NicoQuery::ObjectMapper::MylistRSS.new source
+        @source = NicoQuery::Api::MylistRSS.new mylist_id
+        @hash = NicoQuery::ObjectMapper::MylistRSS.new @source.get
 
         return if @hash.items.nil?
         @hash.items.map do |item|
@@ -35,6 +34,14 @@ module NicoQuery
           @movies.push movie
         end
       end
+
+      def available?
+        [!forbidden?].all?
+      end
+
+      def forbidden?
+        @source.forbidden
+      end
     end
   end
 end

data/lib/nicoquery/object_mapper/mylist_rss.rb

@@ -7,9 +7,9 @@ module NicoQuery
       attr_reader :meta, :items
 
       def initialize(xml)
-        parser = Nori.new
-        parsed_xml = parser.parse xml
-        entire = parsed_xml['rss']['channel']
+        @parser = Nori.new
+        @parsed_xml = @parser.parse xml
+        entire = @parsed_xml['rss']['channel']
 
         @meta = Meta.new entire, title_prefix
         if entire['item'].is_a? Array
@@ -35,8 +35,7 @@ module NicoQuery
         end
 
         def title
-          @hash['title']
-            .scan(/(?<=#{@title_prefix}\s).+(?=\‐ニコニコ動画)/)[0].split(' ')[0]
+          @hash['title'].scan(/(?<=#{@title_prefix}\s).+(?=\‐ニコニコ動画)/)[0].split(' ')[0]
             # .force_encoding('utf-8')
         end
 
@@ -45,26 +44,32 @@ module NicoQuery
         end
 
         def link
-          @hash['link']
+          @hash['link'].presence
         end
 
         def mylist_id
+          return nil unless @hash['link'].present?
           @hash['link'].scan(/(?<=mylist\/)\d{1,}/)[0].to_i
         end
 
         def description
+          return nil unless @hash['description'].present?
+          return nil if @hash['description'] == "このマイリストは非公開に設定されています。"
           @hash['description']
         end
 
         def publish_date
+          return nil unless @hash['publish_date'].present?
           Time.parse @hash['publish_date']
         end
 
         def last_build_date
+          return nil unless @hash['lastBuildDate'].present?
           Time.parse @hash['lastBuildDate']
         end
 
         def creator
+          return nil unless @hash['dc:creator'].present?
           @hash['dc:creator']
         end
       end
@@ -75,47 +80,58 @@ module NicoQuery
         end
 
         def title
+          return nil if @hash == nil
           @hash['title']
         end
 
         def video_id
+          return nil if @hash == nil
           (url.scan(/((sm|nm)\d{1,})/).map {|e| e[0]})[0]
         end
 
         def url
+          return nil if @hash == nil
           @hash['link']
         end
 
         def thread_id
+          return nil if @hash == nil
           @hash['guid'].scan(/(?<=watch\/)\d{1,}$/)[0].to_i
         end
 
         def publish_date
+          return nil if @hash == nil
           Time.parse @hash['pubDate']
         end
 
         def thumbnail_url
+          return nil if @hash == nil
           description.raw_text.scan(/(?<=src\=\").{1,}(?=\"\swidth)/)[0]
           $&
         end
 
         def view_counter
+          return nil if @hash == nil
           description.raw_text.scan(/(?<=nico-numbers-view\">)[0-9,]{1,}(?=\<\/strong)/)[0].delete(',').to_i
         end
 
         def comment_num
+          return nil if @hash == nil
           description.raw_text.scan(/(?<=nico-numbers-res\">)[0-9,]{1,}(?=\<\/strong)/)[0].delete(',').to_i
         end
 
         def mylist_counter
+          return nil if @hash == nil
           description.raw_text.scan(/(?<=nico-numbers-mylist\">)[0-9,]{1,}(?=\<\/strong)/)[0].delete(',').to_i
         end
 
         def description
+          return nil if @hash == nil
           @_description ||= Description.new @hash['description']
         end
 
         def length
+          return nil if @hash == nil
           description.raw_text.scan(/(?<=class\=\"nico\-info\-length\"\>)\d{1,}\:\d{1,2}(?=\<\/strong\>)/)
           length_string = $&.to_s.split(':')
           length_string[0].to_i * 60 + length_string[1].to_i

data/lib/nicoquery/version.rb

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

data/spec/object/mylist_spec.rb

@@ -1,47 +1,91 @@
 require "nicoquery/object/mylist"
+require "fixture/mylist_rss_403"
 
 
 describe "NicoQuery::Object::Mylist" do
-  before do
-    # mylist:38369702 はテスト用に作ったマイリスト。以下の動画を含んでいる。
-    # sm9 新・豪血寺一族 -煩悩解放 - レッツゴー！陰陽師
-    # sm1097445 【初音ミク】みくみくにしてあげる♪【してやんよ】
-    @mylist = NicoQuery::Object::Mylist.new('38369702')
-  end
+  context "when specified mylist exists and is public" do
+    before do
+      # mylist:38369702 はテスト用に作ったマイリスト。以下の動画を含んでいる。
+      # sm9 新・豪血寺一族 -煩悩解放 - レッツゴー！陰陽師
+      # sm1097445 【初音ミク】みくみくにしてあげる♪【してやんよ】
+      @mylist = NicoQuery::Object::Mylist.new(38369702)
+    end
 
-  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
+    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
+      end
     end
-  end
 
-  describe "title" do
-    subject { @mylist }
-    it "returns string of title" do
-      expect(subject.title).to eq "to_test"
+    describe "title" do
+      subject { @mylist }
+      it "returns string of title" do
+        expect(subject.title).to eq "to_test"
+      end
     end
-  end
 
-  describe "url" do
-    subject { @mylist }
-    it "returns string of url" do
-      expect(subject.url).to eq "http://www.nicovideo.jp/mylist/38369702"
+    describe "url" do
+      subject { @mylist }
+      it "returns string of url" do
+        expect(subject.url).to eq "http://www.nicovideo.jp/mylist/38369702"
+      end
     end
-  end
 
-  describe "mylist_id" do
-    subject { @mylist }
-    it "returns number of mylist_id" do
-      expect(subject.mylist_id).to eq 38369702
+    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
   end
 
-  describe "description" do
+  context "when access for specified mylist is forbidden" do
+    before do
+      WebMock.enable!
+      WebMock.stub_request(:get, "http://www.nicovideo.jp/mylist/999999?rss=2.0&numbers=1").
+        to_return(:status => 403, :body => Fixture.mylist_rss_403, :headers => {})
+
+      @mylist = NicoQuery::Object::Mylist.new(999999)
+    end
+
+    after do
+      WebMock.disable!
+    end
+
     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 "
+
+    describe "#forbidden?" do
+      it "returns true" do
+        expect(subject.forbidden?).to be_true
+      end
+    end
+
+    describe "#available?" do
+      it "returns false" do
+        expect(subject.available?).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.link).to be_nil
+        expect(subject.description).to be_nil
+        expect(subject.publish_date).to be_nil
+        expect(subject.last_build_date).to be_nil
+        expect(subject.creator).to be_nil
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,9 @@
 # loaded once.
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require "webmock"
+require "pry"
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nicoquery
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Masami Yonehara