ClassandModuleChildren

.rubocop.yml

@@ -68,26 +68,6 @@ Style/BracesAroundHashParameters:
     - 'app/models/person.rb'
     - 'config/environments/production.rb'
 
-# Offense count: 13
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, EnforcedStyle.
-# SupportedStyles: nested, compact
-Style/ClassAndModuleChildren:
-  Exclude:
-    - 'app/controllers/api/activities_controller.rb'
-    - 'app/controllers/api/groups_controller.rb'
-    - 'app/controllers/api/me_controller.rb'
-    - 'app/controllers/api/people_controller.rb'
-    - 'app/helpers/api/activities_helper.rb'
-    - 'app/helpers/api/groups_helper.rb'
-    - 'app/helpers/api/me_helper.rb'
-    - 'app/helpers/api/people_helper.rb'
-    - 'test/controllers/api/activities_controller_test.rb'
-    - 'test/controllers/api/groups_controller_test.rb'
-    - 'test/controllers/api/me_controller_test.rb'
-    - 'test/controllers/api/people_controller_test.rb'
-    - 'test/test_helper.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 Style/ClassMethods:

app/controllers/api/activities_controller.rb

@@ -1,107 +1,109 @@
 # Provides read-only access to Activities.
-class Api::ActivitiesController < ApiController
-  has_no_activity = [:index]
-
-  # Session-based authentication/authorization
-  before_action :set_activity,        except: has_no_activity
-  before_action :require_membership!, except: has_no_activity
-  before_action :api_require_admin!,  only: has_no_activity
-  skip_before_action :api_require_authentication!, :set_activity, :require_membership!, if: 'request.authorization'
-
-  # Group API-key-based authentication/authorization
-  before_action :api_auth_group_token,    if: 'request.authorization'
-  before_action :set_activity_with_group, if: 'request.authorization'
-
-  # GET /api/activities
-  def index
-    @activities = Activity.all
-  end
-
-  # GET /api/activities/1
-  def show; end
-
-  # GET /api/activities/1/response_summary
-  def response_summary
-    as = @activity
-         .participants
-         .joins(:person)
-         .order('people.first_name ASC')
-
-    present = as.where(attending: true)
-
-    unknown = as.where(attending: nil)
-
-    absent = as.where(attending: false)
-
-    presentnames = present.map { |p| p.person.first_name }
-
-    unknownnames = unknown.map { |p| p.person.first_name }
-
-    absentnames = absent.map { |p| p.person.first_name }
-
-    if presentnames.positive?
-      present_mess = I18n.t('activities.participant.these_present', count: present.count, names: presentnames.join(', '))
-    else
-      present_mess = I18n.t('activities.participant.none_present')
+module Api
+  class ActivitiesController < ApiController
+    has_no_activity = [:index]
+
+    # Session-based authentication/authorization
+    before_action :set_activity,        except: has_no_activity
+    before_action :require_membership!, except: has_no_activity
+    before_action :api_require_admin!,  only: has_no_activity
+    skip_before_action :api_require_authentication!, :set_activity, :require_membership!, if: 'request.authorization'
+
+    # Group API-key-based authentication/authorization
+    before_action :api_auth_group_token,    if: 'request.authorization'
+    before_action :set_activity_with_group, if: 'request.authorization'
+
+    # GET /api/activities
+    def index
+      @activities = Activity.all
     end
 
-    if unknownnames.positive?
-      unknown_mess = I18n.t('activities.participant.these_unknown', count: unknown.count, names: unknownnames.join(', '))
-    else
-      unknown_mess = I18n.t('activities.participant.none_unknown')
-    end
-
-    if absentnames.positive?
-      absent_mess = I18n.t('activities.participant.these_absent', count: absent.count, names: absentnames.join(', '))
-    else
-      absent_mess = I18n.t('activities.participant.none_absent')
+    # GET /api/activities/1
+    def show; end
+
+    # GET /api/activities/1/response_summary
+    def response_summary
+      as = @activity
+           .participants
+           .joins(:person)
+           .order('people.first_name ASC')
+
+      present = as.where(attending: true)
+
+      unknown = as.where(attending: nil)
+
+      absent = as.where(attending: false)
+
+      presentnames = present.map { |p| p.person.first_name }
+
+      unknownnames = unknown.map { |p| p.person.first_name }
+
+      absentnames = absent.map { |p| p.person.first_name }
+
+      if presentnames.positive?
+        present_mess = I18n.t('activities.participant.these_present', count: present.count, names: presentnames.join(', '))
+      else
+        present_mess = I18n.t('activities.participant.none_present')
+      end
+
+      if unknownnames.positive?
+        unknown_mess = I18n.t('activities.participant.these_unknown', count: unknown.count, names: unknownnames.join(', '))
+      else
+        unknown_mess = I18n.t('activities.participant.none_unknown')
+      end
+
+      if absentnames.positive?
+        absent_mess = I18n.t('activities.participant.these_absent', count: absent.count, names: absentnames.join(', '))
+      else
+        absent_mess = I18n.t('activities.participant.none_absent')
+      end
+
+      @summary = {
+        present: {
+          count: present.count,
+          names: presentnames,
+          message: present_mess
+        },
+        unknown: {
+          count: unknown.count,
+          names: unknownnames,
+          message: unknown_mess
+        },
+        absent: {
+          count: absent.count,
+          names: absentnames,
+          message: absent_mess
+        }
+      }
     end
 
-    @summary = {
-      present: {
-        count: present.count,
-        names: presentnames,
-        message: present_mess
-      },
-      unknown: {
-        count: unknown.count,
-        names: unknownnames,
-        message: unknown_mess
-      },
-      absent: {
-        count: absent.count,
-        names: absentnames,
-        message: absent_mess
-      }
-    }
-  end
+    def presence
+      participant = Participant.find_by(
+        person_id: params[:person_id],
+        activity: @activity
+      )
 
-  def presence
-    participant = Participant.find_by(
-      person_id: params[:person_id],
-      activity: @activity
-    )
+      participant.update_attributes(params.permit(:attending))
+      head :no_content
+    end
 
-    participant.update_attributes(params.permit(:attending))
-    head :no_content
-  end
+    private
 
-  private
+    # Set activity from the :id-parameter
+    def set_activity
+      @activity = Activity.find(params[:id])
+      @group = @activity.group
+    end
 
-  # Set activity from the :id-parameter
-  def set_activity
-    @activity = Activity.find(params[:id])
-    @group = @activity.group
-  end
+    # Set activity from the :id-parameter, and assert that it belongs to the set @group.
+    def set_activity_with_group
+      @activity = Activity.find_by id: params[:id]
+      unless @activity
+        head :not_found
+        return
+      end
 
-  # Set activity from the :id-parameter, and assert that it belongs to the set @group.
-  def set_activity_with_group
-    @activity = Activity.find_by id: params[:id]
-    unless @activity
-      head :not_found
-      return
+      head :unauthorized unless @activity.group == @group
     end
-
-    head :unauthorized unless @activity.group == @group
   end
 end

app/controllers/api/groups_controller.rb

@@ -4,65 +4,67 @@
 #   - By passing a custom Authorization:-header of the form 'Group :api_key'.
 #
 # If the API key method is used, the :id parameter is ignored, but still required in the URL.
-class Api::GroupsController < ApiController
-  has_no_group = [:index]
+module Api
+  class GroupsController < ApiController
+    has_no_group = [:index]
 
-  # Session-based authentication / authorization filters
-  before_action :set_group,           except: has_no_group
-  before_action :require_membership!, except: has_no_group
-  before_action :api_require_admin!,  only:   has_no_group
-  skip_before_action :set_group, :require_membership!, :api_require_authentication!, if: 'request.authorization'
+    # Session-based authentication / authorization filters
+    before_action :set_group,           except: has_no_group
+    before_action :require_membership!, except: has_no_group
+    before_action :api_require_admin!,  only:   has_no_group
+    skip_before_action :set_group, :require_membership!, :api_require_authentication!, if: 'request.authorization'
 
-  # API key based filter (both authenticates and authorizes)
-  before_action :api_auth_group_token, if: 'request.authorization'
+    # API key based filter (both authenticates and authorizes)
+    before_action :api_auth_group_token, if: 'request.authorization'
 
-  # GET /api/groups
-  def index
-    @groups = Group.all
-  end
+    # GET /api/groups
+    def index
+      @groups = Group.all
+    end
 
-  # GET /api/groups/1
-  def show; end
+    # GET /api/groups/1
+    def show; end
 
-  # GET /api/groups/1/current_activities
-  def current_activities
-    reference = try_parse_datetime params[:reference]
-    @activities = @group.current_activities reference
+    # GET /api/groups/1/current_activities
+    def current_activities
+      reference = try_parse_datetime params[:reference]
+      @activities = @group.current_activities reference
 
-    render 'api/activities/index'
-  end
+      render 'api/activities/index'
+    end
 
-  # GET /api/groups/1/upcoming_activities
-  def upcoming_activities
-    reference = try_parse_datetime params[:reference]
-    @activities = @group.upcoming_activities reference
+    # GET /api/groups/1/upcoming_activities
+    def upcoming_activities
+      reference = try_parse_datetime params[:reference]
+      @activities = @group.upcoming_activities reference
 
-    render 'api/activities/index'
-  end
+      render 'api/activities/index'
+    end
 
-  # GET /api/groups/1/previous_activities
-  def previous_activities
-    reference = try_parse_datetime params[:reference]
-    @activities = @group.previous_activities reference
+    # GET /api/groups/1/previous_activities
+    def previous_activities
+      reference = try_parse_datetime params[:reference]
+      @activities = @group.previous_activities reference
 
-    render 'api/activities/index'
-  end
+      render 'api/activities/index'
+    end
 
-  private
+    private
 
-  # Set group from the :id parameter.
-  def set_group
-    @group = Group.find(params[:id])
-  end
+    # Set group from the :id parameter.
+    def set_group
+      @group = Group.find(params[:id])
+    end
 
-  # @return [DateTime] the parsed input.
-  def try_parse_datetime(input = nil)
-    return unless input
+    # @return [DateTime] the parsed input.
+    def try_parse_datetime(input = nil)
+      return unless input
 
-    begin
-      DateTime.parse input
-    rescue ArgumentError
-      nil
+      begin
+        DateTime.parse input
+      rescue ArgumentError
+        nil
+      end
     end
   end
 end

app/controllers/api/me_controller.rb

@@ -1,11 +1,13 @@
-class Api::MeController < ApiController
-  def index
-    @person = current_person
-    render 'api/people/show'
-  end
+module Api
+  class MeController < ApiController
+    def index
+      @person = current_person
+      render 'api/people/show'
+    end
 
-  def groups
-    @groups = current_person.groups
-    render 'api/groups/index'
+    def groups
+      @groups = current_person.groups
+      render 'api/groups/index'
+    end
   end
 end

app/controllers/api/people_controller.rb

@@ -1,21 +1,23 @@
-class Api::PeopleController < ApiController
-  before_action :set_person, only: [:show]
-  before_action :api_require_admin! # Normal people should use /me
+module Api
+  class PeopleController < ApiController
+    before_action :set_person, only: [:show]
+    before_action :api_require_admin! # Normal people should use /me
 
-  # GET /api/people
-  # GET /api/people.json
-  def index
-    @people = Person.all
-  end
+    # GET /api/people
+    # GET /api/people.json
+    def index
+      @people = Person.all
+    end
 
-  # GET /api/people/1
-  # GET /api/people/1.json
-  def show; end
+    # GET /api/people/1
+    # GET /api/people/1.json
+    def show; end
 
-  private
+    private
 
-  # Use callbacks to share common setup or constraints between actions.
-  def set_person
-    @person = Person.find(params[:id])
+    # Use callbacks to share common setup or constraints between actions.
+    def set_person
+      @person = Person.find(params[:id])
+    end
   end
 end

app/helpers/api/activities_helper.rb

@@ -1,2 +1,4 @@
-module Api::ActivitiesHelper
+module Api
+  class ActivitiesHelper
+  end
 end

app/helpers/api/groups_helper.rb

@@ -1,2 +1,4 @@
-module Api::GroupsHelper
+module Api
+  class GroupsHelper
+  end
 end

app/helpers/api/me_helper.rb

@@ -1,2 +1,4 @@
-module Api::MeHelper
+module Api
+  class MeHelper
+  end
 end

app/helpers/api/people_helper.rb

@@ -1,2 +1,4 @@
-module Api::PeopleHelper
+module Api
+  class PeopleHelper
+  end
 end

test/controllers/api/activities_controller_test.rb

@@ -1,48 +1,50 @@
 require 'test_helper'
 
-class Api::ActivitiesControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    @api_activity = api_activities(:one)
-  end
-
-  test "should get index" do
-    get api_activities_url
-    assert_response :success
-  end
+module Api
+  class ActivitiesControllerTest < ActionDispatch::IntegrationTest
+    setup do
+      @api_activity = api_activities(:one)
+    end
 
-  test "should get new" do
-    get new_api_activity_url
-    assert_response :success
-  end
+    test "should get index" do
+      get api_activities_url
+      assert_response :success
+    end
 
-  test "should create api_activity" do
-    assert_difference('Api::Activity.count') do
-      post api_activities_url, params: { api_activity: {} }
+    test "should get new" do
+      get new_api_activity_url
+      assert_response :success
     end
 
-    assert_redirected_to api_activity_url(Api::Activity.last)
-  end
+    test "should create api_activity" do
+      assert_difference('Api::Activity.count') do
+        post api_activities_url, params: { api_activity: {} }
+      end
 
-  test "should show api_activity" do
-    get api_activity_url(@api_activity)
-    assert_response :success
-  end
+      assert_redirected_to api_activity_url(Api::Activity.last)
+    end
 
-  test "should get edit" do
-    get edit_api_activity_url(@api_activity)
-    assert_response :success
-  end
+    test "should show api_activity" do
+      get api_activity_url(@api_activity)
+      assert_response :success
+    end
 
-  test "should update api_activity" do
-    patch api_activity_url(@api_activity), params: { api_activity: {} }
-    assert_redirected_to api_activity_url(@api_activity)
-  end
+    test "should get edit" do
+      get edit_api_activity_url(@api_activity)
+      assert_response :success
+    end
 
-  test "should destroy api_activity" do
-    assert_difference('Api::Activity.count', -1) do
-      delete api_activity_url(@api_activity)
+    test "should update api_activity" do
+      patch api_activity_url(@api_activity), params: { api_activity: {} }
+      assert_redirected_to api_activity_url(@api_activity)
     end
 
-    assert_redirected_to api_activities_url
+    test "should destroy api_activity" do
+      assert_difference('Api::Activity.count', -1) do
+        delete api_activity_url(@api_activity)
+      end
+
+      assert_redirected_to api_activities_url
+    end
   end
 end

test/controllers/api/groups_controller_test.rb

@@ -1,48 +1,50 @@
 require 'test_helper'
 
-class Api::GroupsControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    @api_group = api_groups(:one)
-  end
-
-  test "should get index" do
-    get api_groups_url
-    assert_response :success
-  end
+module Api
+  class GroupsControllerTest < ActionDispatch::IntegrationTest
+    setup do
+      @api_group = api_groups(:one)
+    end
 
-  test "should get new" do
-    get new_api_group_url
-    assert_response :success
-  end
+    test "should get index" do
+      get api_groups_url
+      assert_response :success
+    end
 
-  test "should create api_group" do
-    assert_difference('Api::Group.count') do
-      post api_groups_url, params: { api_group: {} }
+    test "should get new" do
+      get new_api_group_url
+      assert_response :success
     end
 
-    assert_redirected_to api_group_url(Api::Group.last)
-  end
+    test "should create api_group" do
+      assert_difference('Api::Group.count') do
+        post api_groups_url, params: { api_group: {} }
+      end
 
-  test "should show api_group" do
-    get api_group_url(@api_group)
-    assert_response :success
-  end
+      assert_redirected_to api_group_url(Api::Group.last)
+    end
 
-  test "should get edit" do
-    get edit_api_group_url(@api_group)
-    assert_response :success
-  end
+    test "should show api_group" do
+      get api_group_url(@api_group)
+      assert_response :success
+    end
 
-  test "should update api_group" do
-    patch api_group_url(@api_group), params: { api_group: {} }
-    assert_redirected_to api_group_url(@api_group)
-  end
+    test "should get edit" do
+      get edit_api_group_url(@api_group)
+      assert_response :success
+    end
 
-  test "should destroy api_group" do
-    assert_difference('Api::Group.count', -1) do
-      delete api_group_url(@api_group)
+    test "should update api_group" do
+      patch api_group_url(@api_group), params: { api_group: {} }
+      assert_redirected_to api_group_url(@api_group)
     end
 
-    assert_redirected_to api_groups_url
+    test "should destroy api_group" do
+      assert_difference('Api::Group.count', -1) do
+        delete api_group_url(@api_group)
+      end
+
+      assert_redirected_to api_groups_url
+    end
   end
 end

test/controllers/api/me_controller_test.rb

@@ -1,7 +1,9 @@
 require 'test_helper'
 
-class Api::MeControllerTest < ActionDispatch::IntegrationTest
-  # test "the truth" do
-  #   assert true
-  # end
+module Api
+  class MeControllerTest < ActionDispatch::IntegrationTest
+    # test "the truth" do
+    #   assert true
+    # end
+  end
 end

test/controllers/api/people_controller_test.rb

@@ -1,48 +1,50 @@
 require 'test_helper'
 
-class Api::PeopleControllerTest < ActionDispatch::IntegrationTest
-  setup do
-    @api_person = api_people(:one)
-  end
-
-  test "should get index" do
-    get api_people_url
-    assert_response :success
-  end
+module Api
+  class PeopleControllerTest < ActionDispatch::IntegrationTest
+    setup do
+      @api_person = api_people(:one)
+    end
 
-  test "should get new" do
-    get new_api_person_url
-    assert_response :success
-  end
+    test "should get index" do
+      get api_people_url
+      assert_response :success
+    end
 
-  test "should create api_person" do
-    assert_difference('Api::Person.count') do
-      post api_people_url, params: { api_person: {} }
+    test "should get new" do
+      get new_api_person_url
+      assert_response :success
     end
 
-    assert_redirected_to api_person_url(Api::Person.last)
-  end
+    test "should create api_person" do
+      assert_difference('Api::Person.count') do
+        post api_people_url, params: { api_person: {} }
+      end
 
-  test "should show api_person" do
-    get api_person_url(@api_person)
-    assert_response :success
-  end
+      assert_redirected_to api_person_url(Api::Person.last)
+    end
 
-  test "should get edit" do
-    get edit_api_person_url(@api_person)
-    assert_response :success
-  end
+    test "should show api_person" do
+      get api_person_url(@api_person)
+      assert_response :success
+    end
 
-  test "should update api_person" do
-    patch api_person_url(@api_person), params: { api_person: {} }
-    assert_redirected_to api_person_url(@api_person)
-  end
+    test "should get edit" do
+      get edit_api_person_url(@api_person)
+      assert_response :success
+    end
 
-  test "should destroy api_person" do
-    assert_difference('Api::Person.count', -1) do
-      delete api_person_url(@api_person)
+    test "should update api_person" do
+      patch api_person_url(@api_person), params: { api_person: {} }
+      assert_redirected_to api_person_url(@api_person)
     end
 
-    assert_redirected_to api_people_url
+    test "should destroy api_person" do
+      assert_difference('Api::Person.count', -1) do
+        delete api_person_url(@api_person)
+      end
+
+      assert_redirected_to api_people_url
+    end
   end
 end

test/test_helper.rb

@@ -2,9 +2,11 @@ ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../config/environment', __dir__)
 require 'rails/test_help'
 
-class ActiveSupport::TestCase
-  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
-  fixtures :all
+module ActiveSupport
+  class TestCase
+    # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+    fixtures :all
 
-  # Add more helper methods to be used by all tests here...
+    # Add more helper methods to be used by all tests here...
+  end
 end