enju_message 0.1.14.pre18 → 0.1.14.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 004aa8590cc20abdc5f3c528cdd94269c27de7ff
-  data.tar.gz: ff821dc630b8cf8c648636bc98ced539ca04b34d
+  metadata.gz: ef4312ea35b18d0e50dea0bdbd11705c929048f1
+  data.tar.gz: f6c1a640a798af4455d4120d80f8c8313de2e342
 SHA512:
-  metadata.gz: afb72ca0304e2be0e8ed351565ce1fb81aa7b098c8af93dff99cb7aa6de6c68ee1255667bcae1dabeb89878ea15d747ec980f5354cac36ff35f12f5ac84c9254
-  data.tar.gz: ee71da95407ad2fdcb2d6085bafd1c674489bb35d33c894bd8e0d6ce3325f96ee5579b3a7676e739cac5d09d7b624d90c2c23a12fee07ca371525d3c0d5cc2ad
+  metadata.gz: bce0b92632d8ea595d156d52b7b3a588a0888b8e6a8cfb014d2211fadf6c1b8412aa0055e5a0708dd67ba497ac8f6a510635426c9ffacd554456f21695353b58
+  data.tar.gz: 8464e49e1372825f5c99d6d25079865117adef3c5771981dfd2da8e6cb70e314ff7cbd2ddd674931ea64888e38797da13720ef831c76d6ff22a8cc7a6a4be052

data/app/controllers/messages_controller.rb

@@ -7,7 +7,7 @@ class MessagesController < ApplicationController
   # GET /messages
   # GET /messages.json
   def index
-    query = params[:query].to_s.strip
+    query = @query = params[:query].to_s.strip
     search = Sunspot.new_search(Message)
     user = current_user
     case params[:mode]
@@ -24,7 +24,7 @@ class MessagesController < ApplicationController
       with(:receiver_id).equal_to user.id
       facet(:is_read)
     end
-    @message_facet = search.execute!.facet('is_read').rows
+    @message_facet =  Hash[*search.execute!.facet_response['facet_fields']['is_read_b']]
     search.build do
       with(:is_read).equal_to is_read unless is_read.nil?
     end

data/app/models/message_state_machine.rb

@@ -16,9 +16,23 @@ class MessageStateMachine
 
   before_transition(from: :unread, to: :read) do |message|
     message.read_at = Time.zone.now unless message.read_at
+    message.index!
   end
 
   before_transition(from: :read, to: :unread) do |message|
     message.read_at = nil
+    message.index!
+  end
+
+  after_transition(from: :pending, to: :read) do |message|
+    message.index!
+  end
+
+  after_transition(from: :unread, to: :read) do |message|
+    message.index!
+  end
+
+  after_transition(from: :read, to: :unread) do |message|
+    message.index!
   end
 end

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

@@ -46,15 +46,18 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <% mode = params[:mode].to_s %>
-    <%- @message_facet.each do |facet| -%>
-      <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)) -%>
-        (<%= facet.count -%>)
-        <%- if facet_mode == mode -%></strong><%- end -%>
-      </li>
-    <%- end -%>
+    <li>
+      <%- if mode == 'unread' -%><strong><%- end -%>
+        <%= link_to t('message.unread'), url_for(params.merge(page: nil, mode: 'unread', only_path: true)) -%>
+      (<%= @message_facet['false'] -%>)
+      <%- if mode == 'unread' -%></strong><%- end -%>
+    </li>
+    <li>
+      <%- if mode == 'read' -%><strong><%- end -%>
+        <%= link_to t('message.read'), url_for(params.merge(page: nil, mode: 'read', only_path: true)) -%>
+      (<%= @message_facet['true'] -%>)
+      <%- if mode == 'read' -%></strong><%- end -%>
+    </li>
     <% if mode.present? %>
       <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(mode: nil, page: nil, only_path: true)) -%></li>
     <% end %>

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre18"
+  VERSION = "0.1.14.pre19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.1.14.pre18
+  version: 0.1.14.pre19
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2014-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_seed
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc14
+        version: 1.1.0.rc15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc14
+        version: 1.1.0.rc15
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -314,7 +314,6 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_agents.rb
 - spec/dummy/db/migrate/002_devise_create_users.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -437,50 +436,12 @@ files:
 - spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
 - spec/dummy/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/delayed_job
 - spec/dummy/script/rails
-- spec/dummy/solr/conf/admin-extra.html
-- spec/dummy/solr/conf/elevate.xml
-- spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
-- spec/dummy/solr/conf/protwords.txt
-- spec/dummy/solr/conf/schema.xml
-- spec/dummy/solr/conf/scripts.conf
-- spec/dummy/solr/conf/solrconfig.xml
-- spec/dummy/solr/conf/spellings.txt
-- spec/dummy/solr/conf/stopwords.txt
-- spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/default/data/index/_qz.fdt
-- spec/dummy/solr/default/data/index/_qz.fdx
-- spec/dummy/solr/default/data/index/_qz.fnm
-- spec/dummy/solr/default/data/index/_qz.nvd
-- spec/dummy/solr/default/data/index/_qz.nvm
-- spec/dummy/solr/default/data/index/_qz.si
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.doc
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.pos
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.tim
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.tip
-- spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_19r
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001636
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001637
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001638
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001639
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001640
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001641
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001642
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001643
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001644
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001645
-- spec/dummy/solr/development/data/index/segments.gen
-- spec/dummy/solr/development/data/index/segments_1
-- spec/dummy/solr/solr.xml
-- spec/dummy/solr/test/data/index/segments.gen
-- spec/dummy/solr/test/data/index/segments_1
 - spec/factories/library.rb
 - spec/factories/message.rb
 - spec/factories/message_request.rb
@@ -559,7 +520,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_agents.rb
 - spec/dummy/db/migrate/002_devise_create_users.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
@@ -682,7 +642,6 @@ test_files:
 - spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
 - spec/dummy/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -690,43 +649,6 @@ test_files:
 - 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
-- spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt
-- spec/dummy/solr/conf/protwords.txt
-- spec/dummy/solr/conf/schema.xml
-- spec/dummy/solr/conf/scripts.conf
-- spec/dummy/solr/conf/solrconfig.xml
-- spec/dummy/solr/conf/spellings.txt
-- spec/dummy/solr/conf/stopwords.txt
-- spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/default/data/index/_qz.fdt
-- spec/dummy/solr/default/data/index/_qz.fdx
-- spec/dummy/solr/default/data/index/_qz.fnm
-- spec/dummy/solr/default/data/index/_qz.nvd
-- spec/dummy/solr/default/data/index/_qz.nvm
-- spec/dummy/solr/default/data/index/_qz.si
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.doc
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.pos
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.tim
-- spec/dummy/solr/default/data/index/_qz_Lucene41_0.tip
-- spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_19r
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001636
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001637
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001638
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001639
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001640
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001641
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001642
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001643
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001644
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000001645
-- spec/dummy/solr/development/data/index/segments.gen
-- spec/dummy/solr/development/data/index/segments_1
-- spec/dummy/solr/solr.xml
-- spec/dummy/solr/test/data/index/segments.gen
-- spec/dummy/solr/test/data/index/segments_1
 - spec/factories/library.rb
 - spec/factories/message.rb
 - spec/factories/message_request.rb

data/spec/dummy/solr/conf/admin-extra.html

@@ -1,31 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top
-of the admin page.  Uncomment this as an example to see there the content
-will show up.
-
-<hr>
-<i>This line will appear before the first table</i>
-<tr>
-<td colspan="2">
-This row will be appended to the end of the first table
-</td>
-</tr>
-<hr>
-
--->

data/spec/dummy/solr/conf/elevate.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- If this file is found in the config directory, it will only be
-     loaded once at startup.  If it is found in Solr's data
-     directory, it will be re-loaded every commit.
--->
-
-<elevate>
- <query text="foo bar">
-  <doc id="1" />
-  <doc id="2" />
-  <doc id="3" />
- </query>
- 
- <query text="ipod">
-   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
-   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
- </query>
- 
-</elevate>

data/spec/dummy/solr/conf/mapping-ISOLatin1Accent.txt

@@ -1,246 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Syntax:
-#   "source" => "target"
-#     "source".length() > 0 (source cannot be empty.)
-#     "target".length() >= 0 (target can be empty.)
-
-# example:
-#   "À" => "A"
-#   "\u00C0" => "A"
-#   "\u00C0" => "\u0041"
-#   "ß" => "ss"
-#   "\t" => " "
-#   "\n" => ""
-
-# À => A
-"\u00C0" => "A"
-
-# Á => A
-"\u00C1" => "A"
-
-# Â => A
-"\u00C2" => "A"
-
-# Ã => A
-"\u00C3" => "A"
-
-# Ä => A
-"\u00C4" => "A"
-
-# Å => A
-"\u00C5" => "A"
-
-# Æ => AE
-"\u00C6" => "AE"
-
-# Ç => C
-"\u00C7" => "C"
-
-# È => E
-"\u00C8" => "E"
-
-# É => E
-"\u00C9" => "E"
-
-# Ê => E
-"\u00CA" => "E"
-
-# Ë => E
-"\u00CB" => "E"
-
-# Ì => I
-"\u00CC" => "I"
-
-# Í => I
-"\u00CD" => "I"
-
-# Î => I
-"\u00CE" => "I"
-
-# Ï => I
-"\u00CF" => "I"
-
-# IJ => IJ
-"\u0132" => "IJ"
-
-# Ð => D
-"\u00D0" => "D"
-
-# Ñ => N
-"\u00D1" => "N"
-
-# Ò => O
-"\u00D2" => "O"
-
-# Ó => O
-"\u00D3" => "O"
-
-# Ô => O
-"\u00D4" => "O"
-
-# Õ => O
-"\u00D5" => "O"
-
-# Ö => O
-"\u00D6" => "O"
-
-# Ø => O
-"\u00D8" => "O"
-
-# Π=> OE
-"\u0152" => "OE"
-
-# Þ
-"\u00DE" => "TH"
-
-# Ù => U
-"\u00D9" => "U"
-
-# Ú => U
-"\u00DA" => "U"
-
-# Û => U
-"\u00DB" => "U"
-
-# Ü => U
-"\u00DC" => "U"
-
-# Ý => Y
-"\u00DD" => "Y"
-
-# Ÿ => Y
-"\u0178" => "Y"
-
-# à => a
-"\u00E0" => "a"
-
-# á => a
-"\u00E1" => "a"
-
-# â => a
-"\u00E2" => "a"
-
-# ã => a
-"\u00E3" => "a"
-
-# ä => a
-"\u00E4" => "a"
-
-# å => a
-"\u00E5" => "a"
-
-# æ => ae
-"\u00E6" => "ae"
-
-# ç => c
-"\u00E7" => "c"
-
-# è => e
-"\u00E8" => "e"
-
-# é => e
-"\u00E9" => "e"
-
-# ê => e
-"\u00EA" => "e"
-
-# ë => e
-"\u00EB" => "e"
-
-# ì => i
-"\u00EC" => "i"
-
-# í => i
-"\u00ED" => "i"
-
-# î => i
-"\u00EE" => "i"
-
-# ï => i
-"\u00EF" => "i"
-
-# ij => ij
-"\u0133" => "ij"
-
-# ð => d
-"\u00F0" => "d"
-
-# ñ => n
-"\u00F1" => "n"
-
-# ò => o
-"\u00F2" => "o"
-
-# ó => o
-"\u00F3" => "o"
-
-# ô => o
-"\u00F4" => "o"
-
-# õ => o
-"\u00F5" => "o"
-
-# ö => o
-"\u00F6" => "o"
-
-# ø => o
-"\u00F8" => "o"
-
-# œ => oe
-"\u0153" => "oe"
-
-# ß => ss
-"\u00DF" => "ss"
-
-# þ => th
-"\u00FE" => "th"
-
-# ù => u
-"\u00F9" => "u"
-
-# ú => u
-"\u00FA" => "u"
-
-# û => u
-"\u00FB" => "u"
-
-# ü => u
-"\u00FC" => "u"
-
-# ý => y
-"\u00FD" => "y"
-
-# ÿ => y
-"\u00FF" => "y"
-
-# ff => ff
-"\uFB00" => "ff"
-
-# fi => fi
-"\uFB01" => "fi"
-
-# fl => fl
-"\uFB02" => "fl"
-
-# ffi => ffi
-"\uFB03" => "ffi"
-
-# ffl => ffl
-"\uFB04" => "ffl"
-
-# ſt => ft
-"\uFB05" => "ft"
-
-# st => st
-"\uFB06" => "st"

data/spec/dummy/solr/conf/protwords.txt

@@ -1,21 +0,0 @@
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#-----------------------------------------------------------------------
-# Use a protected word file to protect against the stemmer reducing two
-# unrelated words to the same base word.
-
-# Some non-words that normally won't be encountered,
-# just to test that they won't be stemmed.
-dontstems
-zwhacky
-