events_jp 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 506a0f963ad30764a42e08c29054518eb119c5ca
-  data.tar.gz: d67d55a6df42148286bfd569d159c932f5026f87
+  metadata.gz: 1b72366a2c43a2818f9958cf03f8fcf01b0173d5
+  data.tar.gz: 559646ba6b435275e6d2c3b1d3cce1aeafbc7b4f
 SHA512:
-  metadata.gz: c33a02211be7877b90d04cb43e12bbc25c132db39b3a3003af1a96f5d5aae3ea4f81a02ef3725d33418ef64d352dbd03433e118724a029dc7ce9a5cdfdc6d5b2
-  data.tar.gz: d457140afe746f53c17f3c8e4109b46499a84b9634783b22d4466ae68114672a8f107775b10c9c3e11c7ffa1f798be049648878621cc73335f82c32c556c9e59
+  metadata.gz: 5c4e07290fee2b796f61e5b65eccb04caa5c99e26e0cbe875ab345975030c7913ea416a41ddb3280cfb50e58fa17a6cf4bd879613dd40dd98dbc3314b09982bc
+  data.tar.gz: 3ed18a91d2a21ecf8ad4bd407c01a4380f34e164b5ec35d93dbfba5f7ff24d5e2445559772ca8e4e61f217a0cccbfa3ad143f7c490069e0e32cef93bdd2c2811

data/lib/events_jp/event_object/atnd.rb

@@ -1,25 +1,19 @@
 module EventsJp
   class Atnd < EventsJp::EventObject
-    ENDPOINT = 'http://api.atnd.org/events/'.freeze
-    DEFAULT_OPT = {format: 'json', count: 100}.freeze
 
-    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)
-        sleep(1)
-      end
-
-      return [results.uniq.compact.flatten, errors.compact.flatten]
-    end
+    private
 
     def self.convert_response(json_str)
       e = Hashie::Mash.new(JSON.parse(json_str)).events
       e.map { |_| to_basic_hash(_.event) }
     end
+
+    def self.endpoint
+      'http://api.atnd.org/events/'
+    end
+
+    def self.default_opt
+      {format: 'json', count: 100}
+    end
   end
 end

data/lib/events_jp/event_object/connpass.rb

@@ -1,26 +1,19 @@
 module EventsJp
   class Connpass < EventsJp::EventObject
-    ENDPOINT = 'http://connpass.com/api/v1/event/'.freeze
-    DEFAULT_OPT = {order: 2, count: 100}.freeze
 
-    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)
-
-        sleep(1)
-      end
-
-      return [results.uniq.compact.flatten, errors.compact.flatten]
-    end
+    private
 
     def self.convert_response(json_str)
       e = Hashie::Mash.new(JSON.parse(json_str)).events
       e.map { |_| to_basic_hash(_) }
     end
+
+    def self.endpoint
+      'http://connpass.com/api/v1/event/'
+    end
+
+    def self.default_opt
+      {order: 2, count: 100}
+    end
   end
 end

data/lib/events_jp/event_object/doorkeeper.rb

@@ -1,22 +1,21 @@
 module EventsJp
   class Doorkeeper < EventsJp::EventObject
-    ENDPOINT = 'http://api.doorkeeper.jp/events'.freeze
-    DEFAULT_OPT = {locale: 'ja', sort: 'starts_at'}.freeze
-
     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))
+          opt = merged_option(page, default_opt)
+          convert_response(get(endpoint, opt))
         end
         break if finish_get?(results, has_response, limit)
         sleep(1)
       end
 
-      return [results.uniq.compact.flatten, errors.compact.flatten]
+      return [results, errors]
     end
 
+    private
+
     def self.merged_option(page, option)
       opt = option.dup
       opt.merge({page: page})
@@ -45,5 +44,13 @@ module EventsJp
                          accepted:    h[:participants],
                          waiting:     h[:waitlisted] })
     end
+
+    def self.endpoint
+      'http://api.doorkeeper.jp/events'
+    end
+
+    def self.default_opt
+      {locale: 'ja', sort: 'starts_at'}
+    end
   end
 end

data/lib/events_jp/event_object/event_object.rb

@@ -3,6 +3,22 @@ module EventsJp
     class ImplementationException < Exception; end
     extend EventsJp::Connection
 
+    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)
+        sleep(1)
+      end
+
+      return [results, errors]
+    end
+
+    private
+
     def self.access_wrapper(results, errors, &block)
       results << (tmp = block.call)
       has_response = (tmp.count >= 1)
@@ -48,5 +64,12 @@ module EventsJp
     def self.parse_datetime(dt)
       dt ? DateTime.parse(dt) : nil
     end
+
+    # インターフェース
+    def self.endpoint
+    end
+
+    def self.default_opt
+    end
   end
 end

data/lib/events_jp/event_object/zusaar.rb

@@ -1,25 +1,19 @@
 module EventsJp
   class Zusaar < EventsJp::EventObject
-    ENDPOINT = 'http://www.zusaar.com/api/event/'.freeze
-    DEFAULT_OPT = {count: 100}.freeze
 
-    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)
-        sleep(1)
-      end
-
-      return [results, errors]
-    end
+    private
 
     def self.convert_response(json_str)
       e = Hashie::Mash.new(JSON.parse(json_str)).event
       e.map{ |_| to_basic_hash(_) }
     end
+
+    def self.endpoint
+      'http://www.zusaar.com/api/event/'
+    end
+
+    def self.default_opt
+      {count: 100}
+    end
   end
 end

data/lib/events_jp/version.rb

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

data/spec/spec_helper.rb

@@ -28,13 +28,13 @@ end
 
 RSpec.configure do |config|
  config.before(:each) do
-   stub_get("#{EventsJp::Atnd::ENDPOINT}?format=json&count=100&start=1", 'event/atnd.json')
-   stub_get("#{EventsJp::Atnd::ENDPOINT}?format=json&count=100&start=1&keyword=Ruby", 'event/atnd_ruby.json')
-   stub_get("#{EventsJp::Connpass::ENDPOINT}?order=2&count=100&start=1", 'event/connpass.json')
-   stub_get("#{EventsJp::Connpass::ENDPOINT}?order=2&count=100&start=1&keyword=Ruby", 'event/connpass_ruby.json')
-   stub_get("#{EventsJp::Doorkeeper::ENDPOINT}?locale=ja&sort=starts_at&page=1", 'event/doorkeeper.json')
-   stub_get("#{EventsJp::Zusaar::ENDPOINT}?count=100&start=1", 'event/zusaar.json')
-   stub_get("#{EventsJp::Zusaar::ENDPOINT}?count=100&start=1&keyword=Ruby", 'event/zusaar_ruby.json')
-   stub_get("#{EventsJp::Zusaar::ENDPOINT}?count=100&start=1&keyword=Ruby", 'event/zusaar_ruby.json')
+   stub_get("#{EventsJp::Atnd.__send__(:endpoint)}?format=json&count=100&start=1", 'event/atnd.json')
+   stub_get("#{EventsJp::Atnd.__send__(:endpoint)}?format=json&count=100&start=1&keyword=Ruby", 'event/atnd_ruby.json')
+   stub_get("#{EventsJp::Connpass.__send__(:endpoint)}?order=2&count=100&start=1", 'event/connpass.json')
+   stub_get("#{EventsJp::Connpass.__send__(:endpoint)}?order=2&count=100&start=1&keyword=Ruby", 'event/connpass_ruby.json')
+   stub_get("#{EventsJp::Doorkeeper.__send__(:endpoint)}?locale=ja&sort=starts_at&page=1", 'event/doorkeeper.json')
+   stub_get("#{EventsJp::Zusaar.__send__(:endpoint)}?count=100&start=1", 'event/zusaar.json')
+   stub_get("#{EventsJp::Zusaar.__send__(:endpoint)}?count=100&start=1&keyword=Ruby", 'event/zusaar_ruby.json')
+   stub_get("#{EventsJp::Zusaar.__send__(:endpoint)}?count=100&start=1&keyword=Ruby", 'event/zusaar_ruby.json')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: events_jp
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - morizyun