meetupinator 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 807cb86ec05130fef1235a08122c6a80f7475699
-  data.tar.gz: 532b7089fc9b8c295dbb33ef5390a8cdcdc0ca49
+  metadata.gz: 650e65483735a0353ef8106235d686e9fdd448e6
+  data.tar.gz: 902cd77c38c9a1feafa23de2b52a0a7c4ce9c231
 SHA512:
-  metadata.gz: 6ef813072e22cd0c8f9818730a6b6e7e8d186a638d1b369498d79de625104aa1094377dca543ca874537a1ebab1a896a24925977c4e034d2faa55f5b80db3bef
-  data.tar.gz: f311fc3c830f103787d7c72bde26a2681787bd524838621a6172a5af2a1a3baa31260d7e489e85bd01c4013faa7151bb348e13ceaa8e90c460c86c4aa394097f
+  metadata.gz: b7831e74baec3cbb16e2cd1b37956266efad197147c5b19a056d6d45400a481363a221490eec263762fa74b8d48839ffcbceb889d8ab977d23a5f747412c662b
+  data.tar.gz: 9c2b72265e701802bea0cb90fc47ee5ed97dd51c87c295a90be2d14d724337816d43aca13316b68f872d74ebb5ccd748caeaa378c1f78818d7b9be2cd6cf2669

data/lib/meetupinator/app.rb

@@ -11,7 +11,7 @@ module Meetupinator
 
     def run(args)
       init(args)
-      events = @event_finder.extract_events(@group_names, @api, args[:week])
+      events = @event_finder.extract_events(@group_names, @api, args[:weeks])
       @event_list_file_writer.write events, args[:output]
     end
 

data/lib/meetupinator/cli.rb

@@ -25,7 +25,7 @@ module Meetupinator
                   default: 'output.csv',
                   desc: 'The name of the file you want to output. (default is ./output.csv)'
 
-    method_option :week, aliases: '-w', required: false, type: :boolean
+    method_option :weeks, aliases: '-w', required: false, type: :boolean
 
     def run_app
       Meetupinator::App.run(options)

data/lib/meetupinator/meetup_api.rb

@@ -11,11 +11,7 @@ module Meetupinator
       @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)
@@ -25,11 +21,11 @@ module Meetupinator
       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)
@@ -41,14 +37,17 @@ module Meetupinator
 
     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
@@ -57,17 +56,26 @@ module Meetupinator
       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

data/lib/meetupinator/version.rb

@@ -1,4 +1,4 @@
 # Module Comment
 module Meetupinator
-  VERSION = '0.5'
+  VERSION = '0.6'
 end

data/spec/lib/meetupinator/app_spec.rb

@@ -16,7 +16,7 @@ describe Meetupinator::App do
         meetup_api_key: 1234,
         input: input_file,
         output: output_file,
-        week: false
+        weeks: 1
       }
     end
 
@@ -26,7 +26,7 @@ describe Meetupinator::App do
         expect(Meetupinator::InputFileReader).to receive(:group_names).with(input_file).and_return(group_names)
         expect(Meetupinator::EventFinder).to receive(:new).and_return(event_finder)
         expect(Meetupinator::EventListFileWriter).to receive(:new).and_return(file_writer)
-        expect(event_finder).to receive(:extract_events).with(group_names, meetup_api, false).and_return(events)
+        expect(event_finder).to receive(:extract_events).with(group_names, meetup_api, 1).and_return(events)
         expect(file_writer).to receive(:write).with(events, output_file)
         Meetupinator::App.run(args)
       end

data/spec/lib/meetupinator/meetup_api_spec.rb

@@ -2,10 +2,35 @@ require 'spec_helper'
 require 'vcr_setup'
 require 'meetupinator/meetup_api'
 
+# Query - Return something / change nothing
+# Command - Return nothing / change something
+# Test the interface not the implementation.
+# eg
+# Incoming Query Message --> [Test Object].return_balance
+# Test incoming query messages, by making assertions about what they send back.
+
+# Incoming Command Message --> [Test Object].set_something(y)
+# Test incoming command messages by making assertions about the
+# direct public side effects.
+
+# Do not test private method calls, do not make assertions about their result.
+# Don't expect to send/call them.
+# (Break rule if it saves $$ during development)
+
+# Do not test outgoing query messages.
+# Do not make assertions about their result
+# Do not expect them to send.
+
+# If a message has no visible side effects the sender should not test it.
+
+# Expect to send outgoing command messages.
+# Break rule if side effects are stable and cheap.
+
 describe Meetupinator::MeetupAPI do
   let(:group_id) { 980_007_2 }
+  let(:env_api_key) { '1234' } # this key is coupled to the vcr tests
 
-  describe '#new' do
+  describe '#new' do # Command
     context 'when there is no Meetup API key in the environment' do
       before { ENV['MEETUP_API_KEY'] = nil }
 
@@ -21,9 +46,8 @@ describe Meetupinator::MeetupAPI do
     end
 
     context 'when there is a Meetup API key in the environment' do
-      let(:env_api_key) { '1234' }
-
       before { ENV['MEETUP_API_KEY'] = env_api_key }
+      after { ENV['MEETUP_API_KEY'] = nil }
 
       it 'uses the API given in the env if no API key is explicitly given' do
         expect(subject.api_key).to eq(env_api_key)
@@ -37,40 +61,50 @@ describe Meetupinator::MeetupAPI do
     end
   end
 
-  describe '#get_meetup_id' do
-    let(:group_url_name) { 'Ruby-On-Rails-Oceania-Melbourne' }
+  describe '#get_meetup_id' do # Query
+    context 'when there is a Meetup API key in the environment' do
+      before { ENV['MEETUP_API_KEY'] = env_api_key }
+      after { ENV['MEETUP_API_KEY'] = nil }
+
+      let(:group_url_name) { 'Ruby-On-Rails-Oceania-Melbourne' }
 
-    it 'returns the id of the meetup' do
-      VCR.use_cassette('groups') do
-        expect(subject.get_meetup_id(group_url_name)).to eq(group_id)
+      it 'returns the id of the meetup' do
+        VCR.use_cassette('groups') do
+          expect(subject.get_meetup_id(group_url_name)).to eq(group_id)
+        end
       end
     end
   end
 
-  describe '#get_upcoming_events' do
-    context 'single group' do
-      let(:expected_number_of_events) { 6 }
+  describe '#get_upcoming_events' do # Query
+    context 'when there is a Meetup API key in the environment' do
+      before { ENV['MEETUP_API_KEY'] = env_api_key }
+      after { ENV['MEETUP_API_KEY'] = nil }
+
+      context 'single group' do
+        let(:expected_number_of_events) { 6 }
 
-      it 'returns all the upcoming events' do
-        VCR.use_cassette('events_single_group') do
-          expect(subject.get_upcoming_events([group_id], nil).size).to eq(expected_number_of_events)
+        it 'returns all the upcoming events' do
+          VCR.use_cassette('events_single_group') do
+            expect(subject.get_upcoming_events([group_id], nil).size).to eq(expected_number_of_events)
+          end
         end
-      end
 
-      it 'returns all the upcoming events for the next week' do
-        VCR.use_cassette('events_next_week') do
-          expect(subject.get_upcoming_events([group_id], true).size).to eq(1)
+        it 'returns all the upcoming events for the next week' do
+          VCR.use_cassette('events_next_week') do
+            expect(subject.get_upcoming_events([group_id], 1).size).to eq(1)
+          end
         end
       end
-    end
 
-    context 'multiple groups' do
-      let(:meetup_ids) { [group_id, 183_050_22] }
-      let(:expected_number_of_events) { 73 }
+      context 'multiple groups' do
+        let(:meetup_ids) { [group_id, 183_050_22] }
+        let(:expected_number_of_events) { 73 }
 
-      it 'returns all the upcoming events' do
-        VCR.use_cassette('events_multiple_groups') do
-          expect(subject.get_upcoming_events([meetup_ids], nil).size).to eq(expected_number_of_events)
+        it 'returns all the upcoming events' do
+          VCR.use_cassette('events_multiple_groups') do
+            expect(subject.get_upcoming_events([meetup_ids], nil).size).to eq(expected_number_of_events)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meetupinator
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Joe Sustaric
@@ -153,7 +153,10 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.19'
 description: Tool to generate weekly meetup emails using the Meetup API
-email: joe8307@gmail.com
+email:
+- joe8307@gmail.com
+- jfulton@thoughtworks.com
+- me@charleskorn.com
 executables:
 - meetupinator
 extensions: []