enju_message 0.1.14.pre8 → 0.1.14.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3dd92c198cb7b815152a480533b991075917735a
-  data.tar.gz: 9306e8ae4b0b1fd1064750f74dfb9caedef2fa8d
+  metadata.gz: 02a1cae4b9213d73460fd217952044bd0927e09b
+  data.tar.gz: 9110f24a1c7d924470b0d85817db0b62e9410130
 SHA512:
-  metadata.gz: 378f518bbfcbfceda3310d71eefa728697e6ace08b22d928b11245672212e20269e4ec7f9217d6a26398990fd56d3a6fc2c81c5cd69ce27444ced59c1e75580e
-  data.tar.gz: 9c703128094b9894a4e2cf8d2c4cfad5f3c6bea7e52370085db732382bdec6f4709f2b269ea087478627dfcee2c2308db9d337d21fe508343171af94a0d06c65
+  metadata.gz: 42e043db562178f4282666cecdf736f00dce2ebb6d68e85fb86d6755d9f4ebc1a6ce1ec4a966d9fe13418641fdf39db37aaec3690183545c6ef91169e45e1e84
+  data.tar.gz: eb19ba49de1db2575a5f1677bf3cdfa31bb264b7156190b236943e55d66c650e01a79c90e2096bdd261fd3917c23feacd005c0d5238a13b91abe8edf8b307427

data/app/controllers/messages_controller.rb

@@ -1,6 +1,6 @@
 class MessagesController < ApplicationController
-  load_and_authorize_resource :except => :index
-  authorize_resource :only => :index
+  load_and_authorize_resource :except => [:index, :show]
+  authorize_resource :only => [:index, :show]
   before_filter :get_user, :only => :index
   after_filter :solr_commit, :only => [:create, :update, :destroy, :destroy_selected]
 

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre8"
+  VERSION = "0.1.14.pre9"
 end

data/spec/controllers/messages_controller_spec.rb

@@ -86,9 +86,11 @@ describe MessagesController do
 
       it "assigns the requested message as @message" do
         message = messages(:user1_to_user2_1)
-        get :show, :id => message.id
-        assigns(:message).should eq(message)
-        response.should be_missing
+        lambda{
+          get :show, :id => message.id
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        assigns(:message).should be_nil
+        #response.should be_missing
       end
     end
 
@@ -97,9 +99,11 @@ describe MessagesController do
 
       it "assigns the requested message as @message" do
         message = messages(:user1_to_user2_1)
-        get :show, :id => message.id
-        assigns(:message).should eq(message)
-        response.should be_forbidden
+        lambda{
+          get :show, :id => message.id
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        assigns(:message).should be_nil
+        #response.should be_forbidden
       end
     end
 
@@ -112,8 +116,10 @@ describe MessagesController do
     end
 
       it "should should not show other user's message" do
-        get :show, :id => messages(:user1_to_user2_1).id
-        response.should be_forbidden
+        lambda{
+          get :show, :id => messages(:user1_to_user2_1).id
+        }.should raise_error(ActiveRecord::RecordNotFound)
+        #response.should be_missing
       end
     end
 
@@ -185,9 +191,11 @@ describe MessagesController do
 
       it "assigns the requested message as @message" do
         message = messages(:user1_to_user2_1)
-        get :edit, :id => message.id
+        lambda{
+          get :edit, :id => message.id
+        }.should raise_error(ActiveRecord::RecordNotFound)
         assigns(:message).should eq(message)
-        response.should be_missing
+        #response.should be_missing
       end
     end
 
@@ -320,24 +328,32 @@ describe MessagesController do
 
       describe "with valid params" do
         it "updates the requested message" do
-          put :update, :id => @message.id, :message => @attrs
+          lambda{
+            put :update, :id => @message.id, :message => @attrs
+          }.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it "assigns the requested message as @message" do
-          put :update, :id => @message.id, :message => @attrs
+          lambda{
+            put :update, :id => @message.id, :message => @attrs
+          }.should raise_error(ActiveRecord::RecordNotFound)
           assigns(:message).should eq(@message)
-          response.should be_missing
+          #response.should be_missing
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested message as @message" do
-          put :update, :id => @message.id, :message => @invalid_attrs
+          lambda{
+            put :update, :id => @message.id, :message => @invalid_attrs
+          }.should raise_error(ActiveRecord::RecordNotFound)
         end
 
         it "re-renders the 'edit' template" do
-          put :update, :id => @message.id, :message => @invalid_attrs
-          response.should be_missing
+          lambda{
+            put :update, :id => @message.id, :message => @invalid_attrs
+          }.should raise_error(ActiveRecord::RecordNotFound)
+          #response.should be_missing
         end
       end
     end

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

@@ -1,52 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :template => 'page/403', :status => 403}
-        format.mobile {render :template => 'page/403', :status => 403}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.mobile {redirect_to new_user_session_url}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :template => 'page/404', :status => 404}
-      format.mobile {render :template => 'page/404', :status => 404}
-      format.xml {render :template => 'page/404', :status => 404}
-      format.json
-    end
-  end
-
-  def get_user
-    @user = User.where(:username => params[:user_id]).first if params[:user_id]
-  end
-
-  def solr_commit
-    Sunspot.commit
-  end
-
-  def move_position(resource, direction)
-    if ['higher', 'lower'].include?(direction)
-      resource.send("move_#{direction}")
-      redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
-      return
-    end
-  end
+  enju_leaf
+  enju_library
 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/mime_types.rb

@@ -3,4 +3,3 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register_alias "text/html", :mobile

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.14.pre8
+  version: 0.1.14.pre9
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -122,6 +122,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: enju_leaf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0.rc2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +178,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: sunspot-rails-tester
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Message management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -278,7 +306,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
@@ -298,16 +325,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/_2v.fdt
-- spec/dummy/solr/data/test/index/_2v.fdx
-- spec/dummy/solr/data/test/index/_2v.fnm
-- spec/dummy/solr/data/test/index/_2v.frq
-- spec/dummy/solr/data/test/index/_2v.nrm
-- spec/dummy/solr/data/test/index/_2v.prx
-- spec/dummy/solr/data/test/index/_2v.tii
-- spec/dummy/solr/data/test/index/_2v.tis
+- spec/dummy/solr/data/test/index/_6n.fdt
+- spec/dummy/solr/data/test/index/_6n.fdx
+- spec/dummy/solr/data/test/index/_6n.fnm
+- spec/dummy/solr/data/test/index/_6n.frq
+- spec/dummy/solr/data/test/index/_6n.nrm
+- spec/dummy/solr/data/test/index/_6n.prx
+- spec/dummy/solr/data/test/index/_6n.tii
+- spec/dummy/solr/data/test/index/_6n.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5t
+- spec/dummy/solr/data/test/index/segments_dd
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb
@@ -348,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: enju_message plugin
@@ -413,7 +440,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
@@ -433,16 +459,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/_2v.fdt
-- spec/dummy/solr/data/test/index/_2v.fdx
-- spec/dummy/solr/data/test/index/_2v.fnm
-- spec/dummy/solr/data/test/index/_2v.frq
-- spec/dummy/solr/data/test/index/_2v.nrm
-- spec/dummy/solr/data/test/index/_2v.prx
-- spec/dummy/solr/data/test/index/_2v.tii
-- spec/dummy/solr/data/test/index/_2v.tis
+- spec/dummy/solr/data/test/index/_6n.fdt
+- spec/dummy/solr/data/test/index/_6n.fdx
+- spec/dummy/solr/data/test/index/_6n.fnm
+- spec/dummy/solr/data/test/index/_6n.frq
+- spec/dummy/solr/data/test/index/_6n.nrm
+- spec/dummy/solr/data/test/index/_6n.prx
+- spec/dummy/solr/data/test/index/_6n.tii
+- spec/dummy/solr/data/test/index/_6n.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_5t
+- spec/dummy/solr/data/test/index/segments_dd
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb