shoulda-matchers-pundit 0.0.1 → 0.0.2

data/Gemfile

@@ -1,29 +1,29 @@
 source 'https://rubygems.org'
 gemspec
 
-group :development do
+# group :development do
 
-  gem 'foreman', '~> 0.62.0'
-  gem 'guard', '~> 1.6.2'
-  gem 'guard-minitest', '~> 0.5.0'
-  gem 'pry'
+#   gem 'foreman', '~> 0.62.0'
+#   gem 'guard', '~> 1.6.2'
+#   gem 'guard-minitest', '~> 0.5.0'
+#   gem 'pry'
 
-  gem 'rspec-web', github: 'dcunited001/rspec-web'
-  gem 'minitest-reporters-ws', "~> 0.0.2"
+#   gem 'rspec-web', github: 'dcunited001/rspec-web'
+#   gem 'minitest-reporters-ws', "~> 0.0.2"
 
-  if RbConfig::CONFIG['target_os'] =~ /linux/i
-    gem 'rb-inotify', require: false
-    gem 'ruby_gntp'
-  end
+#   if RbConfig::CONFIG['target_os'] =~ /linux/i
+#     gem 'rb-inotify', require: false
+#     gem 'ruby_gntp'
+#   end
 
-  if RbConfig::CONFIG['target_os'] =~ /darwin/i
-    gem 'rb-fsevent', require: false
-    gem 'growl'
-  end
+#   if RbConfig::CONFIG['target_os'] =~ /darwin/i
+#     gem 'rb-fsevent', require: false
+#     gem 'growl'
+#   end
 
-  if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
-    gem 'wdm', require: false, platforms: [:mswin, :mingw]
-    gem 'rb-notifu', platforms: [:mswin, :mingw]
-  end
+#   if RbConfig::CONFIG['target_os'] =~ /mswin|mingw/i
+#     gem 'wdm', require: false, platforms: [:mswin, :mingw]
+#     gem 'rb-notifu', platforms: [:mswin, :mingw]
+#   end
 
-end
+# end

data/README.md

@@ -2,6 +2,11 @@
 
 # Shoulda::Matchers::Pundit
 
+### Issues:
+
+TODO: fix bundler dependancy problem!!
+TODO: fix failure message for wont (doesn't output failing actions)
+
 TODO: update readme: description, installation, usage
 TODO: Configure Travis
 TODO: Configure Appraisal?
@@ -38,4 +43,15 @@ TODO: Write usage instructions here
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull
+
+## Changelog
+
+#### 0.0.2
+
+* Added ForbidMatcher.  May add ForbiddenToMatcher later on.
+* Match multiple actions with a single permit/forbid statement
+
+#### 0.0.1
+
+* Added PermitMatcher & PermittedToMatcher.

data/lib/shoulda/matchers/pundit.rb

@@ -4,8 +4,12 @@ module Shoulda
   module Matchers
     module Pundit
 
-      def permit(action)
-        PermitMatcher.new(action)
+      def permit(*actions)
+        PermitMatcher.new(*actions)
+      end
+
+      def forbid(*actions)
+        ForbidMatcher.new(*actions)
       end
 
       def be_permitted_to(action)
@@ -13,27 +17,32 @@ module Shoulda
       end
 
       class PermitMatcher
-        attr_reader :action, :policy
+        attr_reader :actions, :policy
+        attr_reader :failed_actions
 
-        def initialize(action)
-          @action = action
+        def initialize(*actions)
+          @actions = actions
+          @failed_actions = []
         end
 
         def matches?(policy)
           @policy = policy
-          policy.public_send("#{action}?")
+
+          actions.inject(true) do |pass, action|
+            match?(action) && pass
+          end
         end
 
         def failure_message_for_should
           <<-message
-            #{policy.class} does not permit #{action} on #{policy.record}
+            #{policy.class} does not #{failure_keyword_permit} #{failed_actions.join('/')} on #{policy.record}
             for #{policy.user.inspect}.
           message
         end
 
         def failure_message_for_should_not
           <<-message
-            #{policy.class} does not forbid #{action} on #{policy.record}
+            #{policy.class} does not #{failure_keyword_forbid} #{failed_actions.join('/')} on #{policy.record}
             for #{policy.user.inspect}.
           message
         end
@@ -41,6 +50,45 @@ module Shoulda
         def description
           "permits #{@action}"
         end
+
+        private
+
+        def match?(action)
+          p = permits? action
+          append_failed(action) unless p
+          p
+        end
+
+        def permits?(action)
+          policy.public_send("#{action}?")
+        end
+
+        def append_failed(action)
+          @failed_actions << action
+        end
+
+        def failure_keyword_permit; 'permit'; end
+        def failure_keyword_forbid; 'forbid'; end
+
+      end
+
+      class ForbidMatcher < PermitMatcher
+
+        private
+
+        def match?(action)
+          f = forbids? action
+          append_failed(action) unless f
+          f
+        end
+
+        def forbids?(action)
+          !permits? action
+        end
+
+        def failure_keyword_permit; 'forbid'; end
+        def failure_keyword_forbid; 'permit'; end
+
       end
 
       class PermittedToMatcher

data/lib/shoulda/matchers/pundit/version.rb

@@ -1,7 +1,7 @@
 module Shoulda
   module Matchers
     module Pundit
-      VERSION = "0.0.1".freeze
+      VERSION = "0.0.2".freeze
     end
   end
 end

data/shoulda-matchers-pundit.gemspec

@@ -19,10 +19,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "shoulda-matchers", ">= 1.4.1"
+  spec.add_dependency "shoulda-matchers", "~> 1.4.0"
   spec.add_dependency "pundit", "~> 0.2.0"
 
-  spec.add_development_dependency "rake", ">= 0.9.2"
-  spec.add_development_dependency "minitest-matchers", ">= 1.2.0"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake", "~> 0.9"
+  spec.add_development_dependency "minitest-matchers", "~> 1.2"
+  spec.add_development_dependency "minitest-reporters-ws", "~> 0.0.2"
+  spec.add_development_dependency "pry", "~> 0.9"
 
 end

data/spec/minitest_matchers_spec.rb

@@ -10,11 +10,8 @@ describe Shoulda::Matchers::Pundit::PermitMatcher do
     describe 'Guest' do
       let(:user) { nil }
 
-      wont { permit(:create) }
-      must { permit(:show) }
-      wont { permit(:update) }
-      wont { permit(:destroy) }
-
+      wont { permit :create, :update, :destroy }
+      must { permit :show }
     end
 
     describe 'Any User' do
@@ -22,22 +19,50 @@ describe Shoulda::Matchers::Pundit::PermitMatcher do
       let(:another_user) { User.new(1) }
       let(:article) { Article.new(another_user) }
 
-      must { permit(:create) }
-      must { permit(:show) }
-      wont { permit(:update) }
-      wont { permit(:destroy) }
-
+      must { permit :create, :show }
+      wont { permit :update, :destroy }
     end
 
     describe 'Article Creater' do
       let(:user) { User.new(1) }
 
-      must { permit(:create) }
-      must { permit(:show) }
-      must { permit(:update) }
-      wont { permit(:destroy) }
+      must { permit :create, :show, :update }
+      must { forbid :destroy }
+    end
+
+  end
+end
+
+describe Shoulda::Matchers::Pundit::ForbidMatcher do
+
+  describe ArticlePolicy do
+
+    subject { ArticlePolicy.new(user, article) }
+    let(:article) { Article.new(user) }
+
+    describe 'Guest' do
+      let(:user) { nil }
+
+      wont { forbid :show }
+      must { forbid :create, :update, :destroy }
+    end
+
+    describe 'Any User' do
+      let(:user) { User.new(0) }
+      let(:another_user) { User.new(1) }
+      let(:article) { Article.new(another_user) }
+
+      wont { forbid :create, :show }
+      must { forbid :update, :destroy }
+    end
 
+    describe 'Article Creater' do
+      let(:user) { User.new(1) }
+
+      wont { forbid :create, :show, :update }
+      must { forbid :destroy }
     end
+
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers-pundit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -43,38 +43,86 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest-matchers
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters-ws
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0.9'
 description: Shoulda Matchers for Pundit & Setup for RSpec/Minitest
 email:
 - dconner.pro@gmail.com
@@ -90,7 +138,6 @@ files:
 - Procfile.example
 - README.md
 - Rakefile
-- lib/shoulda-matchers-pundit.rb
 - lib/shoulda/matchers/pundit.rb
 - lib/shoulda/matchers/pundit/minitest.rb
 - lib/shoulda/matchers/pundit/version.rb

data/lib/shoulda-matchers-pundit.rb

@@ -1,7 +0,0 @@
-module Shoulda
-  module Matchers
-    module Pundit
-      VERSION = "0.0.1"
-    end
-  end
-end