access-granted 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 99c759ed2b314ec49877c1ba6b0673650b9c3fba
-  data.tar.gz: b77fa0ed9b87a7fd2bb3aa853a767f6e43cfe014
+SHA256:
+  metadata.gz: 0ce9cfd4d0c980f5f3ba545fa4f2691897b80698fd6fe665c6b29ff226131774
+  data.tar.gz: 82802d1c59a69c201f5f9bfd73de5f17e82e47d8532ca22682a4cef140bada80
 SHA512:
-  metadata.gz: 270c16d0e319ac997679178287cbfb323b69c210b6f57ce8dbb1b34b42d566ec1c415936df32004d2a0f65f8622a777cb02c58b8c4514d14563412dd153e35c5
-  data.tar.gz: 112f93450a81eac894aeb55fb007fc6b1dabec4626e5b561c62a9ceb52e31c29254b0c2a3aae693bb20786e74d77d4376badfaa497e33e0b29a1b3103b1c67d6
+  metadata.gz: 7e050411bc42573ce3da74a78672974f4cf589e97c5c320a2774093a4c659bd95302f49796fa1f7ec785a36b93823684c4942b828de675fa24d696bc14a1fb89
+  data.tar.gz: '0119c97744988a5c1aea30e5e1e14606cbb53a78c448e2b57d94cc2d7ebcdc0b0ab5220ff7a2672e6c1d56a8ce710f58a20625e288e6d9a4bef069ca1acff56b'

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
 sudo: false
 rvm:
-  - 1.9.3
   - 2.0
   - 2.1
   - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
   - jruby-1
   - jruby

data/CHANGELOG.md

@@ -1,9 +1,15 @@
+# 1.3.0
+
+- Drop support for Ruby 1.9.3, it might still work but we are no longer testing against it.
+- Start testing against Rubies 2.3-2.5 in CI
+- Move Rails integration into Railties, this fixes some load order issues ([PR #45](https://github.com/chaps-io/access-granted/pull/45)), thanks [jraqula](https://github.com/jraqula)!
+
 # 1.2.0
 
 - Cache whole blocks of identical permissions when one of them is checked.
   For example, assuming we have a given permissions set:
 
-  ```
+  ```ruby
   can [:update, :destroy, :archive], Post do |post, user|
      post.user_id == user.id
   end
@@ -11,7 +17,7 @@
 
   When resolving one of them like this:
 
-  ```
+  ```ruby
   can? :update, @post
   ```
 

data/README.md

@@ -31,26 +31,26 @@ AccessGranted is meant as a replacement for CanCan to solve major problems:
 
 1. Performance
 
-  On average AccessGranted is **20 times faster** in resolving identical permissions and takes less memory.
-  See [benchmarks](https://github.com/chaps-io/access-granted/blob/master/benchmarks).
+    On average AccessGranted is **20 times faster** in resolving identical permissions and takes less memory.
+    See [benchmarks](https://github.com/chaps-io/access-granted/blob/master/benchmarks).
 
 2. Roles
 
-  Adds support for roles, so no more `if`s and `else`s in your Policy file. This makes it extremely easy to maintain and read the code.
+    Adds support for roles, so no more `if`s and `else`s in your Policy file. This makes it extremely easy to maintain and    read the code.
 
 3. Whitelists
 
-  This means that you define what the user can do, which results in clean, readable policies regardless of application complexity.
-  You don't have to worry about juggling `can`s and `cannot`s in a very convoluted way!
+    This means that you define what the user can do, which results in clean, readable policies regardless of application complexity.
+    You don't have to worry about juggling `can`s and `cannot`s in a very convoluted way!
 
-  _Note_: `cannot` is still available, but has a very specifc use. See [Usage](#usage) below.
+    _Note_: `cannot` is still available, but has a very specifc use. See [Usage](#usage) below.
 
 4. Framework agnostic
 
-  Permissions can work on basically any object and AccessGranted is framework-agnostic,
-  but it has Rails support out of the box. :)
-  It does not depend on any libraries, pure and clean Ruby code. Guaranteed to always work,
-  even when software around changes.
+    Permissions can work on basically any object and AccessGranted is framework-agnostic,
+    but it has Rails support out of the box. :)
+    It does not depend on any libraries, pure and clean Ruby code. Guaranteed to always work,
+    even when software around changes.
 
 ## Usage
 
@@ -280,7 +280,7 @@ or with `cannot?`:
 
 ```ruby
 policy.cannot?(:create, Post) #=> false
-policy.cannot?(:update, @ost) #=> true
+policy.cannot?(:update, @post) #=> true
 ```
 
 ## Common examples

data/access-granted.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "access-granted"
-  spec.version       = "1.2.0"
+  spec.version       = "1.3.0"
   spec.authors       = ["Piotrek Okoński"]
   spec.email         = ["piotrek@okonski.org"]
   spec.description   = %q{Role based authorization gem}

data/benchmarks/README.md

@@ -1,24 +1,24 @@
 # Benchmark results
 
-Benchmarks ran on Ubuntu 15.04 64bit, i5 2500k @ 4.4Ghz, 16 GB RAM with Ruby 2.2.
+Benchmarks ran on Ubuntu 17.04 64bit, i7 6700k @ 4.0Ghz, 32 GB RAM with Ruby 2.3.
 
 ## permissions.rb
 
 This benchmark runs `can?` method for the 3 user roles for 20 seconds each, for both CanCan and AccessGranted.
 
 ```
+Warming up --------------------------------------
+            ag-admin   158.815k i/100ms
+        ag-moderator   161.055k i/100ms
+             ag-user   161.670k i/100ms
+        cancan-admin    14.865k i/100ms
+    cancan-moderator    13.181k i/100ms
+         cancan-user    18.907k i/100ms
 Calculating -------------------------------------
-            ag-admin    21.361k i/100ms
-        cancan-admin    13.631k i/100ms
-        ag-moderator    22.328k i/100ms
-    cancan-moderator    11.679k i/100ms
-             ag-user    25.860k i/100ms
-         cancan-user    16.308k i/100ms
--------------------------------------------------
-            ag-admin    283.174k (± 1.1%) i/s -      5.682M
-        cancan-admin    160.450k (± 1.0%) i/s -      3.217M
-        ag-moderator    301.290k (± 1.1%) i/s -      6.029M
-    cancan-moderator    134.591k (± 1.3%) i/s -      2.698M
-             ag-user    353.259k (± 0.9%) i/s -      7.086M
-         cancan-user    198.579k (± 1.6%) i/s -      3.979M
+            ag-admin      2.141M (± 3.9%) i/s -     10.799M in   5.052573s
+        ag-moderator      2.180M (± 2.1%) i/s -     10.952M in   5.025727s
+             ag-user      2.206M (± 0.4%) i/s -     11.155M in   5.056550s
+        cancan-admin    158.288k (± 2.4%) i/s -    802.710k in   5.074299s
+    cancan-moderator    142.573k (± 2.1%) i/s -    724.955k in   5.087277s
+         cancan-user    204.783k (± 2.2%) i/s -      1.040M in   5.080488s
 ```

data/lib/access-granted.rb

@@ -3,19 +3,9 @@ require "access-granted/policy"
 require "access-granted/permission"
 require "access-granted/role"
 require "access-granted/rails/controller_methods"
+require "access-granted/railtie" if defined?(Rails)
 
 module AccessGranted
 
 end
 
-if defined? ActionController::Base
-  ActionController::Base.class_eval do
-    include AccessGranted::Rails::ControllerMethods
-  end
-end
-
-if defined? ActionController::API
-  ActionController::API.class_eval do
-    include AccessGranted::Rails::ControllerMethods
-  end
-end

data/lib/access-granted/railtie.rb

@@ -0,0 +1,19 @@
+require 'rails/railtie'
+
+module AccessGranted
+  class Railtie < ::Rails::Railtie
+    initializer :access_granted do
+      if defined? ActionController::Base
+        ActionController::Base.class_eval do
+          include AccessGranted::Rails::ControllerMethods
+        end
+      end
+
+      if defined? ActionController::API
+        ActionController::API.class_eval do
+          include AccessGranted::Rails::ControllerMethods
+        end
+      end
+    end
+  end
+end

data/spec/permission_spec.rb

@@ -7,13 +7,13 @@ describe AccessGranted::Permission do
 
     it "matches proc conditions when true" do
       sub = double("Element", published?: true)
-      perm = subject.new(true, :read, sub, nil, {}, proc {true})
+      perm = subject.new(true, :read, sub, nil, {}, [], proc {true})
       expect(perm.matches_conditions?(sub)).to eq(true)
     end
 
     it "does not match proc conditions false" do
       sub = double("Element", published?: true)
-      perm = subject.new(true, :read, sub, nil, {}, proc {false})
+      perm = subject.new(true, :read, sub, nil, {}, [], proc {false})
       expect(perm.matches_conditions?(sub)).to eq(false)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: access-granted
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Piotrek Okoński
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,7 @@ files:
 - lib/access-granted/permission.rb
 - lib/access-granted/policy.rb
 - lib/access-granted/rails/controller_methods.rb
+- lib/access-granted/railtie.rb
 - lib/access-granted/role.rb
 - lib/generators/access_granted/policy_generator.rb
 - lib/generators/templates/access_policy.rb
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Elegant whitelist and role based authorization with ability to prioritize