portier 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c33d0423d1f9c49d68a3334e45a97174fcb13ab6
-  data.tar.gz: 5e359491e90f1d8cf608f5fd1caf589744f52ddc
+SHA256:
+  metadata.gz: 6c67c0d7cb06502c7bfa625bfb032b297ce6e8449dc9982c0af2714a5509e644
+  data.tar.gz: 2c65741303048681f797cf36157955390a1001d2970c1bd806d72512e0bba0a8
 SHA512:
-  metadata.gz: c1b7cb91f5b65f7fc17b2f1c68070cf865a4a58aae84c4080418bc484922146f8b03802f4b17a6083fa6a11f26a23d15b5e82f4d8122856fa8d068b4c1ea289c
-  data.tar.gz: 785f54d140c86965f58e90fd417cd5b56ea34f033f488f210d84733de1a79b17b049a02b8de7173e87f9fd6a5b28a03a2b07a5468149666bed0a695437e85c9e
+  metadata.gz: d30afb8e7a877d0a102eedca29871c08f73e9f86da1a365a23a9ebefb0871f2f282adfb37832b1515ee7c822eb8047af827d0209c04befd90ebc21ba65b8e00a
+  data.tar.gz: d4449bbf6b0b9be5fdbb298c84519ebb06faec3b300b01cb481f8d7ef1e92f01b4c24aca868ea27968c94fe526573dea72388e2ce7040adc145360a1c1ab8b18

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in portier.gemspec
 gemspec
+
+gem 'coveralls', require: false

data/README.md

@@ -26,7 +26,7 @@ In order to let portier control the requests to your application, you need to ad
     protect_from_forgery with: :exception
 
     # This filter the requests using the permission files
-    before_filter :protect_app
+    before_action :protect_app
 
     # You can define the current_user anyway you want as long as it return the current user record.
     def current_user
@@ -163,7 +163,15 @@ Both ```can?``` and ```can_view?``` methods can take options
   end
 ```
 
+### namespace
 
+If you are using namespacing in your controller, you can pass the namespace option.
+
+```erb
+  <%# app/views/admin/products/show.html.erb %>
+
+  <%= link_to 'Edit product', edit_product_path(id: @product.id) if can? :edit, @product, namespace: :admin %>
+```
 
 Copyright
 ---------

data/lib/portier/application_permission.rb

@@ -65,7 +65,11 @@ class Portier::ApplicationPermission < Portier::BasePermission
   end
 
   def model
-    controller_name.singularize.camelize.constantize
+    model_name.camelize.constantize
+  end
+
+  def model_name
+    controller_name.split('/').last.singularize
   end
 
   def model_exists?
@@ -73,7 +77,7 @@ class Portier::ApplicationPermission < Portier::BasePermission
   end
 
   def record_name
-    controller_name.singularize.to_sym
+    model_name.to_sym
   end
 
 

data/lib/portier/base.rb

@@ -26,6 +26,9 @@ class Portier::Base
     else
       object.class.name.pluralize
     end
+
+    object_name = "#{options[:namespace].to_s.camelize}::#{object_name.camelize}" if options[:namespace]
+
     permission = permission_for object_name
     permission.can? action, object, options
   end
@@ -56,7 +59,7 @@ class Portier::Base
     begin
       "#{target.camelize}Permission".constantize.new(application_controller, current_user)
     rescue
-        raise Portier::Uninitalized, "You must define #{controller_name.camelize}Permission in app/permissions/#{controller_name}_permission.rb. See documentation for more details."
+      raise Portier::Uninitalized, "You must define #{target.camelize}Permission in app/permissions/#{target}_permission.rb. See documentation for more details."
     end
   end
 

data/lib/portier/implants/action_controller_implant.rb

@@ -32,6 +32,6 @@ module Portier::Implants::ActionControllerImplant
   end
 
   def render_access_denied
-    render text: "access_denied", status: 401
+    render plain: "access_denied", status: 401
   end
 end

data/portier.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |gem|
   gem.name        = "portier"
   gem.description = "Portier is an gem that manage permissions in a rails project. The permission rules are flexible, non-obstrusive, scalable and can be applied to the controller actions, and views."
   gem.summary     = "Portier is an gem that manage permissions in a rails project. The permission rules are flexible, non-obstrusive, scalable and can be applied to the controller actions, and views."
-  gem.homepage    = "https://bitbucket.org/alchimikweb/portier"
-  gem.version     = "1.0.3"
+  gem.homepage    = "https://github.com/alchimikweb/portier"
+  gem.version     = "1.1.0"
   gem.licenses    = ["MIT"]
 
   gem.authors     = ["Sebastien Rosa"]
@@ -14,9 +14,9 @@ Gem::Specification.new do |gem|
   gem.test_files  = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", ['>= 4.0']
-  gem.add_development_dependency "sqlite3"
-  gem.add_development_dependency "rspec-rails"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-rcov-text"
+  gem.add_dependency "rails", ['~> 5.0']
+  gem.add_development_dependency "sqlite3", "~> 1.3"
+  gem.add_development_dependency "rspec-rails", "~> 3.7"
+  gem.add_development_dependency "simplecov", "~> 0.15"
+  gem.add_development_dependency "simplecov-rcov-text", "~> 0"
 end

data/spec/controllers/application_controller_spec.rb

@@ -1,8 +1,11 @@
 require "spec_helper"
 
-describe ApplicationController do
+#describe ApplicationController do
+#end
+
+describe ApplicationController, :type => :controller do
   controller do
-    before_filter :protect_app
+    before_action :protect_app
 
     def current_user
       @user
@@ -10,26 +13,26 @@ describe ApplicationController do
 
     def index
       if can_view?(:granted_response, show: true)
-        render text: 'Granted!'
+        render plain: 'Granted!'
       else
-        render text: 'Nothing'
+        render plain: 'Nothing'
       end
     end
 
     def create
       if can?(:create, :products)
-        render text: "Created! #{permitted_params}"
+        render plain: "Created! #{permitted_params}"
       else
-        render text: "Not Created!"
+        render plain: "Not Created!"
       end
     end
 
     def edit
-      render text: 'Refused!'
+      render plain: 'Refused!'
     end
 
     def destroy
-      render text: 'Destroyed!'
+      render plain: 'Destroyed!'
     end
   end
 
@@ -44,7 +47,7 @@ describe ApplicationController do
 
   describe "when calling a restricted action" do
     it 'should not grant access' do
-      get :edit, id: '123'
+      get :edit, params: { id: '123' }
 
       expect(response.status).to eq(401)
       expect(response.body).to eq "access_denied"
@@ -53,7 +56,7 @@ describe ApplicationController do
 
   describe "when sending the role and the role is not allowed to be sent" do
     it 'should not have role in the permitted_params' do
-      post :create, anonymou: { name: '123', email: 'a@at.com', role: 'admin' }
+      post :create, params: { anonymou: { name: '123', email: 'a@at.com', role: 'admin' }}
 
       expect(response.status).to eq(200)
       expect(response.body).to include('email')
@@ -63,7 +66,7 @@ describe ApplicationController do
 
   describe "when deleting an open record" do
     it 'should grant access' do
-      delete :destroy, id: 'open'
+      delete :destroy, params: { id: 'open' }
 
       expect(response.status).to eq(200)
       expect(response.body).to eq "Destroyed!"
@@ -72,7 +75,7 @@ describe ApplicationController do
 
   describe "when deleting an restricted record" do
     it 'should not grant access' do
-      delete :destroy, id: 'restricted'
+      delete :destroy, params: { id: 'restricted' }
 
       expect(response.status).to eq(401)
       expect(response.body).to eq "access_denied"

data/spec/portier/application_permission_spec.rb

@@ -11,7 +11,8 @@ describe Portier::ApplicationPermission do
 
   describe "#default" do
     it "should be protected by default" do
-      Portier::ApplicationPermission.new(double(:app), double(:user)).default.should be_false
+      permission = Portier::ApplicationPermission.new(double(:app), double(:user)).default
+      expect(permission).to be_falsey
     end
   end
 

data/spec/portier/view_tags_permission_spec.rb

@@ -12,18 +12,18 @@ describe Portier::ViewTagsPermission do
       end
 
       context "with the tag show_admin_link restricting access to the user" do
-        before { @permission.stub(:show_admin_link).and_return false }
+        before { allow(@permission).to receive_messages(show_admin_link: false) }
 
         context "when checking if the user can view the show_admin_link" do
-          specify { @permission.can_view?(:show_admin_link).should be_false }
+          specify { expect(@permission.can_view?(:show_admin_link)).to be_falsey }
         end
       end
 
       context "with the tag show_admin_link allowing access to the user" do
-        before { @permission.stub(:show_admin_link).and_return true }
+        before { allow(@permission).to receive_messages(show_admin_link: true) }
 
         context "when checking if the user can view the show_admin_link" do
-          specify { @permission.can_view?(:show_admin_link).should be_true }
+          specify { expect(@permission.can_view?(:show_admin_link)).to be_truthy }
         end
       end
     end

data/spec/spec_helper.rb

@@ -2,11 +2,13 @@ ENV["RAILS_ENV"] ||= 'test'
 
 require 'simplecov'
 require 'simplecov-rcov-text'
+require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::RcovTextFormatter,
-]
+  Coveralls::SimpleCov::Formatter
+])
 
 SimpleCov.start do
   add_filter "spec/dummy"
@@ -17,7 +19,6 @@ end
 require File.expand_path("../dummy/config/environment", __FILE__)
 
 require 'rspec/rails'
-require 'rspec/autorun'
 
 Dir["./spec/support/**/*.rb"].sort.each {|f| require f }
 

data/spec/support/views_helper.rb

@@ -4,8 +4,10 @@ module ViewHelpers
 
     app = double()
 
-    app.stub(:request).and_return({ controller: options[:controller], action: options[:action] })
-    app.stub(:params).and_return(options[:params])
+    allow(app).to receive_messages(
+      request: { controller: options[:controller], action: options[:action] },
+      params: options[:params]
+    )
 
     return app
   end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: portier
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Sebastien Rosa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov-text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: Portier is an gem that manage permissions in a rails project. The permission
@@ -137,7 +137,7 @@ files:
 - spec/portier_spec.rb
 - spec/spec_helper.rb
 - spec/support/views_helper.rb
-homepage: https://bitbucket.org/alchimikweb/portier
+homepage: https://github.com/alchimikweb/portier
 licenses:
 - MIT
 metadata: {}
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Portier is an gem that manage permissions in a rails project. The permission