enju_message 0.0.25 → 0.1.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Kosuke Tanabe
+Copyright 2011 YOURNAME
 
 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    = 'EnjuMessage'
+  rdoc.title    = 'EnjuSubject'
   rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
@@ -26,15 +26,6 @@ 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'
 
@@ -42,5 +33,4 @@ 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 :no_content }
+        format.json { head :ok }
       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 :no_content }
+      format.html { redirect_to(message_requests_url) }
+      format.json { head :ok }
     end
   end
 end

data/app/controllers/messages_controller.rb

@@ -33,7 +33,7 @@ class MessagesController < ApplicationController
     @messages = search.execute!.results
 
     respond_to do |format|
-      format.html # index.html.erb
+      format.html # index.rhtml
       format.json { render :json => @messages }
       format.rss
       format.atom
@@ -47,7 +47,7 @@ class MessagesController < ApplicationController
     @message.sm_read!
 
     respond_to do |format|
-      format.html # show.html.erb
+      format.html # show.rhtml
       format.json { render :json => @message }
     end
   end
@@ -77,14 +77,14 @@ class MessagesController < ApplicationController
   # POST /messages
   # POST /messages.json
   def create
-    @message = Message.new(params[:message])
-    @message.sender = current_user
+    @message = current_user.sent_messages.new(params[:message])
     get_parent(@message.parent_id)
     @message.receiver = User.find(@message.recipient) rescue nil
 
     respond_to do |format|
       if @message.save
-        format.html { redirect_to messages_url, :notice => t('controller.successfully_created', :model => t('activerecord.models.message')) }
+        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.message'))
+        format.html { redirect_to messages_url }
         format.json { render :json => @message, :status => :created, :location => @message }
       else
         format.html { render :action => "new" }
@@ -99,7 +99,8 @@ class MessagesController < ApplicationController
     @message = current_user.received_messages.find(params[:id])
 
     if @message.update_attributes(params[:message])
-      format.html { redirect_to @message, :notice => t('controller.successfully_updated', :model => t('activerecord.models.message')) }
+      flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.message'))
+      format.html { redirect_to @message }
       format.json { head :no_content }
     else
       format.html { render :action => "edit" }

data/app/models/message.rb

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

data/app/models/message_request.rb

@@ -1,7 +1,5 @@
 require 'erubis'
 class MessageRequest < ActiveRecord::Base
-  attr_accessible :body
-  attr_accessible :sender, :receiver, :message_template, :body, :as => :admin
   scope :not_sent, where('sent_at IS NULL AND state = ?', 'pending')
   scope :sent, where(:state => 'sent')
   scope :started, where(:state => 'started')
@@ -12,7 +10,6 @@ class MessageRequest < ActiveRecord::Base
 
   validates_associated :sender, :receiver, :message_template
   validates_presence_of :sender, :receiver, :message_template
-  validates_presence_of :body, :on => :update
 
   state_machine :initial => :pending do
     before_transition any - :sent => :sent, :do => :send_message
@@ -43,8 +40,7 @@ class MessageRequest < ActiveRecord::Base
       else
         raise 'body is empty!'
       end
-      self.sent_at = Time.zone.now
-      save!
+      self.update_attributes({:sent_at => Time.zone.now})
       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)

data/app/models/message_template.rb

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

data/app/views/checked_items/_checkouts.html.erb

@@ -14,7 +14,7 @@
         <%= render 'manifestations/holding', :manifestation => checkout.item.manifestation -%>
       </td>
       <td><%= link_to checkout.item.item_identifier, checkout.item -%></td>
-      <td><%= l(checkout.due_date, :formats => :only_date) -%></td>
+      <td><%= l(checkout.due_date, :format => :only_date) -%></td>
     </tr>
   <%- end -%>
 </table>

data/app/views/checked_items/_list.html.erb

@@ -26,7 +26,7 @@
       <%= render 'manifestations/show_index', :manifestation => checked_item.item.manifestation -%>
     </td>
     <td><%= link_to checked_item.item.item_identifier, checked_item.item -%></td>
-    <td><%= l(checked_item.due_date, :formats => :only_date) -%></td>
+    <td><%= l(checked_item.due_date, :format => :only_date) -%></td>
     <td><%= link_to t('page.destroy'), checked_item, :confirm => t('page.are_you_sure'), :method => :delete -%></td>
   </tr>
 <%- end -%>

data/app/views/checkins/_list.html.erb

@@ -36,7 +36,7 @@
     </td>
     <td>
       <%- if checkin.checkout -%>
-        <%= l(checkin.checkout.due_date, :formats => :only_date) -%>
+        <%= l(checkin.checkout.due_date, :format => :only_date) -%>
       <%- end -%>
     </td>
     <td>

data/app/views/checkouts/_list.html.erb

@@ -21,7 +21,7 @@
       (<%= link_to checkout.item.item_identifier, checkout.item -%>)
     </td>
     <td>
-      <%= l(checkout.due_date, :formats => :only_date) -%>
+      <%= l(checkout.due_date, :format => :only_date) -%>
       <br />
       <% if checkout.checkin %>
         <strong><%= t('checkout.returned') %></strong>

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

@@ -7,7 +7,7 @@
 <h3><%= t('checkout.renewal') -%></h3>
 <%- if @checkout.checkout_renewable? -%>
   <%= form_for(@checkout) do |f| -%>
-    <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :formats => :only_date) if @new_due_date -%>
+    <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :format => :only_date) if @new_due_date -%>
     <%= f.hidden_field :due_date, :value => @new_due_date -%>
     <br />
     <%= f.submit %>

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

@@ -10,7 +10,7 @@
   </p>
   <p>
     <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
-    <%= l(@checkout.due_date, :formats => :only_date) if @checkout.due_date -%>
+    <%= l(@checkout.due_date, :format => :only_date) if @checkout.due_date -%>
   </p>
   <%- if can? :destroy, @checkout -%>
     <p>

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

@@ -21,7 +21,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.lending_policy.fixed_due_date') -%>:</strong>
-  <%= l(@lending_policy.fixed_due_date, :formats => :only_date) if @lending_policy.fixed_due_date -%>
+  <%= l(@lending_policy.fixed_due_date, :format => :only_date) if @lending_policy.fixed_due_date -%>
 </p>
 
 <p>

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

@@ -31,7 +31,7 @@
     <td>
       <%= link_to t('page.show'), message_request -%>
       <%= link_to t('page.edit'), edit_message_request_path(message_request) -%>
-      <%= link_to t('page.destroy'), message_request, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), message_request, :confirm => t('page.are_you_sure'), :method => :delete -%>
     </td>
   </tr>
 <%- end -%>

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

@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_message_template_path(message_template) -%>
       <% end %>
       <%- if can? :destroy, message_template -%>
-        <%= link_to t('page.destroy'), message_template, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), message_template, :confirm => t('page.are_you_sure'), :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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, :only_path => true)) -%>
+          <%= link_to t("message.#{facet_mode}"), url_for(params.merge(:page => nil, :mode => facet_mode)) -%>
         (<%= 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, :only_path => true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:mode => nil, :page => nil)) -%></li>
     <% end %>
   </ul>
 

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

@@ -42,7 +42,7 @@
     <% end %>
     <li><%= link_to t('message.reply'), new_message_path(:parent_id => @message.id) -%></li>
     <% if can? :destroy, :message %>
-      <li><%= link_to t('page.destroy'), @message, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+      <li><%= link_to t('page.destroy'), @message, :confirm => t('page.are_you_sure'), :method => :delete -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -1,11 +1,11 @@
-<%= @message.receiver.patron.full_name -%> :
+<%= @message.receiver.full_name -%> :
 
 A new message arrived from <%= @sender_name -%>.
 <%= messages_url %>
 
 -----
 
-<%=raw @message.body %>
+<%= @message.body %>
 
 -----
 

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

@@ -1,11 +1,11 @@
-<%= @message.receiver.patron.full_name -%> さん
+<%= @message.receiver.full_name -%> さん
 
 <%= @sender_name -%> さんから新しいメッセージが届きました。
 <%= messages_url %>
 
 -----
 
-<%=raw @message.body %>
+<%= @message.body %>
 
 -----
 

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

@@ -22,7 +22,7 @@
       <%= render 'title', :reserve => reserve -%>
     </td>
     <td><%= i18n_state(reserve.state) -%></td>
-    <td><%= l(reserve.expired_at, :formats => :only_date) -%></td>
+    <td><%= l(reserve.expired_at, :format => :only_date) -%></td>
     <%- if can? :destroy, reserve -%>
       <td>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>

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

@@ -33,7 +33,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.reserve.expired_at') -%>:</strong>
-  <%= l(@reserve.expired_at, :formats => :only_date) if @reserve.expired_at -%>
+  <%= l(@reserve.expired_at, :format => :only_date) if @reserve.expired_at -%>
 </p>
 
 <p>

data/lib/enju_message/engine.rb

@@ -1,9 +1,16 @@
-require 'enju_core'
 require 'configatron'
 require 'delayed_job_active_record'
+require 'devise'
+require 'cancan'
 require 'state_machine'
 require 'inherited_resources'
+require 'attribute_normalizer'
+require 'addressable/uri'
+require 'friendly_id'
 require 'awesome_nested_set'
+require 'will_paginate'
+require 'sunspot_rails'
+require 'acts_as_list'
 
 module EnjuMessage
   class Engine < ::Rails::Engine

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.0.25"
+  VERSION = "0.1.0"
 end

data/lib/enju_message.rb

@@ -1,7 +1,4 @@
 require "enju_message/engine"
-require "enju_message/user"
 
 module EnjuMessage
 end
-
-ActiveRecord::Base.send :include, EnjuMessage::MessageUser

data/spec/controllers/message_requests_controller_spec.rb

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

data/spec/controllers/messages_controller_spec.rb

@@ -4,10 +4,6 @@ describe MessagesController do
   fixtures :all
 
   describe "GET index", :solr => true do
-    before do
-      Message.reindex
-    end
-
     describe "When logged in as Administrator" do
       before(:each) do
         @user = FactoryGirl.create(:admin)

data/spec/dummy/app/models/user.rb

@@ -12,10 +12,10 @@ class User < ActiveRecord::Base
   has_one :patron
   belongs_to :user_group
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
+  has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
+  has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
   before_create :set_role_and_patron
 
-  enju_message_user
-
   extend FriendlyId
   friendly_id :username
 
@@ -39,4 +39,15 @@ class User < ActiveRecord::Base
       false
     end
   end
+
+  def send_message(status, options = {})
+    MessageRequest.transaction do
+      request = MessageRequest.new
+      request.sender = User.find(1)
+      request.receiver = self
+      request.message_template = MessageTemplate.localized_template(status, self.locale)
+      request.save_message_body(options)
+      request.sm_send_message!
+    end
+  end
 end

data/spec/dummy/config/application.rb

@@ -42,3 +42,5 @@ module Dummy
     config.assets.version = '1.0'
   end
 end
+
+require 'enju_leaf'

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

@@ -92,6 +92,10 @@ 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/db/migrate/20111201155513_add_devise_to_users.rb

@@ -1,40 +1,19 @@
 class AddDeviseToUsers < ActiveRecord::Migration
   def self.up
     change_table(:users) do |t|
-      ## Database authenticatable
-      t.string :email,              :null => false, :default => ""
-      t.string :encrypted_password, :null => false, :default => ""
+      t.database_authenticatable :null => false
+      t.recoverable
+      t.rememberable
+      t.trackable
 
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
+      # t.encryptable
+      # t.confirmable
+      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
+      # t.token_authenticatable
 
-      ## Rememberable
-      t.datetime :remember_created_at
 
-      ## Trackable
-      t.integer  :sign_in_count, :default => 0
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Encryptable
-      t.string :password_salt
-
-      ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
-      t.datetime :confirmation_sent_at
-      t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
-      t.string   :unlock_token # Only if unlock strategy is :email or :both
-      t.datetime :locked_at
-
-      # Token authenticatable
-      t.string :authentication_token
+      # Uncomment below if timestamps were not included in your original model.
+      # t.timestamps
     end
 
     add_index :users, :email #,                :unique => true

data/spec/dummy/db/schema.rb

@@ -207,27 +207,18 @@ ActiveRecord::Schema.define(:version => 20120213092115) do
     t.text     "note"
     t.string   "locale"
     t.string   "user_number"
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
-    t.string   "email",                  :default => "", :null => false
-    t.string   "encrypted_password",     :default => "", :null => false
+    t.datetime "created_at",                                            :null => false
+    t.datetime "updated_at",                                            :null => false
+    t.string   "email",                                 :default => "", :null => false
+    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer  "sign_in_count",                         :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
-    t.string   "password_salt"
-    t.string   "confirmation_token"
-    t.datetime "confirmed_at"
-    t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.integer  "failed_attempts",        :default => 0
-    t.string   "unlock_token"
-    t.datetime "locked_at"
-    t.string   "authentication_token"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"

data/spec/dummy/lib/enju_leaf/localized_name.rb

@@ -0,0 +1,13 @@
+module LocalizedName
+  def localize(locale = I18n.locale.to_s)
+    values = Hash[*self.strip.split("\n").map{|n| n.split(':', 2)}.flatten]
+    name = values[locale.to_s] || self
+    name.strip
+  rescue ArgumentError
+    self
+  end
+end
+
+class String
+  include LocalizedName
+end

data/spec/dummy/lib/enju_leaf/master_model.rb

@@ -0,0 +1,41 @@
+module MasterModel
+  def self.included(base)
+    #base.extend ClassMethods
+    base.send :include, InstanceMethods
+    base.class_eval do
+      acts_as_list
+      validates_uniqueness_of :name, :case_sensitive => false
+      validates_presence_of :name, :display_name
+      before_validation :set_display_name, :on => :create
+      normalize_attributes :name
+    end
+  end
+
+  module InstanceMethods
+    def set_display_name
+      self.display_name = self.name if self.display_name.blank?
+    end
+
+    def check_creatable
+      if creatable?
+        raise NotModifiableError
+      end
+    end
+
+    def check_deletable
+      if deletable?
+        raise NotModifiableError
+      end
+    end
+
+    def creatable?
+      false
+    end
+
+    def deletable?
+      false
+    end
+  end
+
+  class NotModifiableError < StandardError; end
+end

data/spec/dummy/lib/enju_leaf/url_validator.rb

@@ -0,0 +1,10 @@
+class UrlValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    url = ::Addressable::URI.parse(value)
+    if url
+      unless ['http', 'https'].include?(url.scheme)
+        record.errors.add(attribute.to_sym)
+      end
+    end
+  end
+end

data/spec/dummy/lib/enju_leaf.rb

@@ -0,0 +1,4 @@
+require 'addressable/uri'
+require 'enju_leaf/localized_name'
+require 'enju_leaf/master_model'
+require 'enju_leaf/url_validator'

data/spec/factories/message_request.rb

@@ -3,6 +3,5 @@ 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

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ RSpec.configure do |config|
   config.before :each, :solr => true do
     Sunspot::Rails::Tester.start_original_sunspot_session
     Sunspot.session = $original_sunspot_session
-    Sunspot.remove_all!
+    #Sunspot.remove_all!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.1.0
   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-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,70 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +188,55 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: enju_core
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: attribute_normalizer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: sunspot_rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -139,6 +251,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -188,21 +316,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sunspot_solr
+  name: sunspot-rails-tester
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120720
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre.120720
+        version: '0'
 description: Message management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -365,7 +493,6 @@ files:
 - db/migrate/20110913115320_add_lft_and_rgt_to_message.rb
 - db/migrate/20120125050502_add_depth_to_message.rb
 - lib/enju_message/engine.rb
-- lib/enju_message/user.rb
 - lib/enju_message/version.rb
 - lib/enju_message.rb
 - lib/tasks/enju_message_tasks.rake
@@ -432,6 +559,10 @@ files:
 - spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/lib/enju_leaf/localized_name.rb
+- spec/dummy/lib/enju_leaf/master_model.rb
+- spec/dummy/lib/enju_leaf/url_validator.rb
+- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -449,16 +580,8 @@ 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/segments.gen
-- spec/dummy/solr/data/test/index/segments_x
+- spec/dummy/solr/data/test/index/segments_1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb
@@ -565,6 +688,10 @@ test_files:
 - spec/dummy/db/production.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
+- spec/dummy/lib/enju_leaf/localized_name.rb
+- spec/dummy/lib/enju_leaf/master_model.rb
+- spec/dummy/lib/enju_leaf/url_validator.rb
+- spec/dummy/lib/enju_leaf.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -582,16 +709,8 @@ 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/segments.gen
-- spec/dummy/solr/data/test/index/segments_x
+- spec/dummy/solr/data/test/index/segments_1
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb

data/lib/enju_message/user.rb

@@ -1,28 +0,0 @@
-module EnjuMessage
-  module MessageUser
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def enju_message_user
-        include InstanceMethods
-        has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
-        has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
-      end
-    end
-
-    module InstanceMethods
-      def send_message(status, options = {})
-        MessageRequest.transaction do
-          request = MessageRequest.new
-          request.sender = self.class.find(1)
-          request.receiver = self
-          request.message_template = MessageTemplate.localized_template(status, self.locale)
-          request.save_message_body(options)
-          request.sm_send_message!
-        end
-      end
-    end
-  end
-end

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

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

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

@@ -1 +0,0 @@
-


















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

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