enju_leaf 1.1.0.rc1 → 1.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e460dfb746a695bc7488df46411d278b325f1b0f
-  data.tar.gz: 21c7e6d60ef5f7dbf40093ea0928612c4fc009c0
+  metadata.gz: cb475fbf4410550d3dc061f52c492e46c1be4865
+  data.tar.gz: e228f432f945a2a5df4262bda6500849575d6e4a
 SHA512:
-  metadata.gz: 8f89f9d2ade2efcecccf7d7bc2d9a69f5e757e1ae10bea255d9b1220996b851014e4617ddd52f36974746f224f4a7db31be53b6fd61f218326a84ebc860a06ce
-  data.tar.gz: 9e2b0c521f4e0d05a49674a84d916808104455017342d1bc5bd4ea0fd7fff72be70e5408e818deaa09018dcad3d857d7de644ad4671e5c38402b539d1d5e4d50
+  metadata.gz: a454d695e703abcffcda74a2e558dbee3a4c109d284f6a62918e41ec0d4c81f954a42f7b31eaefa15e1f4cd7f950efe6e1cc83a543be24461666b0219b052808
+  data.tar.gz: 40e9399a04f6adfff8b9c0956f973f5a7f37f31fe3212b05adbbf61cc770a62ef83e63563652a172284727c482f14f589482c98b1106d63abaaaed169c522afb

data/app/assets/javascripts/enju_leaf.js

@@ -13,4 +13,3 @@
 //= require event_calendar
 //= require jquery.powertip
 //= require jquery_nested_form
-//= require jquery.modal

data/app/assets/javascripts/mobile.js

@@ -1,3 +1,4 @@
 //= require jquery
-//= require jquery.mobile-1.3.0
+//= require jquery_ujs
+//= require jquery.mobile-1.3.1
 //= require jquery.colorbox

data/app/assets/stylesheets/enju.css

@@ -383,7 +383,7 @@ input.date_field{
 }
 
 input.date_text_field{
-  width: 80px;
+  width: 100px;
 }
 
 input.wide_date_text_field{

data/app/assets/stylesheets/enju_leaf.css

@@ -9,6 +9,5 @@
  *= require jquery.ui.tabs
  *= require jquery.ui.menu
  *= require jquery.ui.menubar
- *= require jquery.modal
  *= require portlets
 */

data/app/assets/stylesheets/mobile.css

@@ -3,6 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require jquery.mobile-1.3.0
+ *= require jquery.mobile-1.3.1
  *= require enju_mobile
 */

data/app/controllers/user_groups_controller.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
 class UserGroupsController < ApplicationController
   load_and_authorize_resource
+  before_filter :prepare_options, :only => [:new, :edit]
 
   # GET /user_groups
   # GET /user_groups.json
@@ -46,6 +47,7 @@ class UserGroupsController < ApplicationController
         format.html { redirect_to @user_group, :notice => t('controller.successfully_created', :model => t('activerecord.models.user_group')) }
         format.json { render :json => @user_group, :status => :created, :location => @user_group }
       else
+        prepare_options
         format.html { render :action => "new" }
         format.json { render :json => @user_group.errors, :status => :unprocessable_entity }
       end
@@ -65,6 +67,7 @@ class UserGroupsController < ApplicationController
         format.html { redirect_to @user_group, :notice => t('controller.successfully_updated', :model => t('activerecord.models.user_group')) }
         format.json { head :no_content }
       else
+        prepare_options
         format.html { render :action => "edit" }
         format.json { render :json => @user_group.errors, :status => :unprocessable_entity }
       end
@@ -81,4 +84,11 @@ class UserGroupsController < ApplicationController
       format.json { head :no_content }
     end
   end
+
+  private
+  def prepare_options
+    if defined?(EnjuCirculation)
+      @checkout_types = CheckoutType.select([:id, :display_name, :position])
+    end
+  end
 end

data/app/mailers/notifier.rb

@@ -1,13 +1,5 @@
 class Notifier < ActionMailer::Base
   include Resque::Mailer
-  if LibraryGroup.site_config.try(:url)
-    uri = Addressable::URI.parse(LibraryGroup.site_config.url)
-    default_url_options[:host] = uri.host
-    default_url_options[:port] = uri.port if Setting.enju.web_port_number != 80
-  else
-    default_url_options[:host] = Setting.enju.web_hostname
-    default_url_options[:port] = Setting.enju.web_port_number if Setting.enju.web_port_number != 80
-  end
 
   def message_notification(message_id)
     message = Message.find(message_id)

data/app/models/user_group.rb

@@ -1,22 +1,3 @@
-# == Schema Information
-#
-# Table name: user_groups
-#
-#  id                               :integer          not null, primary key
-#  name                             :string(255)
-#  display_name                     :text
-#  note                             :text
-#  position                         :integer
-#  created_at                       :datetime         not null
-#  updated_at                       :datetime         not null
-#  deleted_at                       :datetime
-#  valid_period_for_new_user        :integer          default(0), not null
-#  expired_at                       :datetime
-#  number_of_day_to_notify_overdue  :integer          default(1), not null
-#  number_of_day_to_notify_due_date :integer          default(7), not null
-#  number_of_time_to_notify_overdue :integer          default(3), not null
-#
-
 # -*- encoding: utf-8 -*-
 class UserGroup < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :valid_period_for_new_user,
@@ -37,3 +18,23 @@ class UserGroup < ActiveRecord::Base
 
   enju_circulation_user_group_model if defined?(EnjuCirculation)
 end
+
+# == Schema Information
+#
+# Table name: user_groups
+#
+#  id                               :integer          not null, primary key
+#  name                             :string(255)
+#  display_name                     :text
+#  note                             :text
+#  position                         :integer
+#  created_at                       :datetime         not null
+#  updated_at                       :datetime         not null
+#  deleted_at                       :datetime
+#  valid_period_for_new_user        :integer          default(0), not null
+#  expired_at                       :datetime
+#  number_of_day_to_notify_overdue  :integer          default(1), not null
+#  number_of_day_to_notify_due_date :integer          default(7), not null
+#  number_of_time_to_notify_overdue :integer          default(3), not null
+#
+

data/app/views/devise/sessions/new.html.erb

@@ -17,7 +17,7 @@
 
   <p>
     <%= f.label t('activerecord.attributes.user.password') %><br />
-    <%= f.password_field :password, :class => 'login_password' %>
+    <%= f.password_field :password, :class => 'login_password', :autocomplete => 'off' %>
   </p>
 
   <p id="notice"><%= notice %></p>

data/app/views/my_accounts/_edit_credential.html.erb

@@ -12,15 +12,15 @@
   <div class="field">
     <abbr title="required"><%= t('simple_form.required.mark') %></abbr>
     <%= f.label :current_password -%><br />
-    <%= f.password_field :current_password, :class => 'resource_email' -%>
+    <%= f.password_field :current_password, :class => 'resource_email', :autocomplete => 'off' -%>
   </div>
   <div class="field">
     <%= f.label :password -%><br />
-    <%= f.password_field :password, :class => 'resource_email' -%>
+    <%= f.password_field :password, :class => 'resource_email', :autocomplete => 'off' -%>
   </div>
   <div class="field">
     <%= f.label :password_confirmation -%><br />
-    <%= f.password_field :password_confirmation, :class => 'resource_email' -%>
+    <%= f.password_field :password_confirmation, :class => 'resource_email', :autocomplete => 'off' -%>
   </div>
 
   <div class="field">

data/app/views/page/_menu.html.erb

@@ -41,7 +41,7 @@
               <li><%= link_to t('enju_ndl.import_from_ndl_search'), ndl_books_path -%></li>
             <% end %>
             <li><%= link_to t('page.add_manually'), new_manifestation_path -%></li>
-            <li><%= link_to t('page.serial'), series_statements_path -%></li>
+            <li><%= link_to t('page.serial'), manifestations_path(:periodical => true) -%></li>
             <li><%= link_to t('page.import_from_file'), new_resource_import_file_path -%></li>
             <li><%= link_to t('activerecord.models.accept'), new_accept_path -%></li>
             <% if defined?(EnjuBookmark) %>

data/app/views/page/configuration.html.erb

@@ -46,6 +46,7 @@
           <li><%= link_to t('item.all_item'), items_path %></li>
         </ul>
         </li>
+        <li><%= link_to t('activerecord.models.identifier_type'), identifier_types_path -%>
         <% if defined?(EnjuBookmark) %>
           <li><%= link_to t('activerecord.models.bookmark'), bookmarks_path -%></li>
         <% end %>
@@ -81,7 +82,6 @@
           <li><%= link_to t('activerecord.models.subject_heading_type'), subject_heading_types_path -%></li>
           <li><%= link_to t('activerecord.models.classification'), classifications_path -%></li>
           <li><%= link_to t('activerecord.models.classification_type'), classification_types_path -%></li>
-          <li><%= link_to t('activerecord.models.subject_has_classification'), subject_has_classifications_path -%></li>
         </ul>
       </div>
     </div>
@@ -104,9 +104,11 @@
         <li><%= link_to t('activerecord.models.patron_relationship_type'), patron_relationship_types_path -%></li>
         <li><%= link_to t('activerecord.models.manifestation_relationship_type'), manifestation_relationship_types_path -%></li>
         <li><%= link_to t('activerecord.models.license'), licenses_path -%></li>
+        <!--
         <li><%= link_to t('activerecord.models.create_type'), create_types_path -%></li>
         <li><%= link_to t('activerecord.models.realize_type'), realize_types_path -%></li>
         <li><%= link_to t('activerecord.models.produce_type'), produce_types_path -%></li>
+        -->
       </ul>
     </div>
   </div>

data/app/views/user_groups/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@user_group, :validate => true) do |f| %>
+<%= simple_nested_form_for(@user_group) do |f| %>
   <%= f.error_notification -%>
 
   <div class="field">
@@ -25,6 +25,11 @@
     <%= f.label :number_of_time_to_notify_overdue %><br />
     <%= f.text_field :number_of_time_to_notify_overdue, :class => 'resource_integer' %>
   </div>
+
+  <% if defined?(EnjuCirculation) %>
+    <%= render 'user_groups/checkout_form', :f => f %>
+  <% end %>
+
   <div class="field">
     <%= f.label :note %><br />
     <%= f.text_area :note %>

data/config/locales/translation_ja.yml

@@ -239,9 +239,8 @@ ja:
     successfully_updated: "%{model}は正常に更新されました。"
     successfully_deleted: "%{model}は正常に削除されました。"
   advanced_search:
-    from: "ここから"
-    to: "ここまで"
-    from_to: "から"
+    from: ""
+    to: "から"
     all_libraries: "全ての図書館"
   work:
     patron_work: "%{patron_name} の書いた資料"

data/config/routes.rb

@@ -20,14 +20,14 @@ Rails.application.routes.draw do
 
   root :to => "page#index"
 
-  match '/page/about' => 'page#about'
-  match '/page/configuration' => 'page#configuration'
-  match '/page/advanced_search' => 'page#advanced_search'
-  match '/page/add_on' => 'page#add_on'
-  match '/page/export' => 'page#export'
-  match '/page/import' => 'page#import'
-  match '/page/msie_acceralator' => 'page#msie_acceralator'
-  match '/page/opensearch' => 'page#opensearch'
-  match '/page/statistics' => 'page#statistics'
-  match '/page/routing_error' => 'page#routing_error'
+  get '/page/about' => 'page#about'
+  get '/page/configuration' => 'page#configuration'
+  get '/page/advanced_search' => 'page#advanced_search'
+  get '/page/add_on' => 'page#add_on'
+  get '/page/export' => 'page#export'
+  get '/page/import' => 'page#import'
+  get '/page/msie_acceralator' => 'page#msie_acceralator'
+  get '/page/opensearch' => 'page#opensearch'
+  get '/page/statistics' => 'page#statistics'
+  get '/page/routing_error' => 'page#routing_error'
 end

data/lib/enju_leaf.rb

@@ -54,7 +54,7 @@ module EnjuLeaf
 
     def render_404_invalid_format
       return if performed?
-      render :file => "#{Rails.root}/public/404.html"
+      render :file => "#{Rails.root}/public/404", :formats => [:html]
     end
 
     def render_500
@@ -62,8 +62,8 @@ module EnjuLeaf
       return if performed?
       #flash[:notice] = t('page.connection_failed')
       respond_to do |format|
-        format.html {render :file => "#{Rails.root.to_s}/public/500.html", :layout => false, :status => 500}
-        format.mobile {render :file => "#{Rails.root.to_s}/public/500.html", :layout => false, :status => 500}
+        format.html {render :file => "#{Rails.root.to_s}/public/500", :layout => false, :status => 500}
+        format.mobile {render :file => "#{Rails.root.to_s}/public/500", :layout => false, :status => 500}
         format.xml {render :template => 'page/500', :status => 500}
         format.json { render :text => '{"error": "server_error"}' }
       end
@@ -272,8 +272,6 @@ module EnjuLeaf
             request.format = :html if request.format == :mobile
           end
         end
-      #else
-      #  session[:mobylette_override] = nil
       end
     end
 

data/lib/enju_leaf/controller.rb

@@ -9,7 +9,7 @@ module EnjuLeaf
     private
     def set_error_template
       rescue_from CanCan::AccessDenied, :with => :render_403
-      rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+      #rescue_from ActiveRecord::RecordNotFound, :with => :render_404
       rescue_from Errno::ECONNREFUSED, :with => :render_500
       rescue_from ActionView::MissingTemplate, :with => :render_404_invalid_format
     end

data/lib/enju_leaf/engine.rb

@@ -3,8 +3,12 @@ require 'enju_library'
 require 'enju_manifestation_viewer'
 require 'redcarpet'
 require 'mobylette'
+require 'rails_autolink'
+require 'devise-encryptable'
+require 'sitemap_generator'
+require 'redis-rails'
+require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'jquery-modal-rails'
 
 module EnjuLeaf
   class Engine < ::Rails::Engine

data/lib/enju_leaf/version.rb

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

data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb

@@ -3,7 +3,6 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
 
   def quick_install
     environment = ENV['ENJU_ENV'] || 'development'
-    rake("db:create:all")
     rake("db:migrate", :env => environment)
     generate("enju_circulation:setup")
     generate("enju_subject:setup")

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

@@ -20,6 +20,12 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.irregular 'reserve', 'reserves'
 end
 EOS
+    inject_into_file 'config/environments/development.rb',
+      " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
+      :after => "::Application.configure do\n"
+    inject_into_file 'config/environments/production.rb',
+      " config.action_mailer.default_url_options = {:host => 'localhost:3000'}\n",
+      :after => "::Application.configure do\n"
     generate("devise:install")
     generate("devise", "User")
     generate("enju_biblio:setup")
@@ -41,6 +47,16 @@ EOS
   enju_leaf
   enju_biblio
   enju_library
+
+  private
+  def mobylette_options
+    @mobylette_options ||= ApplicationController.send(:mobylette_options).merge(
+      {
+        :skip_xhr_requests => false
+      }
+    )
+  end
+
 EOS
     end
     #inject_into_class "app/models/user.rb", User, "  enju_user_model\n"
@@ -48,7 +64,10 @@ EOS
       <<"EOS"
   include EnjuLeaf::EnjuLeafHelper
   include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
-  include EnjuManifestationViewer::ManifestationViewerHelper if defined?(EnjuManifestationViewer)
+  if defined?(EnjuManifestationViewer)
+    include EnjuManifestationViewer::BookJacketHelper
+    include EnjuManifestationViewer::ManifestationViewerHelper
+  end
 EOS
     end
     inject_into_file "app/assets/javascripts/application.js", :after => /\/\/= require jquery_ujs$\n/ do

data/lib/generators/enju_leaf/setup/templates/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

data/spec/controllers/users_controller_spec.rb

@@ -65,11 +65,6 @@ describe UsersController do
         get :show, :id => 'admin'
         assigns(:user).should eq(User.find('admin'))
       end
-
-      it "should not show missing user" do
-        get :show, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do
@@ -157,11 +152,6 @@ describe UsersController do
         get :edit, :id => user.id
         assigns(:user).should eq(user)
       end
-
-      it "should not edit missing user" do
-        get :edit, :id => 'missing'
-        response.should be_missing
-      end
     end
 
     describe "When logged in as Librarian" do

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

@@ -4,9 +4,12 @@ class ApplicationController < ActionController::Base
   enju_biblio
   enju_library
 
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-  rescue_from Errno::ECONNREFUSED, :with => :render_500
-  rescue_from ActionView::MissingTemplate, :with => :render_404_invalid_format
-  #rescue_from ActionController::RoutingError, :with => :render_404
+  private
+  def mobylette_options
+    @mobylette_options ||= ApplicationController.send(:mobylette_options).merge(
+      {
+        :skip_xhr_requests => false
+      }
+    )
+  end
 end