canard 0.5.0.pre → 0.6.0.pre

data/test/canard/canard_test.rb

@@ -1,30 +1,28 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'canard'
 
 describe Canard do
-
-  describe "ability_definitions" do
-
-    it "should be an accessor" do
+  describe 'ability_definitions' do
+    it 'should be an accessor' do
       Canard.must_respond_to(:ability_definitions)
     end
 
-    it "should be a hash" do
+    it 'should be a hash' do
       Canard.ability_definitions.must_be_instance_of Hash
     end
-
   end
 
-  describe "ability_key" do
-
-    it "returns a snake case version of the string" do
+  describe 'ability_key' do
+    it 'returns a snake case version of the string' do
       class_name = 'CamelCaseString'
       key = :camel_case_string
 
       Canard.ability_key(class_name).must_equal key
     end
 
-    it "prepends namespaces to the class name" do
+    it 'prepends namespaces to the class name' do
       class_name = 'Namespace::CamelCaseString'
       key = :namespace_camel_case_string
 

data/test/canard/find_abilities_test.rb

@@ -1,35 +1,35 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Canard do
-
-  describe "find_abilities" do
-
+  describe 'find_abilities' 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__)]
     end
 
-    it "loads the abilities into ability_definitions" do
+    it 'loads the abilities into ability_definitions' do
       Canard.find_abilities
 
       Canard.ability_definitions.keys.must_include :admin
     end
 
-    it "finds abilities in the default path" do
+    it 'finds abilities in the default path' do
       Canard.find_abilities
 
       Canard.ability_definitions.keys.must_include :author
       Canard.ability_definitions.keys.wont_include :administrator
     end
 
-    it "finds abilities in additional paths" do
-      Canard::Abilities.definition_paths << File.expand_path('../../abilities', __FILE__)
+    it 'finds abilities in additional paths' do
+      Canard::Abilities.definition_paths << File.expand_path('../abilities', __dir__)
       Canard.find_abilities
 
       Canard.ability_definitions.keys.must_include :author
       Canard.ability_definitions.keys.must_include :administrator
     end
 
-    it "reloads existing abilities" do
+    it 'reloads existing abilities' do
       Canard.find_abilities
       Canard::Abilities.send(:instance_variable_set, '@definitions', {})
       Canard.find_abilities
@@ -37,7 +37,5 @@ describe Canard do
       Canard.ability_definitions.keys.must_include :author
       Canard.ability_definitions.keys.must_include :admin
     end
-
   end
-
 end

data/test/canard/user_model_test.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 describe Canard::UserModel do
-
   describe 'acts_as_user' do
-
-    describe "integrating RoleModel" do
-
+    describe 'integrating RoleModel' do
       before do
         PlainRubyUser.acts_as_user
       end
@@ -16,21 +15,18 @@ describe Canard::UserModel do
       end
     end
 
-    describe "with a roles_mask" do
-
+    describe 'with a roles_mask' do
       describe 'and :roles => [] specified' do
-
         before do
-          PlainRubyUser.acts_as_user :roles => [:viewer, :author, :admin]
+          PlainRubyUser.acts_as_user roles: %i[viewer author admin]
         end
 
         it 'sets the valid_roles for the class' do
-          PlainRubyUser.valid_roles.must_equal [:viewer, :author, :admin]
+          PlainRubyUser.valid_roles.must_equal %i[viewer author admin]
         end
       end
 
       describe 'and no :roles => [] specified' do
-
         before do
           PlainRubyUser.acts_as_user
         end
@@ -41,41 +37,37 @@ describe Canard::UserModel do
       end
     end
 
-    describe "with no roles_mask" do
-
+    describe 'with no roles_mask' do
       before do
-        PlainRubyNonUser.acts_as_user :roles => [:viewer, :author, :admin]
+        PlainRubyNonUser.acts_as_user roles: %i[viewer author admin]
       end
 
-      it "sets no roles" do
+      it 'sets no roles' do
         PlainRubyNonUser.valid_roles.must_equal []
       end
     end
 
-    describe "setting the role_mask" do
-
+    describe 'setting the role_mask' do
       before do
         PlainRubyNonUser.send :attr_accessor, :my_roles
-        PlainRubyNonUser.acts_as_user :roles => [:viewer, :author], :roles_mask => :my_roles
+        PlainRubyNonUser.acts_as_user roles: %i[viewer author], roles_mask: :my_roles
       end
 
       it 'sets the valid_roles for the class' do
-        PlainRubyNonUser.valid_roles.must_equal [:viewer, :author]
+        PlainRubyNonUser.valid_roles.must_equal %i[viewer author]
       end
     end
   end
 
-  describe "scopes" do
-
+  describe 'scopes' do
     before do
-      PlainRubyUser.acts_as_user :roles => [:viewer, :author, :admin]
+      PlainRubyUser.acts_as_user roles: %i[viewer author admin]
     end
 
-    describe "on a plain Ruby class" do
-
+    describe 'on a plain Ruby class' do
       subject { PlainRubyUser }
 
-      it "creates no scope methods" do
+      it 'creates no scope methods' do
         subject.wont_respond_to :admins
         subject.wont_respond_to :authors
         subject.wont_respond_to :viewers
@@ -90,26 +82,24 @@ describe Canard::UserModel do
 end
 
 describe Canard::UserModel::InstanceMethods do
-
   before do
-    Canard::Abilities.default_path = File.expand_path('../../dummy/app/abilities', __FILE__)
+    Canard::Abilities.default_path = 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 "ability" do
-
+  describe 'ability' do
     before do
-      PlainRubyUser.acts_as_user :roles => [:admin, :author]
+      PlainRubyUser.acts_as_user roles: %i[admin author]
     end
 
     subject { PlainRubyUser.new(:author).ability }
 
-    it "returns an ability for this instance" do
+    it 'returns an ability for this instance' do
       subject.must_be_instance_of Ability
     end
 
-    it "has the users abilities" do
+    it 'has the users abilities' do
       subject.can?(:new, Post).must_equal true
       subject.can?(:create, Post).must_equal true
       subject.can?(:edit, Post).must_equal true
@@ -118,7 +108,7 @@ describe Canard::UserModel::InstanceMethods do
       subject.can?(:index, Post).must_equal true
     end
 
-    it "has no other abilities" do
+    it 'has no other abilities' do
       subject.cannot?(:destroy, Post).must_equal true
     end
   end

data/test/dummy/Rakefile

@@ -1,7 +1,9 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path('config/application', __dir__)
 
 Dummy::Application.load_tasks

data/test/dummy/app/abilities/admins.rb

@@ -1,9 +1,9 @@
+# frozen_string_literal: true
+
 Canard::Abilities.for(:admin) do
-  
   can :manage, [Post, User]
-  
+
   cannot :destroy, User do |u|
     (user == u)
   end
-  
-end
+end

data/test/dummy/app/abilities/authors.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
+
 Canard::Abilities.for(:author) do
-    
-  can [:create, :update, :read], Post
-    
+  can %i[create update read], Post
 end

data/test/dummy/app/abilities/editors.rb

@@ -1,7 +1,7 @@
-Canard::Abilities.for(:editor) do
+# frozen_string_literal: true
 
+Canard::Abilities.for(:editor) do
   includes_abilities_of :author
 
   cannot :create, Post
-
 end

data/test/dummy/app/abilities/guests.rb

@@ -1,5 +1,5 @@
-Canard::Abilities.for(:guest) do
+# frozen_string_literal: true
 
+Canard::Abilities.for(:guest) do
   can :read, Post
-
-end
+end

data/test/dummy/app/abilities/users.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
+
 Canard::Abilities.for(:user) do
-  
-  can [:edit, :update], Member, :user_id => user.id
-  
-end
+  can %i[edit update], Member, user_id: user.id
+end

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end

data/test/dummy/app/models/activity.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Activity
-end
+end

data/test/dummy/app/models/member.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 class Member < ActiveRecord::Base
-    
   belongs_to :user
-  
+
   attr_accessible :user, :user_id
-  
 end

data/test/dummy/app/models/mongoid_user.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class MongoidUser
   include Mongoid::Document
-  
-  acts_as_user :roles => [:viewer, :author, :admin]
-end
+
+  acts_as_user roles: %i[viewer author admin]
+end

data/test/dummy/app/models/plain_ruby_non_user.rb

@@ -1,5 +1,5 @@
+# frozen_string_literal: true
+
 class PlainRubyNonUser
-  
   extend Canard::UserModel
-  
 end

data/test/dummy/app/models/plain_ruby_user.rb

@@ -1,5 +1,6 @@
-class PlainRubyUser
+# frozen_string_literal: true
 
+class PlainRubyUser
   extend Canard::UserModel
 
   attr_accessor :roles_mask
@@ -7,5 +8,4 @@ class PlainRubyUser
   def initialize(*roles)
     self.roles = roles
   end
-
-end
+end

data/test/dummy/app/models/post.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Post < ActiveRecord::Base
-end
+end

data/test/dummy/app/models/user.rb

@@ -1,6 +1,7 @@
-class User < ActiveRecord::Base
+# frozen_string_literal: true
 
-  acts_as_user :roles => [:viewer, :author, :admin, :editor]
+class User < ActiveRecord::Base
+  acts_as_user roles: %i[viewer author admin editor]
 
   attr_accessible :roles
 end

data/test/dummy/app/models/user_without_role.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 class UserWithoutRole < ActiveRecord::Base
-  
-  acts_as_user 
-  
+  acts_as_user
+
   attr_accessible :roles
 end
-

data/test/dummy/app/models/user_without_role_mask.rb

@@ -1,5 +1,5 @@
-class UserWithoutRoleMask < ActiveRecord::Base
+# frozen_string_literal: true
 
+class UserWithoutRoleMask < ActiveRecord::Base
   attr_accessible :roles
-
-end
+end

data/test/dummy/config.ru

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path('../config/environment', __FILE__)
 run Dummy::Application

data/test/dummy/config/application.rb

@@ -1,18 +1,20 @@
-require File.expand_path('../boot', __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('boot', __dir__)
 
 # Pick the frameworks you want:
-require "active_record/railtie"
-require "action_controller/railtie"
-require "active_resource/railtie"
-require "rails/test_unit/railtie"
+require 'active_record/railtie'
+require 'action_controller/railtie'
+require 'active_resource/railtie'
+require 'rails/test_unit/railtie'
 
-Bundler.require  if defined?(Bundler)
+Bundler.require if defined?(Bundler)
 require 'canard'
 
 module Dummy
   class Application < Rails::Application
     # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
+    config.encoding = 'utf-8'
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
@@ -29,4 +31,3 @@ module Dummy
     config.active_record.whitelist_attributes = true
   end
 end
-

data/test/dummy/config/boot.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = File.expand_path('../../../Gemfile', __dir__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +9,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../../lib', __dir__)