Merge pull request #994 from projectblacklight/rails-matrix

Update travis' rails matrix

Author: jcoyne

.travis.yml

@@ -2,29 +2,29 @@ notifications:
   email: false
 
 rvm:
-  - 2.1.2
+  - 2.1.4
 
 matrix:
   include:
-    - rvm: 2.1.2
-      env: "RAILS_VERSION=4.0.9"
+    - rvm: 2.1.4
+      env: "RAILS_VERSION=4.0.11"
     - rvm: 2.0.0
-      env: "RAILS_VERSION=4.1.5"
+      env: "RAILS_VERSION=4.1.7"
     - rvm: 1.9.3
-      env: "RAILS_VERSION=4.1.5"
+      env: "RAILS_VERSION=4.1.7"
     - rvm: jruby
-      env: "RAILS_VERSION=4.1.5 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
-    - rvm: 2.1.2
-      env: "RAILS_VERSION=4.2.0.beta1"
+      env: "RAILS_VERSION=4.1.7 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.1.4
+      env: "RAILS_VERSION=4.2.0.beta4"
   allow_failures:
-    - env: "RAILS_VERSION=4.2.0.beta1"
+    - env: "RAILS_VERSION=4.2.0.beta4"
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=3.2.19"
- - "RAILS_VERSION=4.1.5"
+ - "RAILS_VERSION=3.2.20"
+ - "RAILS_VERSION=4.1.7"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

Gemfile

@@ -23,5 +23,10 @@ else
   gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
   # explicitly include sass-rails to get compatible sprocket dependencies
-  gem 'sass-rails'
+  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'sass-rails', ">= 5.0.0.beta1"
+    gem 'responders', "~> 2.0"
+  else
+    gem 'sass-rails'
+  end
 end

app/views/layouts/blacklight.html.erb

@@ -14,7 +14,7 @@
     <![endif]-->
 
     <title><%= render_page_title %></title>
-    <%= opensearch_description_tag application_name, opensearch_catalog_path(:format => 'xml', :only_path => false) %>
+    <%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %>
     <%= favicon_link_tag 'favicon.ico' %>
     <%= stylesheet_link_tag "application", media: "all" %>
     <%= javascript_include_tag "application" %>

app/views/record_mailer/email_record.text.erb

@@ -1,5 +1,5 @@
 <% @documents.each do |document| %>
 <%= document.to_email_text %>
-<%= t('blacklight.email.text.url', :url =>polymorphic_path(document, {:only_path => false}.merge(@url_gen_params))) %>
+<%= t('blacklight.email.text.url', :url =>polymorphic_url(document, @url_gen_params)) %>
 <% end %>
 <%= t('blacklight.email.text.message', :message => @message) %>

app/views/record_mailer/sms_record.text.erb

@@ -1,4 +1,4 @@
 <% @documents.each do |document| %>
 <%= document.to_sms_text %>
-<%= t('blacklight.sms.text.url', :url => polymorphic_path(document, {:only_path => false}.merge(@url_gen_params)) ) %>
+<%= t('blacklight.sms.text.url', :url => polymorphic_url(document, @url_gen_params) ) %>
 <% end %>

lib/blacklight/catalog.rb

@@ -116,7 +116,12 @@ def email
 
       if request.post? and validate_email_params
         email = RecordMailer.email_record(@documents, {:to => params[:to], :message => params[:message]}, url_options)
-        email.deliver 
+
+        if email.respond_to? :deliver_now
+          email.deliver_now
+        else
+          email.deliver
+        end
 
         flash[:success] = I18n.t("blacklight.email.success")
 
@@ -141,7 +146,12 @@ def sms
         to = "#{params[:to].gsub(/[^\d]/, '')}@#{params[:carrier]}"
 
         sms = RecordMailer.sms_record(@documents, { :to => to }, url_options)
-        sms.deliver
+
+        if sms.respond_to? :deliver_now
+          sms.deliver_now
+        else
+          sms.deliver
+        end
 
         flash[:success] = I18n.t("blacklight.sms.success")
 

lib/blacklight/solr/document.rb

@@ -42,6 +42,14 @@ def initialize(source_doc={}, solr_response=nil)
     apply_extensions
   end
 
+  def to_model
+    self
+  end
+
+  def persisted?
+    true
+  end
+
   # the wrapper method to the @_source object.
   # If a method is missing, it gets sent to @_source
   # with all of the original params and block