umlaut 3.0.3 → 3.0.4

data/README.md

@@ -45,3 +45,5 @@ https://github.com/team-umlaut/umlaut/
 
 You can join the umlaut listserv at:
 http://rubyforge.org/mail/?group_id=4382
+
+## Build Status [![Build Status](https://secure.travis-ci.org/team-umlaut/umlaut.png)](http://travis-ci.org/team-umlaut/umlaut)

data/app/assets/javascripts/umlaut/ajax_windows.js.coffee

@@ -0,0 +1,23 @@
+# ajax_windows.js.  Support for modal popup windows in Umlaut items.
+$ ->
+  shared_modal_d = $("<div></div>").dialog({autoOpen: false, modal: true, width: "400px"})
+  $("a.ajax_window").live "click", (event)->                
+      $(shared_modal_d).load this.href, ->
+          heading = shared_modal_d.find("h1, h2, h3, h4, h5, h6").eq(0).remove()
+          $(shared_modal_d).dialog "option", "title", heading.text()
+          $(shared_modal_d).dialog "open" 
+      false
+
+  ajax_form_catch = (event) ->
+    $(shared_modal_d).load $(event.target).closest("form").attr("action"), $(event.target).closest("form").serialize(), ->
+        heading = shared_modal_d.find("h1, h2, h3, h4, h5, h6").eq(0).remove()
+        $(shared_modal_d).dialog "option", "title", heading.text()
+        $(shared_modal_d).dialog "open"
+    return false;
+
+  # # Trapping two events, click on the submit button or submit on the form
+  # # is strangely needed in IE7 to trap both return-in-field submits
+  # # and click-on-button submits. In FF just the second "submit" version
+  # # is sufficient. 
+  $("form.modal_dialog_form input[type=submit]").live "click", ajax_form_catch
+  $("form.modal_dialog_form").live "submit", ajax_form_catch 

data/app/controllers/export_email_controller.rb

@@ -2,11 +2,10 @@ class ExportEmailController < UmlautController
   
   before_filter :load_objects
   layout Proc.new { |controller|         
-     if (controller.request.xhr? ||
-         controller.params["X-Requested-With"] == "XmlHttpRequest")
+     if (controller.request.xhr? || controller.params["X-Requested-With"] == "XmlHttpRequest")
        nil
      else
-       config.layout
+       umlaut_config.layout
      end
   }
 
@@ -16,108 +15,78 @@ class ExportEmailController < UmlautController
   end
   
   def email    
-
   end 
   
   def txt    
-
   end
     
   def send_email
     @email = params[:email]
     @fulltexts = @user_request.get_service_type('fulltext', { :refresh=>true })
     @holdings = @user_request.get_service_type('holding', { :refresh=>true })
-    
-      if valid_email?
-        Emailer.citation(@email, @user_request, @fulltexts, @holdings).deliver 
-        respond_to do |format|
-          format.html {  render }
-        end
-      else
-        @partial = "email"
-        flash[:error] = email_validation_error
-        redirect_to params_preserve_xhr(params.merge(:action => "email"))        
+    if valid_email?
+      Emailer.citation(@email, @user_request, @fulltexts, @holdings).deliver 
+      respond_to do |format|
+        format.html {  render }
       end
-    
+    else
+      @partial = "email"
+      flash[:error] = email_validation_error
+      redirect_to params_preserve_xhr(params.merge(:action => "email"))        
+    end
   end
   
   def send_txt
     @number = params[:number]
     # Remove any punctuation or spaces etc
     @number.gsub!(/[^\d]/, '') if @number
-
-    
     @provider = params[:provider]
-    
     @email = "#{@number}@#{@provider}" unless @number.nil? or @provider.nil?
-
     @holding_id = params[:holding]
-    
-      if valid_txt_number? && valid_txt_holding?
-        Emailer.short_citation(@email, @user_request, location(@holding_id), call_number(@holding_id)).deliver 
-
-        render # send_txt.rhtml       
-      else        
-        flash[:error] = txt_validation_error        
-        redirect_to params_preserve_xhr(params.merge(:action => "txt"))
-      end    
+    if valid_txt_number? && valid_txt_holding?
+      Emailer.short_citation(@email, @user_request, holding_location(@holding_id), call_number(@holding_id)).deliver 
+      render # send_txt.rhtml       
+    else        
+      flash[:error] = txt_validation_error        
+      redirect_to params_preserve_xhr(params.merge(:action => "txt"))
+    end    
   end
   
   private
-    def valid_txt_number?
-      return (! @number.blank?) && @number.length == 10
-    end
+  def valid_txt_number?
+    return (! @number.blank?) && @number.length == 10
+  end
 
-    def valid_txt_holding?
-       return ! @holding_id.blank?
-    end
-    
-    def valid_email?
-      return @email =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-    end
-    
+  def valid_txt_holding?
+     return ! @holding_id.blank?
+  end
+  
+  def valid_email?
+    return @email =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  end
   
   def txt_validation_error
-    rv = ""
-    unless valid_txt_number? && valid_txt_holding?
-      rv += "<div class=\"validation_errors\">"
-      rv += "<span>Please provide the following:</span>"
-      rv += "<ul>"
-      rv += "<li>a valid number</li>" unless valid_txt_number?
-      rv += "<li>the item you wish to send</li>" unless valid_txt_holding?
-      rv += "</ul>"
-      rv += "</div>"
-    end
-    return rv
+    errors = []
+    errors << "a valid number" unless valid_txt_number?
+    errors << "the item you wish to send" unless valid_txt_holding?
+    errors
   end
   
   def email_validation_error
-    rv = ""
-    unless valid_email?
-      rv += "<div class=\"validation_errors\">"
-      rv += "<span>Please provide the following:</span>"
-      rv += "<ul>"
-      rv += "<li>a valid email address</li>"
-      rv += "</ul>"
-      rv += "</div>"
-    end
-    return rv
+    errors = []
+    errors << "a valid email address"
+    errors
   end
 
   def holding(id)
     return ServiceResponse.find(id) unless id.nil?
   end
   
-  def location(id)
+  def holding_location(id)
     return holding(id).view_data[:collection_str] unless holding(id).nil?
   end
     
   def call_number(id)
     return holding(id).view_data[:call_number] unless holding(id).nil?
   end
-
-
-
-
- 
-end
+end

data/app/controllers/search_controller.rb

@@ -288,13 +288,13 @@ class SearchController < UmlautController
   end
 
   def search_method_module
-    umlaut_config.lookup!("az_search_method", SearchMethods::Sfx4)
+    umlaut_config.lookup!("search.az_search_method", SearchMethods::Sfx4)
   end
   
   # sfx a-z profile as defined in config, used for direct db connections
   # to sfx. 
   def sfx_az_profile
-    umlaut_config.lookup!("sfx_az_profile", "default")
+    umlaut_config.lookup!("search.sfx_az_profile", "default")
   end
   helper_method :sfx_az_profile
   

data/app/helpers/export_email_helper.rb

@@ -3,18 +3,14 @@ module ExportEmailHelper
   
   def formatted_txt_holding_status(view_data)
     output = ""
-
     output << view_data[:collection_str] if view_data[:collection_str]
     output << " " + view_data[:call_number] if view_data[:call_number]
     output << " " + view_data[:status] if view_data[:status]
-    
     return output
   end
 
   def formatted_html_holding_status(view_data)
     output = "".html_safe
-
-    
     if view_data[:collection_str]
       output << content_tag("span", view_data[:collection_str], :class => "collection") 
     end
@@ -24,11 +20,19 @@ module ExportEmailHelper
     if view_data[:status]
       output << " ".html_safe << content_tag("span", view_data[:status], :class => "status")
     end
-      
     return output
   end
 
-
-
-  
-end
+  def validation_error(errors)
+    return content_tag(:div, :class => "validation_errors") do
+      return content_tag(:span, "Please provide the following:") + 
+        content_tag(:ul) do 
+          e = "".html_safe
+          errors.each do |error|
+            e << content_tag(:li, error)
+          end
+          e
+        end
+    end
+  end
+end

data/app/models/referent_value.rb

@@ -1,4 +1,5 @@
 class ReferentValue < ActiveRecord::Base
+  attr_accessible :key_name, :value, :normalized_value, :metadata, :private_data
   belongs_to :referent, :include => :referent_values
 
   # Class method to normalize a string for normalized_value attribute. 

data/app/models/sfx_db/az_title.rb

@@ -3,15 +3,17 @@ module SfxDb
     self.table_name = 'AZ_TITLE_VER3'
     self.primary_key = 'AZ_TITLE_VER3_ID'
 
-    belongs_to :object,
-               :foreign_key => 'OBJECT_ID',
-               :class_name => "SfxDb::Object"
-
+    belongs_to  :object,
+                :foreign_key => 'OBJECT_ID',
+                :class_name => "SfxDb::Object"
+               
     has_many  :az_additional_titles,
-               :foreign_key => 'AZ_TITLE_VER3_ID'
-    has_many  :az_letter_groups,
-               :foreign_key => 'AZ_TITLE_VER3_ID'
+              :foreign_key => 'AZ_TITLE_VER3_ID',
+              :class_name => "SfxDb::AzAdditionalTitle"
 
+    has_many  :az_letter_groups,
+              :foreign_key => 'AZ_TITLE_VER3_ID',
+              :class_name => "SfxDb::AzLetterGroup"
 
     def to_context_object
       #require 'openurl'

data/app/models/sfx_db/target.rb

@@ -3,7 +3,8 @@ module SfxDb
       self.table_name = 'TARGET'
       self.primary_key = 'INTERNAL_ID'
 
-      has_many :target_services,
-               :foreign_key => 'TARGET'
+      has_many  :target_services,
+                :foreign_key => 'TARGET',
+                :class_name => "SfxDb::TargetService"
   end
 end

data/app/views/export_email/_email.html.erb

@@ -7,7 +7,7 @@ cite = @user_request.referent.to_citation %>
   <h2>Email the title and locations</h2>
   
   <div class="formError">
-    <%= @error || flash[:error] %>
+    <%= validation_error( @error || flash[:error]) if ( @error || flash[:error]) %>
   </div>
   
   <h3><strong>Title:</strong> <%= h(cite[:title]) %>/<%= h(cite[:author]) %></h3>

data/app/views/export_email/_txt.html.erb

@@ -7,7 +7,7 @@ unless @user_request.nil?
   <h2>Send the title and location of an item to your mobile phone</h2>
   
   <div class="formError">
-    <%= @error || flash[:error] %>
+    <%= validation_error( @error || flash[:error]) if ( @error || flash[:error]) %>
   </div>
   
   <h3><strong>Title:</strong> 

data/lib/service_adaptors/primo_source.rb

@@ -54,7 +54,7 @@ class PrimoSource < PrimoService
           service_data[attr] = holding.method(attr).call
         end
         @source_attributes.each do |attr|
-          service_data[attr.to_sym] = holding.method(attr.to_sym).call
+          service_data[attr.to_sym] = holding.method(attr.to_sym).call if holding.respond_to?(attr.to_sym)
         end
         service_data.merge!({
           :call_number => holding.call_number, :collection => holding.collection,

data/lib/umlaut/version.rb

@@ -1,3 +1,3 @@
 module Umlaut
-  VERSION = "3.0.3"
+  VERSION = "3.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -304,8 +304,8 @@ files:
 - app/assets/images/error.gif
 - app/assets/javascripts/umlaut_ui.js
 - app/assets/javascripts/umlaut.js
+- app/assets/javascripts/umlaut/ajax_windows.js.coffee
 - app/assets/javascripts/umlaut/update_html.js
-- app/assets/javascripts/umlaut/ajax_windows.js
 - app/assets/javascripts/umlaut/simple_visible_toggle.js
 - app/assets/javascripts/umlaut/ensure_window_size.js.erb
 - app/assets/javascripts/umlaut/expand_contract_toggle.js
@@ -468,7 +468,6 @@ files:
 - README.md
 - ./test/integration/request_test.rb
 - ./test/integration/request_reuse_test.rb
-- ./test/integration/permalinks_test.rb
 - ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
 - ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
 - ./test/dummy/tmp/cache/assets/CD1/F20/sprockets%2F385e5fb31cf27e262480d1174be1d500
@@ -575,7 +574,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1929703717396747492
+      hash: 1628836782081809943
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -584,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1929703717396747492
+      hash: 1628836782081809943
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -595,7 +594,6 @@ summary: For Libraries, a just-in-time last-mile service aggregator, taking Open
 test_files:
 - ./test/integration/request_test.rb
 - ./test/integration/request_reuse_test.rb
-- ./test/integration/permalinks_test.rb
 - ./test/dummy/tmp/cache/assets/D16/F90/sprockets%2F5fe3c021048c6f9a6086bed7736d87b1
 - ./test/dummy/tmp/cache/assets/DE8/790/sprockets%2Fd1333bde2b9aafcc712d11dd09ab35d8
 - ./test/dummy/tmp/cache/assets/CD1/F20/sprockets%2F385e5fb31cf27e262480d1174be1d500

data/app/assets/javascripts/umlaut/ajax_windows.js

@@ -1,35 +0,0 @@
-/* ajax_windows.js.  Support for modal popup windows in Umlaut items. */
-jQuery(document).ready(function($) {
-   
-    var shared_modal_d = $("<div></div>").dialog({autoOpen: false, modal: true, width: "400px"}) ;
-
-    $("a.ajax_window").live("click", function(event) {                
-        
-        $(shared_modal_d).load(  this.href, function() {
-            var heading = shared_modal_d.find("h1, h2, h3, h4, h5, h6").eq(0).remove();
-            $(shared_modal_d).dialog("option", "title", heading.text());
-            $(shared_modal_d).dialog("open");
-        });
-        return false;
-    });
-    
-    function ajax_form_catch(event) {
-        $(shared_modal_d).load( $(event.target).closest("form").attr("action"), $(event.target).closest("form").serialize(), function() {
-           var heading = shared_modal_d.find("h1, h2, h3, h4, h5, h6").eq(0).remove();
-           $(shared_modal_d).dialog("option", "title", heading.text());
-           $(shared_modal_d).dialog("open");
-           
-        });
-        return false;
-    }
-    
-    //Trapping two events, click on the submit button or submit on the form
-    //is strangely needed in IE7 to trap both return-in-field submits
-    //and click-on-button submits. In FF just the second "submit" version
-    //is sufficient. 
-    $("form.modal_dialog_form input[type=submit]").live("click", ajax_form_catch );    
-    $("form.modal_dialog_form").live( "submit", ajax_form_catch);
-    
-
-    
-});

data/test/integration/permalinks_test.rb

@@ -1,19 +0,0 @@
-require 'test_helper'
-
-class PermalinksTest < ActionDispatch::IntegrationTest
-
-    
-  test "missing id" do
-    sess = open_session
-    
-    missing_id = 999999999
-    
-    sess.get "/go/#{missing_id}"
-    
-    assert_response(:missing)
-    
-  end
-  
-  
-  
-end