enju_leaf 1.1.0.rc2 → 1.1.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb475fbf4410550d3dc061f52c492e46c1be4865
-  data.tar.gz: e228f432f945a2a5df4262bda6500849575d6e4a
+  metadata.gz: 0e3eea98167932846eaf29fa7605d9f0a64e34e5
+  data.tar.gz: fddd833c6f35a45a55b59063018a53cbf121a40f
 SHA512:
-  metadata.gz: a454d695e703abcffcda74a2e558dbee3a4c109d284f6a62918e41ec0d4c81f954a42f7b31eaefa15e1f4cd7f950efe6e1cc83a543be24461666b0219b052808
-  data.tar.gz: 40e9399a04f6adfff8b9c0956f973f5a7f37f31fe3212b05adbbf61cc770a62ef83e63563652a172284727c482f14f589482c98b1106d63abaaaed169c522afb
+  metadata.gz: f748cf7b69cd91563fcf07b1dd7879cb358a5d82bd9b6dd22e260d550d581ee7810608e682fdaccfaa7e648db8c5043ef2b1d41d1696625a70c7950f53d3d1ac
+  data.tar.gz: 97e8b29bc6765aae5d6ef1e890e4a2a344bf44d71ccbdfa7497aa485cc1c720b4352c91d90fa0a9ecbaa9cc296efbf77b5ce011b1f314da5ef7a479773b2d0c7

data/config/initializers/mime_types.rb

@@ -9,5 +9,4 @@ Mime::Type.register "application/xml",  :sru
 #Mime::Type.register "application/xml",  :openurl
 Mime::Type.register "application/xml",  :mods
 Mime::Type.register "application/rdf+xml",  :rdf
-Mime::Type.register_alias "text/xml",  :oai
 Mime::Type.register "application/svg+xml",  :svg

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc2"
+  VERSION = "1.1.0.rc3"
 end

data/lib/generators/enju_leaf/setup/setup_generator.rb

@@ -48,13 +48,9 @@ EOS
   enju_biblio
   enju_library
 
-  private
-  def mobylette_options
-    @mobylette_options ||= ApplicationController.send(:mobylette_options).merge(
-      {
-        :skip_xhr_requests => false
-      }
-    )
+  mobylette_config do |config|
+    config[:skip_xhr_requests] = false
+    config[:skip_user_agents] = Setting.enju.skip_mobile_agents.map{|a| a.to_sym}
   end
 
 EOS
@@ -76,6 +72,12 @@ EOS
     inject_into_file "app/assets/stylesheets/application.css", :after => / *= require_self$\n/ do
       " *= require enju_leaf\n"
     end
+    inject_into_file "config.ru", :after => /require ::File.expand_path\(\'..\/config\/environment\',  __FILE__\)$\n/ do
+      <<"EOS"
+require 'rack/protection'
+use Rack::Protection, :except => [:escaped_params, :json_csrf, :http_origin, :session_hijacking, :remote_token]
+EOS
+    end
     generate("sunspot_rails:install")
     remove_file "public/index.html"
     remove_file "app/views/layouts/application.html.erb"

data/spec/dummy/app/controllers/application_controller.rb

@@ -4,12 +4,8 @@ class ApplicationController < ActionController::Base
   enju_biblio
   enju_library
 
-  private
-  def mobylette_options
-    @mobylette_options ||= ApplicationController.send(:mobylette_options).merge(
-      {
-        :skip_xhr_requests => false
-      }
-    )
+  mobylette_config do |config|
+    config[:skip_xhr_requests] = false
+    config[:skip_user_agents] = Setting.enju.skip_mobile_agents.map{|a| a.to_sym}
   end
 end

data/spec/dummy/config/application.yml

@@ -1,8 +1,8 @@
 defaults: &defaults
   enju:
-    web_hostname: localhost
-    web_port_number: 3000
     erms_url: 
+    skip_mobile_agents:
+      - ipad
 
   family_name_first: true
   max_number_of_results: 500

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_leaf
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_biblio
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre23
+        version: 0.1.0.pre24
 - !ruby/object:Gem::Dependency
   name: enju_manifestation_viewer
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre8
+        version: 0.1.14.pre9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre8
+        version: 0.1.14.pre9
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -423,8 +423,6 @@ files:
 - app/views/my_accounts/edit.html.erb
 - app/views/my_accounts/show.html.erb
 - app/views/my_accounts/show.mobile.erb
-- app/views/notifier/manifestation_info.en.text.erb
-- app/views/notifier/manifestation_info.ja.text.erb
 - app/views/page/403.html.erb
 - app/views/page/403.mobile.erb
 - app/views/page/403.xml.erb
@@ -767,16 +765,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_6b.fdt
-- spec/dummy/solr/data/test/index/_6b.fdx
-- spec/dummy/solr/data/test/index/_6b.fnm
-- spec/dummy/solr/data/test/index/_6b.frq
-- spec/dummy/solr/data/test/index/_6b.nrm
-- spec/dummy/solr/data/test/index/_6b.prx
-- spec/dummy/solr/data/test/index/_6b.tii
-- spec/dummy/solr/data/test/index/_6b.tis
+- spec/dummy/solr/data/test/index/_6z.fdt
+- spec/dummy/solr/data/test/index/_6z.fdx
+- spec/dummy/solr/data/test/index/_6z.fnm
+- spec/dummy/solr/data/test/index/_6z.frq
+- spec/dummy/solr/data/test/index/_6z.nrm
+- spec/dummy/solr/data/test/index/_6z.prx
+- spec/dummy/solr/data/test/index/_6z.tii
+- spec/dummy/solr/data/test/index/_6z.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_cp
+- spec/dummy/solr/data/test/index/segments_e1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role
@@ -1068,16 +1066,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_6b.fdt
-- spec/dummy/solr/data/test/index/_6b.fdx
-- spec/dummy/solr/data/test/index/_6b.fnm
-- spec/dummy/solr/data/test/index/_6b.frq
-- spec/dummy/solr/data/test/index/_6b.nrm
-- spec/dummy/solr/data/test/index/_6b.prx
-- spec/dummy/solr/data/test/index/_6b.tii
-- spec/dummy/solr/data/test/index/_6b.tis
+- spec/dummy/solr/data/test/index/_6z.fdt
+- spec/dummy/solr/data/test/index/_6z.fdx
+- spec/dummy/solr/data/test/index/_6z.fnm
+- spec/dummy/solr/data/test/index/_6z.frq
+- spec/dummy/solr/data/test/index/_6z.nrm
+- spec/dummy/solr/data/test/index/_6z.prx
+- spec/dummy/solr/data/test/index/_6z.tii
+- spec/dummy/solr/data/test/index/_6z.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_cp
+- spec/dummy/solr/data/test/index/segments_e1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/tmp/cache/4F7/F90/default_role

data/app/views/notifier/manifestation_info.en.text.erb

@@ -1,18 +0,0 @@
-<%= @user.patron.full_name -%> :
-
-Title: <%= @manifestation.original_title %>
-Creator(s): <%= @manifestation.creators.readable_by(@user).collect(&:full_name).join("/") %>
-Contributor(s): <%= @manifestation.contributors.readable_by(@user).collect(&:full_name).join("/") %> 
-Publisher(s): <%= @manifestation.publishers.readable_by(@user).collect(&:full_name).join("/") %>
-ISBN: <%= @manifestation.isbn %>
-URL: <%= @manifestation.access_address %>
-Holding:
-<% @manifestation.items.on_shelf.each do |item| -%>
- <%= item.shelf_display_name.localize %> <%= item.call_number %> <%= item.item_identifier %>
-<% end -%>
-
-<%= "#{LibraryGroup.site_config.url}manifestations/#{@manifestation.id}" %>
-
--- 
-<%= LibraryGroup.system_name(@user.locale) %>
-<%= LibraryGroup.site_config.url %>

data/app/views/notifier/manifestation_info.ja.text.erb

@@ -1,18 +0,0 @@
-<%= @user.patron.full_name -%> さん
-
-資料名: <%= @manifestation.original_title %>
-著者: <%= @manifestation.creators.readable_by(@user).collect(&:full_name).join("/") %>
-編者: <%= @manifestation.contributors.readable_by(@user).collect(&:full_name).join("/") %> 
-出版者: <%= @manifestation.publishers.readable_by(@user).collect(&:full_name).join("/") %>
-ISBN: <%= @manifestation.isbn %>
-URL: <%= @manifestation.access_address %>
-所蔵場所:
-<% @manifestation.items.on_shelf.each do |item| -%>
- <%= item.shelf_display_name.localize %> <%= item.call_number %> <%= item.item_identifier %>
-<% end -%>
-
-<%= "#{LibraryGroup.site_config.url}manifestations/#{@manifestation.id}" %>
-
--- 
-<%= LibraryGroup.system_name(@user.locale) %>
-<%= LibraryGroup.site_config.url %>