canard 0.5.0.pre → 0.6.0.pre

data/test/dummy/config/environment.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 # Load the rails application
-require File.expand_path('../application', __FILE__)
+require File.expand_path('application', __dir__)
 
 # Initialize the rails application
 Dummy::Application.initialize!

data/test/dummy/config/environments/development.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

data/test/dummy/config/environments/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
@@ -9,7 +11,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -22,7 +24,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict

data/test/dummy/config/initializers/secret_token.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Your secret key for verifying the integrity of signed cookies.

data/test/dummy/config/initializers/session_store.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains settings for ActionController::ParamsWrapper which
@@ -5,7 +7,7 @@
 
 # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
 ActiveSupport.on_load(:action_controller) do
-  wrap_parameters :format => [:json]
+  wrap_parameters format: [:json]
 end
 
 # Disable root element in JSON by default.

data/test/dummy/config/mongoid3.yml

@@ -10,4 +10,8 @@ test:
     default:
       database: canard_test
       hosts:
-        - localhost:27017
+        - localhost:27017
+      options:
+        connect_timeout: 0.01
+        wait_queue_timeout: 0.01
+        socket_timeout: 0.01

data/test/dummy/config/routes.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 Dummy::Application.routes.draw do
 end

data/test/dummy/db/migrate/20120430083231_initialize_db.rb

@@ -1,19 +1,19 @@
+# frozen_string_literal: true
+
 class InitializeDb < ActiveRecord::Migration
-  
   def change
-    create_table :users, :force => true do |t|
+    create_table :users, force: true do |t|
       t.integer     :roles_mask
     end
-    create_table :user_without_roles, :force => true do |t|
+    create_table :user_without_roles, force: true do |t|
       t.integer     :roles_mask
     end
-    create_table :user_without_role_masks, :force => true do |t|
+    create_table :user_without_role_masks, force: true do |t|
       t.integer     :my_roles_mask
     end
-  
-    create_table :members, :force => true do |t|
+
+    create_table :members, force: true do |t|
       t.references :user
     end
   end
-  
 end

data/test/dummy/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -10,22 +12,20 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120430083231) do
-
-  create_table "members", :force => true do |t|
-    t.integer "user_id"
+ActiveRecord::Schema.define(version: 20_120_430_083_231) do
+  create_table 'members', force: true do |t|
+    t.integer 'user_id'
   end
 
-  create_table "user_without_role_masks", :force => true do |t|
-    t.integer "my_roles_mask"
+  create_table 'user_without_role_masks', force: true do |t|
+    t.integer 'my_roles_mask'
   end
 
-  create_table "user_without_roles", :force => true do |t|
-    t.integer "roles_mask"
+  create_table 'user_without_roles', force: true do |t|
+    t.integer 'roles_mask'
   end
 
-  create_table "users", :force => true do |t|
-    t.integer "roles_mask"
+  create_table 'users', force: true do |t|
+    t.integer 'roles_mask'
   end
-
 end

data/test/dummy/script/rails

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
+APP_PATH = File.expand_path('../config/application', __dir__)
+require File.expand_path('../config/boot', __dir__)
 require 'rails/commands'

data/test/support/reloadable.rb

@@ -1,22 +1,21 @@
+# frozen_string_literal: true
+
 module MiniTest
   class Unit
     class TestCase
-    
-    def teardown
-      Object.send(:remove_const, 'Canard') if Object.const_defined?('Canard')
-      GC.start
-    end
-    
-    def setup
-      [ 'canard/abilities.rb',
-        'canard/user_model.rb',
-        "canard/find_abilities.rb"
-      ].each do |file|
-        file_path = File.join(File.expand_path('../../../lib', __FILE__), file)
-        load file_path
+      def teardown
+        Object.send(:remove_const, 'Canard') if Object.const_defined?('Canard')
+        GC.start
       end
-    end
-  end
 
+      def setup
+        ['canard/abilities.rb',
+         'canard/user_model.rb',
+         'canard/find_abilities.rb'].each do |file|
+          file_path = File.join(File.expand_path('../../lib', __dir__), file)
+          load file_path
+        end
+      end
+    end
   end
 end

data/test/test_helper.rb

@@ -1,33 +1,29 @@
+# frozen_string_literal: true
+
 require 'rubygems'
-gem 'minitest'
 require 'minitest/autorun'
 require 'active_record'
 require 'mongoid'
 
 # Configure Rails Environment
-environment  = ENV["RAILS_ENV"] = 'test'
-rails_root   = File.expand_path('../dummy', __FILE__)
+environment  = ENV['RAILS_ENV'] = 'test'
+rails_root   = File.expand_path('dummy', __dir__)
 database_yml = File.expand_path('config/database.yml', rails_root)
 
 ActiveRecord::Base.configurations = YAML.load_file(database_yml)
 
 config = ActiveRecord::Base.configurations[environment]
-db     = File.expand_path(config['database'], rails_root)
+db = File.expand_path(config['database'], rails_root)
 
 # Drop the test database and migrate up
 FileUtils.rm(db) if File.exist?(db)
-ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => db)
+ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: db)
 ActiveRecord::Base.connection
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Migrator.up File.expand_path('db/migrate', rails_root)
 
 # Load mongoid config
-if Mongoid::VERSION < '3'
-  ENV["MONGOID_ENV"] = "test"
-  Mongoid.load!(File.expand_path('config/mongoid2.yml', rails_root))
-else
-  Mongoid.load!(File.expand_path('config/mongoid3.yml', rails_root), :test)
-end
+Mongoid.load!(File.expand_path('config/mongoid3.yml', rails_root), :test)
 Mongoid.logger.level = :info
 
 # Load dummy rails app
@@ -37,5 +33,3 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files (reloadable reloads canard)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canard
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre
+  version: 0.6.0.pre
 platform: ruby
 authors:
 - James McCarthy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -25,39 +25,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - Gemfile
 - MIT-LICENSE
@@ -153,7 +156,6 @@ files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/mongoid2.yml
 - test/dummy/config/mongoid3.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20120430083231_initialize_db.rb
@@ -181,8 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements:
 - cancan's community supported Rails4+ compatible cancancan fork.
-rubyforge_project: canard
-rubygems_version: 2.6.10
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Adds role based authorisation to Rails by combining RoleModel and CanCanCan.
@@ -222,7 +223,6 @@ test_files:
 - test/dummy/config/initializers/session_store.rb
 - test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/mongoid2.yml
 - test/dummy/config/mongoid3.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/migrate/20120430083231_initialize_db.rb

data/test/dummy/config/mongoid2.yml

@@ -1,9 +0,0 @@
-development:
-  database: canard_development
-  host: localhost
-  port: 27017
-
-test:
-  database: canard_test
-  host: localhost
-  port: 27017