enju_leaf 1.1.0.rc16 → 1.1.0.rc17

data/app/views/profiles/show.html.erb

@@ -6,7 +6,7 @@
   <h2 class="resource_title">
     [U]
     <%= @profile.user.username -%>
-    <% if @profile.full_name %>
+    <% if @profile.full_name? %>
       (<%= @profile.full_name %>)
     <% end %>
   </h2>
@@ -18,32 +18,15 @@
   <%- end -%>
 
   <% if defined?(EnjuCirculation) %>
-    <h2><%= t('activerecord.models.checkout') %></h2>
-    <table class="table table-striped index">
-      <tr>
-        <th><%= t('activerecord.models.item') %></th>
-        <th><%= t('activerecord.attributes.checkout.due_date') %></th>
-      </tr>
-      <% if @profile.user %>
-      <% @profile.user.checkouts.not_returned.each do |checkout| %>
-        <tr class="line<%= cycle("0", "1") -%>">
-          <td>
-            <%= link_to checkout.item.item_identifier, checkout.item %><br />
-            (<%= link_to checkout.item.manifestation.original_title, checkout.item.manifestation %>)
-          </td>
-          <td>
-            <%=l checkout.due_date, formats: :only_date %>
-            <br />
-            <%- if can? :update, checkout -%>
-              <% unless checkout.checkin %>
-                (<%= link_to t('checkout.extend'), edit_checkout_path(checkout) -%>)
-              <% end %>
-            <%- end -%>
-          </td>
-        </tr>
-      <% end %>
-      <% end %>
-    </table>
+    <h2>
+      <%= t('activerecord.models.checkout') %>
+      <%= link_to image_tag('icons/date.png', size: '16x16', alt: 'iCalendar', class: 'icon'), checkouts_path(icalendar_token: current_user.profile.checkout_icalendar_token, format: :ics) if current_user.profile.checkout_icalendar_token? %>
+      <%= link_to image_tag('icons/feed.png', size: '16x16', alt: 'RSS', class: 'icon'), checkouts_path(user_id: current_user.username, format: :rss) %>
+      <%= link_to image_tag('icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), checkouts_path(user_id: current_user.username, format: :txt) %>
+    </h2>
+    <% if @profile.user %>
+      <%= render 'checkouts/list', checkouts: @profile.user.checkouts.page(params[:page]) %>
+    <% end %>
   <% end %>
 </div>
 </div>

data/app/views/user_export_files/index.html.erb

@@ -19,13 +19,13 @@
         <td><%= link_to user_export_file.id, user_export_file %></td>
         <td><%= user_export_file.user.try(:username) %></td>
         <td>
-          <%= link_to user_export_file.user_export_file_name, user_export_file.user_export.url if user_export_file.user_export.path %>
+          <%= link_to user_export_file.user_export_file_name, user_export_file_path(user_export_file, format: :download) if user_export_file.user_export_file_name %>
           <br />
           <%= user_export_file.created_at %>
         </td>
         <td><%= localized_state(user_export_file.current_state) -%></td>
         <td>
-          <%= link_to t('page.destroy'), user_export_file, method: :delete, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+          <%= link_to t('page.destroy'), user_export_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         </td>
       </tr>
     <% end %>

data/app/views/user_export_files/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_export_file.user_export_file_name') -%></strong>
-  <%= link_to @user_export_file.user_export_file_name, @user_export_file.user_export.url if @user_export_file.user_export_file_name %>
+  <%= link_to @user_export_file.user_export_file_name, user_export_file_path(@user_export_file, format: :download) if @user_export_file.user_export_file_name %>
 </p>
 
 <p>

data/app/views/user_import_files/index.html.erb

@@ -19,7 +19,7 @@
       <tr class="line<%= cycle("0", "1") -%>">
         <td><%= link_to (user_import_file.id), user_import_file -%></td>
         <td>
-          <%= link_to user_import_file.user_import_file_name, user_import_file -%>
+          <%= link_to user_import_file.user_import_file_name, user_import_file_path(user_import_file, format: :download) if user_import_file.user_import_file_name %>
           <br />
           <%= t('activerecord.models.user') -%>: <%= link_to user_import_file.user.username, user_import_file.user.profile if user_import_file.user.try(:profile) -%></td>
         <td><%= user_import_file.edit_mode -%></td>

data/app/views/user_import_files/show.html.erb

@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.user_import_file.user_import_file_name') -%>:</strong>
-  <%= link_to @user_import_file.user_import_file_name, user_import_file_path(@user_import_file, format: :download) -%>
+  <%= link_to @user_import_file.user_import_file_name, user_import_file_path(@user_import_file, format: :download) if @user_import_file.user_import_file_name %>
 </p>
 
 <p>

data/lib/enju_leaf/calculate_stat.rb

@@ -28,10 +28,10 @@ module CalculateStat
     end
 
     def send_message
-      sender = User.find(1)
+      sender = User.find(1) # system
       message_template = MessageTemplate.localized_template('counting_completed', user.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template}, as: :admin)
+      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template})
       request.save_message_body
       request.transition_to!(:sent)
     end

data/lib/enju_leaf/engine.rb

@@ -1,3 +1,14 @@
+require 'kaminari'
+require 'devise'
+require 'cancancan'
+require 'acts_as_list'
+require 'attribute_normalizer'
+require 'friendly_id'
+require 'addressable/uri'
+require 'sunspot_rails'
+require 'resque/server'
+require 'settingslogic'
+require 'nested_form'
 require 'enju_biblio'
 require 'enju_library'
 require 'enju_manifestation_viewer'

data/lib/enju_leaf/export_file.rb

@@ -8,7 +8,6 @@ module ExportFile
       include InstanceMethods
       belongs_to :user
       validates :user, presence: true
-      attr_accessible :mode
       attr_accessor :mode
     end
   end
@@ -18,7 +17,7 @@ module ExportFile
       sender = User.find(1)
       message_template = MessageTemplate.localized_template('export_completed', user.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template}, as: :admin)
+      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template})
       request.save_message_body
       request.transition_to!(:sent)
     end

data/lib/enju_leaf/import_file.rb

@@ -53,7 +53,7 @@ module ImportFile
       sender = User.find(1)
       message_template = MessageTemplate.localized_template('import_completed', user.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template}, as: :admin)
+      request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
       request.save_message_body
       request.transition_to!(:sent)
     end

data/lib/enju_leaf/user.rb

@@ -9,22 +9,22 @@ module EnjuLeaf
         include InstanceMethods
 
         # Setup accessible (or protected) attributes for your model
-        attr_accessible :email, :password, :password_confirmation, :current_password,
-          :remember_me, :email_confirmation,
-          :auto_generated_password,
-          :profile_attributes
-        attr_accessible :email, :password, :password_confirmation, :username,
-          :current_password, :remember_me,
-          :email_confirmation,
-          :expired_at, :locked, :role_id,
-          :user_has_role_attributes, :auto_generated_password,
-          :profile_attributes,
-          :as => :admin
+        #attr_accessible :email, :password, :password_confirmation, :current_password,
+        #  :remember_me, :email_confirmation,
+        #  :auto_generated_password,
+        #  :profile_attributes
+        #attr_accessible :email, :password, :password_confirmation, :username,
+        #  :current_password, :remember_me,
+        #  :email_confirmation,
+        #  :expired_at, :locked, :role_id,
+        #  :user_has_role_attributes, :auto_generated_password,
+        #  :profile_attributes,
+        #  :as => :admin
 
         scope :administrators, -> { joins(:role).where('roles.name = ?', 'Administrator') }
         scope :librarians, -> { joins(:role).where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian') }
         scope :suspended, -> { where('locked_at IS NOT NULL') }
-        has_one :profile, :dependent => :destroy
+        has_one :profile
         if defined?(EnjuBiblio)
           has_many :import_requests
           has_many :picture_files, :as => :picture_attachable, :dependent => :destroy
@@ -98,19 +98,19 @@ module EnjuLeaf
             lines = []
             lines << u.username
             lines << u.email
-            lines << u.profile.user_number
+            lines << u.try(:profile).try(:user_number)
             lines << u.role.name
-            lines << u.profile.user_group.try(:name)
-            lines << u.profile.library.try(:name)
-            lines << u.profile.locale
+            lines << u.try(:profile).try(:user_group).try(:name)
+            lines << u.try(:profile).try(:library).try(:name)
+            lines << u.try(:profile).try(:locale)
             lines << u.created_at
             lines << u.updated_at
             lines << u.expired_at
-            lines << u.profile.keyword_list.try(:split).try(:join, "//")
-            lines << u.profile.note
+            lines << u.try(:profile).try(:keyword_list).try(:split).try(:join, "//")
+            lines << u.try(:profile).try(:note)
             if defined?(EnjuCirculation)
-              lines << u.profile.try(:checkout_icalendar_token)
-              lines << u.profile.try(:save_checkout_history)
+              lines << u.try(:profile).try(:checkout_icalendar_token)
+              lines << u.try(:profile).try(:save_checkout_history)
             else
               lines << nil
             end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc16"
+  VERSION = "1.1.0.rc17"
 end

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

@@ -22,15 +22,15 @@ EOS
     append_to_file("Rakefile", "require 'resque/tasks'\n")
     append_to_file("Rakefile", "require 'resque/scheduler/tasks'")
     append_to_file("db/seeds.rb", File.open(File.expand_path('../templates', __FILE__) + '/db/seeds.rb').read)
-    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/test.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"
+    application(nil, env: "development") do
+      "config.action_mailer.default_url_options = {host: 'localhost:3000'}\n"
+    end
+    application(nil, env: "test") do
+      "config.action_mailer.default_url_options = {host: 'localhost:3000'}\n"
+    end
+    application(nil, env: "production") do
+      "config.action_mailer.default_url_options = {host: 'localhost:3000'}\n"
+    end
     generate("devise:install")
     generate("devise", "User")
     if Rails::VERSION::MAJOR >= 4
@@ -57,7 +57,6 @@ EOS
 , :trackable, #:validatable, 
       :lockable, :lock_strategy => :none, :unlock_strategy => :none
   enju_leaf_user_model
-  attr_accessible :username
 EOS
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       <<"EOS"

data/lib/generators/enju_leaf/setup/templates/Procfile

@@ -1,3 +1,3 @@
 solr: bundle exec rake sunspot:solr:run
-resque: bundle exec rake environment resque:work QUEUE=* TERM_CHILD=1
+resque: bundle exec rake environment resque:work QUEUE=enju_leaf TERM_CHILD=1
 web: bundle exec rails s

data/lib/generators/enju_leaf/setup/templates/config/application.yml

@@ -16,6 +16,7 @@ defaults: &defaults
     hostname: www.amazon.co.jp
     access_key_id: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
     secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
+    bucket: enju_leaf
 
 # :google, :amazon
   book_jacket:

data/lib/tasks/enju_leaf_tasks.rake

@@ -37,4 +37,9 @@ namespace :enju_leaf do
     Rails::Engine.subclasses.each{|engine| engine.instance.eager_load!}
     Rake::Task['sunspot:reindex'].execute(args)
   end
+
+  desc 'Export items'
+  task :item => :environment do
+    puts Manifestation.export(format: :txt)
+  end
 end

data/spec/controllers/my_accounts_controller_spec.rb

@@ -82,6 +82,7 @@ describe MyAccountsController do
     before(:each) do
       @attrs = {:user_attributes => {:email => 'newaddress@example.jp', :current_password => 'password'}, :locale => 'en'}
       @invalid_attrs = {:user_attributes => {:username => ''}, :user_number => '日本語'}
+      @invalid_passwd_attrs = {:user_attributes => {:current_password=> ''}}
     end
 
     describe "When logged in as Administrator" do
@@ -123,6 +124,12 @@ describe MyAccountsController do
           expect(response).to render_template("edit")
         end
       end
+      describe "with invalid password params" do
+        it "assigns the requested user as @user" do
+          put :update, profile: @invalid_passwd_attrs
+	  expect(assigns(:profile).errors).not_to be_blank
+	end
+      end
     end
 
     describe "When logged in as Librarian" do
@@ -135,10 +142,12 @@ describe MyAccountsController do
 
       describe "with valid params" do
         it "updates the requested user" do
+          @attrs[:user_attributes][:id] = @user.id
           put :update, profile: @attrs
         end
 
         it "assigns the requested user as @user" do
+          @attrs[:user_attributes][:id] = @user.id
           put :update, profile: @attrs
           expect(assigns(:profile)).to eq(@user.profile)
         end
@@ -176,10 +185,12 @@ describe MyAccountsController do
 
       describe "with valid params" do
         it "updates the requested user" do
+          @attrs[:user_attributes][:id] = @user.id
           put :update, profile: @attrs
         end
 
         it "assigns the requested user as @user" do
+          @attrs[:user_attributes][:id] = @user.id
           put :update, profile: @attrs
           expect(assigns(:profile)).to eq(@user.profile)
           expect(response).to redirect_to(my_account_url)

data/spec/controllers/profiles_controller_spec.rb

@@ -394,7 +394,7 @@ describe ProfilesController do
       end
 
       it "should update myself" do
-        put :update, id: profiles(:user1).id, profile: { }
+        put :update, id: profiles(:user1).id, profile: {keyword_list: 'test'}
         response.should redirect_to profile_url(assigns(:profile))
       end
 
@@ -407,7 +407,7 @@ describe ProfilesController do
       it "should not update my user_group" do
         put :update, id: profiles(:user1).id, profile: {:user_group_id => 3, :library_id => 3}
         response.should redirect_to profile_url(assigns(:profile))
-        assigns(:profile).user_group.id.should eq 1
+        assigns(:profile).user_group_id.should eq 1
       end
 
       it "should not update my note" do

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,3 +1,4 @@
 module ApplicationHelper
   include EnjuLeaf::EnjuLeafHelper
+  include EnjuBiblio::BiblioHelper if defined?(EnjuBiblio)
 end

data/spec/dummy/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/spec/dummy/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/spec/dummy/bin/setup

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end