lib/meetupinator/meetup_api.rb in meetupinator-0.5 vs lib/meetupinator/meetup_api.rb in meetupinator-0.6

@@ -9,29 +9,25 @@
 
     def initialize(api_key = nil)
       @base_uri = 'api.meetup.com'
       @groups_endpoint = '/2/groups'
       @events_endpoint = '/2/events'
-      if key_valid?(api_key) || key_found_in_env?
-        @api_key = retreive_key api_key
-      else
-        fail('no MEETUP_API_KEY provided')
-      end
+      @api_key = pick_which_api_key(api_key)
     end
 
     def get_meetup_id(group_url_name)
       query_string = 'key=' + @api_key + '&group_urlname=' + group_url_name
       uri = URI::HTTP.build(host: @base_uri, path: @groups_endpoint,
                             query: query_string)
       extract_meetup_id get_meetup_response(uri)
     end
 
-    def get_upcoming_events(group_ids, week)
+    def get_upcoming_events(group_ids, weeks)
       query_string = 'sign=true&photo-host=public&status=upcoming&key=' +
                      @api_key + '&group_id=' + group_ids.join(',')
 
-      query_string << '&time=,1w' if week
+      query_string << "&time=,#{weeks}w" if weeks
 
       uri = URI::HTTP.build(host: @base_uri, path: @events_endpoint,
                             query: query_string)
       response = get_meetup_response uri
       get_results response
@@ -39,35 +35,47 @@
 
     private
 
     def get_meetup_response(uri)
       response = Net::HTTP.get_response uri
-      if response.code != '200'
-        msg = "Call to #{uri} failed: #{response.code} - #{response.message}"
-        msg << '. ' + response.body if response.class.body_permitted?
-        fail(msg)
-      end
+      fail_if_not_ok(response)
       JSON.parse response.body
     end
 
+    def fail_if_not_ok(response)
+      return unless response.code != '200'
+      msg = "Call to #{uri} failed: #{response.code} - #{response.message}"
+      msg << '. ' + response.body if response.class.body_permitted?
+      fail(msg)
+    end
+
     def extract_meetup_id(response)
       get_results(response)[0]['id']
     end
 
     def get_results(response)
       response['results']
     end
 
-    def retreive_key(api_key)
-      return api_key if key_valid? api_key
-      return ENV['MEETUP_API_KEY'] if key_found_in_env?
+    def pick_which_api_key(api_key)
+      key = api_key if key_valid?(api_key)
+      key = ENV['MEETUP_API_KEY'] if key_found_in_env? && key_invalid?(key)
+      key_invalid?(key) ? fail('no MEETUP_API_KEY provided') : key
     end
 
     def key_valid?(api_key)
       !(api_key.nil? || api_key.empty?)
     end
 
+    def key_invalid?(api_key)
+      !key_valid?(api_key)
+    end
+
+    def key_not_found_in_env?
+      !key_found_in_env?
+    end
+
     def key_found_in_env?
-      !(ENV['MEETUP_API_KEY'].nil? || ENV['MEETUP_API_KEY'].empty?)
+      (!ENV['MEETUP_API_KEY'].nil? && !ENV['MEETUP_API_KEY'].empty?)
     end
   end
 end