events_jp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f67d6a45cf0c82bfadeefff22ffd982d7bd52f9
-  data.tar.gz: 7cdbcd44a517af9b0573b7ac1bc9260df3114215
+  metadata.gz: 506a0f963ad30764a42e08c29054518eb119c5ca
+  data.tar.gz: d67d55a6df42148286bfd569d159c932f5026f87
 SHA512:
-  metadata.gz: aa55f679cabc8e8d020b3d702dc13dc44c30d6ce5088ec203318fe6f0647cc9499d70c467e1da312d9eb39f306988f3bc9f40b0e9fea140b10ae2bb5f5134716
-  data.tar.gz: 67220f492e3d0c0831e1bd86f23d867cd7e0ad8ddc0f14c84fde3e4ca3f60f9a5fb842079fa0b4b9bb1af5347ace937543673f3e74764bab40945876b7e2f826
+  metadata.gz: c33a02211be7877b90d04cb43e12bbc25c132db39b3a3003af1a96f5d5aae3ea4f81a02ef3725d33418ef64d352dbd03433e118724a029dc7ce9a5cdfdc6d5b2
+  data.tar.gz: d457140afe746f53c17f3c8e4109b46499a84b9634783b22d4466ae68114672a8f107775b10c9c3e11c7ffa1f798be049648878621cc73335f82c32c556c9e59

data/lib/events_jp/event_object/atnd.rb

@@ -3,27 +3,23 @@ module EventsJp
     ENDPOINT = 'http://api.atnd.org/events/'.freeze
     DEFAULT_OPT = {format: 'json', count: 100}.freeze
 
-    class << self
-      def get_events(keyword: nil, limit: nil)
-        results, errors = [], []
-        loop do
-          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)
+    def self.get_events(keyword: nil, limit: nil)
+      results, errors = [], []
+      loop do
+        results, errors, has_response = access_wrapper(results, errors) do
+          opt = merged_option(keyword, results, DEFAULT_OPT)
+          convert_response(get(ENDPOINT, opt))
         end
-
-        return [results.uniq.compact.flatten, errors.compact.flatten]
+        break if finish_get?(results, has_response, limit)
+        sleep(1)
       end
 
-      def convert_response(json_str)
-        e = Hashie::Mash.new(JSON.parse(json_str)).events
-        e.map { |_| to_basic_hash(_.event) }
-      end
+      return [results.uniq.compact.flatten, errors.compact.flatten]
+    end
+
+    def self.convert_response(json_str)
+      e = Hashie::Mash.new(JSON.parse(json_str)).events
+      e.map { |_| to_basic_hash(_.event) }
     end
   end
 end

data/lib/events_jp/event_object/connpass.rb

@@ -3,28 +3,24 @@ module EventsJp
     ENDPOINT = 'http://connpass.com/api/v1/event/'.freeze
     DEFAULT_OPT = {order: 2, count: 100}.freeze
 
-    class << self
-      def get_events(keyword: nil, limit: nil)
-        results, errors = [], []
-        loop do
-          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)
+    def self.get_events(keyword: nil, limit: nil)
+      results, errors = [], []
+      loop do
+        results, errors, has_response = access_wrapper(results, errors) do
+          opt = merged_option(keyword, results, DEFAULT_OPT)
+          convert_response(get(ENDPOINT, opt))
         end
+        break if finish_get?(results, has_response, limit)
 
-        return [results.uniq.compact.flatten, errors.compact.flatten]
+        sleep(1)
       end
 
-      def convert_response(json_str)
-        e = Hashie::Mash.new(JSON.parse(json_str)).events
-        e.map { |_| to_basic_hash(_) }
-      end
+      return [results.uniq.compact.flatten, errors.compact.flatten]
+    end
+
+    def self.convert_response(json_str)
+      e = Hashie::Mash.new(JSON.parse(json_str)).events
+      e.map { |_| to_basic_hash(_) }
     end
   end
 end

data/lib/events_jp/event_object/doorkeeper.rb

@@ -3,54 +3,47 @@ module EventsJp
     ENDPOINT = 'http://api.doorkeeper.jp/events'.freeze
     DEFAULT_OPT = {locale: 'ja', sort: 'starts_at'}.freeze
 
-    class << self
-      def get_events(keyword: nil, limit: nil)
-        results, errors = [], []
-
-        1.upto(1000) do |page|
-          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)
+    def self.get_events(keyword: nil, limit: nil)
+      results, errors = [], []
+      1.upto(1000) do |page|
+        results, errors, has_response = access_wrapper(results, errors) do
+          opt = merged_option(page, DEFAULT_OPT)
+          convert_response(get(ENDPOINT, opt))
         end
-
-        return [results.uniq.compact.flatten, errors.compact.flatten]
+        break if finish_get?(results, has_response, limit)
+        sleep(1)
       end
 
-      def merged_option(page, option)
-        opt = option.dup
-        opt.merge({page: page})
-      end
+      return [results.uniq.compact.flatten, errors.compact.flatten]
+    end
 
-      def convert_response(json_str)
-        j = JSON.parse(json_str)
-        j.map do |_|
-          e = Hashie::Mash.new(_).event
-          to_basic_hash(e)
-        end
-      end
+    def self.merged_option(page, option)
+      opt = option.dup
+      opt.merge({page: page})
+    end
 
-      def to_basic_hash(h)
-        Hashie::Mash.new({
-             service:     service_name,
-             address:     h[:address],
-             title:       h[:title],
-             catch:       nil,
-             event_url:   h[:public_url],
-             started_at:  parse_datetime(h[:starts_at]),
-             ended_at:    parse_datetime(h[:ends_at]),
-             place:       h[:venue_name],
-             lon:         h[:long] ? h[:long].to_f : nil,
-             lat:         h[:lat] ? h[:lat].to_f : nil,
-             limit:       h[:ticket_limit],
-             accepted:    h[:participants],
-             waiting:     h[:waitlisted]
-         })
+    def self.convert_response(json_str)
+      j = JSON.parse(json_str)
+      j.map do |_|
+        e = Hashie::Mash.new(_).event
+        to_basic_hash(e)
       end
     end
+
+    def self.to_basic_hash(h)
+      Hashie::Mash.new({ service:     service_name,
+                         address:     h[:address],
+                         title:       h[:title],
+                         catch:       nil,
+                         event_url:   h[:public_url],
+                         started_at:  parse_datetime(h[:starts_at]),
+                         ended_at:    parse_datetime(h[:ends_at]),
+                         place:       h[:venue_name],
+                         lon:         h[:long] ? h[:long].to_f : nil,
+                         lat:         h[:lat] ? h[:lat].to_f : nil,
+                         limit:       h[:ticket_limit],
+                         accepted:    h[:participants],
+                         waiting:     h[:waitlisted] })
+    end
   end
 end

data/lib/events_jp/event_object/event_object.rb

@@ -3,50 +3,50 @@ module EventsJp
     class ImplementationException < Exception; end
     extend EventsJp::Connection
 
-    class << self
-      def access_wrapper(&block)
-        return [block.call, nil]
-      rescue => e
-        return [[], e.message]
-      end
+    def self.access_wrapper(results, errors, &block)
+      results << (tmp = block.call)
+      has_response = (tmp.count >= 1)
+      return [results.flatten.compact, errors, has_response]
+    rescue => e
+      errors << e.message
+      has_response = false
+      return [results, errors, has_response]
+    end
 
-      def service_name
-        self.name.to_s.downcase.gsub(/^(.*::)/, '')
-      end
+    def self.service_name
+      self.name.to_s.downcase.gsub(/^(.*::)/, '')
+    end
 
-      def merged_option(keyword, response, option)
-        opt = option.dup
-        opt.merge!({start: (response.count + 1)})
-        keyword ? opt.merge!(keyword: keyword) : opt
-      end
+    def self.merged_option(keyword, response, option)
+      opt = option.dup
+      opt.merge!({start: (response.count + 1)})
+      keyword ? opt.merge!(keyword: keyword) : opt
+    end
 
-      def finish_get?(res, current, limit = nil)
-        return true if limit.to_i > 0 && res.count >= limit
-        return true if current.count == 0
-        return false
-      end
+    def self.finish_get?(res, has_response, limit = nil)
+      return true if limit.to_i > 0 && res.count >= limit
+      return true unless has_response
+      return false
+    end
 
-      def to_basic_hash(h)
-        Hashie::Mash.new({
-            service:     service_name,
-            address:     h[:address],
-            catch:       h[:catch],
-            title:       h[:title],
-            event_url:   h[:event_url],
-            started_at:  parse_datetime(h[:started_at]),
-            ended_at:    parse_datetime(h[:ended_at]),
-            place:       h[:place],
-            lon:         h[:lon].to_f,
-            lat:         h[:lat].to_f,
-            limit:       h[:limit],
-            accepted:    h[:accepted],
-            waiting:     h[:waiting]
-        })
-      end
+    def self.to_basic_hash(h)
+      Hashie::Mash.new({ service:     service_name,
+                         address:     h[:address],
+                         catch:       h[:catch],
+                         title:       h[:title],
+                         event_url:   h[:event_url],
+                         started_at:  parse_datetime(h[:started_at]),
+                         ended_at:    parse_datetime(h[:ended_at]),
+                         place:       h[:place],
+                         lon:         h[:lon].to_f,
+                         lat:         h[:lat].to_f,
+                         limit:       h[:limit],
+                         accepted:    h[:accepted],
+                         waiting:     h[:waiting] })
+    end
 
-      def parse_datetime(dt)
-        dt ? DateTime.parse(dt) : nil
-      end
+    def self.parse_datetime(dt)
+      dt ? DateTime.parse(dt) : nil
     end
   end
 end

data/lib/events_jp/event_object/zusaar.rb

@@ -3,27 +3,23 @@ module EventsJp
     ENDPOINT = 'http://www.zusaar.com/api/event/'.freeze
     DEFAULT_OPT = {count: 100}.freeze
 
-    class << self
-      def get_events(keyword: nil, limit: nil)
-        results, errors = [], []
-        loop do
-          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)
+    def self.get_events(keyword: nil, limit: nil)
+      results, errors = [], []
+      loop do
+        results, errors, has_response = access_wrapper(results, errors) do
+          opt = merged_option(keyword, results, DEFAULT_OPT)
+          convert_response(get(ENDPOINT, opt))
         end
-
-        return [results.uniq.compact.flatten, errors.compact.flatten]
+        break if finish_get?(results, has_response, limit)
+        sleep(1)
       end
 
-      def convert_response(json_str)
-        e = Hashie::Mash.new(JSON.parse(json_str)).event
-        e.map{ |_| to_basic_hash(_) }
-      end
+      return [results, errors]
+    end
+
+    def self.convert_response(json_str)
+      e = Hashie::Mash.new(JSON.parse(json_str)).event
+      e.map{ |_| to_basic_hash(_) }
     end
   end
 end

data/lib/events_jp/version.rb

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

data/spec/events_jp/event/event_object_spec.rb

@@ -6,7 +6,8 @@ describe 'EventsJp::EventObject' do
     context 'achieve limit' do
       before(:each)  do
         response = %w(1 2)
-        @result = EventsJp::EventObject.finish_get?(response, response, 2)
+        has_response = true
+        @result = EventsJp::EventObject.finish_get?(response, has_response, 2)
       end
 
       it 'return true' do
@@ -17,7 +18,8 @@ describe 'EventsJp::EventObject' do
     context 'get no response' do
       before(:each)  do
         response = %w(1)
-        @result = EventsJp::EventObject.finish_get?(response, [], 2)
+        has_response = false
+        @result = EventsJp::EventObject.finish_get?(response, has_response, 2)
       end
 
       it 'return true' do
@@ -28,7 +30,8 @@ describe 'EventsJp::EventObject' do
     context 'not achieve limit' do
       before(:each)  do
         response = %w(1)
-        @result = EventsJp::EventObject.finish_get?(response, response, 2)
+        has_response = true
+        @result = EventsJp::EventObject.finish_get?(response, has_response, 2)
       end
 
       it 'return false' do

metadata

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