enju_message 0.1.11 → 0.1.12

data/app/controllers/messages_controller.rb

@@ -29,7 +29,7 @@ class MessagesController < ApplicationController
       with(:is_read).equal_to is_read unless is_read.nil?
     end
     page = params[:page] || 1
-    search.query.paginate(page.to_i, Message.per_page)
+    search.query.paginate(page.to_i, Message.default_per_page)
     @messages = search.execute!.results
 
     respond_to do |format|

data/app/models/message.rb

@@ -40,9 +40,7 @@ class Message < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def set_receiver
     if self.recipient

data/app/models/message_request.rb

@@ -26,9 +26,7 @@ class MessageRequest < ActiveRecord::Base
     end
   end
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def start_sending_message
     sm_start!
@@ -38,16 +36,22 @@ class MessageRequest < ActiveRecord::Base
   def send_message
     message = nil
     MessageRequest.transaction do
-      if self.body
-        message = Message.create!(:sender => self.sender, :recipient => self.receiver.username, :subject => self.subject, :body => self.body)
+      if body
+        message = Message.new
+        message.sender = sender
+        message.recipient  = receiver.username
+        message.subject = subject
+        message.body = body
+        message.save!
       else
         raise 'body is empty!'
       end
       self.sent_at = Time.zone.now
-      save!
+      save(:validate => false)
       if ['reservation_expired_for_patron', 'reservation_expired_for_patron'].include?(self.message_template.status)
         self.receiver.reserves.each do |reserve|
-          reserve.update_attribute(:expiration_notice_to_patron, true)
+          reserve.expiration_notice_to_patron = true
+          reserve.save(:validate => false)
         end
       end
     end
@@ -55,7 +59,7 @@ class MessageRequest < ActiveRecord::Base
   end
 
   def subject
-    self.message_template.title
+    message_template.title
   end
 
   def save_message_body(options = {})

data/app/models/message_template.rb

@@ -8,9 +8,7 @@ class MessageTemplate < ActiveRecord::Base
 
   acts_as_list
 
-  def self.per_page
-    10
-  end
+  paginates_per 10
 
   def embed_body(options = {})
     template = Erubis::Eruby.new(body)

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

@@ -37,7 +37,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@message_requests) -%>
+<%= paginate(@message_requests) -%>
 </div>
 </div>
 

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

@@ -33,7 +33,7 @@
 <%- end -%>
 </table>
 
-<%= will_paginate(@message_templates) -%>
+<%= paginate(@message_templates) -%>
 </div>
 </div>
 

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

@@ -37,7 +37,7 @@
     </tr>
   </table>
 <%- end -%>
-<%= will_paginate(@messages) -%>
+<%= paginate(@messages) -%>
 </div>
 </div>
 

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/lib/generators/enju_message/views_generator.rb

@@ -0,0 +1,21 @@
+module EnjuMessage
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path('../../../../app/views', __FILE__)
+
+      def copy_files
+        directories = %w(
+          layouts
+          message_requests
+          message_templates
+          messages
+          notifier
+        )
+
+        directories.each do |dir|
+          directory dir, "app/views/#{dir}"
+        end
+      end
+    end
+  end
+end

data/spec/dummy/solr/data/test/index/{_f.fnm → _n.fnm}

@@ -1,3 +1,3 @@
-����
+����
 idtype
 class_name	subject_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -201,84 +201,7 @@ files:
 - app/models/message.rb
 - app/models/message_request.rb
 - app/models/message_template.rb
-- app/views/baskets/edit.html.erb
-- app/views/baskets/index.html.erb
-- app/views/baskets/new.html.erb
-- app/views/baskets/show.html.erb
-- app/views/carrier_type_has_checkout_types/_form.html.erb
-- app/views/carrier_type_has_checkout_types/edit.html.erb
-- app/views/carrier_type_has_checkout_types/index.html.erb
-- app/views/carrier_type_has_checkout_types/new.html.erb
-- app/views/carrier_type_has_checkout_types/show.html.erb
-- app/views/checked_items/_checkouts.html.erb
-- app/views/checked_items/_list.html.erb
-- app/views/checked_items/edit.html.erb
-- app/views/checked_items/index.html.erb
-- app/views/checked_items/index.js.erb
-- app/views/checked_items/new.html.erb
-- app/views/checked_items/show.html.erb
-- app/views/checkins/_form.html.erb
-- app/views/checkins/_list.html.erb
-- app/views/checkins/edit.html.erb
-- app/views/checkins/index.html.erb
-- app/views/checkins/index.js.erb
-- app/views/checkins/new.html.erb
-- app/views/checkins/show.html.erb
-- app/views/checkout_stat_has_manifestations/_form.html.erb
-- app/views/checkout_stat_has_manifestations/edit.html.erb
-- app/views/checkout_stat_has_manifestations/index.html.erb
-- app/views/checkout_stat_has_manifestations/new.html.erb
-- app/views/checkout_stat_has_manifestations/show.html.erb
-- app/views/checkout_stat_has_users/_form.html.erb
-- app/views/checkout_stat_has_users/edit.html.erb
-- app/views/checkout_stat_has_users/index.html.erb
-- app/views/checkout_stat_has_users/new.html.erb
-- app/views/checkout_stat_has_users/show.html.erb
-- app/views/checkout_types/_form.html.erb
-- app/views/checkout_types/edit.html.erb
-- app/views/checkout_types/index.html.erb
-- app/views/checkout_types/new.html.erb
-- app/views/checkout_types/show.html.erb
-- app/views/checkouts/_form.html.erb
-- app/views/checkouts/_index.html.erb
-- app/views/checkouts/_index_overdue.html.erb
-- app/views/checkouts/_index_user.html.erb
-- app/views/checkouts/_list.html.erb
-- app/views/checkouts/edit.html.erb
-- app/views/checkouts/index.atom.builder
-- app/views/checkouts/index.csv.erb
-- app/views/checkouts/index.html.erb
-- app/views/checkouts/index.ics.erb
-- app/views/checkouts/index.rss.builder
-- app/views/checkouts/new.html.erb
-- app/views/checkouts/show.html.erb
-- app/views/circulation_statuses/_form.html.erb
-- app/views/circulation_statuses/edit.html.erb
-- app/views/circulation_statuses/index.html.erb
-- app/views/circulation_statuses/new.html.erb
-- app/views/circulation_statuses/show.html.erb
-- app/views/item_has_use_restrictions/edit.html.erb
-- app/views/item_has_use_restrictions/index.html.erb
-- app/views/item_has_use_restrictions/new.html.erb
-- app/views/item_has_use_restrictions/show.html.erb
 - app/views/layouts/messages.html.erb
-- app/views/lending_policies/_form.html.erb
-- app/views/lending_policies/edit.html.erb
-- app/views/lending_policies/index.html.erb
-- app/views/lending_policies/new.html.erb
-- app/views/lending_policies/show.html.erb
-- app/views/manifestation_checkout_stats/_form.html.erb
-- app/views/manifestation_checkout_stats/edit.html.erb
-- app/views/manifestation_checkout_stats/index.html.erb
-- app/views/manifestation_checkout_stats/new.html.erb
-- app/views/manifestation_checkout_stats/show.csv.erb
-- app/views/manifestation_checkout_stats/show.html.erb
-- app/views/manifestation_reserve_stats/_form.html.erb
-- app/views/manifestation_reserve_stats/edit.html.erb
-- app/views/manifestation_reserve_stats/index.html.erb
-- app/views/manifestation_reserve_stats/new.html.erb
-- app/views/manifestation_reserve_stats/show.csv.erb
-- app/views/manifestation_reserve_stats/show.html.erb
 - app/views/message_requests/edit.html.erb
 - app/views/message_requests/index.html.erb
 - app/views/message_requests/new.html.erb
@@ -297,48 +220,6 @@ files:
 - app/views/messages/show.html.erb
 - app/views/notifier/message_notification.en.text.erb
 - app/views/notifier/message_notification.ja.text.erb
-- app/views/reserve_stat_has_manifestations/_form.html.erb
-- app/views/reserve_stat_has_manifestations/edit.html.erb
-- app/views/reserve_stat_has_manifestations/index.html.erb
-- app/views/reserve_stat_has_manifestations/new.html.erb
-- app/views/reserve_stat_has_manifestations/show.html.erb
-- app/views/reserve_stat_has_users/_form.html.erb
-- app/views/reserve_stat_has_users/edit.html.erb
-- app/views/reserve_stat_has_users/index.html.erb
-- app/views/reserve_stat_has_users/new.html.erb
-- app/views/reserve_stat_has_users/show.html.erb
-- app/views/reserves/_form.html.erb
-- app/views/reserves/_new.html.erb
-- app/views/reserves/_new_user.html.erb
-- app/views/reserves/_title.html.erb
-- app/views/reserves/edit.html.erb
-- app/views/reserves/index.atom.builder
-- app/views/reserves/index.csv.erb
-- app/views/reserves/index.html.erb
-- app/views/reserves/index.rss.builder
-- app/views/reserves/new.html.erb
-- app/views/reserves/show.html.erb
-- app/views/use_restrictions/_form.html.erb
-- app/views/use_restrictions/edit.html.erb
-- app/views/use_restrictions/index.html.erb
-- app/views/use_restrictions/new.html.erb
-- app/views/use_restrictions/show.html.erb
-- app/views/user_checkout_stats/_form.html.erb
-- app/views/user_checkout_stats/edit.html.erb
-- app/views/user_checkout_stats/index.html.erb
-- app/views/user_checkout_stats/new.html.erb
-- app/views/user_checkout_stats/show.csv.erb
-- app/views/user_checkout_stats/show.html.erb
-- app/views/user_group_has_checkout_types/edit.html.erb
-- app/views/user_group_has_checkout_types/index.html.erb
-- app/views/user_group_has_checkout_types/new.html.erb
-- app/views/user_group_has_checkout_types/show.html.erb
-- app/views/user_reserve_stats/_form.html.erb
-- app/views/user_reserve_stats/edit.html.erb
-- app/views/user_reserve_stats/index.html.erb
-- app/views/user_reserve_stats/new.html.erb
-- app/views/user_reserve_stats/show.csv.erb
-- app/views/user_reserve_stats/show.html.erb
 - config/locales/translation_en.yml
 - config/locales/translation_ja.yml
 - config/routes.rb
@@ -352,6 +233,7 @@ files:
 - lib/enju_message/user.rb
 - lib/enju_message/version.rb
 - lib/enju_message.rb
+- lib/generators/enju_message/views_generator.rb
 - lib/tasks/enju_message_tasks.rake
 - MIT-LICENSE
 - Rakefile
@@ -397,7 +279,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
@@ -414,7 +295,6 @@ files:
 - spec/dummy/db/migrate/20111201163342_create_user_groups.rb
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
 - spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb
-- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -434,16 +314,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/_f.fdt
-- spec/dummy/solr/data/test/index/_f.fdx
-- spec/dummy/solr/data/test/index/_f.fnm
-- spec/dummy/solr/data/test/index/_f.frq
-- spec/dummy/solr/data/test/index/_f.nrm
-- spec/dummy/solr/data/test/index/_f.prx
-- spec/dummy/solr/data/test/index/_f.tii
-- spec/dummy/solr/data/test/index/_f.tis
+- spec/dummy/solr/data/test/index/_n.fdt
+- spec/dummy/solr/data/test/index/_n.fdx
+- spec/dummy/solr/data/test/index/_n.fnm
+- spec/dummy/solr/data/test/index/_n.frq
+- spec/dummy/solr/data/test/index/_n.nrm
+- spec/dummy/solr/data/test/index/_n.prx
+- spec/dummy/solr/data/test/index/_n.tii
+- spec/dummy/solr/data/test/index/_n.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_x
+- spec/dummy/solr/data/test/index/segments_1d
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb
@@ -531,7 +411,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/080_create_library_groups.rb
 - spec/dummy/db/migrate/20080905191442_create_patron_types.rb
@@ -548,7 +427,6 @@ test_files:
 - spec/dummy/db/migrate/20111201163342_create_user_groups.rb
 - spec/dummy/db/migrate/20111201163718_create_user_has_roles.rb
 - spec/dummy/db/migrate/20120213092115_add_queue_to_delayed_jobs.rb
-- spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
@@ -568,16 +446,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/_f.fdt
-- spec/dummy/solr/data/test/index/_f.fdx
-- spec/dummy/solr/data/test/index/_f.fnm
-- spec/dummy/solr/data/test/index/_f.frq
-- spec/dummy/solr/data/test/index/_f.nrm
-- spec/dummy/solr/data/test/index/_f.prx
-- spec/dummy/solr/data/test/index/_f.tii
-- spec/dummy/solr/data/test/index/_f.tis
+- spec/dummy/solr/data/test/index/_n.fdt
+- spec/dummy/solr/data/test/index/_n.fdx
+- spec/dummy/solr/data/test/index/_n.fnm
+- spec/dummy/solr/data/test/index/_n.frq
+- spec/dummy/solr/data/test/index/_n.nrm
+- spec/dummy/solr/data/test/index/_n.prx
+- spec/dummy/solr/data/test/index/_n.tii
+- spec/dummy/solr/data/test/index/_n.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_x
+- spec/dummy/solr/data/test/index/segments_1d
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb

data/app/views/baskets/edit.html.erb

@@ -1,30 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_list">
-
-<%= form_for(@basket) do |f| -%>
-  <%= f.error_messages -%>
-  <div class="field">
-    <%= f.label t('activerecord.models.user') -%><br />
-    <%= @basket.user.username -%>
-    <%= f.hidden_field :user_id -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
-  </div>
-
-  <div class="actions">
-    <%= f.submit %>
-  </div>
-<%- end -%>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.show'), basket_path(@basket) -%></li>
-    <li><%= link_to t('page.back'), user_baskets_path(@basket.user) -%></li>
-  </ul>
-</div>

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

@@ -1,31 +0,0 @@
-<div id="content_list">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.basket')) -%></h1>
-<div id="content_detail" class="ui-corner-all">
-
-<table class="index">
-  <tr>
-    <th><%= t('activerecord.models.user') -%></th>
-    <th><%= t('activerecord.attributes.basket.note') -%></th>
-    <th><%= t('page.updated_at') -%></th>
-  </tr>
-
-<%- @baskets.each do |basket| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= basket.user.username -%></td>
-    <td><%= basket.note -%></td>
-    <td><%= basket.updated_at -%></td>
-    <td><%= link_to t('page.show'), basket -%></td>
-  </tr>
-<%- end -%>
-</table>
-
-<%= will_paginate(@baskets) -%>
-
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.basket')), new_basket_path -%></li>
-  </ul>
-</div>