softwear-lib 1.5.8 → 1.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0b0ffdf353b1125791532b04b4c69178f3848d
-  data.tar.gz: b5ffb662dafdbd0ced2e2b3fda77c68314ed4a9e
+  metadata.gz: 20165a6e28e50bf2343b3616f440fe581c249b4d
+  data.tar.gz: 6f50638cdade6f465fc5d92372c4181f877d3718
 SHA512:
-  metadata.gz: 51397655427dfd487c7690028a486f73e2b35bd4a5fa4bfd7a92b02a3b5f1cfe651d63d26238c4f5d0e5f3620e263264d8535abc8eb6f2bf9678921354fda310
-  data.tar.gz: 536a85856023e46c1897ba453764710d257cc940beb5923b6510c1f3ff9ffaf40ab7c605443a469f927c9b3f4d0c6c25720f6ca64a43f537e16a3d36d2447a65
+  metadata.gz: a67cfdbec3d95464d2c551420582fc65d7bad6083dd03b2602b04db2c12a9f0335b802c0a686b3a06fd88513184423bbafd07cf9339d918d6151afd29db1d699
+  data.tar.gz: 34f0a721a49c5e7cad13e9673b9767251f516b3a050b186b79c002e72fe4cc00f89b6b335f7454b073f0090cfbee06721033ad47043bef380e0539000a494a8b

data/lib/softwear/auth/spec.rb

@@ -14,6 +14,8 @@ module Softwear
           allow(User).to receive(:auth)  { @_signed_in_user or false }
           allow(User).to receive(:raw_query) { |q| raise "Unstubbed authentication query \"#{q}\"" }
 
+          allow(Figaro.env).to receive(:softwear_hub_url).and_return 'http://hub.example.com'
+
           allow_any_instance_of(Softwear::Lib::ControllerAuthentication)
             .to receive(:user_token)
             .and_return('')

data/lib/softwear/lib/version.rb

@@ -1,5 +1,5 @@
 module Softwear
   module Lib
-    VERSION = "1.5.8"
+    VERSION = "1.5.9"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: softwear-lib
 version: !ruby/object:Gem::Version
-  version: 1.5.8
+  version: 1.5.9
 platform: ruby
 authors:
 - Nigel Baillie
@@ -91,7 +91,6 @@ files:
 - lib/softwear/auth/token_authentication.rb
 - lib/softwear/lib.rb
 - lib/softwear/lib/api_controller.rb
-- lib/softwear/lib/authentication.rb
 - lib/softwear/lib/capistrano.rb
 - lib/softwear/lib/controller_authentication.rb
 - lib/softwear/lib/spec.rb

data/lib/softwear/lib/authentication.rb

@@ -1,103 +0,0 @@
-module Softwear
-  module Lib
-    module ControllerAuthentication
-      extend ActiveSupport::Concern
-
-      class NotSignedInError < StandardError
-      end
-
-      included do
-        rescue_from NotSignedInError, with: :user_not_signed_in
-        rescue_from Softwear::Auth::Model::AuthServerDown, with: :auth_server_down
-
-        helper_method :current_user
-        helper_method :user_signed_in?
-
-        helper_method :destroy_user_session_path
-        helper_method :users_path
-        helper_method :user_path
-        helper_method :edit_user_path
-      end
-
-      def user_class
-        if Softwear::Auth::Model.descendants.size > 1
-          raise "More than one descendent of Softwear::Auth::Model is not supported."
-        elsif Softwear::Auth::Model.descendants.size == 0
-          raise "Please define a user model that extends Softwear::Auth::Model."
-        end
-        Softwear::Auth::Model.descendants.first
-      end
-
-      # ====================
-      # Action called when a NotSignedInError is raised.
-      # ====================
-      def user_not_signed_in
-        redirect_to Figaro.env.softwear_hub_url + "/users/sign_in?#{{return_to: request.original_url}.to_param}"
-      end
-
-      # ====================
-      # Action called when a NotSignedInError is raised.
-      # ====================
-      def auth_server_down(error)
-        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>"
-          end
-
-          format.js do
-            render inline: "alert(\"#{error.message.gsub('"', '\"')}\");"
-          end
-        end
-      end
-
-      # ====================
-      # Drop this into a before_filter to require a user be signed in on every request -
-      # just like in Devise.
-      # ====================
-      def authenticate_user!
-        token = session[:user_token]
-
-        if token.blank?
-          raise NotSignedInError, "No token"
-        end
-
-        if user = user_class.auth(token)
-          @current_user = user
-        else
-          session[:user_token] = nil
-          raise NotSignedInError, "Invalid token"
-        end
-      end
-
-      def current_user
-        @current_user
-      end
-
-      def user_signed_in?
-        !@current_user.nil?
-      end
-
-      # -- url uelpers --
-
-      def destroy_user_session_path
-        Figaro.env.softwear_hub_url + "/users/sign_out"
-      end
-
-      def user_path(user)
-        user_id = user.is_a?(user_class) ? user.id : user
-        Figaro.env.softwear_hub_url + "/users/#{user_id}"
-      end
-
-      def edit_user_path(user)
-        user_id = user.is_a?(user_class) ? user.id : user
-        Figaro.env.softwear_hub_url + "/users/#{user_id}/edit"
-      end
-
-      def users_path
-        Figaro.env.softwear_hub_url + "/users"
-      end
-    end
-  end
-end