Permalink
Browse files

the result of running magic_encoding gem from / - this sets the encod…

…ing on all of our ruby files to utf-8, which should help in getting to the point where we support 1.9.2
  • Loading branch information...
1 parent 3d40c5c commit 655b2b3922e0ff03cc25475dcd3c7438deb0135a Dan Funk committed Jun 16, 2011
Showing with 118 additions and 12 deletions.
  1. +1 −0 app/controllers/bookmarks_controller.rb
  2. +1 −0 app/controllers/feedback_controller.rb
  3. +1 −0 app/controllers/folder_controller.rb
  4. +1 −0 app/controllers/saved_searches_controller.rb
  5. +1 −0 app/controllers/search_history_controller.rb
  6. +1 −0 app/helpers/blacklight_helper.rb
  7. +2 −1 app/helpers/bookmarks_helper.rb
  8. +1 −0 app/helpers/catalog_helper.rb
  9. +1 −0 app/helpers/feedback_helper.rb
  10. +1 −0 app/helpers/hash_as_hidden_fields.rb
  11. +1 −0 app/helpers/render_constraints_helper.rb
  12. +1 −0 app/helpers/saved_searches_helper.rb
  13. +2 −1 app/helpers/search_history_helper.rb
  14. +2 −1 app/models/bookmark.rb
  15. +1 −0 app/models/record_mailer.rb
  16. +2 −1 app/models/search.rb
  17. +1 −0 config/routes.rb
  18. +1 −0 db/seeds.rb
  19. +1 −1 features/default_setup.feature
  20. +3 −2 features/support/aruba.rb
  21. +1 −0 install.rb
  22. +1 −0 lib/blacklight.rb
  23. +1 −0 lib/blacklight/catalog.rb
  24. +1 −0 lib/blacklight/comma_link_renderer.rb
  25. +1 −0 lib/blacklight/configurable.rb
  26. +1 −0 lib/blacklight/controller.rb
  27. +1 −0 lib/blacklight/engine.rb
  28. +1 −0 lib/blacklight/exceptions.rb
  29. +1 −0 lib/blacklight/routes.rb
  30. +1 −0 lib/blacklight/search_fields.rb
  31. +1 −0 lib/blacklight/solr.rb
  32. +1 −0 lib/blacklight/solr/document.rb
  33. +1 −0 lib/blacklight/solr/document/dublin_core.rb
  34. +1 −0 lib/blacklight/solr/document/email.rb
  35. +1 −0 lib/blacklight/solr/document/marc.rb
  36. +1 −0 lib/blacklight/solr/document/marc_export.rb
  37. +1 −0 lib/blacklight/solr/document/sms.rb
  38. +2 −1 lib/blacklight/solr/facet_paginator.rb
  39. +1 −0 lib/blacklight/solr_helper.rb
  40. +1 −0 lib/blacklight/user.rb
  41. +1 −0 lib/blacklight/version.rb
  42. +1 −0 lib/colorize.rb
  43. +1 −0 lib/generators/blacklight/assets_generator.rb
  44. +1 −0 lib/generators/blacklight/blacklight_generator.rb
  45. +1 −0 lib/generators/blacklight/jetty_generator.rb
  46. +1 −0 lib/generators/blacklight/solr_conf_generator.rb
  47. +1 −0 lib/generators/blacklight/templates/catalog_controller.rb
  48. +1 −0 lib/generators/blacklight/templates/config/blacklight_config.rb
  49. +1 −0 lib/generators/blacklight/templates/migrations/add_user_types_to_bookmarks_searches.rb
  50. +2 −1 lib/generators/blacklight/templates/migrations/create_bookmarks.rb
  51. +1 −0 lib/generators/blacklight/templates/migrations/create_searches.rb
  52. +1 −0 lib/generators/blacklight/templates/migrations/remove_editable_fields_from_bookmarks.rb
  53. +1 −0 lib/generators/blacklight/templates/solr_document.rb
  54. +1 −0 lib/railties/jetty_solr_server.rb
  55. +1 −0 test_support/features/step_definitions/bookmarks_steps.rb
  56. +1 −0 test_support/features/step_definitions/error_steps.rb
  57. +1 −0 test_support/features/step_definitions/folder_steps.rb
  58. +1 −0 test_support/features/step_definitions/general_steps.rb
  59. +1 −0 test_support/features/step_definitions/record_view_steps.rb
  60. +1 −0 test_support/features/step_definitions/saved_searches_steps.rb
  61. +1 −0 test_support/features/step_definitions/search_facets_steps.rb
  62. +1 −0 test_support/features/step_definitions/search_history_steps.rb
  63. +1 −0 test_support/features/step_definitions/search_result_steps.rb
  64. +1 −0 test_support/features/step_definitions/search_steps.rb
  65. +2 −1 test_support/features/step_definitions/user_steps.rb
  66. +1 −0 test_support/features/step_definitions/web_steps.rb
  67. +1 −0 test_support/features/support/env.rb
  68. +1 −0 test_support/features/support/paths.rb
  69. +1 −0 test_support/features/support/selectors.rb
  70. +1 −0 test_support/spec/controllers/application_controller_spec.rb
  71. +1 −0 test_support/spec/controllers/catalog_controller_spec.rb
  72. +1 −0 test_support/spec/controllers/folder_controller_spec.rb
  73. +1 −0 test_support/spec/controllers/search_history_controller_spec.rb
  74. +1 −0 test_support/spec/helpers/blacklight_helper_spec.rb
  75. +1 −0 test_support/spec/helpers/catalog_helper_spec.rb
  76. +1 −0 test_support/spec/helpers/hash_as_hidden_fields_spec.rb
  77. +1 −0 test_support/spec/helpers/render_constraints_helper_spec.rb
  78. +1 −0 test_support/spec/helpers/search_history_helper_spec.rb
  79. +1 −0 test_support/spec/helpers/solr_helper_spec.rb
  80. +1 −0 test_support/spec/lib/blacklight_email_spec.rb
  81. +1 −0 test_support/spec/lib/blacklight_sms_spec.rb
  82. +1 −0 test_support/spec/lib/blacklight_solr_document_dublin_core_spec.rb
  83. +1 −0 test_support/spec/lib/blacklight_solr_document_marc_spec.rb
  84. +1 −0 test_support/spec/lib/blacklight_solr_document_spec.rb
  85. +1 −0 test_support/spec/lib/blacklight_spec.rb
  86. +1 −0 test_support/spec/lib/blacklight_user_spec.rb
  87. +1 −0 test_support/spec/lib/configurable_spec.rb
  88. +1 −0 test_support/spec/lib/facet_paginator_spec.rb
  89. +1 −0 test_support/spec/lib/marc_export_spec.rb
  90. +1 −0 test_support/spec/lib/search_fields_spec.rb
  91. +1 −0 test_support/spec/lib/tasks/blacklight_task_spec.rb
  92. +1 −0 test_support/spec/lib/tasks/solr_marc_task_spec.rb
  93. +1 −0 test_support/spec/models/bookmark_spec.rb
  94. +1 −1 test_support/spec/models/record_mailer_spec.rb
  95. +1 −0 test_support/spec/models/search_spec.rb
  96. +1 −1 test_support/spec/models/solr_docment_spec.rb
  97. +1 −0 test_support/spec/spec_helper.rb
  98. +1 −0 test_support/spec/support/action_controller.rb
  99. +1 −0 test_support/spec/support/assert_difference.rb
  100. +1 −0 test_support/spec/support/include_text.rb
  101. +1 −0 test_support/spec/views/catalog/_constraints_element.html.erb_spec.rb
  102. +1 −0 test_support/spec/views/catalog/_document_list.html.erb_spec.rb
  103. +1 −0 test_support/spec/views/catalog/_facets.html.erb_spec.rb
  104. +1 −0 test_support/spec/views/catalog/_index_partials/_default.erb_spec.rb
  105. +1 −0 test_support/spec/views/catalog/_show_partials/_default.html.erb_spec.rb
  106. +1 −0 test_support/spec/views/catalog/index.atom.builder_spec.rb
  107. +1 −0 test_support/spec/views/catalog/show.html.erb_spec.rb
  108. +1 −0 test_support/spec/views/catalog/unapi.xml.builder_spec.rb
  109. +1 −0 uninstall.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# note that while this is mostly restful routing, the #update and #destroy actions
# take the Solr document ID as the :id, NOT the id of the actual Bookmark action.
class BookmarksController < ApplicationController
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class FeedbackController < ApplicationController
# http://expressica.com/simple_captcha/
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class FolderController < ApplicationController
include Blacklight::SolrHelper
helper CatalogHelper
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class SavedSearchesController < ApplicationController
before_filter :verify_user
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class SearchHistoryController < ApplicationController
def index
@searches = searches_from_history
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# -*- coding: utf-8 -*-
#
# Methods added to this helper will be available to all templates in the hosting application
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module BookmarksHelper
-end
+end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module CatalogHelper
def paginate_rsolr_response(response, options = {}, &block)
@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
module FeedbackHelper
end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# Rails Helper methods to take a hash and turn it to form <input type="hidden">
# fields, works with hash nested with other hashes and arrays, standard rails
# serialization style. Oddly while Hash#to_query will do this for a URL
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# All methods in here are 'api' that may be over-ridden by plugins and local
# code, so method signatures and semantics should not be changed casually.
# implementations can be of course.
@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
module SavedSearchesHelper
end
@@ -1,2 +1,3 @@
+# -*- encoding : utf-8 -*-
module SearchHistoryHelper
-end
+end
View
@@ -1,6 +1,7 @@
+# -*- encoding : utf-8 -*-
class Bookmark < ActiveRecord::Base
belongs_to :user
validates_presence_of :user_id, :scope=>:document_id
-end
+end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# Only works for documents with a #to_marc right now.
class RecordMailer < ActionMailer::Base
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class Search < ActiveRecord::Base
belongs_to :user
@@ -16,4 +17,4 @@ def self.delete_old_searches(days_old)
self.destroy_all(['created_at < ? AND user_id IS NULL', Date.today - days_old])
end
-end
+end
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
Rails.application.routes.draw do
# A Note on User Sessions:
# Blacklight expects the following named routes or at least the associated path helper methods to be defined.
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# This file should contain all the record creation needed to seed the database with its default values.
# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
#
@@ -24,7 +24,7 @@ Feature:
end
"""
- And I run `bundle install --local`
+ And I run `bundle install`
Then the file "app/models/user.rb" should not exist
And I run `rails generate blacklight -d`
@@ -1,9 +1,10 @@
+# -*- encoding : utf-8 -*-
require 'aruba/cucumber'
Before do
- @aruba_timeout_seconds = 60
+ @aruba_timeout_seconds = 240
end
Before ('@really_slow_process') do
- @aruba_timeout_seconds = 120
+ @aruba_timeout_seconds = 240
end
View
@@ -0,0 +1 @@
+# -*- encoding : utf-8 -*-
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'kaminari'
require 'marc'
require 'rsolr'
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight::Catalog
extend ActiveSupport::Concern
include Blacklight::SolrHelper
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'will_paginate/view_helpers/link_renderer'
# Custom link renderer for WillPaginate
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight::Configurable
# The config environment name used by the #config method
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
#
# Filters added to this controller apply to all controllers in the hosting application
# as this module is mixed-in to the application controller in the hosting app on installation.
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# lib/blacklight/engine.rb
require "blacklight"
require "rails"
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight
module Exceptions
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight
class Routes
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
##
# Module to deal with accessing (and setting some defaults) in an array of
# hashes that describe Blacklight search fields. Requires the base class this
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight::Solr
autoload :Facets, 'blacklight/solr/facets'
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'rsolr'
require 'rsolr-ext'
##
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'builder'
# This module provide Dublin Core export based on the document's semantic values
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# This module provides the body of an email export based on the document's semantic values
module Blacklight::Solr::Document::Email
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# This is a document extension meant to be mixed into a
# Blacklight::Solr::Document class, such as SolrDocument. It provides support
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# -*- coding: utf-8 -*-
# Written for use with Blacklight::Solr::Document::Marc, but you can use
# it for your own custom Blacklight document Marc extension too -- just
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# This module provides the body of an email export based on the document's semantic values
module Blacklight::Solr::Document::Sms
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight::Solr
@@ -90,4 +91,4 @@ def params_for_resort_url(sort_method, params)
end
-end
+end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# SolrHelper is a controller layer mixin. It is in the controller scope: request params, session etc.
#
# NOTE: Be careful when creating variables here as they may be overriding something that already exists.
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight::User
# This gives us an is_blacklight_user method that can be included in
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight
unless Blacklight.const_defined? :VERSION
def self.version
View
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# == colorize
# http://colorize.rubyforge.org
# http://fazibear.prv.pl
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# Copy Blacklight assets to public folder in current app.
# If you want to do this on application startup, you can
# add this next line to your one of your environment files --
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'rails/generators'
require 'rails/generators/migration'
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight
class Jetty < Rails::Generators::Base
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module Blacklight
class SolrConf < Rails::Generators::Base
source_root File.expand_path('../templates', __FILE__)
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require 'blacklight/catalog'
class CatalogController < ApplicationController
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# You can configure Blacklight from here.
#
# Blacklight.configure(:environment) do |config| end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class AddUserTypesToBookmarksSearches < ActiveRecord::Migration
def self.up
add_column :searches, :user_type, :string
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class CreateBookmarks < ActiveRecord::Migration
def self.up
create_table :bookmarks do |t|
@@ -14,4 +15,4 @@ def self.down
drop_table :bookmarks
end
-end
+end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class CreateSearches < ActiveRecord::Migration
def self.up
create_table :searches do |t|
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class RemoveEditableFieldsFromBookmarks < ActiveRecord::Migration
def self.up
remove_column :bookmarks, :notes
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
class SolrDocument
include Blacklight::Solr::Document
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# The ASF licenses this file to You under the Apache License, Version 2.0
# (the "License"); you may not use this file except in compliance with
# the License. You may obtain a copy of the License at
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
Given /^"([^\"]*)" has bookmarked an item with title "([^\"]*)"$/ do |user, title|
user = User.find_by_email("#{user}@#{user}.com")
user.bookmarks << Bookmark.create(:title => title, :document_id => "123456")
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# checkout http://blog.codefront.net/2007/03/31/testing-rescue_action_in_public-with-rspec/
Then /^I should see a flash error "([^\"]*)"$/ do |message|
pageshould have_selector("div.notice", :content => message)
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
Then /^I should see an add to folder form$/ do
page.should have_selector("form.addFolder")
end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
When /^I follow "([^\"]*)" in "([^\"]*)"$/ do |link, scope|
within(scope) do
click_link(link)
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
Then /^I (should|should not) see an? "([^\"]*)" element containing "([^\"]*)"$/ do |bool,elem,content|
if bool == "should"
page.should have_xpath("//#{elem}[text()='#{content}']")
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
Given /^I am logged in as "([^\"]*)"$/ do |login|
email = "#{login}@#{login}.com"
user = User.create(:login => login, :email => email, :password => "password", :password_confirmation => "password")
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# deprecated
Then /^I should see the applied filter "([^\"]*)" with the value "([^\"]*)"$/ do |filter, text|
page.should have_selector(".facet_limit") do |node|
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
Given /^no previous searches$/ do
# nothing to do
end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
#include Blacklight::SolrHelper
When /^I fill in the search box with "(.*?)"$/ do |query|
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# User added
Then /^I should see a search field$/ do
page.should have_selector("input#q")
@@ -1,4 +1,5 @@
+# -*- encoding : utf-8 -*-
Given /^user with login "([^\"]*)" and email "([^\"]*)" and password "([^\"]*)"$/ do |login, email, password|
user = User.create(:login => login, :email => email, :password => password, :password_confirmation => password)
User.find(user.id).should_not be_nil
-end
+end
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# TL;DR: YOU SHOULD DELETE THIS FILE
#
# This file iwas generated by Cucumber-Rails and is only here to get you a head start
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
# TL;DR: YOU SHOULD DELETE THIS FILE
#
# This file iwas generated by Cucumber-Rails and is only here to get you a head start
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module NavigationHelpers
# Maps a name to a path. Used by the
#
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
module HtmlSelectorsHelpers
# Maps a name to a selector. Used primarily by the
#
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe ApplicationController do
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
require 'rubygems'
require 'marc'
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
describe FolderController do
before(:each) do
Oops, something went wrong.

0 comments on commit 655b2b3

Please sign in to comment.