canard 0.5.0.pre → 0.6.0.pre

data/lib/generators/canard/ability/ability_generator.rb

@@ -1,27 +1,31 @@
+# frozen_string_literal: true
+
 require_relative '../../ability_definition'
 
 module Canard
   module Generators
-    class AbilityGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
-      argument :ability_definitions, :type => :array, :default => [], :banner => "can:[read,update]:[user,account] cannot:[create,destroy]:user"
+    class AbilityGenerator < Rails::Generators::NamedBase # :nodoc:
+      source_root File.expand_path('templates', __dir__)
+      argument :ability_definitions,
+               type: :array,
+               default: [],
+               banner: 'can:[read,update]:[user,account] cannot:[create,destroy]:user'
 
       def generate_ability
-        template "abilities.rb.erb", Abilities.default_path + "/#{file_name.pluralize}.rb"
+        template 'abilities.rb.erb', Abilities.default_path + "/#{file_name.pluralize}.rb"
       end
-    
-      hook_for :test_framework, :as => 'ability'
-    
+
+      hook_for :test_framework, as: 'ability'
+
       private
-      
-      def definitions(&block)
+
+      def definitions
         ability_definitions.each { |definition| AbilityDefinition.parse(definition) }
-        
+
         AbilityDefinition.models.sort.each do |model, definition|
           yield model, definition
         end
       end
-      
     end
   end
-end
+end

data/lib/generators/rspec/ability/ability_generator.rb

@@ -1,27 +1,27 @@
+# frozen_string_literal: true
+
 require 'generators/rspec'
 require_relative '../../ability_definition'
 
 module Rspec
   module Generators
     class AbilityGenerator < Base
-      @_rspec_source_root = File.expand_path('../templates', __FILE__)
-      argument :ability_definitions, :type => :array, :default => [], :banner => "can:abilities:models cannot:abilities:models"
+      @_rspec_source_root = File.expand_path('templates', __dir__)
+      argument :ability_definitions, type: :array, default: [], banner: 'can:abilities:models cannot:abilities:models'
 
       def generate_ability_spec
-        template "abilities_spec.rb.erb", "spec/abilities/#{file_name.pluralize}_spec.rb"
+        template 'abilities_spec.rb.erb', "spec/abilities/#{file_name.pluralize}_spec.rb"
       end
-      
+
       private
-      
-      def definitions(&block)
+
+      def definitions
         ability_definitions.each { |definition| AbilityDefinition.parse(definition) }
-        
+
         AbilityDefinition.models.sort.each do |model, definition|
           yield model, definition
         end
       end
-      
     end
-    
   end
 end

data/lib/tasks/canard.rake

@@ -1,13 +1,15 @@
+# frozen_string_literal: true
+
 namespace :canard do
   desc 'Upgrades deprecated ability definition syntax and moves the files from abilities to app/abilities'
-  task :upgrade => :environment do
+  task upgrade: :environment do
     require 'rake/clean'
     source_path = 'abilities'
     destination_path = Canard::Abilities.definition_paths.first
 
-    Dir.mkdir(destination_path) unless Dir.exists?(destination_path)
+    Dir.mkdir(destination_path) unless Dir.exist?(destination_path)
 
-    if Dir.exists?(source_path)
+    if Dir.exist?(source_path)
       Dir[File.join(source_path, '*.rb')].each do |input_file|
         input = File.read(input_file)
         output = input.gsub(/abilities_for/, 'Canard::Abilities.for')
@@ -16,8 +18,6 @@ namespace :canard do
         File.delete(input_file)
       end
       Dir.delete(source_path)
-    else
     end
-
   end
-end
+end

data/test/abilities/administrators.rb

@@ -1,5 +1,5 @@
-Canard::Abilities.for(:administrator) do
+# frozen_string_literal: true
 
+Canard::Abilities.for(:administrator) do
   can :manage, [Activity, User]
-
 end

data/test/canard/abilities_test.rb

@@ -1,61 +1,56 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'canard'
 
 describe 'Canard::Abilities' do
-
   subject { Canard::Abilities }
 
-  describe "ability_paths" do
-
-    it "defaults to app/abilities" do
+  describe 'ability_paths' do
+    it 'defaults to app/abilities' do
       subject.definition_paths.must_include 'app/abilities'
     end
 
-    it "appends paths" do
+    it 'appends paths' do
       subject.definition_paths << 'other_abilities'
       subject.definition_paths.must_include 'other_abilities'
     end
 
-    it "can be overwritten" do
+    it 'can be overwritten' do
       subject.definition_paths = ['other_abilities']
 
       subject.definition_paths.must_equal ['other_abilities']
     end
-
   end
 
-  describe "default_path" do
-
-    it "defaults to app/abilities" do
+  describe 'default_path' do
+    it 'defaults to app/abilities' do
       subject.default_path.must_equal 'app/abilities'
     end
 
-    it "can be changhed" do
+    it 'can be changhed' do
       subject.default_path = 'other_abilities'
 
       subject.default_path.must_equal 'other_abilities'
     end
-
-
   end
 
-  describe "for" do
-
-    it "adds the block to the definitions" do
-      block = lambda { puts 'some block' }
+  describe 'for' do
+    it 'adds the block to the definitions' do
+      block = -> { puts 'some block' }
 
       subject.for(:definition, &block)
 
       assert_equal block, subject.definitions[:definition]
     end
 
-    it "normalises the key to a symbol" do
+    it 'normalises the key to a symbol' do
       subject.for('definition') { puts 'a block' }
 
       subject.definitions.keys.must_include :definition
     end
 
-    it "rasises ArgumentError if no block is provided" do
+    it 'rasises ArgumentError if no block is provided' do
       proc { subject.for(:definition) }.must_raise ArgumentError
     end
 
@@ -64,7 +59,5 @@ describe 'Canard::Abilities' do
 
       subject.definitions.keys.must_include :not_camel_case
     end
-
   end
-
 end

data/test/canard/ability_test.rb

@@ -1,47 +1,42 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Ability do
-
   before do
-    Canard::Abilities.definition_paths = [File.expand_path('../../dummy/app/abilities', __FILE__)]
+    Canard::Abilities.definition_paths = [File.expand_path('../dummy/app/abilities', __dir__)]
     # reload abilities because the reloader will have removed them after the railtie ran
     Canard.find_abilities
   end
 
-  describe "new" do
-
-    describe "with a user" do
-
+  describe 'new' do
+    describe 'with a user' do
       let(:user) { User.new }
       subject { Ability.new(user) }
 
-      it "assign the user to Ability#user" do
+      it 'assign the user to Ability#user' do
         subject.user.must_equal user
       end
-
     end
 
-    describe "with a model that references a user" do
-
+    describe 'with a model that references a user' do
       let(:user) { User.create }
-      let(:member) { Member.new(:user => user) }
+      let(:member) { Member.new(user: user) }
 
       subject { Ability.new(member) }
 
-      it "assign the user to Ability#user" do
+      it 'assign the user to Ability#user' do
         subject.user.must_equal user
       end
-
     end
 
-    describe "with a user that has author role" do
-
-      let(:user) { User.create(:roles => [:author]) }
-      let(:member) { Member.create(:user => user) }
-      let(:other_member) { Member.new(:user => User.create) }
+    describe 'with a user that has author role' do
+      let(:user) { User.create(roles: [:author]) }
+      let(:member) { Member.create(user: user) }
+      let(:other_member) { Member.new(user: User.create) }
       subject { Ability.new(user) }
 
-      it "has all the abilities of the base class" do
+      it 'has all the abilities of the base class' do
         subject.can?(:edit, member).must_equal true
         subject.can?(:update, member).must_equal true
 
@@ -49,7 +44,7 @@ describe Ability do
         subject.can?(:update, other_member).wont_equal true
       end
 
-      it "has all the abilities of an author" do
+      it 'has all the abilities of an author' do
         subject.can?(:new, Post).must_equal true
         subject.can?(:create, Post).must_equal true
         subject.can?(:edit, Post).must_equal true
@@ -58,21 +53,19 @@ describe Ability do
         subject.can?(:index, Post).must_equal true
       end
 
-      it "has no admin abilities" do
+      it 'has no admin abilities' do
         subject.cannot?(:destroy, Post).must_equal true
       end
-
     end
 
-    describe "with a user that has admin and author roles" do
-
-      let(:user) { User.create(:roles => [:author, :admin]) }
-      let(:member) { Member.create(:user => user) }
+    describe 'with a user that has admin and author roles' do
+      let(:user) { User.create(roles: %i[author admin]) }
+      let(:member) { Member.create(user: user) }
       let(:other_user) { User.create }
-      let(:other_member) { Member.new(:user => other_user) }
+      let(:other_member) { Member.new(user: other_user) }
       subject { Ability.new(user) }
 
-      it "has all the abilities of the base class" do
+      it 'has all the abilities of the base class' do
         subject.can?(:edit, member).must_equal true
         subject.can?(:update, member).must_equal true
 
@@ -80,27 +73,26 @@ describe Ability do
         subject.cannot?(:update, other_member).must_equal true
       end
 
-      it "has all the abilities of an author" do
+      it 'has all the abilities of an author' do
         subject.can?(:new, Post).must_equal true
       end
 
-      it "has the abilities of an admin" do
+      it 'has the abilities of an admin' do
         subject.can?(:manage, Post).must_equal true
         subject.can?(:manage, other_user).must_equal true
         subject.can?(:destroy, other_user).must_equal true
         subject.cannot?(:destroy, user).must_equal true
       end
-
     end
 
-    describe "a user with editor role" do
-      let(:user) { User.create(:roles => [:editor]) }
-      let(:member) { Member.create(:user => user) }
+    describe 'a user with editor role' do
+      let(:user) { User.create(roles: [:editor]) }
+      let(:member) { Member.create(user: user) }
       let(:other_user) { User.create }
-      let(:other_member) { Member.new(:user => other_user) }
+      let(:other_member) { Member.new(user: other_user) }
       subject { Ability.new(user) }
 
-      it "has all the abilities of the base class" do
+      it 'has all the abilities of the base class' do
         subject.can?(:edit, member).must_equal true
         subject.can?(:update, member).must_equal true
 
@@ -113,14 +105,12 @@ describe Ability do
         subject.can?(:read, Post).must_equal true
         subject.cannot?(:create, Post).must_equal true
       end
-
     end
 
-    describe "with no user" do
-
+    describe 'with no user' do
       subject { Ability.new }
 
-      it "applies the guest abilities" do
+      it 'applies the guest abilities' do
         subject.can?(:index, Post)
         subject.can?(:show, Post)
 
@@ -133,30 +123,29 @@ describe Ability do
       end
     end
 
-    describe "with an instance of an anonymous class that has author role" do
-
+    describe 'with an instance of an anonymous class that has author role' do
       let(:klass) do
         Class.new do
           extend Canard::UserModel
           attr_accessor :roles_mask
-          acts_as_user :roles => [:author, :admin]
-          def initialize(*roles); self.roles = roles; end
+          acts_as_user roles: %i[author admin]
+          def initialize(*roles)
+            self.roles = roles
+          end
         end
       end
       let(:instance) { klass.new(:author) }
 
-      describe "for base class abilities" do
-
-        it "does nothing" do
+      describe 'for base class abilities' do
+        it 'does nothing' do
           proc { Ability.new(instance) }.must_be_silent
         end
       end
 
-      describe "for assigned roles" do
-
+      describe 'for assigned roles' do
         subject { Ability.new(instance) }
 
-        it "has all the abilities of an author" do
+        it 'has all the abilities of an author' do
           subject.can?(:new, Post).must_equal true
           subject.can?(:create, Post).must_equal true
           subject.can?(:edit, Post).must_equal true
@@ -165,11 +154,10 @@ describe Ability do
           subject.can?(:index, Post).must_equal true
         end
 
-        it "has no admin abilities" do
+        it 'has no admin abilities' do
           subject.cannot?(:destroy, Post).must_equal true
         end
       end
-
     end
   end
 end

data/test/canard/adapters/active_record_test.rb

@@ -1,32 +1,26 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Canard::Adapters::ActiveRecord do
-
   describe 'acts_as_user' do
-
     describe 'with a role_mask' do
-
       describe 'and :roles => [] specified' do
-
         it 'sets the valid_roles for the class' do
-          User.valid_roles.must_equal [:viewer, :author, :admin, :editor]
+          User.valid_roles.must_equal %i[viewer author admin editor]
         end
-
       end
 
       describe 'and no :roles => [] specified' do
-
         it 'sets no roles' do
           UserWithoutRole.valid_roles.must_equal []
         end
       end
-
     end
 
     describe 'with no roles_mask' do
-
       before do
-        UserWithoutRoleMask.acts_as_user :roles => [:viewer, :admin]
+        UserWithoutRoleMask.acts_as_user roles: %i[viewer admin]
       end
 
       it 'sets no roles' do
@@ -34,48 +28,43 @@ describe Canard::Adapters::ActiveRecord do
       end
     end
 
-    describe "with no table" do
-
+    describe 'with no table' do
       subject { Class.new(ActiveRecord::Base) }
 
-      it "sets no roles" do
-        subject.class_eval { acts_as_user :roles => [:admin] }
+      it 'sets no roles' do
+        subject.class_eval { acts_as_user roles: [:admin] }
         subject.valid_roles.must_equal []
       end
 
-      it "does not raise any errors" do
-        proc { subject.class_eval { acts_as_user :roles => [:admin] } }.must_be_silent
+      it 'does not raise any errors' do
+        proc { subject.class_eval { acts_as_user roles: [:admin] } }.must_be_silent
       end
 
-      it "returns nil" do
-        subject.class_eval { acts_as_user :roles => [:admin] }.must_be_nil
+      it 'returns nil' do
+        subject.class_eval { acts_as_user roles: [:admin] }.must_be_nil
       end
     end
 
     describe 'with an alternative roles_mask specified' do
-
       before do
-        UserWithoutRoleMask.acts_as_user :roles_mask => :my_roles_mask, :roles => [:viewer, :admin]
+        UserWithoutRoleMask.acts_as_user roles_mask: :my_roles_mask, roles: %i[viewer admin]
       end
 
       it 'sets no roles' do
-        UserWithoutRoleMask.valid_roles.must_equal [:viewer, :admin]
+        UserWithoutRoleMask.valid_roles.must_equal %i[viewer admin]
       end
     end
-
   end
 
-  describe "scopes" do
-
-    describe "on an ActiveRecord model with roles" do
-
+  describe 'scopes' do
+    describe 'on an ActiveRecord model with roles' do
       before do
         @no_role             = User.create
-        @admin_author_viewer = User.create(:roles => [:admin, :author, :viewer])
-        @author_viewer       = User.create(:roles => [:author, :viewer])
-        @viewer              = User.create(:roles => [:viewer])
-        @admin_only          = User.create(:roles => [:admin])
-        @author_only         = User.create(:roles => [:author])
+        @admin_author_viewer = User.create(roles: %i[admin author viewer])
+        @author_viewer       = User.create(roles: %i[author viewer])
+        @viewer              = User.create(roles: [:viewer])
+        @admin_only          = User.create(roles: [:admin])
+        @author_only         = User.create(roles: [:author])
       end
 
       after do
@@ -84,25 +73,23 @@ describe Canard::Adapters::ActiveRecord do
 
       subject { User }
 
-      it "adds a scope to return instances with each role" do
+      it 'adds a scope to return instances with each role' do
         subject.must_respond_to :admins
         subject.must_respond_to :authors
         subject.must_respond_to :viewers
       end
 
-      it "adds a scope to return instances without each role" do
+      it 'adds a scope to return instances without each role' do
         subject.must_respond_to :non_admins
         subject.must_respond_to :non_authors
         subject.must_respond_to :non_viewers
       end
 
-      describe "finding instances with a role" do
-
-        describe "admins scope" do
-
+      describe 'finding instances with a role' do
+        describe 'admins scope' do
           subject { User.admins.sort_by(&:id) }
 
-          it "returns only admins" do
+          it 'returns only admins' do
             subject.must_equal [@admin_author_viewer, @admin_only].sort_by(&:id)
           end
 
@@ -112,14 +99,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "authors scope" do
-
+        describe 'authors scope' do
           subject { User.authors.sort_by(&:id) }
 
-          it "returns only authors" do
+          it 'returns only authors' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @author_only].sort_by(&:id)
           end
 
@@ -128,14 +113,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "viewers scope" do
-
+        describe 'viewers scope' do
           subject { User.viewers.sort_by(&:id) }
 
-          it "returns only viewers" do
+          it 'returns only viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @viewer].sort_by(&:id)
           end
 
@@ -144,18 +127,14 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @author_only
           end
-
         end
-
       end
 
-      describe "finding instances without a role" do
-
-        describe "non_admins scope" do
-
+      describe 'finding instances without a role' do
+        describe 'non_admins scope' do
           subject { User.non_admins.sort_by(&:id) }
 
-          it "returns only non_admins" do
+          it 'returns only non_admins' do
             subject.must_equal [@no_role, @author_viewer, @viewer, @author_only].sort_by(&:id)
           end
 
@@ -163,14 +142,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_author_viewer
             subject.wont_include @admin_only
           end
-
         end
 
-        describe "non_authors scope" do
-
+        describe 'non_authors scope' do
           subject { User.non_authors.sort_by(&:id) }
 
-          it "returns only non_authors" do
+          it 'returns only non_authors' do
             subject.must_equal [@no_role, @viewer, @admin_only].sort_by(&:id)
           end
 
@@ -179,14 +156,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_viewer
             subject.wont_include @author_only
           end
-
         end
 
-        describe "non_viewers scope" do
-
+        describe 'non_viewers scope' do
           subject { User.non_viewers.sort_by(&:id) }
 
-          it "returns only non_viewers" do
+          it 'returns only non_viewers' do
             subject.must_equal [@no_role, @admin_only, @author_only].sort_by(&:id)
           end
 
@@ -195,18 +170,14 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_viewer
             subject.wont_include @viewer
           end
-
         end
-
       end
 
-      describe "with_any_role" do
-
-        describe "specifying admin only" do
-
+      describe 'with_any_role' do
+        describe 'specifying admin only' do
           subject { User.with_any_role(:admin).sort_by(&:id) }
 
-          it "returns only admins" do
+          it 'returns only admins' do
             subject.must_equal [@admin_author_viewer, @admin_only].sort_by(&:id)
           end
 
@@ -216,14 +187,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying author only" do
-
+        describe 'specifying author only' do
           subject { User.with_any_role(:author).sort_by(&:id) }
 
-          it "returns only authors" do
+          it 'returns only authors' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @author_only].sort_by(&:id)
           end
 
@@ -232,14 +201,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying viewer only" do
-
+        describe 'specifying viewer only' do
           subject { User.with_any_role(:viewer).sort_by(&:id) }
 
-          it "returns only viewers" do
+          it 'returns only viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @viewer].sort_by(&:id)
           end
 
@@ -248,14 +215,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @author_only
           end
-
         end
 
-        describe "specifying admin and author" do
-
+        describe 'specifying admin and author' do
           subject { User.with_any_role(:admin, :author).sort_by(&:id) }
 
-          it "returns only admins and authors" do
+          it 'returns only admins and authors' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @admin_only, @author_only].sort_by(&:id)
           end
 
@@ -263,14 +228,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @no_role
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying admin and viewer" do
-
+        describe 'specifying admin and viewer' do
           subject { User.with_any_role(:admin, :viewer).sort_by(&:id) }
 
-          it "returns only admins and viewers" do
+          it 'returns only admins and viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @admin_only, @viewer].sort_by(&:id)
           end
 
@@ -278,14 +241,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @no_role
             subject.wont_include @author_only
           end
-
         end
 
-        describe "specifying author and viewer" do
-
+        describe 'specifying author and viewer' do
           subject { User.with_any_role(:author, :viewer).sort_by(&:id) }
 
-          it "returns only authors and viewers" do
+          it 'returns only authors and viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @author_only, @viewer].sort_by(&:id)
           end
 
@@ -293,32 +254,26 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @no_role
             subject.wont_include @admin_only
           end
-
         end
 
-        describe "specifying admin, author and viewer" do
-
+        describe 'specifying admin, author and viewer' do
           subject { User.with_any_role(:admin, :author, :viewer).sort_by(&:id) }
 
-          it "returns only admins, authors and viewers" do
+          it 'returns only admins, authors and viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @admin_only, @author_only, @viewer].sort_by(&:id)
           end
 
           it "doesn't return non admins, authors or viewers" do
             subject.wont_include @no_role
           end
-
         end
-
       end
 
-      describe "with_all_roles" do
-
-        describe "specifying admin only" do
-
+      describe 'with_all_roles' do
+        describe 'specifying admin only' do
           subject { User.with_all_roles(:admin).sort_by(&:id) }
 
-          it "returns only admins" do
+          it 'returns only admins' do
             subject.must_equal [@admin_author_viewer, @admin_only].sort_by(&:id)
           end
 
@@ -328,14 +283,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying author only" do
-
+        describe 'specifying author only' do
           subject { User.with_all_roles(:author).sort_by(&:id) }
 
-          it "returns only authors" do
+          it 'returns only authors' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @author_only].sort_by(&:id)
           end
 
@@ -344,14 +297,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying viewer only" do
-
+        describe 'specifying viewer only' do
           subject { User.with_all_roles(:viewer).sort_by(&:id) }
 
-          it "returns only viewers" do
+          it 'returns only viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer, @viewer].sort_by(&:id)
           end
 
@@ -360,14 +311,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @author_only
           end
-
         end
 
-        describe "specifying admin and author" do
-
+        describe 'specifying admin and author' do
           subject { User.with_all_roles(:admin, :author).sort_by(&:id) }
 
-          it "returns only admins and authors" do
+          it 'returns only admins and authors' do
             subject.must_equal [@admin_author_viewer].sort_by(&:id)
           end
 
@@ -378,14 +327,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying admin and viewer" do
-
+        describe 'specifying admin and viewer' do
           subject { User.with_all_roles(:admin, :viewer).sort_by(&:id) }
 
-          it "returns only admins and viewers" do
+          it 'returns only admins and viewers' do
             subject.must_equal [@admin_author_viewer].sort_by(&:id)
           end
 
@@ -396,14 +343,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying author and viewer" do
-
+        describe 'specifying author and viewer' do
           subject { User.with_all_roles(:author, :viewer).sort_by(&:id) }
 
-          it "returns only authors and viewers" do
+          it 'returns only authors and viewers' do
             subject.must_equal [@admin_author_viewer, @author_viewer].sort_by(&:id)
           end
 
@@ -413,14 +358,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying admin, author and viewer" do
-
+        describe 'specifying admin, author and viewer' do
           subject { User.with_all_roles(:admin, :author, :viewer).sort_by(&:id) }
 
-          it "returns only admins, authors and viewers" do
+          it 'returns only admins, authors and viewers' do
             subject.must_equal [@admin_author_viewer].sort_by(&:id)
           end
 
@@ -431,18 +374,14 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @admin_only
             subject.wont_include @viewer
           end
-
         end
-
       end
 
-      describe "with_only_roles" do
-
-        describe "specifying one role" do
-
+      describe 'with_only_roles' do
+        describe 'specifying one role' do
           subject { User.with_only_roles(:admin).sort_by(&:id) }
 
-          it "returns users with just that role" do
+          it 'returns users with just that role' do
             subject.must_equal [@admin_only].sort_by(&:id)
           end
 
@@ -453,14 +392,12 @@ describe Canard::Adapters::ActiveRecord do
             subject.wont_include @author_only
             subject.wont_include @viewer
           end
-
         end
 
-        describe "specifying multiple roles" do
-
+        describe 'specifying multiple roles' do
           subject { User.with_only_roles(:author, :viewer).sort_by(&:id) }
 
-          it "returns only users with no more or less roles" do
+          it 'returns only users with no more or less roles' do
             subject.must_equal [@author_viewer].sort_by(&:id)
           end
 
@@ -475,5 +412,4 @@ describe Canard::Adapters::ActiveRecord do
       end
     end
   end
-
 end