georgia_mailer 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97372c56f9bbf66fbf16f0e635649c216f7e9cee
-  data.tar.gz: 28ad9ad53df078158cd2547b143f66e0bf02ad5a
+  metadata.gz: 4faad27e6208514d3e840eb69e4ff5d5044a2d4f
+  data.tar.gz: 169e7f7f479f689915d0ceea5ecf2c38f0823182
 SHA512:
-  metadata.gz: e5f2f18244dad2fe6376c42f269af67f70cca35028138577fd1eb615226893771ffaf85f77380a7b25c1cea30f2286d5d81c6f388158b4dd0d8753e9c722c264
-  data.tar.gz: dc2bd696472c16b6489c127ffbe62c34808420f949d79d77e9bec5b751930bdf0ce0267760fabb85a7cc30f17170f8125f6bea4a3fd05156dbbf3a7878c7522d
+  metadata.gz: ec6f19b865de5c131c082a848cca03d95fc1b1a30c19dd5e0849b20c3cdbe415e7006a272fff3d422bc32ece89513e3f1e85a0955322ba9e8ed3f332d265e4b4
+  data.tar.gz: 3826207368f8fd607caf5c8b2d6165968083143dbbcb5a64a9bf4b79f99e94e33ed4590c85448f095c0baaab5bfd79f2c1aac2797f5563506487eaa2f0da1019

data/app/models/georgia_mailer/message.rb

@@ -1,6 +1,8 @@
 module GeorgiaMailer
   class Message < ActiveRecord::Base
 
+    Georgia::Indexer.register_extension(:solr, GeorgiaMailer::Message)
+    Georgia::Indexer.register_extension(:tire, GeorgiaMailer::Message)
     include Georgia::Indexer::Adapter
 
     attr_accessible :name, :email, :subject, :message, :attachment, :phone

data/app/views/georgia/georgia_mailer/messages/_message.html.erb

@@ -21,6 +21,6 @@
     <%= icon_tag('paper-clip') %>
   </td>
   <td class='message-timestamp'>
-    <%= message.created_at %>
+    <%= message.pretty_created_at %>
   </td>
 </tr>

data/lib/georgia/indexer/extensions/tire_adapter/georgia_mailer/message.rb

@@ -23,16 +23,19 @@ module Georgia
             }.to_json
           end
 
-          def self.search_index model, params
-            model.tire.search(page: (params[:page] || 1), per_page: (params[:per] || 25)) do
+          def self.search_index params
+            page     = params.fetch(:page, 1)
+            per_page = params.fetch(:per, 25)
+
+            search(page: page, per_page: per_page) do
               if params[:query].present?
                 query do
                   boolean do
                     must { string params[:query], default_operator: "AND" }
                   end
                 end
-                sort { by (params[:o] || :created_at), (params[:dir] || :desc) }
               end
+              sort { by (params[:o] || :created_at), (params[:dir] || :desc) } if params[:query].blank?
             end.results
           end
 

data/lib/georgia_mailer/version.rb

@@ -1,3 +1,3 @@
 module GeorgiaMailer
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/tasks/georgia_mailer_tasks.rake

@@ -10,4 +10,17 @@ namespace :messages do
     puts "Check completed. #{GeorgiaMailer::Message.spam.count} spam. #{GeorgiaMailer::Message.ham.count} ham."
   end
 
+end
+
+namespace :solr do
+
+  namespace :messages do
+
+    desc 'Reindex messages on solr'
+    task reindex: :environment do
+      GeorgiaMailer::Message.reindex
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: georgia_mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georgia