enju_message 0.0.19 → 0.0.20

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 YOURNAME
+Copyright 2012 Kosuke Tanabe
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -14,7 +14,7 @@ end
 
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'EnjuSubject'
+  rdoc.title    = 'EnjuMessage'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -26,6 +26,15 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = false
+end
+
 require 'rspec/core'
 require 'rspec/core/rake_task'
 
@@ -33,4 +42,5 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+
 task :default => :spec

data/app/controllers/message_requests_controller.rb

@@ -40,7 +40,7 @@ class MessageRequestsController < ApplicationController
       if @message_request.update_attributes(params[:message_request])
         flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.message_request'))
         format.html { redirect_to(@message_request) }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         @message_templates = MessageTemplate.all
         format.html { render :action => "edit" }
@@ -55,8 +55,8 @@ class MessageRequestsController < ApplicationController
     @message_request.destroy
 
     respond_to do |format|
-      format.html { redirect_to(message_requests_url) }
-      format.json { head :ok }
+      format.html { redirect_to message_requests_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/controllers/messages_controller.rb

@@ -77,7 +77,8 @@ class MessagesController < ApplicationController
   # POST /messages
   # POST /messages.json
   def create
-    @message = current_user.sent_messages.new(params[:message])
+    @message = Message.new(params[:message])
+    @message.sender = current_user
     get_parent(@message.parent_id)
     @message.receiver = User.find(@message.recipient) rescue nil
 

data/app/models/message.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 class Message < ActiveRecord::Base
+  attr_accessible :subject, :body, :recipient
   scope :unread, where(:state => 'unread')
   belongs_to :message_request
   belongs_to :sender, :class_name => 'User'

data/app/models/message_request.rb

@@ -1,5 +1,7 @@
 require 'erubis'
 class MessageRequest < ActiveRecord::Base
+  attr_accessible :body
+  attr_accessible :sender, :receiver, :message_template, :as => :admin
   scope :not_sent, where('sent_at IS NULL AND state = ?', 'pending')
   scope :sent, where(:state => 'sent')
   scope :started, where(:state => 'started')
@@ -9,7 +11,7 @@ class MessageRequest < ActiveRecord::Base
   has_many :messages
 
   validates_associated :sender, :receiver, :message_template
-  validates_presence_of :sender, :receiver, :message_template
+  validates_presence_of :sender, :receiver, :message_template, :body
 
   state_machine :initial => :pending do
     before_transition any - :sent => :sent, :do => :send_message
@@ -56,7 +58,7 @@ class MessageRequest < ActiveRecord::Base
 
   def save_message_body(options = {})
     options = {
-      :receiver => self.receiver.patron,
+      :receiver => self.receiver,
       :locale => self.receiver.locale
     }.merge(options)
     self.update_attributes!({:body => self.message_template.embed_body(options)})

data/app/models/message_template.rb

@@ -1,4 +1,5 @@
 class MessageTemplate < ActiveRecord::Base
+  attr_accessible :status, :title, :body, :locale
   default_scope :order => "message_templates.position"
   has_many :message_requests
 

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

@@ -48,13 +48,13 @@
       <li>
         <% facet.value ? facet_mode = 'read' : facet_mode = 'unread' %>
         <%- if facet_mode == mode -%><strong><%- end -%>
-          <%= link_to t("message.#{facet_mode}"), url_for(params.merge(:page => nil, :mode => facet_mode)) -%>
+          <%= link_to t("message.#{facet_mode}"), url_for(params.merge(:page => nil, :mode => facet_mode, :only_path => true)) -%>
         (<%= facet.count -%>)
         <%- if facet_mode == mode -%></strong><%- end -%>
       </li>
     <%- end -%>
     <% if mode.present? %>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:mode => nil, :page => nil)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:mode => nil, :page => nil, :only_path => true)) -%></li>
     <% end %>
   </ul>
 

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

@@ -1,14 +1,14 @@
-<%=h @message.receiver.patron.full_name -%> :
+<%= @message.receiver.patron.full_name -%> :
 
-A new message arrived from <%=h @sender_name -%>.
-<%=h messages_url %>
+A new message arrived from <%= @sender_name -%>.
+<%= messages_url %>
 
 -----
 
-<%= @message.body %>
+<%=raw @message.body %>
 
 -----
 
 -- 
-<%=h LibraryGroup.system_name(@message.receiver.locale) %>
-<%=h LibraryGroup.site_config.url %>
+<%= LibraryGroup.system_name(@message.receiver.locale) %>
+<%= LibraryGroup.site_config.url %>

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

@@ -1,14 +1,14 @@
-<%=h @message.receiver.patron.full_name -%> さん
+<%= @message.receiver.patron.full_name -%> さん
 
-<%=h @sender_name -%> さんから新しいメッセージが届きました。
-<%=h messages_url %>
+<%= @sender_name -%> さんから新しいメッセージが届きました。
+<%= messages_url %>
 
 -----
 
-<%= @message.body %>
+<%=raw @message.body %>
 
 -----
 
 -- 
-<%=h LibraryGroup.system_name(@message.receiver.locale) %>
-<%=h LibraryGroup.site_config.url %>
+<%= LibraryGroup.system_name(@message.receiver.locale) %>
+<%= LibraryGroup.site_config.url %>

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/controllers/message_requests_controller_spec.rb

@@ -125,7 +125,7 @@ describe MessageRequestsController do
     before(:each) do
       @message_request = FactoryGirl.create(:message_request)
       @attrs = FactoryGirl.attributes_for(:message_request)
-      @invalid_attrs = {:sender_id => ''}
+      @invalid_attrs = {:body => ''}
     end
 
     describe "When logged in as Administrator" do

data/spec/dummy/config/initializers/devise.rb

@@ -92,10 +92,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

data/spec/dummy/script/delayed_job

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
+require 'delayed/command'
+Delayed::Command.new(ARGV).daemonize

data/spec/dummy/solr/data/test/index/_0.fnm

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

data/spec/dummy/solr/data/test/index/_0.frq

@@ -0,0 +1 @@
+


















data/spec/dummy/solr/data/test/index/_0.nrm

@@ -0,0 +1 @@
+NRM�vvvxyxy|

data/spec/factories/message_request.rb

@@ -3,5 +3,6 @@ FactoryGirl.define do
     f.sender_id{FactoryGirl.create(:user).id}
     f.receiver_id{FactoryGirl.create(:user).id}
     f.message_template_id{FactoryGirl.create(:message_template).id}
+    f.body 'test'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -568,6 +568,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
+- spec/dummy/script/delayed_job
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
 - spec/dummy/solr/conf/elevate.xml
@@ -579,8 +580,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/_0.fdt
+- spec/dummy/solr/data/test/index/_0.fdx
+- spec/dummy/solr/data/test/index/_0.fnm
+- spec/dummy/solr/data/test/index/_0.frq
+- spec/dummy/solr/data/test/index/_0.nrm
+- spec/dummy/solr/data/test/index/_0.prx
+- spec/dummy/solr/data/test/index/_0.tii
+- spec/dummy/solr/data/test/index/_0.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_2
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb
@@ -696,6 +705,7 @@ test_files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
+- spec/dummy/script/delayed_job
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
 - spec/dummy/solr/conf/elevate.xml
@@ -707,8 +717,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/_0.fdt
+- spec/dummy/solr/data/test/index/_0.fdx
+- spec/dummy/solr/data/test/index/_0.fnm
+- spec/dummy/solr/data/test/index/_0.frq
+- spec/dummy/solr/data/test/index/_0.nrm
+- spec/dummy/solr/data/test/index/_0.prx
+- spec/dummy/solr/data/test/index/_0.tii
+- spec/dummy/solr/data/test/index/_0.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1
+- spec/dummy/solr/data/test/index/segments_2
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb