softwear-lib 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07abbcd1086c6337273c1b6536c2f3ada2c817ca
-  data.tar.gz: afbd2b01e668364fd40d18e5f047a2297a824083
+  metadata.gz: aee29f7263adae53ab78fc85bbf5be053ab9e595
+  data.tar.gz: fb4122fcdf16d493d6458ccd6244b0389abed414
 SHA512:
-  metadata.gz: 44716bcb3a8898364f4092328fc8c59217eb834768678204395dc469316d1b0b28ce27437f6df7ec650b7d15ecf5075ac004f4697d312611b2b77d16f97bee7f
-  data.tar.gz: 4d54bb27f4ece39a7132503fa59759eca15fc39c337d8d1f16f513cad1367d7bf5a10f5a6cd631432af9b612fb122c1e3c02886c2c0074a94f35b31a74da6bad
+  metadata.gz: 1d9e0af480f85c41f40b64c63e26d1c6de7bc8a061117673373fe3889e7c606be2e49ab664a3f53296141be71c0a3a2a2bbdb470113a9008546d8f7ce6d4d975
+  data.tar.gz: 1eaf5225a3240a1e6d0b7953ce33ebab100cb836bf9388dcafc899ba84581a4feaf505cc87ca26696052f54fc443d668320fc12870e5a8e1a22c95a4c4149b0e

data/lib/softwear/auth/controller.rb

@@ -3,6 +3,10 @@ module Softwear
     class Controller < ApplicationController
       skip_before_filter :authenticate_user!, only: [:set_session_token, :clear_query_cache]
 
+      def self.abstract_class?
+        true
+      end
+
       # ====================
       # Comes from an img tag on softwear-hub to let an authorized app know that
       # a user has signed in.

data/lib/softwear/auth/model.rb

@@ -15,6 +15,10 @@ module Softwear
 
       # ============================= CLASS METHODS ======================
       class << self
+        def abstract_class?
+          true
+        end
+
         attr_writer :query_cache
         attr_accessor :total_query_cache
         attr_writer :query_cache_expiry

data/lib/softwear/auth/spec.rb

@@ -0,0 +1,58 @@
+module Softwear
+  module Auth
+    module Spec
+      def spec_users
+        User.instance_variable_get(:@_spec_users)
+      end
+
+      def stub_authentication!(config, *a)
+        config.before(:each, *a) do
+          User.instance_variable_set(:@_spec_users, [])
+
+          allow(User).to receive(:all)   { spec_users }
+          allow(User).to receive(:find)  { |n| spec_users.find { |u| u.id == n } }
+          allow(User).to receive(:auth)  { @_signed_in_user or false }
+          allow(User).to receive(:raw_query) { |q| raise "Unstubbed authentication query \"#{q}\"" }
+
+          allow_any_instance_of(Softwear::Lib::ControllerAuthentication)
+            .to receive(:user_token)
+            .and_return('')
+
+          if (controller rescue false)
+            allow(controller).to receive(:current_user) { @_signed_in_user }
+            controller.class_eval { helper_method :current_user }
+
+            allow(controller).to receive(:user_signed_in?) { !!@_signed_in_user }
+            controller.class_eval { helper_method :user_signed_in? }
+
+            allow(controller).to receive(:destroy_user_session_path) { '#' }
+            controller.class_eval { helper_method :destroy_user_session_path }
+
+            allow(controller).to receive(:users_path) { '#' }
+            controller.class_eval { helper_method :users_path }
+
+            allow(controller).to receive(:edit_user_path) { '#' }
+            controller.class_eval { protected; helper_method :edit_user_path }
+          end
+        end
+
+        config.after(:each, *a) do
+          User.instance_variable_set(:@_spec_users, nil)
+        end
+      end
+
+      def sign_in_as(user)
+        @_signed_in_user = user
+
+        allow_any_instance_of(Softwear::Lib::ControllerAuthentication)
+          .to receive(:user_token).and_return 'abc123'
+
+        if respond_to?(:session) && session.respond_to?(:[]=)
+          session[:user_token] = 'abc123'
+        end
+      end
+      alias_method :sign_in, :sign_in_as
+      alias_method :login_as, :sign_in_as
+    end
+  end
+end

data/lib/softwear/lib.rb

@@ -6,6 +6,7 @@ require "softwear/lib/controller_authentication"
 require "softwear/auth/helper"
 require "softwear/auth/model"
 require "softwear/auth/belongs_to_user"
+require "softwear/auth/spec"
 
 module Softwear
   module Lib

data/lib/softwear/lib/controller_authentication.rb

@@ -42,8 +42,15 @@ module Softwear
         respond_to do |format|
           format.html do
             render inline: \
-              "<h1>#{error.message}</h1><div>Not all site functions will work until the problem is resolved. "\
-              "<a href='javascripr' onclick='history.go(-1);return false;' class='btn btn-default'>Go back.</a></div>"
+              "<div class='panel panel-danger'>"\
+                "<div class='panel-heading'>"\
+                  "<h3 class='panel-title'>#{error.message}</h3>"\
+                "</div>"\
+                "<div class='panel-body'>"\
+                  "Not all site functions will work until the problem is resolved. "\
+                  "<a href='javascripr' onclick='history.go(-1);return false;' class='btn btn-default'>Go back.</a>"\
+                "</div>"\
+              "</div>"
           end
 
           format.js do
@@ -57,16 +64,14 @@ module Softwear
       # just like in Devise.
       # ====================
       def authenticate_user!
-        token = session[:user_token]
-
-        if token.blank?
+        if user_token.blank?
           raise NotSignedInError, "No token"
         end
 
-        if user = user_class.auth(token)
+        if user = user_class.auth(user_token)
           @current_user = user
         else
-          session[:user_token] = nil
+          self.user_token = nil
           raise NotSignedInError, "Invalid token"
         end
       end
@@ -98,6 +103,16 @@ module Softwear
       def users_path
         Figaro.env.softwear_hub_url + "/users"
       end
+
+      private
+
+      def user_token
+        session[:user_token]
+      end
+
+      def user_token=(new_token)
+        session[:user_token] = new_token
+      end
     end
   end
 end

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Nigel Baillie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ files:
 - lib/softwear/auth/controller.rb
 - lib/softwear/auth/helper.rb
 - lib/softwear/auth/model.rb
+- lib/softwear/auth/spec.rb
 - lib/softwear/lib.rb
 - lib/softwear/lib/api_controller.rb
 - lib/softwear/lib/authentication.rb