bremen 0.1.3 → 0.2.0

data/README.md

@@ -18,9 +18,11 @@ Or install it yourself as:
 
 ## Setting
 
-As far as Soundcloud concerned, you need to set consumer key before using.
+As far as Soundcloud concerned, you need to set your app's client id before using.
 
-    Bremen::Soundcloud.consumer_key = 'your_consumer_key'
+    Bremen::Soundcloud.client_id = 'your_client_id'
+
+Alternately, you can set 'SOUNDCLOUD_CLIENT_ID' environment variable.
 
 ## Usage
 

data/lib/bremen/mixcloud.rb

@@ -31,7 +31,7 @@ module Bremen
       end
 
       def from_api hash = {}
-        created_at = Time.parse(hash['created_time'])
+        created_at = Time.parse(hash['created_time']).utc
         new({
           uid: hash['key'],
           url: hash['url'],

data/lib/bremen/nicovideo.rb

@@ -39,7 +39,7 @@ module Bremen
       private
       def convert_singly response
         uid = response.scan(%r{<link rel="canonical" href="/watch/([^"]+)">}).flatten.first
-        created_at = Time.parse(response.scan(%r{<meta property="video:release_date" content="(.+)">}).flatten.first.to_s)
+        created_at = Time.parse(response.scan(%r{<meta property="video:release_date" content="(.+)">}).flatten.first.to_s).utc
         new({
           uid: uid,
           url: "#{BASE_URL}watch/#{uid}",
@@ -60,7 +60,7 @@ module Bremen
         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/, ''))
+          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/, '')).utc
           new({
             uid: uid,
             url: "#{BASE_URL}watch/#{uid}",

data/lib/bremen/soundcloud.rb

@@ -13,11 +13,12 @@ module Bremen
     }
 
     class << self
-      attr_accessor :consumer_key
+      attr_accessor :client_id
 
       def build_query options = {}
-        raise %Q{"#{self.name}.consumer_key" must be set} unless consumer_key
-        super(options.merge(consumer_key: consumer_key))
+        self.client_id ||= ENV['SOUNDCLOUD_CLIENT_ID']
+        raise %Q{"#{self.name}.client_id" must be set} unless client_id
+        super(options.merge(client_id: client_id))
       end
 
       def find_url uid_or_url
@@ -41,20 +42,21 @@ module Bremen
       end
 
       def from_api hash = {}
+        created_at = Time.parse(hash['created_at']).utc
         new({
-          uid: hash['id'],
+          uid: hash['id'].to_s,
           url: hash['permalink_url'],
           title: hash['title'],
           author: Bremen::Author.new({
-            uid: hash['user']['id'],
+            uid: hash['user']['id'].to_s,
             url: hash['user']['permalink_url'],
             name: hash['user']['username'],
             thumbnail_url: hash['user']['avatar_url'].sub(%r{\?.*}, ''),
           }),
           length: (hash['duration'].to_i / 1000).round,
           thumbnail_url: hash['artwork_url'] ? hash['artwork_url'].sub(%r{\?.*}, '') : nil,
-          created_at: Time.parse(hash['created_at']),
-          updated_at: Time.parse(hash['created_at']),
+          created_at: created_at,
+          updated_at: created_at,
         })
       end
 

data/lib/bremen/version.rb

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

data/lib/bremen/youtube.rb

@@ -47,8 +47,8 @@ module Bremen
           }),
           length: hash['media$group']['yt$duration']['seconds'].to_i,
           thumbnail_url: hash['media$group']['media$thumbnail'][0]['url'],
-          created_at: Time.parse(hash['published']['$t']),
-          updated_at: Time.parse(hash['updated']['$t']),
+          created_at: Time.parse(hash['published']['$t']).utc,
+          updated_at: Time.parse(hash['updated']['$t']).utc,
         })
       end
 

data/spec/bremen/base_spec.rb

@@ -1,10 +1,19 @@
 $:.unshift(File.expand_path('../../', __FILE__))
 require 'spec_helper'
 
+envfile = File.expand_path('../../../.env', __FILE__)
+if File.exists?(envfile)
+  File.open(envfile, 'r').each do |line|
+    key, val = line.chomp.split('=', 2)
+    ENV[key] = val
+  end
+end
+SITES = ['Youtube', 'Mixcloud', 'Nicovideo']
+SITES << 'Soundcloud' if ENV['SOUNDCLOUD_CLIENT_ID']
+
 describe Bremen::Base do
   describe '.search' do
-    #TODO: need to suport autoload soundcloud consumerkey from dotfile.
-    ['Youtube', 'Mixcloud', 'Nicovideo'].each do |site|
+    SITES.each do |site|
       describe site do
         let(:klass){ Bremen.const_get(site) }
 

data/spec/bremen/mixcloud_spec.rb

@@ -41,6 +41,7 @@ describe Bremen::Mixcloud do
     let(:response){ fixture('mixcloud_single.json') }
     it 'convert successfully' do
       subject.title.must_equal 'Title'
+      subject.created_at.zone.must_equal 'UTC'
     end
   end
 
@@ -49,6 +50,7 @@ describe Bremen::Mixcloud do
     let(:response){ fixture('mixcloud_multi.json') }
     it 'convert successfully' do
       subject.first.title.must_equal 'Title'
+      subject.first.created_at.zone.must_equal 'UTC'
     end
   end
 end

data/spec/bremen/nicovideo_spec.rb

@@ -41,6 +41,7 @@ describe Bremen::Nicovideo do
     let(:response){ fixture('nicovideo_single.html') }
     it 'convert successfully' do
       subject.title.must_equal 'Title'
+      subject.created_at.zone.must_equal 'UTC'
     end
   end
 
@@ -49,6 +50,7 @@ describe Bremen::Nicovideo do
     let(:response){ fixture('nicovideo_multi.html') }
     it 'convert successfully' do
       subject.first.title.must_equal 'Title'
+      subject.first.created_at.zone.must_equal 'UTC'
     end
   end
 end

data/spec/bremen/soundcloud_spec.rb

@@ -2,54 +2,67 @@ $:.unshift(File.expand_path('../../', __FILE__))
 require 'spec_helper'
 
 describe Bremen::Soundcloud do
+  after{ Bremen::Soundcloud.client_id = nil }
   describe '.build_query' do
-    describe 'not set consumer_key' do
+    before do
+      Bremen::Soundcloud.client_id = nil
+      ENV['SOUNDCLOUD_CLIENT_ID'] = nil
+    end
+    describe 'not set client_id' do
       it 'raise error' do
-        lambda{ Bremen::Soundcloud.search_url }.must_raise RuntimeError
+        lambda{ Bremen::Soundcloud.build_query({a: 'b'}) }.must_raise RuntimeError
+      end
+    end
+
+    describe 'set client_id via ENV' do
+      before{ ENV['SOUNDCLOUD_CLIENT_ID'] = 'CID' }
+      subject{ Bremen::Soundcloud.build_query({a: 'b'}) }
+      it 'return query string' do
+        subject.must_equal 'a=b&client_id=CID'
       end
     end
 
-    describe 'set consumer_key' do
-      before{ Bremen::Soundcloud.consumer_key = 'CK' }
+    describe 'set client_id directly' do
+      before{ Bremen::Soundcloud.client_id = 'CID' }
       subject{ Bremen::Soundcloud.build_query({a: 'b'}) }
       it 'return query string' do
-        subject.must_equal 'a=b&consumer_key=CK'
+        subject.must_equal 'a=b&client_id=CID'
       end
     end
   end
 
   describe '.find_url' do
-    before{ Bremen::Soundcloud.consumer_key = 'CK' }
+    before{ Bremen::Soundcloud.client_id = 'CID' }
     subject{ Bremen::Soundcloud.find_url(uid_or_url) }
     describe 'given id' do
       let(:uid_or_url){ 100 }
       it 'generate directly' do
-        subject.must_equal 'http://api.soundcloud.com/tracks/100.json?consumer_key=CK'
+        subject.must_equal 'http://api.soundcloud.com/tracks/100.json?client_id=CID'
       end
     end
 
     describe 'given url' do
       let(:uid_or_url){ 'http://soundcloud.com/author/permalink' }
       it 'generate with resolve resource' do
-        subject.must_equal 'http://api.soundcloud.com/resolve.json?url=http%3A%2F%2Fsoundcloud.com%2Fauthor%2Fpermalink&consumer_key=CK'
+        subject.must_equal 'http://api.soundcloud.com/resolve.json?url=http%3A%2F%2Fsoundcloud.com%2Fauthor%2Fpermalink&client_id=CID'
       end
     end
   end
 
   describe '.search_url' do
-    before{ Bremen::Soundcloud.consumer_key = 'CK' }
+    before{ Bremen::Soundcloud.client_id = 'CID' }
     subject{ Bremen::Soundcloud.search_url(params) }
     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&offset=0&filter=&consumer_key=CK'
+        subject.must_equal 'http://api.soundcloud.com/tracks.json?q=searchword&order=created_at&limit=50&offset=0&filter=&client_id=CID'
       end
     end
 
     describe 'full params' do
       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=10&offset=10&filter=public&consumer_key=CK'
+        subject.must_equal 'http://api.soundcloud.com/tracks.json?q=searchword&order=hotness&limit=10&offset=10&filter=public&client_id=CID'
       end
     end
   end
@@ -59,6 +72,8 @@ describe Bremen::Soundcloud do
     let(:response){ fixture('soundcloud_single.json') }
     it 'convert successfully' do
       subject.title.must_equal 'Title'
+      subject.uid.must_equal '11111111'
+      subject.created_at.zone.must_equal 'UTC'
     end
   end
 
@@ -67,6 +82,8 @@ describe Bremen::Soundcloud do
     let(:response){ fixture('soundcloud_multi.json') }
     it 'convert successfully' do
       subject.first.title.must_equal 'Title'
+      subject.first.uid.must_equal '11111111'
+      subject.first.created_at.zone.must_equal 'UTC'
     end
   end
 end

data/spec/bremen/youtube_spec.rb

@@ -41,6 +41,7 @@ describe Bremen::Youtube do
     let(:response){ fixture('youtube_single.json') }
     it 'convert successfully' do
       subject.title.must_equal 'Title'
+      subject.created_at.zone.must_equal 'UTC'
     end
   end
 
@@ -49,6 +50,7 @@ describe Bremen::Youtube do
     let(:response){ fixture('youtube_multi.json') }
     it 'convert successfully' do
       subject.first.title.must_equal 'Title'
+      subject.first.created_at.zone.must_equal 'UTC'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bremen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
+date: 2012-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard-minitest