niconico 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d27562af52b7189937026da8ae6814c512e8ff5
-  data.tar.gz: bc3e7f6cad8c7950c55231f6434abb18552474b3
+  metadata.gz: d6c8ec6d8e97f5b09a642ef672cdeeb5abd92ab3
+  data.tar.gz: c90979d2f36e626d1560cba1e469f01222043931
 SHA512:
-  metadata.gz: 319b03bbc138554b2241be3580ad22eb89b10f4c55c316f89864073a3ae24e9ff7592ee46a02a52a5907124f1bd60de3d022a2e962d16a8a0fb1919704cb1d57
-  data.tar.gz: 25a64f57036c164c62288fbc84a510fca7f7a38c5c80d7615b6650b4f41f47e270151d7303071ea6b01e124247d5b7d83d26c907a836d95446c9450738a0d6f0
+  metadata.gz: 55c044ba6cd293d95491271834e994774697df728f897028bf1f924544f382ddc13cb5679833d80761453f6f93baf217a52bb2c5030e884be97da2dd24216993
+  data.tar.gz: 6f2bdf570c70d805a4b266de5bc2bbe62d84dcf50df3fbe969288657db088e2d4d677150ccd356e26ab90cfd23f8f4b3300379eb3d99f0fbe989c2f6ff78dc2d

data/Gemfile

@@ -1,6 +1,4 @@
 source "http://rubygems.org"
 
-gem "mechanize"
-
 # Specify your gem's dependencies in niconico.gemspec
 gemspec

data/lib/niconico.rb

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'mechanize'
 require 'cgi'
+require 'niconico/version'
 
 class Niconico
   URL = {
@@ -21,7 +22,10 @@ class Niconico
 
     @logined = false
 
-    @agent = Mechanize.new
+    @agent = Mechanize.new.tap do |agent|
+      agent.user_agent = "Niconico.gem (#{Niconico::VERSION}, https://github.com/sorah/niconico)"
+      agent.ssl_version = 'SSLv3'
+    end
   end
 
   def login(force=false)

data/lib/niconico/version.rb

@@ -1,3 +1,3 @@
 class Niconico
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/niconico/video.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'json'
 
 class Niconico
   def video(video_id)
@@ -35,7 +36,7 @@ class Niconico
 
     def economy?; @eco; end
 
-    def get
+    def get(options = {})
       begin
         @page = @agent.get(@url)
       rescue Mechanize::ResponseCodeError => e
@@ -47,12 +48,23 @@ class Niconico
         sleep 5
         @thread_id = @agent.get("#{Niconico::URL[:watch]}#{@id}").uri.path.sub(/^\/watch\//,"")
       end
-      getflv = Hash[@agent.get_file("#{Niconico::URL[:getflv]}?v=#{@thread_id}").scan(/([^&]+)=([^&]+)/).map{|(k,v)| [k.to_sym,CGI.unescape(v)] }]
+      additional_params = nil
+      if /^nm/ === @id && (!options.key?(:as3) || options[:as3])
+        additional_params = "&as3=1"
+      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"]
+        @title ||= video_detail["title"] if video_detail["title"]
+        @description ||= video_detail["description"] if video_detail["description"]
+        @tags  ||= video_detail["tagList"].map{|e| e["tag"]}
+      end
 
       t = @page.at("#videoTitle")
-      @title = t.inner_text if !t.nil?
+      @title ||= t.inner_text unless t.nil?
       d = @page.at("div#videoComment>div.videoDescription")
-      @description = d.inner_html if !d.nil?
+      @description ||= d.inner_html unless d.nil?
 
       @video_url = getflv[:url]
       @eco = !(/low$/ =~ @video_url).nil?
@@ -61,7 +73,7 @@ class Niconico
               when 's'; :swf
               else;     :flv
               end
-      @tags = @page.search("#video_tags a[rel=tag]").map(&:inner_text)
+      @tags ||= @page.search("#video_tags a[rel=tag]").map(&:inner_text)
       @mylist_comment ||= nil
 
       @page

data/niconico.gemspec

@@ -6,12 +6,12 @@ Gem::Specification.new do |s|
   s.name        = "niconico"
   s.version     = Niconico::VERSION
   s.authors     = ["Shota Fukumori (sora_h)"]
-  s.email       = ["sorah@tubusu.net"]
+  s.email       = ["her@sorah.jp"]
   s.homepage    = ""
   s.summary     = "wrapper of Mechanize, optimized for nicovideo."
   s.description = "wrapper of Mechanize, optimized for nicovideo. :)"
 
-  s.rubyforge_project = "niconico"
+  s.add_dependency "mechanize", '>= 2.7.3'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,23 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: niconico
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
-dependencies: []
+date: 2014-02-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.7.3
 description: wrapper of Mechanize, optimized for nicovideo. :)
 email:
-- sorah@tubusu.net
+- her@sorah.jp
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.mkd
 - Rakefile
@@ -36,17 +50,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: niconico
-rubygems_version: 2.0.0
+rubyforge_project: 
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: wrapper of Mechanize, optimized for nicovideo.