umlaut 4.0.0.beta5 → 4.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mzk2MTBjNThjOTVjZDUyYWJhYTQ1NmU2NGM4ZTg3NzJmNjE2MjYwZg==
+    ODZiYTQzNWJjMzkwMDAyZjZhMTNiODlhYzhlMmFjOGIwNTc0ZTVjYw==
   data.tar.gz: !binary |-
-    MDNkMThjODUzNmFlMTRkZTY0MTViMDkwNmYyNmY0NjNiMzliOTYwMg==
+    MDk2ODYwYTM1M2UwM2QzMDg4ZGNlNDQxNWIwNjQ0YjVjN2JhZDE3NA==
 SHA512:
   metadata.gz: !binary |-
-    NmY0MWNiMDlmMjU0YWZjMmM2MTM2ZGI4M2Y4NzdlNDU4MDdjNTRkYjY1OWU4
-    Y2VlNmI0Zjg3MWJiM2M1ZDI3ZTM4NTc1NDMyNDc4NjM2MDA1YWJkMzhjOGRl
-    YmFlMmZlYzQxMmMyOWE5YTQyMmZjZTEwNzc4Mzc0NTIwYTc4MjM=
+    NTlmOTFjNzA2ZDU2ZDYwZDQ3MTJjNTk4Y2YxM2U0MTk1NGI4OTE1ZDk2YzM3
+    MjcyYjlkNjA5NTViZWNlMGM4Njk5YTJkZGFkMDdkZmY2YzBiYzg5ZWE2YjVk
+    MzZhZDViMmRhZWQyZjQwOWM0YzMwYWFjMTRjYTQ3YWQ2ODZkMmI=
   data.tar.gz: !binary |-
-    YjdlMGIwMmU5YTlkMjFmNTgwY2RkOTZlYWZhYjg2ZWUxMjkwY2VlYWMyYzYy
-    ZmI5NDVhOTIzNDJmYTRjMjAyMGJjNjRmNWNjMTc0ODEzN2U5NDdlMDJjYjg1
-    NmEyZGYwNzQ2ZDIzYWQ2NWQ1ZjAxYzQzYTkxNTRkMGI2NGY4NTg=
+    ODRjOTg4MWY2NWIyNDYwMmU3MmU3ZWY2ZmE2MDg1ZDU4YzU1ZDJiMWU1YWVj
+    YmUxMjYwZTllMWZmNTc0NWI2MzJiN2Q2Nzk2MzcxODQxYjg5M2U3NTgyMzMz
+    NTllZGUxYTU5ZDQyMzI5NzY4ZGY4ZjY4YmMxMWM5YTY4OWE4YTM=

data/README.md

@@ -6,8 +6,6 @@
 [![Coverage Status](https://coveralls.io/repos/team-umlaut/umlaut/badge.png?branch=master)](https://coveralls.io/r/team-umlaut/umlaut)
 <!--[![Security Status](http://rails-brakeman.com/team-umlaut/umlaut.png)](http://rails-brakeman.com/team-umlaut/umlaut)-->
 
-(Umlaut 4.0.0.beta1 is out, and this README refers to Umlaut 4.x, and we recommend starting with Umlaut 4.x even though it's only in beta. Install with `gem install umlaut --pre`)
-
 Umlaut is software for libraries (the kind with books). 
 
 It could be described as a front-end layer on top of an existing OpenURL 
@@ -46,11 +44,11 @@ The Rails/Umlaut super-concise expert summary is:
 
 * `$ gem install umlaut`
 * Then run the umlaut app generator:  `$ umlaut my_new_app`
-** That will make a new rails app
-** without spring or turbolinks
-** using mysql (sqlite3 does not work for umlaut)
-** it will add the umlaut gem to your app
-** and it will run umlaut's generator to add a couple more files to your app, equivalent of `$ rails generate umlaut:install`
+  * That will make a new rails app
+  * without spring or turbolinks
+  * using mysql (sqlite3 does not work for umlaut)
+  * it will add the umlaut gem to your app
+  * and it will run umlaut's generator to add a couple more files to your app, equivalent of `$ rails generate umlaut:install`
 
 * set up your db in config/databases.yml and run `rake db:migrate`
 * configuration in `./config/umlaut_services.yml` and `./app/controllers/umlaut_controller.rb` 

data/app/helpers/umlaut/html_head_helper.rb

@@ -7,7 +7,7 @@ module Umlaut::HtmlHeadHelper
   def render_opensearch_link
     tag("link", :rel => "search", :type => "application/opensearchdescription+xml",
         :title =>  umlaut_config.opensearch_short_name,
-        :href => url_for(:controller=>'open_search', :only_path=>false))
+        :href => url_for(:controller=>'/open_search', :only_path=>false))
   end
 
   # used on non-js progress page, we need to refresh the page

data/app/models/referent.rb

@@ -1,4 +1,5 @@
 require 'i18n'
+require 'truncate_to_db_limit'
 
 # Note: There are a few actual attributes stored as Columns in referent --
 # these were originally used for identifying a Referent identifying the
@@ -16,11 +17,12 @@ class Referent < ActiveRecord::Base
   has_many :referent_values
   has_many :permalinks
 
-  # Make sure years get truncated to 4 chars
-  def year=(y)
-    super(y.slice(0,4))
-  end
+  # We really should get rid of these 'mirror' attributes, but
+  # in the meantime truncate them. 
+  include TruncateToDbLimit
+  truncate_to_db_limit :volume, :year, :issn, :isbn
 
+  
   # Pass in :permalink => :force to force creation of a permalink, otherwise
   # no permalink is created by this method, one can be lazily created when
   # needed. 

data/app/models/service_response.rb

@@ -164,6 +164,7 @@ Generally only for fulltext. Right now only supplied by SFX.
                         method can convenient. 
 
 =end
+require 'truncate_to_db_limit'
 class ServiceResponse < ActiveRecord::Base  
   @@built_in_fields = [:display_text, :url, :notes, :response_key, :value_string, :value_alt_string, :value_text, :id]
   belongs_to :request
@@ -173,6 +174,9 @@ class ServiceResponse < ActiveRecord::Base
   # object.
   attr_accessor :http_request_params
 
+  include TruncateToDbLimit
+  truncate_to_db_limit :display_text
+
   # Constants for 'match_reliability' value.
   MatchExact = 'exact'
   MatchUnsure = 'unsure'

data/app/service_adaptors/amazon.rb

@@ -109,6 +109,7 @@ class Amazon < Service
 
       selected_aws_vals = {}
       if ( @make_aws_call )
+
         aws_response = make_aws_request( isbn )
         
         return request.dispatched(self, true) if aws_response.blank?
@@ -189,7 +190,8 @@ class Amazon < Service
     err = (aws.at("ItemLookupErrorResponse")) if err.blank?
     
     unless (err.blank?)
-      if (err.at('Code').text == 'AWS.InvalidParameterValue')
+      if ((err.at('Code').text == 'AWS.InvalidParameterValue') ||
+          (err.at('Code').text == 'AWS.ECommerceService.ItemNotAccessible'))
         # Indicates an ISBN that Amazon doesn't know about, or that
         # was mal-formed. We can't tell the difference, so either
         # way let's silently ignore. 
@@ -306,9 +308,9 @@ class Amazon < Service
       look_inside = false
 
       # Check for search_inside or look_inside if we're configured
-      # to supply highlighted_link or search_inside, that's what we
+      # to supply "excerpts" or search_inside, that's what we
       # need it for.
-      if ( @service_types.include?("highlighted_link") ||
+      if ( @service_types.include?("excerpts") ||
            @service_types.include?("search_inside"))
         
         

data/app/service_adaptors/hathi_trust.rb

@@ -127,8 +127,7 @@ class HathiTrust < Service
   def get_bibkey_parameters(rft)
     # filter out special chars that ought not to be in there anyway,
     # and that HathiTrust barfs on. 
-    isbn = get_identifier(:urn, "isbn", rft)
-    isbn = isbn.gsub(/[\-\[\]]/, '') unless isbn.blank?
+    isbn = get_isbn(rft)
     
     oclcnum = get_identifier(:info, "oclcnum", rft)
     oclcnum = oclcnum.gsub(/[\-\[\]]/, '') unless oclcnum.blank?

data/app/service_adaptors/scopus2.rb

@@ -139,7 +139,8 @@ class Scopus2 < Service
         code    = error.at_xpath("./status/statusCode")
         message = error.at_xpath("./status/statusText")
       end
-      e = StandardError.new("Scopus returned error: #{code}: #{message}: scopus query: #{url}")
+
+      e = StandardError.new("Scopus returned error HTTP status #{response.code}: #{code}: #{message}: scopus query: #{url}")
       return request.dispatched(self, DispatchedService::FailedFatal, e)
     end
 

data/bin/umlaut

@@ -43,15 +43,19 @@ def run
 
   puts "#{command}\n\n"
 
-  system command
+  success = system command
 
-  post_install_message!
+  if success
+    post_install_message!
+  else
+    puts "\nError installing Umlaut app.\n\n"
+  end
 end
 
 def command_line(options)
   umlaut_template_path = File.expand_path(File.dirname(__FILE__) + '/../lib/generators/umlaut_app_template.rb')
 
-  return "rails _#{options.rails_version}_ new -d mysql --skip-spring #{options.app_path} -m #{umlaut_template_path}"
+  return "rails _#{options.rails_version}_ new #{options.app_path} -d mysql --skip-spring -m #{umlaut_template_path}"
 end
 
 def parse_options!

data/lib/generators/umlaut/install_generator.rb

@@ -96,7 +96,13 @@ module Umlaut
     
     def asset_hooks
       guarded(:asset_hooks) do
-        generate("umlaut:asset_hooks")
+        # generate tries to invoke rails from the command line, at which point
+        # it will complain about not yet having a db defined. 
+        #generate("umlaut:asset_hooks")
+
+        # try like so instead which seems to work, and is faster too. 
+        log :generate, "umlaut:asset_hooks"
+        Rails::Generators.invoke("umlaut:asset_hooks")
       end
     end
     
@@ -105,6 +111,16 @@ module Umlaut
         copy_file("app/controllers/umlaut_controller.rb")
       end
     end
+
+    def config_colorize_logging
+      guarded(:config_colorize_logging) do
+        application(nil, env: "production") do
+          "# Umlaut generated this, because Umlaut does some colorized\n" +
+          "  # logging, and Rails really ought to default to false in production.\n" +
+          "  config.colorize_logging = false\n"
+        end
+      end
+    end
       
     def post_install_message            
         say("\n              Umlaut installed, now:", :yellow)

data/lib/truncate_to_db_limit.rb

@@ -0,0 +1,51 @@
+# An ActiveRecord extension that will let you automatically truncate
+# certain attributes to the maximum length allowed by the DB. 
+#
+#     require 'truncate_to_db_limit'
+#     class Something < ActiveRecord::Base
+#        include TruncateToDbLimit
+#        truncate_to_db_limit :short_attr, :short_attr2
+#        #...
+#
+# Truncation is done in a before_validate hook, so won't happen until
+# you try to save. 
+#
+module TruncateToDbLimit
+  extend ActiveSupport::Concern
+
+  included do 
+    class_attribute :'_truncate_to_db_limit_attributes', instance_accessor: false
+    before_validation :do_truncate_to_db_limit!
+
+
+    def self.truncate_to_db_limit(*attribute_names)   
+      self._truncate_to_db_limit_attributes = attribute_names
+    end
+  end
+
+
+
+
+  def do_truncate_to_db_limit!
+    
+    
+    self.class._truncate_to_db_limit_attributes.each do |attribute_name|
+
+      ar_attr = self.class.columns_hash[attribute_name.to_s]
+
+      unless ar_attr
+        raise ArgumentError.new("truncate_to_db_limit #{attribute_name}: No such attribute")
+      end
+
+      limit   = ar_attr.limit
+
+      unless limit && limit.to_i != 0
+        raise ArgumentError.new("truncate_to_db_limit #{attribute_name}: Limit not known")
+      end
+
+      normalized = send(attribute_name).try {|v| v.slice(0, limit)}
+      send("#{attribute_name}=", normalized)
+    end
+  end
+
+end

data/lib/umlaut/version.rb

@@ -1,8 +1,8 @@
 module Umlaut
-  VERSION = "4.0.0.beta5"
+  VERSION = "4.0.0"
 
   # This is used in Umlaut's .gemspec for generating the gem,
   # and is also used in the umlaut app generator to make sure
   # we're generating with a compatible Rails version. 
-  RAILS_COMPAT_SPEC = [">= 3.2.12", "<= 4.2.0.beta1"]
+  RAILS_COMPAT_SPEC = [">= 3.2.12", "< 4.2.0"]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umlaut
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta5
+  version: 4.0.0
 platform: ruby
 authors:
 - Jonathan Rochkind, et al
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +27,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.12
-    - - <=
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -506,6 +506,7 @@ files:
 - lib/tasks/umlaut_asset_compile.rake
 - lib/tasks/umlaut_migrate_permalinks.rake
 - lib/term_color.rb
+- lib/truncate_to_db_limit.rb
 - lib/umlaut.rb
 - lib/umlaut/routes.rb
 - lib/umlaut/version.rb
@@ -523,9 +524,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1