ostiary 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ac43974292700caba182663ecbd1f8993b9df1f5ed1e29205f2f35fb31f4bc
-  data.tar.gz: b05dba4a650386ae4ab6c83d15e0bfb613a8bffe7994406b3cee6c70f427bf06
+  metadata.gz: 0b7ce83b09324ad3a1c1007d3dd1267c623f763867baccb06cc6e03f951090e1
+  data.tar.gz: 875b2111b2b9ff647371bbaaf4c969b975b3e1a5839a64e4d3785519c6a991aa
 SHA512:
-  metadata.gz: 27cea053af1915dd68430018d7f9bc66b000e39f14bb4e9b40920b1304dd33a149c748b9123e03382e8c335623a06d0ccf36b3043dee73ca8f44e3b65f9d534a
-  data.tar.gz: 49d80a51225c39c24184e63b30b66815a3785825115d4bfd10e47c320482a49f1a380cf3523877d3016323b242eea3737e77f125f338919c1dc18bfaabfe0e9c
+  metadata.gz: 6d5eec55afa4931f62b9d6b6c850967e49c9d0d5047c923167e7c3eafb3b4c0e1dbaaeb7cf66fbe7dd6b743254b9c057494e895ce85df6d47a36ac7646c792be
+  data.tar.gz: 97c50c8c0828bf690470af0bcbf7446252fd94a8905c85eb2e12db7824421192f28d18c9afa40336b21b40c6c0424e288c1abf92a0c64ce369291868cd80df4e

data/.gitignore

@@ -0,0 +1,53 @@
+*.gem
+*.rbc
+.rspec_status
+/.config
+/coverage/
+/InstalledFiles
+/pkg/
+/spec/reports/
+/spec/examples.txt
+/test/tmp/
+/test/version_tmp/
+/tmp/
+
+# Used by dotenv library to load environment variables.
+# .env
+
+## Specific to RubyMotion:
+.dat*
+.repl_history
+build/
+*.bridgesupport
+build-iPhoneOS/
+build-iPhoneSimulator/
+
+## Specific to RubyMotion (use of CocoaPods):
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# vendor/Pods/
+
+## Documentation cache and generated files:
+/.yardoc/
+/_yardoc/
+/doc/
+/rdoc/
+
+## Environment normalization:
+/.bundle/
+/vendor/bundle
+/lib/bundler/man/
+
+# for a library or gem, you might want to ignore these files since the code is
+# intended to run in multiple environments; otherwise, check them in:
+Gemfile.lock
+# .ruby-version
+# .ruby-gemset
+
+# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
+.rvmrc
+
+.DS_Store

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--profile

data/lib/ostiary/controller_helper.rb

@@ -28,15 +28,21 @@ module Ostiary
       # Exclude action(s) from requiring a role
       #  except: [*actions]
       # By default a given role will be required for every action
-      #
+      # Override role checking by passing a symbol as method;
+      #   ostiary_policy method: :master?, only: :show
       # One line creates one policy, which are immediately created with the proper class
-      def ostiary_policy(role, actions = {})
+      def ostiary_policy(role = nil, only: nil, except: nil, method: nil)
+        raise ArgumentError, "Use at least role or method" unless method || role
+        raise ArgumentError, "Use either role or method"       if method && role
+        raise ArgumentError, "Use either only or except"       if except && only
+        raise ArgumentError, "Use a symbol for method:"        if method && !(method.is_a? Symbol)
+
         if actions.empty?
-          self.ostiary.policies << Policy.new(role)
-        elsif actions.has_key?(:only)
-          self.ostiary.policies << PolicyLimited.new(role, actions[:only])
-        elsif actions.has_key?(:except)
-          self.ostiary.policies << PolicyExempted.new(role, actions[:except])
+          ostiary.policies << Policy.new(role, method: method&.to_proc)
+        elsif only
+          ostiary.policies << PolicyLimited.new(role, only, method: method&.to_proc)
+        elsif except
+          ostiary.policies << PolicyExempted.new(role, except, method: method&.to_proc)
         end
       end
 

data/lib/ostiary/ostiary.rb

@@ -6,24 +6,18 @@ module Ostiary
       @policies = []
     end
 
-    def authorize!(action)
+    def authorize!(action, &block)
       policies.each do |policy|
-        next if policy_met?(policy, action, &Proc.new)
+        next if policy.met?(action, block)
         raise PolicyBroken, policy.error_message(action)
       end
     end
 
-    def authorized?(action)
+    def authorized?(action, &block)
       policies.all? do |policy|
-        policy_met?(policy, action, &Proc.new)
+        policy.met?(action, block)
       end
     end
 
-    private
-
-    def policy_met?(policy, action)
-      policy.met?(action) { yield(policy.name) }
-    end
-
   end
 end

data/lib/ostiary/policy.rb

@@ -1,18 +1,20 @@
 module Ostiary
   class Policy
-    attr_accessor :name, :rules
+    attr_reader :name, :method, :actions
 
-    def initialize(name, rules = [])
-      @name   = name
-      @rules  = rules || []
+    def initialize(name, actions = [], method: nil)
+      @name = name
+      @method = method
+      @actions = actions
     end
 
     def inspect
       "#{name}"
     end
 
-    def met?(*)
-      yield
+    def met?(_action)
+      return yield name unless method
+      method.call
     end
 
     def error_message(action)

data/lib/ostiary/policy_exempted.rb

@@ -2,12 +2,12 @@ module Ostiary
   class PolicyExempted < Policy
 
     def inspect
-      "#{name} except for #{rules.to_sentence}"
+      "#{name} except for #{actions.to_sentence}"
     end
 
     def met?(action)
-      return true if rules.include?(action)
-      yield
+      return true if actions.include?(action)
+      super
     end
 
     def error_message(action)

data/lib/ostiary/policy_limited.rb

@@ -2,12 +2,12 @@ module Ostiary
   class PolicyLimited < Policy
 
     def inspect
-      "#{name} only for #{rules.to_sentence}"
+      "#{name} only for #{actions.to_sentence}"
     end
 
     def met?(action)
-      return true if !rules.include?(action)
-      yield
+      return true unless actions.include?(action)
+      super
     end
 
     def error_message(action)

data/lib/ostiary/version.rb

@@ -1,3 +1,3 @@
 module Ostiary
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ostiary
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Jacques Hakvoort
@@ -67,11 +67,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,35 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ostiary (0.9.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.13)
-  ostiary!
-  rake (~> 10.0)
-  rspec (~> 3.0)
-
-BUNDLED WITH
-   1.16.1