cancancan 1.15.0 → 1.16.0

data/spec/cancan/rule_spec.rb

@@ -1,5 +1,5 @@
-require "spec_helper"
-require "ostruct" # for OpenStruct below
+require 'spec_helper'
+require 'ostruct' # for OpenStruct below
 
 # Most of Rule functionality is tested in Ability specs
 describe CanCan::Rule do
@@ -8,44 +8,44 @@ describe CanCan::Rule do
     @rule = CanCan::Rule.new(true, :read, Integer, @conditions, nil)
   end
 
-  it "returns no association joins if none exist" do
+  it 'returns no association joins if none exist' do
     expect(@rule.associations_hash).to eq({})
   end
 
-  it "returns no association for joins if just attributes" do
+  it 'returns no association for joins if just attributes' do
     @conditions[:foo] = :bar
     expect(@rule.associations_hash).to eq({})
   end
 
-  it "returns single association for joins" do
-    @conditions[:foo] = {:bar => 1}
-    expect(@rule.associations_hash).to eq({:foo => {}})
+  it 'returns single association for joins' do
+    @conditions[:foo] = { bar: 1 }
+    expect(@rule.associations_hash).to eq(foo: {})
   end
 
-  it "returns multiple associations for joins" do
-    @conditions[:foo] = {:bar => 1}
-    @conditions[:test] = {1 => 2}
-    expect(@rule.associations_hash).to eq({:foo => {}, :test => {}})
+  it 'returns multiple associations for joins' do
+    @conditions[:foo] = { bar: 1 }
+    @conditions[:test] = { 1 => 2 }
+    expect(@rule.associations_hash).to eq(foo: {}, test: {})
   end
 
-  it "returns nested associations for joins" do
-    @conditions[:foo] = {:bar => {1 => 2}}
-    expect(@rule.associations_hash).to eq({:foo => {:bar => {}}})
+  it 'returns nested associations for joins' do
+    @conditions[:foo] = { bar: { 1 => 2 } }
+    expect(@rule.associations_hash).to eq(foo: { bar: {} })
   end
 
-  it "returns no association joins if conditions is nil" do
+  it 'returns no association joins if conditions is nil' do
     rule = CanCan::Rule.new(true, :read, Integer, nil, nil)
     expect(rule.associations_hash).to eq({})
   end
 
-  it "is not mergeable if conditions are not simple hashes" do
-    meta_where = OpenStruct.new(:name => 'metawhere', :column => 'test')
+  it 'is not mergeable if conditions are not simple hashes' do
+    meta_where = OpenStruct.new(name: 'metawhere', column: 'test')
     @conditions[meta_where] = :bar
 
     expect(@rule).to be_unmergeable
   end
 
-  it "is not mergeable if conditions is an empty hash" do
+  it 'is not mergeable if conditions is an empty hash' do
     @conditions = {}
     expect(@rule).to_not be_unmergeable
   end

data/spec/spec_helper.rb

@@ -12,11 +12,11 @@ if defined?(I18n) && I18n.respond_to?('enforce_available_locales=')
 end
 
 # Add support to load paths
-$:.unshift File.expand_path('../support', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../support', __FILE__)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.filter_run :focus => true
+  config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.mock_with :rspec
   config.order = 'random'

data/spec/support/ability.rb

@@ -4,4 +4,3 @@ class Ability
   def initialize(user)
   end
 end
-

metadata

@@ -1,83 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: cancancan
 version: !ruby/object:Gem::Version
-  version: 1.15.0
+  version: 1.16.0
 platform: ruby
 authors:
+- Alessandro Rodi (Renuo AG)
 - Bryan Rite
 - Ryan Bates
 - Richard Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.46'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.46'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.1.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
-description: Continuation of the simple authorization solution for Rails which is
-  decoupled from user roles. All permissions are stored in a single location.
-email: r.crawfordwilson@gmail.com
+description: Simple authorization solution for Rails. All permissions are stored in
+  a single location.
+email: alessandro.rodi@renuo.ch
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .rubocop.yml
+- .rubocop_todo.yml
+- .travis.yml
 - Appraisals
 - CHANGELOG.rdoc
 - CONTRIBUTING.md
@@ -142,19 +159,43 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Simple authorization solution for Rails.
 test_files:
 - Appraisals
+- gemfiles/activerecord_3.2.gemfile
+- gemfiles/activerecord_4.0.gemfile
+- gemfiles/activerecord_4.1.gemfile
+- gemfiles/activerecord_4.2.gemfile
+- gemfiles/activerecord_5.0.gemfile
+- gemfiles/mongoid_2.x.gemfile
+- gemfiles/sequel_3.x.gemfile
+- spec/README.rdoc
+- spec/cancan/ability_spec.rb
+- spec/cancan/controller_additions_spec.rb
+- spec/cancan/controller_resource_spec.rb
+- spec/cancan/exceptions_spec.rb
+- spec/cancan/inherited_resource_spec.rb
+- spec/cancan/matchers_spec.rb
+- spec/cancan/model_adapters/active_record_4_adapter_spec.rb
+- spec/cancan/model_adapters/active_record_adapter_spec.rb
+- spec/cancan/model_adapters/default_adapter_spec.rb
+- spec/cancan/model_adapters/mongoid_adapter_spec.rb
+- spec/cancan/model_adapters/sequel_adapter_spec.rb
+- spec/cancan/rule_spec.rb
+- spec/matchers.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/support/ability.rb