niconico 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df82c4e26df5f6e3fd88b09775a014a65600fb3b
-  data.tar.gz: dccb4490003953bcbc1bac19b533f775e506cdde
+  metadata.gz: 178df7276651dc0b9075d0cee6421c57ea0412a7
+  data.tar.gz: 3e6285ae48a8ff5c29c39bbcee1eb394be0be620
 SHA512:
-  metadata.gz: c56db982b4c804be9d889360b752396bb321bd2e88c874e709dc5d9bb2853348b330de2421d4aca67888e1fa19688953be8353945ed1ce2b890984c0a7f422d8
-  data.tar.gz: 5bea438a9fd9264d97328918663b1287bc5164d320ca2a0237bfc448a6c6915861cf875d4e4f6cbc81dd83d9eca5dbf970ff08f251cc8aa688f77d5542a06de4
+  metadata.gz: d29f2441bd54014a1c94b26fa97865f70f089e2e7ce42f48230721b7327102e8bbe6170838a3b17ef777718584a7c44b4df028f09df2caa1889ad131e78d7dce
+  data.tar.gz: 51e778a8b3086e7239cf4f5172df862f46b3866b40d03f66655645223af69466efea25cd813745958330808e0aaa82e7294cdfb49e64f40b1d1c10422f08d253

data/lib/niconico/deferrable.rb

@@ -5,7 +5,7 @@ class Niconico
         keys.each do |key|
           binding.eval(<<-EOM, __FILE__, __LINE__.succ)
             define_method(:#{key}) do
-              get() unless fetched?
+              get() if @#{key}.nil? && !fetched?
               @#{key}
             end
           EOM

data/lib/niconico/mylist.rb

@@ -7,7 +7,7 @@ class Niconico
 
     page = @agent.get(url = "http://www.nicovideo.jp/mylist/#{i.to_s.sub(/^mylist\//,"")}")
     #require 'ir_b'; ir b
-    if page.search("script").map(&:inner_text).find{|x| /preload/ =~ x }.match(/Mylist\.preload\(\d+, (.+?)\);/)
+    if page.search("script").map(&:inner_text).find{|x| /\tMylist\.preload/ =~ x }.match(/\tMylist\.preload\(\d+, (.+?)\);\n/)
       json = JSON.parse($1)
       #require 'pp'; pp json
       json.sort_by{|item| item["create_time"].to_f }.map do |item|

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/lib/niconico/video.rb

@@ -14,7 +14,7 @@ class Niconico
     deferrable :id, :title,
       :description, :description_raw,
       :url, :video_url, :type,
-      :tags, :mylist_comment
+      :tags, :mylist_comment, :api_data
 
     def initialize(parent, video_id, defer=nil)
       @parent = parent
@@ -51,8 +51,9 @@ class Niconico
       end
       getflv = Hash[@agent.get_file("#{Niconico::URL[:getflv]}?v=#{@thread_id}#{additional_params}").scan(/([^&]+)=([^&]+)/).map{|(k,v)| [k.to_sym,CGI.unescape(v)] }]
 
-      if api_data = @page.at("#watchAPIDataContainer")
-        video_detail = JSON.parse(api_data.text())["videoDetail"]
+      if api_data_node = @page.at("#watchAPIDataContainer")
+        @api_data = JSON.parse(api_data_node.text())
+        video_detail = @api_data["videoDetail"]
         @title ||= video_detail["title"] if video_detail["title"]
         @description ||= video_detail["description"] if video_detail["description"]
         @tags  ||= video_detail["tagList"].map{|e| e["tag"]}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: niconico
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -84,3 +84,4 @@ signing_key:
 specification_version: 4
 summary: wrapper of Mechanize, optimized for nicovideo.
 test_files: []
+has_rdoc: