bremen 0.1.2 → 0.1.3

data/lib/bremen/mixcloud.rb

@@ -7,6 +7,7 @@ module Bremen
     self.default_options = {
       keyword: '',
       limit: 20,
+      page: 1,
     }
 
     class << self
@@ -23,6 +24,7 @@ module Bremen
         query = {
           q: options[:keyword],
           limit: options[:limit],
+          offset: options[:limit] * (options[:page] - 1),
           type: 'cloudcast',
         }
         "#{BASE_URL}search/?#{build_query(query)}"

data/lib/bremen/nicovideo.rb

@@ -6,6 +6,7 @@ module Bremen
     BASE_URL = 'http://www.nicovideo.jp/'
     self.default_options = {
       keyword: '',
+      page: 1,
       sort: 'f', #n(newer commented)/v(viewed)/r(most commented)/m(listed)/f(uploaded)/l(duration)
       order: 'd', #a(asc)/d(desc)
       within: '', #1(24h)/2(1w)/3(1m)
@@ -25,6 +26,7 @@ module Bremen
       def search_url options = {}
         options = default_options.merge(options)
         query = {
+          page: options[:page],
           sort: options[:sort],
           order: options[:order],
           f_range: options[:within],
@@ -53,6 +55,8 @@ module Bremen
       end
 
       def convert_multiply response
+        return [] if response.scan(%r{<div class="mb16p4">}).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(':')

data/lib/bremen/soundcloud.rb

@@ -8,6 +8,7 @@ module Bremen
       keyword: '',
       order: 'created_at', #created_at/hotness
       limit: 50,
+      page: 1,
       filter: '', #(all)/public/private/streamable/downloadable
     }
 
@@ -33,6 +34,7 @@ module Bremen
           q: options[:keyword],
           order: options[:order],
           limit: options[:limit],
+          offset: options[:limit] * (options[:page] - 1),
           filter: options[:filter],
         }
         "#{BASE_URL}tracks.json?#{build_query(query)}"

data/lib/bremen/version.rb

@@ -1,3 +1,3 @@
 module Bremen
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/bremen/youtube.rb

@@ -7,6 +7,7 @@ module Bremen
     self.default_options = {
       order: 'published', #relevance/published/viewCount/rating
       limit: 25,
+      page: 1,
       category: 'Music',
       tag: '',
     }
@@ -27,6 +28,7 @@ module Bremen
           vq: options[:keyword],
           orderby: options[:order],
           :"max-results" => options[:limit],
+          :"start-index" => options[:page],
         }
         "#{BASE_URL}-/#{options[:category]}/#{options[:tag]}/?#{build_query(query)}"
       end
@@ -56,7 +58,9 @@ module Bremen
       end
 
       def convert_multiply response
-        JSON.parse(response)['feed']['entry'].map{|t| from_api(t) }
+        feed = JSON.parse(response)['feed']
+        return [] unless feed['entry']
+        feed['entry'].map{|t| from_api(t) }
       end
     end
   end

data/spec/bremen/base_spec.rb

@@ -0,0 +1,30 @@
+$:.unshift(File.expand_path('../../', __FILE__))
+require 'spec_helper'
+
+describe Bremen::Base do
+  describe '.search' do
+    #TODO: need to suport autoload soundcloud consumerkey from dotfile.
+    ['Youtube', 'Mixcloud', 'Nicovideo'].each do |site|
+      describe site do
+        let(:klass){ Bremen.const_get(site) }
+
+        describe 'pagination' do
+          let(:params){ {keyword: 'kyary pamyu pamyu', limit: 1} }
+          let(:track_page1){ klass.search(params.merge(page: 1)).first }
+          let(:track_page2){ klass.search(params.merge(page: 2)).first }
+          it 'first tracks on each pages are different' do
+            track_page1.uid.wont_equal track_page2.uid
+          end
+        end
+
+        describe 'no result keyword' do
+          let(:params){ {keyword: 'kyarolinecharonpropkyarypamyupamyu', limit: 1 } }
+          subject{ klass.search(params) }
+          it 'returns empty array' do
+            subject.must_be_empty
+          end
+        end
+      end
+    end
+  end
+end

data/spec/bremen/mixcloud_spec.rb

@@ -24,14 +24,14 @@ describe Bremen::Mixcloud do
     describe 'only keyword' do
       let(:params){ {keyword: 'searchword'} }
       it 'generate' do
-        subject.must_equal 'http://api.mixcloud.com/search/?q=searchword&limit=20&type=cloudcast'
+        subject.must_equal 'http://api.mixcloud.com/search/?q=searchword&limit=20&offset=0&type=cloudcast'
       end
     end
 
     describe 'full params' do
-      let(:params){ {keyword: 'searchword', limit: 1} }
+      let(:params){ {keyword: 'searchword', limit: 10, page: 2} }
       it 'generate' do
-        subject.must_equal 'http://api.mixcloud.com/search/?q=searchword&limit=1&type=cloudcast'
+        subject.must_equal 'http://api.mixcloud.com/search/?q=searchword&limit=10&offset=10&type=cloudcast'
       end
     end
   end

data/spec/bremen/nicovideo_spec.rb

@@ -24,14 +24,14 @@ describe Bremen::Nicovideo do
     describe 'only keyword' do
       let(:params){ {keyword: 'searchword'} }
       it 'generate' do
-        subject.must_equal 'http://www.nicovideo.jp/search/searchword?sort=f&order=d&f_range=&l_range=&opt_md='
+        subject.must_equal 'http://www.nicovideo.jp/search/searchword?page=1&sort=f&order=d&f_range=&l_range=&opt_md='
       end
     end
 
     describe 'full params' do
-      let(:params){ {keyword: 'searchword', sort: 'n', order: 'a', within: 3, length: 2, downloadable: 1} }
+      let(:params){ {keyword: 'searchword', page: 2, sort: 'n', order: 'a', within: 3, length: 2, downloadable: 1} }
       it 'generate' do
-        subject.must_equal 'http://www.nicovideo.jp/search/searchword?sort=n&order=a&f_range=3&l_range=2&opt_md=1'
+        subject.must_equal 'http://www.nicovideo.jp/search/searchword?page=2&sort=n&order=a&f_range=3&l_range=2&opt_md=1'
       end
     end
   end

data/spec/bremen/soundcloud_spec.rb

@@ -42,14 +42,14 @@ describe Bremen::Soundcloud do
     describe 'only keyword' do
       let(:params){ {keyword: 'searchword'} }
       it 'generate' do
-        subject.must_equal 'http://api.soundcloud.com/tracks.json?q=searchword&order=created_at&limit=50&filter=&consumer_key=CK'
+        subject.must_equal 'http://api.soundcloud.com/tracks.json?q=searchword&order=created_at&limit=50&offset=0&filter=&consumer_key=CK'
       end
     end
 
     describe 'full params' do
-      let(:params){ {keyword: 'searchword', order: 'hotness', limit: 1, filter: 'public'} }
+      let(:params){ {keyword: 'searchword', order: 'hotness', limit: 10, page: 2, filter: 'public'} }
       it 'generate' do
-        subject.must_equal 'http://api.soundcloud.com/tracks.json?q=searchword&order=hotness&limit=1&filter=public&consumer_key=CK'
+        subject.must_equal 'http://api.soundcloud.com/tracks.json?q=searchword&order=hotness&limit=10&offset=10&filter=public&consumer_key=CK'
       end
     end
   end

data/spec/bremen/youtube_spec.rb

@@ -24,14 +24,14 @@ describe Bremen::Youtube do
     describe 'only keyword' do
       let(:params){ {keyword: 'searchword'} }
       it 'generate' do
-        subject.must_equal 'http://gdata.youtube.com/feeds/api/videos/-/Music//?vq=searchword&orderby=published&max-results=25&alt=json'
+        subject.must_equal 'http://gdata.youtube.com/feeds/api/videos/-/Music//?vq=searchword&orderby=published&max-results=25&start-index=1&alt=json'
       end
     end
 
     describe 'full params' do
-      let(:params){ {keyword: 'searchword', order: 'relevance', limit: 1, category: 'Entertainment', tag: 'game'} }
+      let(:params){ {keyword: 'searchword', order: 'relevance', limit: 10, page: 2, category: 'Entertainment', tag: 'game'} }
       it 'generate' do
-        subject.must_equal 'http://gdata.youtube.com/feeds/api/videos/-/Entertainment/game/?vq=searchword&orderby=relevance&max-results=1&alt=json'
+        subject.must_equal 'http://gdata.youtube.com/feeds/api/videos/-/Entertainment/game/?vq=searchword&orderby=relevance&max-results=10&start-index=2&alt=json'
       end
     end
   end

data/spec/fixtures/mixcloud_single.json

@@ -4,7 +4,7 @@
   "tags": [
     {
     "url": "http://www.mixcloud.com/tag/tag1/",
-    "name": "Inna",
+    "name": "tag1",
     "key": "/tag/tag1/"
     }
   ],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bremen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest
@@ -83,6 +83,7 @@ files:
 - lib/bremen/track.rb
 - lib/bremen/version.rb
 - lib/bremen/youtube.rb
+- spec/bremen/base_spec.rb
 - spec/bremen/mixcloud_spec.rb
 - spec/bremen/nicovideo_spec.rb
 - spec/bremen/soundcloud_spec.rb
@@ -122,6 +123,7 @@ specification_version: 3
 summary: Bremen provides common search interface for some music websites. it supports
   YouTube, SoundCloud, MixCloud and Nicovideo
 test_files:
+- spec/bremen/base_spec.rb
 - spec/bremen/mixcloud_spec.rb
 - spec/bremen/nicovideo_spec.rb
 - spec/bremen/soundcloud_spec.rb