Make rubocop happy

diff --git a/Gemfile b/Gemfile
index 8b8eae0bba5864534de5ef9c13eeee72ec379b7b..a385851ff7aa631b2d901eb5ccfe46e1232d700b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -42,6 +42,7 @@ gem "image_optim_rails"
 
 # Load rails plugins
 gem "actionpack-page_caching"
 
 # Load rails plugins
 gem "actionpack-page_caching"

+gem "cancancan"

 gem "composite_primary_keys", "~> 10.0.0"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
 gem "composite_primary_keys", "~> 10.0.0"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"


@@ -54,7 +55,6 @@ gem "rails-i18n", "~> 4.0.0"
 gem "record_tag_helper"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "validates_email_format_of", ">= 1.5.1"
 gem "record_tag_helper"
 gem "rinku", ">= 1.2.2", :require => "rails_rinku"
 gem "validates_email_format_of", ">= 1.5.1"

-gem "cancancan"

 
 # Native OSM extensions
 gem "quad_tile", "~> 1.0.1"
 
 # Native OSM extensions
 gem "quad_tile", "~> 1.0.1"

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2be8c16371546e9fe39e7491b8e11a66536e54a4..eed183893c725ae74cc3b345cbf3425d630606a0 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -478,7 +478,7 @@ class ApplicationController < ActionController::Base
     Capability.new(current_user, current_token)
   end
 
     Capability.new(current_user, current_token)
   end
 

-  def deny_access(exception)
+  def deny_access(_exception)

     if current_user
       set_locale
       report_error t("oauth.permissions.missing"), :forbidden
     if current_user
       set_locale
       report_error t("oauth.permissions.missing"), :forbidden

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index ff875899030b287138170ddd09727e5c4ea480a3..6e926800817d4ff3e11152e62c8a219baa96cc36 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -11,7 +11,6 @@ class DiaryEntryController < ApplicationController
   before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
   before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :view, :comments]
 
   before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
   before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :view, :comments]
 

-

   def new
     @title = t "diary_entry.new.title"
 
   def new
     @title = t "diary_entry.new.title"
 


@@ -247,7 +246,6 @@ class DiaryEntryController < ApplicationController
     params.require(:diary_comment).permit(:body)
   end
 
     params.require(:diary_comment).permit(:body)
   end
 

-

   ##
   # decide on a location for the diary entry map
   def set_map_location
   ##
   # decide on a location for the diary entry map
   def set_map_location

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 2f86ea4120df3fc3de02b4351055aea79530def0..5be0b37e561068e3aaf0f05b26f0c54475590c38 100644 (file)
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -17,9 +17,7 @@ class Ability
 
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
 
 
       can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
 

-      if user.administrator?
-        can [:hide, :hidecomment], [DiaryEntry, DiaryComment]
-      end
+      can [:hide, :hidecomment], [DiaryEntry, DiaryComment] if user.administrator?

     end
     # Define abilities for the passed in user here. For example:
     #
     end
     # Define abilities for the passed in user here. For example:
     #

diff --git a/app/models/capability.rb b/app/models/capability.rb
index 17468750331de66846a696472c8436f3dd740bad..db2d7171170745acda1dc9898411473b8808ef53 100644 (file)
--- a/app/models/capability.rb
+++ b/app/models/capability.rb
@@ -5,15 +5,17 @@ class Capability
 
   def initialize(user, token)
     if user
 
   def initialize(user, token)
     if user

-      can [:read, :read_one], UserPreference if has_capability?(token, :allow_read_prefs)
-      can [:update, :update_one, :delete_one], UserPreference if has_capability?(token, :allow_write_prefs)
+      can [:read, :read_one], UserPreference if capability?(token, :allow_read_prefs)
+      can [:update, :update_one, :delete_one], UserPreference if capability?(token, :allow_write_prefs)

 
     end
   end
 
 
     end
   end
 

+  private
+

   # If a user provides no tokens, they've authenticated via a non-oauth method
   # and permission to access to all capabilities is assumed.
   # If a user provides no tokens, they've authenticated via a non-oauth method
   # and permission to access to all capabilities is assumed.

-  def has_capability?(token, cap)
+  def capability?(token, cap)

     token.nil? || token.read_attribute(cap)
   end
 end
     token.nil? || token.read_attribute(cap)
   end
 end

diff --git a/test/models/abilities_test.rb b/test/models/abilities_test.rb
index 77c14f40f5fb30498a01adf78ea95f973c54ee7c..28a5c7fd9f30496227994463e41102f605e1aa39 100644 (file)
--- a/test/models/abilities_test.rb
+++ b/test/models/abilities_test.rb
@@ -6,7 +6,6 @@ class AbilityTest < ActiveSupport::TestCase
 end
 
 class GuestAbilityTest < AbilityTest
 end
 
 class GuestAbilityTest < AbilityTest

-

   test "geocoder permission for a guest" do
     ability = Ability.new nil
 
   test "geocoder permission for a guest" do
     ability = Ability.new nil
 


@@ -27,11 +26,9 @@ class GuestAbilityTest < AbilityTest
       assert ability.cannot?(action, DiaryComment), "should be able to #{action} DiaryEntries"
     end
   end
       assert ability.cannot?(action, DiaryComment), "should be able to #{action} DiaryEntries"
     end
   end

-

 end
 
 class UserAbilityTest < AbilityTest
 end
 
 class UserAbilityTest < AbilityTest

-

   test "Diary permissions" do
     ability = Ability.new create(:user)
 
   test "Diary permissions" do
     ability = Ability.new create(:user)
 


@@ -47,7 +44,6 @@ class UserAbilityTest < AbilityTest
 end
 
 class AdministratorAbilityTest < AbilityTest
 end
 
 class AdministratorAbilityTest < AbilityTest

-

   test "Diary for an administrator" do
     ability = Ability.new create(:administrator_user)
     [:list, :rss, :view, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|
   test "Diary for an administrator" do
     ability = Ability.new create(:administrator_user)
     [:list, :rss, :view, :comments, :create, :edit, :comment, :subscribe, :unsubscribe, :hide, :hidecomment].each do |action|


@@ -66,6 +62,4 @@ class AdministratorAbilityTest < AbilityTest
       assert ability.cannot? act, UserPreference
     end
   end
       assert ability.cannot? act, UserPreference
     end
   end

-
-

 end
 end

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 39e8cdd059df4c6e3254a9ab6259852d2607d517..df88a6ee073cc4e3ff1b38511951fa75ea1d53ef 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -95,7 +95,6 @@ module ActiveSupport
       end
     end
 
       end
     end
 

-

     ##
     # set request readers to ask for a particular error format
     def error_format(format)
     ##
     # set request readers to ask for a particular error format
     def error_format(format)