bremen 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987e03779501f1b43cc0702ec8d3e2315f513fed
-  data.tar.gz: 8a78ebca2f9fc3110e298bd3192c99ef3f33f36a
+  metadata.gz: 9e74839d7d457ec1ed46c65c82444f33f62c75d9
+  data.tar.gz: fbdafe69f7f70a0b3a1480abcf61f3dca2dd8899
 SHA512:
-  metadata.gz: ffac9107f2da27c277441e6f1d40573132eaf620af55c7e8543849da3d1982d122f7499014094e9db4031b318350c1b36b9028b314b7aedf9b3c0ad18c1a91aa
-  data.tar.gz: ff5a508db79895b47f08c86488807266405dc219512218870305c2a39d3432afa1579e9a160816ba6e3eaed245fd48c7a518496338503c7551ef4e167cb516c0
+  metadata.gz: 3aefb2b8221d5ec9c834c4c6ec95a064a33b40d3ada1a7a9351123049388c49c20057a4c787c3d33a3a54d430a8ebd20eeee9d60a3fb676fec275fe06947b3d0
+  data.tar.gz: b9d650b0c844d9057460b164cb1d31ccafed870251b804fcb170693926b8b72b1c8c4cacb3a900e9fbae289b5967b83115c61e1c890b557248d2c7aa5f82ac89

data/.travis.yml

@@ -1,3 +1,5 @@
+language: ruby
 rvm:
+  - 2.1
   - 2.0.0
   - 1.9.3

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2012 itzki
+Copyright (c) 2012 deeeki
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# Bremen [![Build Status](https://travis-ci.org/itzki/bremen.png)](https://travis-ci.org/itzki/bremen)
+# Bremen [![Build Status](https://travis-ci.org/deeeki/bremen.png)](https://travis-ci.org/deeeki/bremen) [![Coverage Status](https://coveralls.io/repos/deeeki/bremen/badge.png)](https://coveralls.io/r/deeeki/bremen) [![Code Climate](https://codeclimate.com/github/deeeki/bremen.png)](https://codeclimate.com/github/deeeki/bremen) [![Gem Version](https://badge.fury.io/rb/bremen.png)](http://badge.fury.io/rb/bremen)
 
 **Bremen** provides common search interface for some music websites. it supports YouTube, SoundCloud, MixCloud and Nicovideo
 
@@ -20,7 +20,9 @@ Or install it yourself as:
 
 As far as SoundCloud concerned, you need to set your app's client id before using.
 
-    Bremen::Soundcloud.client_id = 'your_client_id'
+```ruby
+Bremen::Soundcloud.client_id = 'your_client_id'
+```
 
 Alternately, you can set 'SOUNDCLOUD_CLIENT_ID' environment variable.
 

data/bremen.gemspec

@@ -1,24 +1,26 @@
-# -*- encoding: utf-8 -*-
+# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bremen/version'
 
-Gem::Specification.new do |gem|
-  gem.name          = "bremen"
-  gem.version       = Bremen::VERSION
-  gem.authors       = ["itzki"]
-  gem.email         = ["itzki.h@gmail.com"]
-  gem.description   = %q{integrated searcher of audio tracks on music sites}
-  gem.summary       = %q{Bremen provides common search interface for some music websites. it supports YouTube, SoundCloud, MixCloud and Nicovideo}
-  gem.homepage      = "https://github.com/itzki/bremen"
+Gem::Specification.new do |spec|
+  spec.name          = "bremen"
+  spec.version       = Bremen::VERSION
+  spec.authors       = ["deeeki"]
+  spec.email         = ["deeeki@gmail.com"]
+  spec.summary       = %q{integrated searcher of audio tracks on music sites}
+  spec.description   = %q{Bremen provides common search interface for some music websites. it supports YouTube, SoundCloud, MixCloud and Nicovideo}
+  spec.homepage      = "https://github.com/deeeki/bremen"
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  gem.add_development_dependency 'guard-minitest', ['>= 0']
-  gem.add_development_dependency 'rb-fsevent', ['>= 0']
-  gem.add_development_dependency 'terminal-notifier-guard', ['>= 0']
-  gem.add_development_dependency 'rake'
+  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'rake', '~> 10'
+  spec.add_development_dependency 'coveralls', '~> 0'
+  spec.add_development_dependency 'guard-minitest', '~> 2'
+  spec.add_development_dependency 'terminal-notifier-guard', '~> 1'
 end

data/lib/bremen/nicovideo.rb

@@ -55,18 +55,18 @@ module Bremen
       end
 
       def convert_multiply response
-        return [] if response.scan(%r{<div class="mb16p4">}).flatten.first
+        return [] if response.scan(%r{<div class="videoList01">}).flatten.first
 
-        response.scan(%r{<div class="thumb_col_1">\n<!---->\n(.*?)\n<!---->\n</div></div>}m).flatten.map do |html|
-          uid = html.scan(%r{<table [^>]+ summary="(.+)">}).flatten.first
-          min, sec = html.scan(%r{<p class="vinfo_length"><span>([\d:]+)</span></p>}).flatten.first.to_s.split(':')
-          created_at = Time.parse(html.scan(%r{<strong>(.+:\d\d)</strong>}).flatten.first.to_s.gsub(/\xE5\xB9\xB4|\xE6\x9C\x88|\xE6\x97\xA5/n, '')).utc
+        response.scan(%r{<li class="item" [^>]+ data-enable-uad="1">\n(.*?)\n    </li>}m).flatten.map do |html|
+          uid = html.scan(%r{<div class="itemThumb" [^>]+ data-id="(.+)">}).flatten.first
+          min, sec = html.scan(%r{<span class="videoLength">([\d:]+)</span></div>}).flatten.first.to_s.split(':')
+          created_at = Time.parse(html.scan(%r{<span class="time">(.+:\d\d)</span>}).flatten.first.to_s.gsub(/\xE5\xB9\xB4|\xE6\x9C\x88|\xE6\x97\xA5/n, '')).utc
           new({
             uid: uid,
             url: "#{BASE_URL}watch/#{uid}",
-            title: CGI.unescape(html.scan(%r{<a [^>]+ class="watch" [^>]+>(.+)</a>}).flatten.first.to_s),
+            title: CGI.unescape(html.scan(%r{<p class="itemTitle">\n\s+<a [^>]+>(.+)</a>}).flatten.first.to_s),
             length: min.to_i * 60 + sec.to_i,
-            thumbnail_url: html.scan(%r{<img src="([^"]+)"[^>]*class="img_std96" ?/?>}).flatten.first,
+            thumbnail_url: html.scan(%r{<img [^>]+data-original="([^"]+)"[^>]*data-thumbnail [^>]+/?>}).flatten.first,
             created_at: created_at,
             updated_at: created_at,
           })

data/lib/bremen/version.rb

@@ -1,3 +1,3 @@
 module Bremen
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/fixtures/nicovideo_multi.html

@@ -1,44 +1,41 @@
 <html>
 <body>
-<div class="thumb_col_1">
-<!---->
-<table width="624" cellpadding="4" cellspacing="0" summary="sm11111111">
-<tr valign="top">
-<td><div id="item1" style="display:none;" onMouseover="showOBJ('thumb_uad_msg_sm11111111')" onMouseout="hideOBJ('thumb_uad_msg_sm11111111')">
-	<div id="thumb_uad_msg_sm11111111" style="display:none; position:absolute;">
-	<p id="item1_uad_comment" class="uad_comment"><span style="color:#666;">-</span></p>
-	</div>
-</div>
-<div id="item1_thumb" class="uad_thumbfrm">
-<table cellspacing="0" cellpadding="0">
-<tr>
-<td onMouseover="showOBJ('thumb_uad_msg_sm11111111')" onMouseout="hideOBJ('thumb_uad_msg_sm11111111')">
-<p><a href="watch/sm11111111"><img src="http://tn-skr4.smilevideo.jp/smile?i=11111111" alt="" class="img_std96"></a></p>
-<p class="vinfo_length"><span>1:01</span></p>
-</td>
-<td class="font10" align="right"><div style="width:92px; overflow:hidden; padding-left:4px;"><nobr>Views: <strong class="vinfo_view">111</strong><br></nobr>
-<nobr>Comments: <strong class="vinfo_res">1</strong><br></nobr>
-<nobr>My Lists: <a href="mylistcomment/video/sm11111111" style="color:#393F3F;"><strong class="vinfo_mylist">9</strong></a><br></nobr>
-<nobr>Ads: <a href="http://uad.nicovideo.jp/ads/?vid=sm11111111" style="color:#393F3F;"><strong id="item1_uad_point_number" class="vinfo_uadp">0</strong></a><br></nobr>
-</div></td>
-</tr>
-</table>
-	</div>
-</td>
-<td style="background:url('http://res.nimg.jp/img/common/thumb/split_line.png') no-repeat bottom left; padding-bottom:6px;">
-<div style="width:412px; overflow:hidden;">
-<p class="font12 thumb_num">
+<div class="contentBody video uad videoList01">
+  <ul class="list">
+
+        <li class="item" data-video-item data-id="sm11111111" data-enable-uad="1">
+      <div class="videoList01Wrap">
+        <p class="itemTime"><span class="time">14/06/15 00:00</span><span class="separate">投稿</span></p>
+        <div class="uadWrap">
+          <div class="itemThumbBox"><div class="itemThumb" data-video-thumbnail data-id="sm11111111"><a href="/watch/sm11111111?ref=search_key_video" class="itemThumbWrap" data-link
+    ><img src="http://res.nimg.jp/images/noimage.png" title="" alt="" class="noImage"><img class="jsLazyImage thumb" src="images/1x1.gif" data-original="http://tn-skr2.smilevideo.jp/smile?i=11111111.M" alt="Title" data-thumbnail style="
+
+    "></a></div><span class="videoLength">1:01</span></div>
+
+          <div class="balloon recent active" data-uad-comment style="display:none"></div>
+        </div>
+      </div>
 
+      <div class="itemContent">
+        <p class="itemTitle">
+          <a title="Title" href="/watch/sm11111111?ref=search_key_video">Title</a>
+        </p>
+        <div class="wrap">
+          <p title="This is a description." class="itemDescription">This is a description.</p>
+                    <p class="itemComment">Comment</p>
+                  </div>
+        <div class="itemData">
+          <ul class="list">
+            <li class="count view">再生<span class="value">111</span></li>
+            <li class="count comment">コメ<span class="value">1</span></li>
+            <li class="count mylist">マイ<span class="value"><a href="/mylistcomment/video/sm11111111">1</a></span></li>
+            <li class="count ads">宣伝<span class="value"><a href="http://uad.nicovideo.jp/ads/?vid=sm11111111" data-uad-point>0</a></span></li>
+          </ul>
+        </div>
+      </div>
 
-Uploaded on: <strong>Nov 11, 2012, 00:00</strong>
-</p>
-<p class="font16" style="margin:2px 0;"><nobr><a href="watch/sm11111111" class="watch" title="Title">Title</a></nobr></p>
-<p class="vinfo_description" title="This is a description.">This is a description.</p>
+    </li>
+  </ul>
 </div>
-</td>
-</tr>
-</table>
-<!---->
-</div></div>
 </body>
 </html>

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'minitest/autorun'
 require 'minitest/pride'
 require 'bremen'
+require 'coveralls'
+Coveralls.wear!
 
 def fixture path
   File.read("#{File.dirname(__FILE__)}/fixtures/#{path}")

metadata

@@ -1,80 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: bremen
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
-- itzki
+- deeeki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: guard-minitest
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: terminal-notifier-guard
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: guard-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: integrated searcher of audio tracks on music sites
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: terminal-notifier-guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+description: Bremen provides common search interface for some music websites. it supports
+  YouTube, SoundCloud, MixCloud and Nicovideo
 email:
-- itzki.h@gmail.com
+- deeeki@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -105,8 +120,9 @@ files:
 - spec/fixtures/youtube_multi.json
 - spec/fixtures/youtube_single.json
 - spec/spec_helper.rb
-homepage: https://github.com/itzki/bremen
-licenses: []
+homepage: https://github.com/deeeki/bremen
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -114,21 +130,20 @@ 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: 
-rubygems_version: 2.0.3
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
-summary: Bremen provides common search interface for some music websites. it supports
-  YouTube, SoundCloud, MixCloud and Nicovideo
+summary: integrated searcher of audio tracks on music sites
 test_files:
 - spec/bremen/base_spec.rb
 - spec/bremen/mixcloud_spec.rb