Merge pull request #37 from ualbertalib/development

Add Opinionated Metadata functionality

.bundle/config

@@ -1,3 +1,2 @@
 ---
-BUNDLE_PATH: vendor
-BUNDLE_DISABLE_SHARED_GEMS: '1'
+BUNDLE_FROZEN: '1'

.gitignore

@@ -17,3 +17,4 @@
 /tmp
 APIauthentication.txt
 /vendor
+token.txt

Gemfile

@@ -48,3 +48,5 @@ gem "ebsco-discovery-service-api", "1.0.4"
 gem "addressable", "2.3.2"
 gem "htmlentities"
 gem "activerecord-session_store"
+
+gem "factory_girl", "~> 4.0", group: [:test, :development]

Gemfile.lock

@@ -71,6 +71,8 @@ GEM
     ensure_valid_encoding (0.5.3)
     erubis (2.7.0)
     execjs (2.2.1)
+    factory_girl (4.4.0)
+      activesupport (>= 3.0.0)
     ffi (1.9.3)
     hike (1.2.3)
     htmlentities (4.3.2)
@@ -184,6 +186,7 @@ DEPENDENCIES
   devise
   devise-guests (~> 0.3)
   ebsco-discovery-service-api (= 1.0.4)
+  factory_girl (~> 4.0)
   htmlentities
   jbuilder (~> 2.0)
   jettywrapper (~> 1.7)

app/controllers/application_controller.rb

@@ -9,4 +9,30 @@ class ApplicationController < ActionController::Base
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception
+
+  def after_sign_in_path_for(resource)
+    if session[:session_key].present?
+      connection = EDSApi::ConnectionHandler.new(2)
+      connection.end_session(session[:session_key])
+      session[:session_key] = nil
+    end
+    if session[:results].present?
+      session[:results] = nil
+    end
+    if session[:current_url].present?
+      session[:current_url]
+    end
+  end
+
+  def after_sign_out_path_for(resource)
+    if session[:session_key].present?
+      connection = EDSApi::ConnectionHandler.new(2)
+      connection.end_session(session[:session_key])
+      session[:session_key] = nil
+    end
+    if session[:results].present?
+      session[:results] = nil
+    end
+    root_path
+  end
 end

app/controllers/articles_controller.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+require 'blacklight/catalog'
+
+class ArticlesController < ApplicationController  
+  #before_filter :authenticate_user!
+
+  include Blacklight::Catalog
+
+end 

app/helpers/articles_helper.rb

@@ -0,0 +1,3 @@
+module ArticlesHelper
+  include Blacklight::ArticlesHelperBehavior
+end