shamu 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cde1e60d3798de927cee92894d391d3387e1619
-  data.tar.gz: 204c11e52933dd2d88acb0e812d9e5183d3c09c0
+  metadata.gz: 984152520f292cc5454b58d1a2622cb4baa4b22c
+  data.tar.gz: 82fbc5924edd73df6e0111e9ad6a1f13226d1774
 SHA512:
-  metadata.gz: cb22139780ad29697e690025ad740b2cb1673b3486f854744182972f4ff382a873c7f362a59936b39c82788742c5e486237d7b29c4346acfd3f0a2532e97f582
-  data.tar.gz: 7d06c76f61740a24724d4261a3b72d9117a5e5f36d6c600168271981c3c45ce23d1e637a9b677809d3996229e0df616e573d3994997ecb54a20310bfa349c65f
+  metadata.gz: 1be5f5704edb9aee60b15c57379efb7c736179c54dc9fe4b4463ed1323ed31ccafe2a4311205a358071f5a34b14409897c73ad4760eda7970882091ae49395b5
+  data.tar.gz: 821a2d3666993ccf08ca3cbfb71292368ccf8153d719c1d9edfbbf514005c3769d94724a8d5e023be8859c70ed365db636127c5b0f7c004fca2da5750150c70b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shamu (0.0.19)
+    shamu (0.0.20)
       activemodel (>= 5.0)
       activesupport (>= 5.0)
       crc32 (~> 1)

data/lib/shamu/attributes.rb

@@ -117,6 +117,8 @@ module Shamu
       def build_value( build, value )
         if build.is_a?( Class )
           build.new( value )
+        elsif build.is_a?( Symbol )
+          value.send( build )
         else
           build.call( value )
         end

data/lib/shamu/attributes/equality.rb

@@ -4,8 +4,8 @@ module Shamu
     # Override equality methods to support shallow comparison of attribute
     # values for equality.
     #
-    # Add `ignore_inequality: true` to any {Attributes::DSL#attribute} that
-    # shouldn't be included in equalty comparisons.
+    # Add `ignore_equality: true` to any {Attributes::DSL#attribute} that
+    # shouldn't be included in equality comparisons.
     module Equality
 
       # @param [Attributes] other object to compare with.
@@ -30,11 +30,11 @@ module Shamu
         #     attributes are all `eql?` to each other.
         def attributes_eql?( other )
           self.class.attributes.all? do |key, attr|
-            next true if attr[:ignore_inequality]
+            next true if attr[:ignore_equality]
             send( key ).eql?( other.send( key ) )
           end
         end
 
     end
   end
-end
+end

data/lib/shamu/auditing/logging_auditing_service.rb

@@ -4,6 +4,17 @@ module Shamu
     # Writes audit logs to the {Shamu::Logger}.
     class LoggingAuditingService < AuditingService
 
+      # ============================================================================
+      # @!group Dependencies
+      #
+
+      # @!attribute
+      # @return [Shamu::Logger]
+      attr_dependency :logger, Shamu::Logger
+
+      #
+      # @!endgroup Dependencies
+
       # Records an auditable event in persistent storage.
       # @param [Transaction] transaction
       # @return [AuditRecord] the persisted record.

data/lib/shamu/entities/entity.rb

@@ -204,6 +204,7 @@ module Shamu
           def model( name, **args, &block )
             attribute( name, **args, &block )
             attributes[name][:model] = true
+            attributes[name][:ignore_equality] = true
             private name
           end
 

data/lib/shamu/features/features_service.rb

@@ -33,6 +33,10 @@ module Shamu
       # Read-only access to Rack and host ENV toggle overrides.
       attr_dependency :env_store, Shamu::Features::EnvStore
 
+      # @!attribute
+      # @return [Shamu::Logger]
+      attr_dependency :logger, Shamu::Logger
+
       #
       # @!endgroup Dependencies
 

data/lib/shamu/rails/controller.rb

@@ -21,12 +21,24 @@ module Shamu
           helper_method :permit?
           helper_method :current_user
         end
+
+        # In `included` block so that it overrides Scorpion controller method.
+
+        def prepare_scorpion( scorpion )
+          super
+
+          scorpion.prepare do |s|
+            s.hunt_for Shamu::Security::Principal do
+              security_principal
+            end
+          end
+        end
       end
 
       private
 
         # The currently logged in user. Must respond to #id when logged in.
-        def current_user
+        def current_user_id
         end
 
         # @!visibility public
@@ -67,7 +79,7 @@ module Shamu
         def security_principal
           @security_principal ||= begin
             Shamu::Security::Principal.new \
-              user_id: current_user && current_user.id,
+              user_id: current_user_id,
               remote_ip: remote_ip,
               elevated: session_elevated?
           end
@@ -89,15 +101,6 @@ module Shamu
         def session_elevated?
         end
 
-        def prepare_scorpion( scorpion )
-          super
-
-          scorpion.prepare do |s|
-            s.hunt_for Shamu::Security::Principal do
-              security_principal
-            end
-          end
-        end
 
       class_methods do
 

data/lib/shamu/security/policy.rb

@@ -115,7 +115,14 @@ module Shamu
 
         # Mapping of action names to aliases.
         def aliases
-          @aliases ||= {}
+          @aliases ||= default_aliases
+        end
+
+        def default_aliases
+          {
+            view: [ :read, :list ],
+            change: [ :create, :update, :destroy ]
+          }
         end
 
         # @!visibility public

data/lib/shamu/security/roles.rb

@@ -38,12 +38,17 @@ module Shamu
 
         private
 
-          def expand_roles_into( roles, expanded )
+          def expand_roles_into( roles, expanded ) # rubocop:disable Metrics/MethodLength
             raise "No roles defined for #{ name }" unless self.roles.present?
 
             roles.each do |name|
               name = name.to_sym
 
+              if name == :all
+                expanded.merge( self.roles.keys )
+                next
+              end
+
               next unless role = self.roles[ name ]
               expanded << name
 

data/lib/shamu/security/roles_service.rb

@@ -11,8 +11,10 @@ module Shamu
       end
 
       # @param [Principal] principal of the currently logged in user.
+      # @param [Boolean] reload to reload the roles from storage and bypass any
+      # caching.
       # @return [Array<Symbol>] the roles granted to the principal.
-      def roles_for( principal )
+      def roles_for( principal, reload: false )
         []
       end
 
@@ -27,4 +29,4 @@ module Shamu
       end
     end
   end
-end
+end

data/lib/shamu/services/error.rb

@@ -23,11 +23,13 @@ module Shamu
 
     class ServiceRequestFailedError < Error
       attr_reader :result
+      attr_reader :full_messages
 
       def initialize( result )
         @result = result
+        @full_messages = result.errors.full_messages.join( ", " )
 
-        super translate( :service_request_failed, errors: result.errors.full_messages.join( ", " ) )
+        super translate( :service_request_failed, errors: @full_messages )
       end
     end
   end

data/lib/shamu/services/service.rb

@@ -1,5 +1,4 @@
 require "scorpion"
-require "shamu/logger"
 
 module Shamu
   module Services
@@ -62,17 +61,6 @@ module Shamu
       # Support dependency injection for related services.
       include Scorpion::Object
 
-      # ============================================================================
-      # @!group Dependencies
-      #
-
-      # @!attribute
-      # @return [Shamu::Logger] the IO to dump logging info to.
-      attr_dependency :logger, Shamu::Logger
-
-      #
-      # @!endgroup Dependencies
-
       initialize do
       end
 

data/lib/shamu/version.rb

@@ -2,7 +2,7 @@
 
 module Shamu
   # The primary version number
-  VERSION_NUMBER  = "0.0.19"
+  VERSION_NUMBER  = "0.0.20"
 
   # Version suffix such as 'beta' or 'alpha'
   VERSION_SUFFIX  = ""

data/spec/lib/shamu/attributes/equality_spec.rb

@@ -8,7 +8,7 @@ describe Shamu::Attributes::Equality do
       include Shamu::Attributes::Equality
 
       attribute :name
-      attribute :random, ignore_inequality: true
+      attribute :random, ignore_equality: true
     end
   end
 
@@ -60,4 +60,4 @@ describe Shamu::Attributes::Equality do
 
     expect( v1 ).to eq v2
   end
-end
+end

data/spec/lib/shamu/rails/controller_spec.rb

@@ -43,7 +43,7 @@ describe Shamu::Rails::Controller, type: :controller do
     end
 
     it "gets security context from current_user" do
-      expect( controller ).to receive( :current_user ).at_least( :once ).and_return( OpenStruct.new( id: 945 ) )
+      expect( controller ).to receive( :current_user_id ).at_least( :once ).and_return( 945 )
 
       expect( controller ).to receive( :show ) do
         expect( scorpion.fetch( Shamu::Security::Principal ).user_id ).to eq 945

data/spec/lib/shamu/security/roles_spec.rb

@@ -26,6 +26,10 @@ describe Shamu::Security::Roles do
       end
     end
 
+    it "returns all roles for :all" do
+      expect( klass.expand_roles( :all ) ).to eq [ :admin, :manager, :user ]
+    end
+
     it "includes base roles" do
       expect( klass.expand_roles( :user ) ).to include :user
     end
@@ -43,4 +47,4 @@ describe Shamu::Security::Roles do
       expect( klass.expand_roles( :admin ) ).to include :user
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shamu
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Paul Alexander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-11 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel