enju_message 0.0.12 → 0.0.13

data/app/controllers/messages_controller.rb

@@ -1,7 +1,7 @@
 class MessagesController < ApplicationController
   load_and_authorize_resource :except => :index
   authorize_resource :only => :index
-  before_filter :get_user_if_nil, :only => :index
+  before_filter :get_user, :only => :index
   after_filter :solr_commit, :only => [:create, :update, :destroy, :destroy_selected]
 
   # GET /messages
@@ -61,9 +61,14 @@ class MessagesController < ApplicationController
     else
       @message.recipient = parent.sender.username if parent
     end
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @message }
+    end
   end
 
-  # GET /messages/1;edit
+  # GET /messages/1/edit
   def edit
     @message = current_user.received_messages.find(params[:id])
     @message.sm_read!
@@ -95,8 +100,8 @@ class MessagesController < ApplicationController
 
     if @message.update_attributes(params[:message])
       flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.message'))
-      format.html { redirect_to message_url(@message) }
-      format.json { head :ok }
+      format.html { redirect_to @message }
+      format.json { head :no_content }
     else
       format.html { render :action => "edit" }
       format.json { render :json => @message.errors, :status => :unprocessable_entity }
@@ -111,7 +116,7 @@ class MessagesController < ApplicationController
 
     respond_to do |format|
       format.html { redirect_to messages_url }
-      format.json { head :ok }
+      format.json { head :no_content }
     end
   end
 

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

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

@@ -34,9 +34,8 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def get_user_if_nil
+  def get_user
     @user = User.where(:username => params[:user_id]).first if params[:user_id]
-    #authorize! :show, @user if @user
   end
 
   def solr_commit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70133998398340 !ruby/object:Gem::Requirement
+  requirement: &70179611324280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998398340
+  version_requirements: *70179611324280
 - !ruby/object:Gem::Dependency
   name: simple_form
-  requirement: &70133998397920 !ruby/object:Gem::Requirement
+  requirement: &70179611323100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998397920
+  version_requirements: *70179611323100
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &70133998397460 !ruby/object:Gem::Requirement
+  requirement: &70179611321920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998397460
+  version_requirements: *70179611321920
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
-  requirement: &70133998397040 !ruby/object:Gem::Requirement
+  requirement: &70179611320460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998397040
+  version_requirements: *70179611320460
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
-  requirement: &70133998396540 !ruby/object:Gem::Requirement
+  requirement: &70179611318860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998396540
+  version_requirements: *70179611318860
 - !ruby/object:Gem::Dependency
   name: friendly_id
-  requirement: &70133998396040 !ruby/object:Gem::Requirement
+  requirement: &70179611318060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998396040
+  version_requirements: *70179611318060
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70133998395580 !ruby/object:Gem::Requirement
+  requirement: &70179611317340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998395580
+  version_requirements: *70179611317340
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70133998411560 !ruby/object:Gem::Requirement
+  requirement: &70179611316700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998411560
+  version_requirements: *70179611316700
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70133998411100 !ruby/object:Gem::Requirement
+  requirement: &70179611316160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998411100
+  version_requirements: *70179611316160
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70133998410680 !ruby/object:Gem::Requirement
+  requirement: &70179611315720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998410680
+  version_requirements: *70179611315720
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70133998410260 !ruby/object:Gem::Requirement
+  requirement: &70179611315240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998410260
+  version_requirements: *70179611315240
 - !ruby/object:Gem::Dependency
   name: addressable
-  requirement: &70133998409840 !ruby/object:Gem::Requirement
+  requirement: &70179611314760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998409840
+  version_requirements: *70179611314760
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70133998409340 !ruby/object:Gem::Requirement
+  requirement: &70179611314260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998409340
+  version_requirements: *70179611314260
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70133998408920 !ruby/object:Gem::Requirement
+  requirement: &70179611313820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998408920
+  version_requirements: *70179611313820
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70133998408460 !ruby/object:Gem::Requirement
+  requirement: &70179611313340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133998408460
+  version_requirements: *70179611313340
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70133998407960 !ruby/object:Gem::Requirement
+  requirement: &70179611312840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +186,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70133998407960
+  version_requirements: *70179611312840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70133998407540 !ruby/object:Gem::Requirement
+  requirement: &70179611312400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133998407540
+  version_requirements: *70179611312400
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70133998407080 !ruby/object:Gem::Requirement
+  requirement: &70179611361080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133998407080
+  version_requirements: *70179611361080
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70133998406580 !ruby/object:Gem::Requirement
+  requirement: &70179611360380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -219,10 +219,10 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70133998406580
+  version_requirements: *70179611360380
 - !ruby/object:Gem::Dependency
   name: sunspot-rails-tester
-  requirement: &70133998406160 !ruby/object:Gem::Requirement
+  requirement: &70179611359840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133998406160
+  version_requirements: *70179611359840
 description: Message management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -505,3 +505,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/controller_macros.rb
 - spec/support/devise.rb
+has_rdoc: