events_jp 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aab2519d8804f736156630b36db725f413a4c164
-  data.tar.gz: b106f59cb674759ce82d20c6d878eccb05fb5638
+  metadata.gz: 4f67d6a45cf0c82bfadeefff22ffd982d7bd52f9
+  data.tar.gz: 7cdbcd44a517af9b0573b7ac1bc9260df3114215
 SHA512:
-  metadata.gz: 2e54ae85cbde020a03ffbc7d1425f136a1ad9fe04211e87758d4eb06f1f4f8a75c1aeae65d28110ffe2aec9f09f32631dd85c431863932a580d0e9167347c787
-  data.tar.gz: a806e5bc7904bb2bce3aa70e46caa234db1adcdb57f47d411f3e530c2c3b1d5878a1953ac6406f70ef137967c9e5fbc6f3dc09bcb74fcf5bdfdb5fb8c05d61d2
+  metadata.gz: aa55f679cabc8e8d020b3d702dc13dc44c30d6ce5088ec203318fe6f0647cc9499d70c467e1da312d9eb39f306988f3bc9f40b0e9fea140b10ae2bb5f5134716
+  data.tar.gz: 67220f492e3d0c0831e1bd86f23d867cd7e0ad8ddc0f14c84fde3e4ca3f60f9a5fb842079fa0b4b9bb1af5347ace937543673f3e74764bab40945876b7e2f826

data/README.md

@@ -21,10 +21,11 @@ Or install it yourself as:
 ### Search events
 
 ```ruby
-events = EventsJp.get_events(keyword: 'Ruby')
+events, errors = EventsJp.get_events(keyword: 'Ruby')
 events.each do |e|
   puts "#{e.service} - #{e.title}"
 end
+puts errors #=> []
 ```
 
 * Unfortunately, Doorkeeper don't support keyword search....
@@ -32,10 +33,11 @@ end
 ### Get all events
 
 ```ruby
-events = EventsJp.get_events(service_limit: 100)
+events, errors = EventsJp.get_events(service_limit: 100)
 events.each do |e|
   puts "#{e.service} - #{e.title}"
 end
+puts errors #=> []
 ```
 
 ### Complement

data/lib/events_jp/event.rb

@@ -4,14 +4,16 @@ module EventsJp
     SERVICES = [EventsJp::Atnd, EventsJp::Connpass, EventsJp::Doorkeeper, EventsJp::Zusaar]
 
     def get_events(keyword: nil, service_limit: nil)
-      results = []
+      results, errors = [], []
 
       Parallel.each(SERVICES, in_threads: SERVICES.count) do |service|
         next if service == EventsJp::Doorkeeper && keyword
-        results << service.get_events(keyword: keyword, limit: service_limit)
+        res, err = service.get_events(keyword: keyword, limit: service_limit)
+        results << res
+        errors << err
       end
 
-      results.compact.flatten
+      return [results.compact.flatten, errors.compact.flatten]
     end
   end
 end

data/lib/events_jp/event_object/atnd.rb

@@ -5,15 +5,19 @@ module EventsJp
 
     class << self
       def get_events(keyword: nil, limit: nil)
-        res = []
+        results, errors = [], []
         loop do
-          opt = merged_option(keyword, res, DEFAULT_OPT)
-          tmp = convert_response(get(ENDPOINT, opt))
-          res += tmp
-          break if finish_get?(res, tmp, limit)
+          tmp, err = access_wrapper do
+            opt = merged_option(keyword, results, DEFAULT_OPT)
+            convert_response(get(ENDPOINT, opt))
+          end
+          results += tmp
+          errors << err
+          break if finish_get?(results, tmp, limit)
           sleep(1)
         end
-        res.uniq.flatten
+
+        return [results.uniq.compact.flatten, errors.compact.flatten]
       end
 
       def convert_response(json_str)

data/lib/events_jp/event_object/connpass.rb

@@ -5,15 +5,20 @@ module EventsJp
 
     class << self
       def get_events(keyword: nil, limit: nil)
-        res = []
+        results, errors = [], []
         loop do
-          opt = merged_option(keyword, res, DEFAULT_OPT)
-          tmp = convert_response(get(ENDPOINT, opt))
-          res += tmp
-          break if finish_get?(res, tmp, limit)
+          tmp, err = access_wrapper do
+            opt = merged_option(keyword, results, DEFAULT_OPT)
+            convert_response(get(ENDPOINT, opt))
+          end
+          results += tmp
+          errors << err
+          break if finish_get?(results, tmp, limit)
+
           sleep(1)
         end
-        res.uniq.flatten
+
+        return [results.uniq.compact.flatten, errors.compact.flatten]
       end
 
       def convert_response(json_str)

data/lib/events_jp/event_object/doorkeeper.rb

@@ -5,15 +5,20 @@ module EventsJp
 
     class << self
       def get_events(keyword: nil, limit: nil)
-        res = []
+        results, errors = [], []
+
         1.upto(1000) do |page|
-          opt = merged_option(page, DEFAULT_OPT)
-          tmp = convert_response(get(ENDPOINT, opt))
-          res += tmp
-          break if finish_get?(res, tmp, limit)
+          tmp, err = access_wrapper do
+            opt = merged_option(page, DEFAULT_OPT)
+            convert_response(get(ENDPOINT, opt))
+          end
+          results += tmp
+          errors << err
+          break if finish_get?(results, tmp, limit)
           sleep(1)
         end
-        res.uniq.flatten
+
+        return [results.uniq.compact.flatten, errors.compact.flatten]
       end
 
       def merged_option(page, option)

data/lib/events_jp/event_object/event_object.rb

@@ -4,6 +4,12 @@ module EventsJp
     extend EventsJp::Connection
 
     class << self
+      def access_wrapper(&block)
+        return [block.call, nil]
+      rescue => e
+        return [[], e.message]
+      end
+
       def service_name
         self.name.to_s.downcase.gsub(/^(.*::)/, '')
       end

data/lib/events_jp/event_object/zusaar.rb

@@ -5,15 +5,19 @@ module EventsJp
 
     class << self
       def get_events(keyword: nil, limit: nil)
-        res = []
+        results, errors = [], []
         loop do
-          opt = merged_option(keyword, res, DEFAULT_OPT)
-          tmp = convert_response(get(ENDPOINT, opt))
-          res += tmp
-          break if finish_get?(res, tmp, limit)
+          tmp, err = access_wrapper do
+            opt = merged_option(keyword, results, DEFAULT_OPT)
+            convert_response(get(ENDPOINT, opt))
+          end
+          results += tmp
+          errors << err
+          break if finish_get?(results, tmp, limit)
           sleep(1)
         end
-        res.uniq.flatten
+
+        return [results.uniq.compact.flatten, errors.compact.flatten]
       end
 
       def convert_response(json_str)

data/lib/events_jp/version.rb

@@ -1,3 +1,3 @@
 module EventsJp
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/events_jp/event/atnd_spec.rb

@@ -1,51 +1,51 @@
-$:.unshift(File.expand_path('../', __FILE__))
 require 'spec_helper'
 
 describe 'EventsJp::Atnd' do
   describe '.convert_response' do
-    before(:each)  do
-      response = %[{"events": [{"event": {"address": "sample"}}]}]
-      @conv_res = EventsJp::Atnd.convert_response(response)
-    end
-
+    let!(:response) { %[{"events": [{"event": {"address": "sample"}}]}] }
     it 'converts to Array' do
-      expect(@conv_res.class).to eq(Array)
-      expect(@conv_res.first.address).to eq('sample')
+      results = EventsJp::Atnd.convert_response(response)
+      expect(results.class).to eq(Array)
+      expect(results.first.address).to eq('sample')
     end
   end
 
   describe '.get_events' do
     context 'with keyword' do
-      before(:each) do
-        @res = EventsJp::Atnd.get_events(limit: 100, keyword: 'Ruby')
-      end
-
       it 'returns conpass API results' do
-        expect(@res.count).to eq(100)
-        expect(@res.first.title).to eq('第16回 tottoruby')
+        results, errors = EventsJp::Atnd.get_events(limit: 100, keyword: 'Ruby')
+        expect(errors).to be == []
+        expect(results.count).to eq(100)
+        expect(results.first.title).to eq('第16回 tottoruby')
       end
     end
 
     context 'no keyword' do
-      before(:each) do
-        @res = EventsJp::Atnd.get_events(limit: 100)
+      it 'returns conpass API results' do
+        results, errors = EventsJp::Atnd.get_events(limit: 100)
+        expect(errors).to be == []
+        expect(results.count).to eq(100)
+        expect(results.first.service).to eq('atnd')
+        expect(results.first.title).to eq('[テスト] qkstudy #01')
+        expect(results.first.catch).to eq('人は働くために、休みが必要である。')
+        expect(results.first.event_url).to eq('http://atnd.org/events/17662')
+        expect(results.first.started_at).to eq(DateTime.parse('2112-08-20T19:00:00.000+09:00'))
+        expect(results.first.ended_at).to eq(DateTime.parse('2112-08-20T21:30:00.000+09:00'))
+        expect(results.first.address).to eq('東京都千代田区丸の内3丁目5番1号')
+        expect(results.first.place).to eq('東京国際フォーラム　ホールB7')
+        expect(results.first.lat).to eq(35.6769467)
+        expect(results.first.lon).to eq(139.7635034)
+        expect(results.first.limit).to be_nil
+        expect(results.first.accepted).to eq(5)
+        expect(results.first.waiting).to eq(0)
       end
+    end
 
-      it 'returns conpass API results' do
-        expect(@res.count).to eq(100)
-        expect(@res.first.service).to eq('atnd')
-        expect(@res.first.title).to eq('[テスト] qkstudy #01')
-        expect(@res.first.catch).to eq('人は働くために、休みが必要である。')
-        expect(@res.first.event_url).to eq('http://atnd.org/events/17662')
-        expect(@res.first.started_at).to eq(DateTime.parse('2112-08-20T19:00:00.000+09:00'))
-        expect(@res.first.ended_at).to eq(DateTime.parse('2112-08-20T21:30:00.000+09:00'))
-        expect(@res.first.address).to eq('東京都千代田区丸の内3丁目5番1号')
-        expect(@res.first.place).to eq('東京国際フォーラム　ホールB7')
-        expect(@res.first.lat).to eq(35.6769467)
-        expect(@res.first.lon).to eq(139.7635034)
-        expect(@res.first.limit).to be_nil
-        expect(@res.first.accepted).to eq(5)
-        expect(@res.first.waiting).to eq(0)
+    context 'when raise errors in convert_response method' do
+      it 'returns error' do
+        allow(EventsJp::Atnd).to receive(:convert_response).and_raise(StandardError)
+        _, errors = EventsJp::Atnd.get_events(limit: 100)
+        expect(errors).not_to be_empty
       end
     end
   end

data/spec/events_jp/event/connpass_spec.rb

@@ -3,49 +3,50 @@ require 'spec_helper'
 
 describe 'EventsJp::Conpass' do
   describe '.convert_response' do
-    before(:each)  do
-      response = %[{"events": [{"address": "sample"}]}]
-      @conv_res = EventsJp::Connpass.convert_response(response)
-    end
-
+    let!(:response) { %[{"events": [{"address": "sample"}]}] }
     it 'converts to Array' do
-      expect(@conv_res.class).to eq(Array)
-      expect(@conv_res.first.address).to eq('sample')
+      result = EventsJp::Connpass.convert_response(response)
+      expect(result.class).to eq(Array)
+      expect(result.first.address).to eq('sample')
     end
   end
 
   describe '.get_events' do
     context 'with keyword' do
-      before(:each) do
-        @res = EventsJp::Connpass.get_events(keyword: 'Ruby', limit: 100)
-      end
-
       it 'returns conpass API results' do
-        expect(@res.count).to eq(100)
-        expect(@res.first.title).to eq('NDS#39 Niigata.pm tech talk')
+        results, errors = EventsJp::Connpass.get_events(keyword: 'Ruby', limit: 100)
+        expect(errors).to be == []
+        expect(results.count).to eq(100)
+        expect(results.first.title).to eq('NDS#39 Niigata.pm tech talk')
       end
     end
 
     context 'no keyword' do
-      before(:each) do
-        @res = EventsJp::Connpass.get_events(limit: 100)
+      it 'returns conpass API results' do
+        results, errors = EventsJp::Connpass.get_events(limit: 100)
+        expect(errors).to be == []
+        expect(results.count).to eq(100)
+        expect(results.first.service).to eq('connpass')
+        expect(results.first.title).to eq('キイロイトリ勉強会')
+        expect(results.first.catch).to eq('キイロイトリの魅力を勉強してください')
+        expect(results.first.event_url).to eq('http://connpass.com/event/14/')
+        expect(results.first.started_at).to eq(DateTime.parse('2038-01-18T03:13:10+09:00'))
+        expect(results.first.ended_at).to eq(DateTime.parse('2038-01-18T03:14:10+09:00'))
+        expect(results.first.address).to eq('東京')
+        expect(results.first.place).to eq('どこか')
+        expect(results.first.lat).to eq(35.6894875)
+        expect(results.first.lon).to eq(139.6917064)
+        expect(results.first.limit).to eq(10)
+        expect(results.first.accepted).to eq(2)
+        expect(results.first.waiting).to eq(0)
       end
+    end
 
-      it 'returns conpass API results' do
-        expect(@res.count).to eq(100)
-        expect(@res.first.service).to eq('connpass')
-        expect(@res.first.title).to eq('キイロイトリ勉強会')
-        expect(@res.first.catch).to eq('キイロイトリの魅力を勉強してください')
-        expect(@res.first.event_url).to eq('http://connpass.com/event/14/')
-        expect(@res.first.started_at).to eq(DateTime.parse('2038-01-18T03:13:10+09:00'))
-        expect(@res.first.ended_at).to eq(DateTime.parse('2038-01-18T03:14:10+09:00'))
-        expect(@res.first.address).to eq('東京')
-        expect(@res.first.place).to eq('どこか')
-        expect(@res.first.lat).to eq(35.6894875)
-        expect(@res.first.lon).to eq(139.6917064)
-        expect(@res.first.limit).to eq(10)
-        expect(@res.first.accepted).to eq(2)
-        expect(@res.first.waiting).to eq(0)
+    context 'when raise errors in convert_response method' do
+      it 'returns error' do
+        allow(EventsJp::Connpass).to receive(:convert_response).and_raise(StandardError)
+        _, errors = EventsJp::Connpass.get_events(limit: 100)
+        expect(errors).not_to be_empty
       end
     end
   end

data/spec/events_jp/event/doorkeeper_spec.rb

@@ -3,37 +3,40 @@ require 'spec_helper'
 
 describe 'EventsJp::Doorkeeper' do
   describe '.convert_response' do
-    before(:each)  do
-      response = %[[{"event":{"address": "sample"}}]]
-      @conv_res = EventsJp::Doorkeeper.convert_response(response)
-    end
-
+    let!(:response) { %[[{"event":{"address": "sample"}}]] }
     it 'converts to Array' do
-      expect(@conv_res.class).to eq(Array)
-      expect(@conv_res.first.address).to eq('sample')
+      results = EventsJp::Doorkeeper.convert_response(response)
+      expect(results.class).to eq(Array)
+      expect(results.first.address).to eq('sample')
     end
   end
 
   describe '.get_events' do
-    before(:each) do
-      @res = EventsJp::Doorkeeper.get_events(limit: 25)
+    it 'returns doorkeeper API results' do
+      results, errors = EventsJp::Doorkeeper.get_events(limit: 25)
+      expect(errors).to be == []
+      expect(results.count).to eq(25)
+      expect(results.first.service).to eq('doorkeeper')
+      expect(results.first.catch).to be_nil
+      expect(results.first.title).to eq('大切な人の未来へ贈る　タイムカプセルレター(2017年に再会！アースデイ東京2014企画プロジェクト版)')
+      expect(results.first.event_url).to eq('http://asobiba.doorkeeper.jp/events/10448')
+      expect(results.first.started_at).to eq(DateTime.parse('2017-04-30T00:00:00.000Z'))
+      expect(results.first.ended_at).to eq(DateTime.parse('2017-04-30T01:00:00.000Z'))
+      expect(results.first.address).to be_nil
+      expect(results.first.place).to be_nil
+      expect(results.first.lat).to be_nil
+      expect(results.first.lon).to be_nil
+      expect(results.first.limit).to eq(500)
+      expect(results.first.accepted).to eq(115)
+      expect(results.first.waiting).to eq(0)
     end
+  end
 
-    it 'returns doorkeeper API results' do
-      expect(@res.count).to eq(25)
-      expect(@res.first.service).to eq('doorkeeper')
-      expect(@res.first.catch).to be_nil
-      expect(@res.first.title).to eq('大切な人の未来へ贈る　タイムカプセルレター(2017年に再会！アースデイ東京2014企画プロジェクト版)')
-      expect(@res.first.event_url).to eq('http://asobiba.doorkeeper.jp/events/10448')
-      expect(@res.first.started_at).to eq(DateTime.parse('2017-04-30T00:00:00.000Z'))
-      expect(@res.first.ended_at).to eq(DateTime.parse('2017-04-30T01:00:00.000Z'))
-      expect(@res.first.address).to be_nil
-      expect(@res.first.place).to be_nil
-      expect(@res.first.lat).to be_nil
-      expect(@res.first.lon).to be_nil
-      expect(@res.first.limit).to eq(500)
-      expect(@res.first.accepted).to eq(115)
-      expect(@res.first.waiting).to eq(0)
+  context 'when raise errors in convert_response method' do
+    it 'returns error' do
+      allow(EventsJp::Doorkeeper).to receive(:convert_response).and_raise(StandardError)
+      _, errors = EventsJp::Doorkeeper.get_events(limit: 100)
+      expect(errors).not_to be_empty
     end
   end
 end

data/spec/events_jp/event/zusaar_spec.rb

@@ -3,49 +3,50 @@ require 'spec_helper'
 
 describe 'EventsJp::Zusaar' do
   describe '.convert_response' do
-    before(:each)  do
-      response = %[{"event":[{"address":"sample"}]}]
-      @conv_res = EventsJp::Zusaar.convert_response(response)
-    end
-
+    let!(:response) { %[{"event":[{"address":"sample"}]}] }
     it 'converts to Array' do
-      expect(@conv_res.class).to eq(Array)
-      expect(@conv_res.first.address).to eq('sample')
+      results = EventsJp::Zusaar.convert_response(response)
+      expect(results.class).to eq(Array)
+      expect(results.first.address).to eq('sample')
     end
   end
 
   describe '.get_events' do
     context 'with keyword' do
-      before(:each) do
-        @res = EventsJp::Zusaar.get_events(keyword: 'Ruby', limit: 10)
-      end
-
       it 'returns conpass API results' do
-        expect(@res.count).to eq(10)
-        expect(@res.first.title).to eq('もくもくRuby')
+        results, errors = EventsJp::Zusaar.get_events(keyword: 'Ruby', limit: 10)
+        expect(errors).to be == []
+        expect(results.count).to eq(10)
+        expect(results.first.title).to eq('もくもくRuby')
       end
     end
 
     context 'no keyword' do
-      before(:each) do
-        @res = EventsJp::Zusaar.get_events(limit: 100)
+      it 'returns zusaar API results' do
+        results, errors = EventsJp::Zusaar.get_events(limit: 100)
+        expect(errors).to be == []
+        expect(results.count).to eq(100)
+        expect(results.first.service).to eq('zusaar')
+        expect(results.first.title).to eq('イスラム＆ハラル市場進出支援セミナー')
+        expect(results.first.catch).to eq('〜本当は教えたくない東南アジア”イスラム市場”のビジネスチャンス〜')
+        expect(results.first.event_url).to eq('http://www.zusaar.com/event/7667004')
+        expect(results.first.started_at).to eq(DateTime.parse('2014-10-11T13:30:00+09:00'))
+        expect(results.first.ended_at).to eq(DateTime.parse('2014-10-11T15:30:00+09:00'))
+        expect(results.first.address).to eq('東京都千代田区神田鍛冶町3-2-2')
+        expect(results.first.place).to eq('エッサム神田ホール')
+        expect(results.first.lat).to eq(35.6934894)
+        expect(results.first.lon).to eq(139.7712663)
+        expect(results.first.limit).to eq(30)
+        expect(results.first.accepted).to eq(0)
+        expect(results.first.waiting).to eq(0)
       end
+    end
 
-      it 'returns zusaar API results' do
-        expect(@res.count).to eq(100)
-        expect(@res.first.service).to eq('zusaar')
-        expect(@res.first.title).to eq('イスラム＆ハラル市場進出支援セミナー')
-        expect(@res.first.catch).to eq('〜本当は教えたくない東南アジア”イスラム市場”のビジネスチャンス〜')
-        expect(@res.first.event_url).to eq('http://www.zusaar.com/event/7667004')
-        expect(@res.first.started_at).to eq(DateTime.parse('2014-10-11T13:30:00+09:00'))
-        expect(@res.first.ended_at).to eq(DateTime.parse('2014-10-11T15:30:00+09:00'))
-        expect(@res.first.address).to eq('東京都千代田区神田鍛冶町3-2-2')
-        expect(@res.first.place).to eq('エッサム神田ホール')
-        expect(@res.first.lat).to eq(35.6934894)
-        expect(@res.first.lon).to eq(139.7712663)
-        expect(@res.first.limit).to eq(30)
-        expect(@res.first.accepted).to eq(0)
-        expect(@res.first.waiting).to eq(0)
+    context 'when raise errors in convert_response method' do
+      it 'returns error' do
+        allow(EventsJp::Zusaar).to receive(:convert_response).and_raise(StandardError)
+        _, errors = EventsJp::Zusaar.get_events(limit: 100)
+        expect(errors).not_to be_empty
       end
     end
   end

data/spec/events_jp/event_spec.rb

@@ -4,26 +4,28 @@ require 'spec_helper'
 describe 'EventsJp::Event' do
   describe '.get_all' do
     context 'with keyword' do
-      before(:each) do
-        @result = EventsJp.get_events(keyword: 'Ruby',  service_limit: 10)
-      end
-
       it 'return each more than 10 events' do
-        expect(@result.count).to be > 40
-      end
-
-      it "doesn't have nil" do
-        expect(@result.any?{|e| e.nil? }).to be_falsy
+        results, errors = EventsJp.get_events(keyword: 'Ruby',  service_limit: 10)
+        expect(errors).to be == []
+        expect(results.count).to be > 40
+        expect(results.any?{|e| e.nil? }).to be_falsy
       end
     end
 
     context 'no keyword' do
-      before(:each) do
-        @result = EventsJp.get_events(service_limit: 10)
+      it 'return each 100 events' do
+        results, errors = EventsJp.get_events(service_limit: 10)
+        expect(errors).to be == []
+        expect(results.count).to be > 40
       end
+    end
 
-      it 'return each 100 events' do
-        expect(@result.count).to be > 40
+    context 'when raise errors in convert_response method' do
+      it 'returns error' do
+        allow(EventsJp::Atnd).to receive(:convert_response).and_raise(StandardError)
+        results, errors = EventsJp.get_events(service_limit: 10)
+        expect(errors).not_to be_empty
+        expect(results.count).to be > 40
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: events_jp
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - morizyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie