georgia_mailer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b39fdbd73795a29fb6f1f300d92c333666742a2
-  data.tar.gz: b247a8adc76637db9504b5cb62e9f2667ce577ec
+  metadata.gz: 97372c56f9bbf66fbf16f0e635649c216f7e9cee
+  data.tar.gz: 28ad9ad53df078158cd2547b143f66e0bf02ad5a
 SHA512:
-  metadata.gz: c53ae62db423a6e55a004c5fb658e19106529de50b24570b2cc16d1c842cf497a7a384f6179eaabcbd3c5d3c09c3c95d879451f4141e142ba0b907da77b1e798
-  data.tar.gz: ae2b705af810ac7ffeac666f26182699d831b06804a22048252dd0b5dcc62fd8fec91173403f253c3a078f638587f0587fa4bfb0eee920e5ec99aa4f247bf80d
+  metadata.gz: e5f2f18244dad2fe6376c42f269af67f70cca35028138577fd1eb615226893771ffaf85f77380a7b25c1cea30f2286d5d81c6f388158b4dd0d8753e9c722c264
+  data.tar.gz: dc2bd696472c16b6489c127ffbe62c34808420f949d79d77e9bec5b751930bdf0ce0267760fabb85a7cc30f17170f8125f6bea4a3fd05156dbbf3a7878c7522d

data/README.md

@@ -6,14 +6,11 @@ Make sure you have a working Georgia installation before proceding with these in
 
 ### Installation
 
-Add migrations and migrate
+The install generator will add missing migrations and automatically migrate your database.
+If you selected ElasticSearch as your indexer with Tire, your index will be created.
+Finally, it will mount the engine in your routes.rb file under '/mailer'
 
-    rake railties:install:migrations
-    rake db:migrate
-
-If you selected ElasticSearch as your indexer, create the GeorgiaMailer::Message index:
-
-    rake environment tire:import CLASS=GeorgiaMailer::Message FORCE=true
+    rails generate georgia_mailer:install
 
 ### Heroku
 

data/app/assets/stylesheets/georgia_mailer/application.css.scss

@@ -1,2 +1,3 @@
 @import "settings/*";
+@import "mixins/*";
 @import "modules/*";

data/app/assets/stylesheets/georgia_mailer/mixins/_ellipsis.scss

@@ -0,0 +1,8 @@
+.ellipsis {
+  display: inline-block;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+    -o-text-overflow: ellipsis;
+    -ms-text-overflow: ellipsis;
+}

data/app/assets/stylesheets/georgia_mailer/modules/_message.scss

@@ -5,7 +5,11 @@
   @extend %clickable;
 }
 .message-timestamp {
-  @extend .timestamp--long;
+  white-space: nowrap;
+  text-align: right;
+  font-size: 0.9em;
+  width: 125px;
+  max-width: 125px;
 }
 
 .message-info {
@@ -43,11 +47,12 @@
 }
 
 .message-attachment {
-  @extend .tiny;
+  white-space: nowrap;
+  width: 25px;
+  max-width: 25px;
 }
 
 .message-message span {
-  @extend .nowrap;
   @extend .ellipsis;
   max-width: 800px;
 }

data/app/models/georgia_mailer/message.rb

@@ -1,6 +1,8 @@
 module GeorgiaMailer
   class Message < ActiveRecord::Base
 
+    include Georgia::Indexer::Adapter
+
     attr_accessible :name, :email, :subject, :message, :attachment, :phone
     delegate :url, :current_path, :size, :content_type, :filename, to: :attachment
 
@@ -24,11 +26,5 @@ module GeorgiaMailer
       @status ||= spam ? 'spam' : 'clean'
     end
 
-    include Georgia::Indexer::Adapter
-    is_searchable({
-      solr: GeorgiaMailer::Concerns::SolrGeorgiaMailerMessageExtension,
-      tire: GeorgiaMailer::Concerns::TireGeorgiaMailerMessageExtension
-    })
-
   end
 end

data/lib/generators/georgia_mailer/install/install_generator.rb

@@ -0,0 +1,23 @@
+module GeorgiaMailer
+  module Generators
+    class InstallGenerator < ::Rails::Generators::Base
+
+      def mount_engine
+        route "mount GeorgiaMailer::Engine => '/mailer'"
+      end
+
+      def run_migrations
+        rake "railties:install:migrations"
+        rake "db:migrate"
+      end
+
+      def create_indices
+        if defined? Tire
+          say("Creating elasticsearch indices", :yellow)
+          rake "environment tire:import CLASS=GeorgiaMailer::Message FORCE=true"
+        end
+      end
+
+    end
+  end
+end

data/{app/models/georgia/extensions/solr/georgia_mailer_message.rb → lib/georgia/indexer/extensions/solr_adapter/georgia_mailer/message.rb}

@@ -2,8 +2,8 @@ require 'active_support/concern'
 
 module Georgia
   module Indexer
-    module Extensions
-      module Solr
+    module SolrAdapter
+      module GeorgiaMailerMessageExtension
         extend ActiveSupport::Concern
 
         included do
@@ -25,6 +25,18 @@ module Georgia
             time :created_at
           end
 
+          def self.search_index model, params
+            search do
+              fulltext params[:query] do
+                fields(:name, :email, :message, :subject, :phone)
+              end
+              facet :spam
+              with(:spam, (params[:s] || 'clean'))
+              order_by (params[:o] || :created_at), (params[:dir] || :desc)
+              paginate(page: params[:page], per_page: (params[:per] || 25))
+            end.results
+          end
+
         end
       end
     end

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

@@ -0,0 +1,43 @@
+require 'active_support/concern'
+
+module Georgia
+  module Indexer
+    module TireAdapter
+      module GeorgiaMailerMessageExtension
+        extend ActiveSupport::Concern
+
+        included do
+
+          include ::Tire::Model::Search
+          include ::Tire::Model::Callbacks
+
+          def to_indexed_json
+            {
+              name: name,
+              email: email,
+              message: message,
+              subject: subject,
+              phone: phone,
+              status: status,
+              created_at: created_at.strftime('%F')
+            }.to_json
+          end
+
+          def self.search_index model, params
+            model.tire.search(page: (params[:page] || 1), per_page: (params[:per] || 25)) 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
+            end.results
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/georgia_mailer/version.rb

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

data/lib/tasks/georgia_mailer_tasks.rake

@@ -1,4 +1,13 @@
-# desc "Explaining what the task does"
-# task :georgia_mailer do
-#   # Task goes here
-# end
+namespace :messages do
+
+  desc "Send to Akismet all unverified messages"
+  task verify: :environment do
+    puts "Check for spam. Currently have #{GeorgiaMailer::Message.spam.count} spam and #{GeorgiaMailer::Message.ham.count} ham messages."
+    puts "Checking #{GeorgiaMailer::Message.where(verified_at: nil).count} unverified messages."
+    GeorgiaMailer::Message.where(verified_at: nil).find_each do |message|
+      message.update_attributes(spam: message.spam?, verified_at: Time.zone.now)
+    end
+    puts "Check completed. #{GeorgiaMailer::Message.spam.count} spam. #{GeorgiaMailer::Message.ham.count} ham."
+  end
+
+end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: georgia_mailer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mathieu Gagné
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: georgia
   requirement: !ruby/object:Gem::Requirement
@@ -78,11 +64,9 @@ files:
 - app/assets/javascripts/georgia_mailer/application.js
 - app/assets/stylesheets/georgia_mailer/settings/_color.scss
 - app/assets/stylesheets/georgia_mailer/modules/_message.scss
+- app/assets/stylesheets/georgia_mailer/mixins/_ellipsis.scss
 - app/assets/stylesheets/georgia_mailer/application.css.scss
 - app/decorators/georgia_mailer/message_decorator.rb
-- app/models/georgia/extensions/solr/georgia_mailer_message.rb
-- app/models/georgia_mailer/concerns/tire_georgia_mailer_message_extension.rb
-- app/models/georgia_mailer/concerns/solr_georgia_mailer_message_extension.rb
 - app/models/georgia_mailer/message.rb
 - app/controllers/georgia/messages_controller.rb
 - app/controllers/georgia_mailer/messages_controller.rb
@@ -101,7 +85,10 @@ files:
 - config/routes.rb
 - db/migrate/001_create_georgia_mailer_messages.rb
 - lib/tasks/georgia_mailer_tasks.rake
+- lib/generators/georgia_mailer/install/install_generator.rb
 - lib/georgia_mailer.rb
+- lib/georgia/indexer/extensions/solr_adapter/georgia_mailer/message.rb
+- lib/georgia/indexer/extensions/tire_adapter/georgia_mailer/message.rb
 - lib/georgia_mailer/engine.rb
 - lib/georgia_mailer/version.rb
 - MIT-LICENSE

data/app/models/georgia_mailer/concerns/solr_georgia_mailer_message_extension.rb

@@ -1,42 +0,0 @@
-require 'active_support/concern'
-
-module GeorgiaMailer
-  module Concerns
-    module SolrGeorgiaMailerMessageExtension
-      extend ActiveSupport::Concern
-
-      included do
-
-        searchable do
-          text :name
-          text :email
-          text :message
-          text :subject
-          text :phone
-          string :spam do
-            status
-          end
-          string :name
-          string :email
-          string :phone
-          string :subject
-          string :message
-          time :created_at
-        end
-
-        def self.search_index model, params
-          @search = Georgia::Message.search do
-            fulltext params[:query] do
-              fields(:name, :email, :message, :subject, :phone)
-            end
-            facet :spam
-            with(:spam, (params[:s] || 'clean'))
-            order_by (params[:o] || :created_at), (params[:dir] || :desc)
-            paginate(page: params[:page], per_page: (params[:per] || 25))
-          end.results
-        end
-
-      end
-    end
-  end
-end

data/app/models/georgia_mailer/concerns/tire_georgia_mailer_message_extension.rb

@@ -1,41 +0,0 @@
-require 'active_support/concern'
-
-module GeorgiaMailer
-  module Concerns
-    module TireGeorgiaMailerMessageExtension
-      extend ActiveSupport::Concern
-
-      included do
-
-        include ::Tire::Model::Search
-        include ::Tire::Model::Callbacks
-
-        def to_indexed_json
-          {
-            name: name,
-            email: email,
-            message: message,
-            subject: subject,
-            phone: phone,
-            status: status,
-            created_at: created_at.strftime('%F')
-            }.to_json
-          end
-
-          def self.search model, params
-            model.tire.search(page: (params[:page] || 1), per_page: (params[:per] || 25)) 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
-            end.results
-          end
-
-      end
-    end
-  end
-end