simon_says 0.3.0.alpha.5 → 0.3.0.alpha.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3abfdc67fe4a00391a5a167d425db7cda7e855c316b00a724d1f452114af6c68
-  data.tar.gz: c14a9de36943db2c6059b8ea6a41063ad99a704a0964c38600a99ebb3687a170
+  metadata.gz: 1dd25d86d02036d68ac186879af756e9544030505f5658b3f7be735f124b2138
+  data.tar.gz: 46e3848c3c5f0c211bdef99a9debc35bcafe96736c9fb480e231c7d923681a55
 SHA512:
-  metadata.gz: ac1930289951138e3bee481d6f09a44b3f5b3878e4b19685167614add7ceff33e1ebb409ec67f382dd3985ba9970373ff3ddac316b97b82443c383d16bc3a7b6
-  data.tar.gz: 9be3fd968195386735821c2ab17b02ce59de685788ad54cc5ded492368e6c2bc2e92f36f77a4b61c1924a78d052ca7b1d0283770957ed8702651f89968839108
+  metadata.gz: fc17c0dfd266893558bfbe1897fee2b475cde52d9a465495e8b4790a0d90f11ed499689e9f0444fc2e2f39b7ff55e7882caf830cccdc91e2073df0dca855be26
+  data.tar.gz: d55a0a2cb7f053505dde303d53b700fb63db896bfb085f951eac341daf9eac986fd6b6ca08d4a7bda54b56d53e7dfa2bdbce08c6aad101907b2b93f19f52ff55

data/.travis.yml

@@ -6,7 +6,7 @@ before_install:
 install: bundle install --jobs=3 --retry=3
 rvm:
   - "2.6.3"
-  - "2.5.4"
+  - "2.5.5"
   - "2.4.6"
 script:
   - bundle exec rake test

data/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+
+$: << File.expand_path('../lib', __dir__) if ENV['DEBUG'] == 'true'
+require 'simon_says'
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require 'irb'
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/config/locales/en.yml

@@ -0,0 +1,16 @@
+en:
+  simon_says:
+    denied:
+      warning: Access denied;
+      array_connector:
+        two_words_connector: ' or '
+        last_word_connector: ', or '
+
+      required:
+        one: '%{list} is required'
+        other: '%{list} are required'
+
+      explanation:
+        zero: '%{warning} %{required}, however you have no %{role_attr} set'
+        one: '%{warning} %{required}, however you have %{actual} %{role_attr} set'
+        other: '%{warning} %{required}, however you have %{actual} %{role_attr} set'

data/lib/simon_says.rb

@@ -1,5 +1,18 @@
 require 'active_support'
+require 'active_support/core_ext'
 
 require "simon_says/version"
 require "simon_says/roleable"
 require "simon_says/authorizer"
+
+begin
+  require 'i18n' unless defined? I18n
+
+  if defined? I18n
+    I18n.load_path += Dir[File.join(
+      File.expand_path(File.join('..', 'config', 'locales'), __dir__), '*.yml'
+    )]
+  end
+rescue LoadError
+  # do nothing
+end

data/lib/simon_says/authorizer.rb

@@ -3,12 +3,30 @@ module SimonSays
     extend ActiveSupport::Concern
 
     class Denied < StandardError
-      # @private
-      def initialize(as, required, actual)
-        # TODO i18n for err message (as should be singluarized with 1 flag)
-        current_access = actual.empty? ? 'empty' : actual.join(', ')
+      attr_reader :role_attr
 
-        super "Access denied; #{required * ', '} #{as} is required. Current access is #{current_access}"
+      # @private
+      def initialize(role_attr, required, actual)
+        @role_attr = role_attr
+
+        if defined? I18n
+          required_text = I18n.translate(
+            'simon_says.denied.required',
+            count: required.size,
+            list: required.to_sentence(I18n.translate('simon_says.denied.array_connector'))
+          )
+
+          super I18n.translate(
+            'simon_says.denied.explanation',
+            count: actual.size,
+            role_attr: @role_attr,
+            warning: I18n.translate('simon_says.denied.warning'),
+            actual: actual.to_sentence,
+            required: required_text
+          )
+        else
+          super "Access denied; required=#{required.inspect} current_access=#{actual.inspect}"
+        end
       end
     end
 

data/lib/simon_says/version.rb

@@ -1,3 +1,3 @@
 module SimonSays
-  VERSION = '0.3.0.alpha.5'
+  VERSION = '0.3.0.alpha.6'
 end

data/test/simon_says/authorizer_denied_test.rb

@@ -0,0 +1,75 @@
+require 'test_helper'
+
+class AuthorizerAccessDeniedTest < ActiveSupport::TestCase
+  test 'one required and none set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo), [])
+
+    assert_equal 'Access denied; foo is required, however you have no roles set', err.message
+  end
+
+  test 'two required and none set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar), [])
+
+    assert_equal 'Access denied; foo or bar are required, however you have no roles set', err.message
+  end
+
+  test 'three required and none set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar baz), [])
+
+    assert_equal 'Access denied; foo, bar, or baz are required, however you have no roles set', err.message
+  end
+
+  test 'one required and one set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo), %w(qux))
+
+    assert_equal 'Access denied; foo is required, however you have qux roles set', err.message
+  end
+
+  test 'two required and one set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar), %w(qux))
+
+    assert_equal 'Access denied; foo or bar are required, however you have qux roles set', err.message
+  end
+
+  test 'three required and one set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar baz), %w(qux))
+
+    assert_equal 'Access denied; foo, bar, or baz are required, however you have qux roles set', err.message
+  end
+
+  test 'one required and two set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo), %w(qux quux))
+
+    assert_equal 'Access denied; foo is required, however you have qux and quux roles set', err.message
+  end
+
+  test 'two required and two set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar), %w(qux quux))
+
+    assert_equal 'Access denied; foo or bar are required, however you have qux and quux roles set', err.message
+  end
+
+  test 'three required and two set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar baz), %w(qux quux))
+
+    assert_equal 'Access denied; foo, bar, or baz are required, however you have qux and quux roles set', err.message
+  end
+
+  test 'one required and three set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo), %w(qux quux quuz))
+
+    assert_equal 'Access denied; foo is required, however you have qux, quux, and quuz roles set', err.message
+  end
+
+  test 'two required and three set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar), %w(qux quux quuz))
+
+    assert_equal 'Access denied; foo or bar are required, however you have qux, quux, and quuz roles set', err.message
+  end
+
+  test 'three required and three set' do
+    err = SimonSays::Authorizer::Denied.new(:roles, %w(foo bar baz), %w(qux quux quuz))
+
+    assert_equal 'Access denied; foo, bar, or baz are required, however you have qux, quux, and quuz roles set', err.message
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simon_says
 version: !ruby/object:Gem::Version
-  version: 0.3.0.alpha.5
+  version: 0.3.0.alpha.6
 platform: ruby
 authors:
 - Michael Coyne
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -106,7 +106,9 @@ description: This gem is a simple, easy-to-use declarative role-based access con
   system for Rails
 email:
 - mikeycgto@gmail.com
-executables: []
+executables:
+- console
+- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -120,6 +122,9 @@ files:
 - README.md
 - Rakefile
 - SimonSays.png
+- bin/console
+- bin/setup
+- config/locales/en.yml
 - lib/generators/active_record/simon_says_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/simon_says.rb
@@ -217,6 +222,7 @@ files:
 - test/rails_app/test/test_helper.rb
 - test/rails_app/vendor/assets/javascripts/.keep
 - test/rails_app/vendor/assets/stylesheets/.keep
+- test/simon_says/authorizer_denied_test.rb
 - test/simon_says/authorizer_test.rb
 - test/simon_says/roleable_test.rb
 - test/simon_says_test.rb
@@ -335,6 +341,7 @@ test_files:
 - test/rails_app/test/test_helper.rb
 - test/rails_app/vendor/assets/javascripts/.keep
 - test/rails_app/vendor/assets/stylesheets/.keep
+- test/simon_says/authorizer_denied_test.rb
 - test/simon_says/authorizer_test.rb
 - test/simon_says/roleable_test.rb
 - test/simon_says_test.rb