mail_engine 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/app/controllers/mail_engine/dashboard_controller.rb

@@ -1,7 +1,7 @@
 class MailEngine::DashboardController < MailEngine::ApplicationController
   def index
     @pie_chart_columns = ["bounces", "unique_opens", "spamreports", "blocks", "unopened"]
-    @data_of_today = MailEngine::Sendgrid::RestApi.stats
+    @data_of_today = MailEngine::Sendgrid::RestApi.stats || {}
     # unopened data needs you calculate by yourself.
     @data_of_today.merge!("unopened" => (@data_of_today["delivered"].to_i - @data_of_today["unique_opens"].to_i))
   end

data/app/controllers/mail_engine/reports_controller.rb

@@ -22,6 +22,7 @@ class MailEngine::ReportsController < MailEngine::ApplicationController
                   else
                     MailEngine::Sendgrid::RestApi.stats(:days => 7)
                   end
+    @stats_data ||= {}
   end
 
   def chart

data/app/views/mail_engine/dashboard/index.html.erb

@@ -12,7 +12,7 @@
 
     <% @pie_chart_columns.each_with_index do |col, i| %>
       data.setValue(<%= i %>, 0, "<%= col %>");
-      data.setValue(<%= i %>, 1, <%= @data_of_today[col] %>);
+      data.setValue(<%= i %>, 1, <%= @data_of_today[col]||0 %>);
     <% end %>
 
     var chart = new google.visualization.PieChart(document.getElementById('pie_chart'));

data/app/views/mail_engine/reports/index.html.erb

@@ -15,7 +15,7 @@
     <% @stats_data.each_with_index do |stat, i| %>
       data.setValue(<%= i %>, 0, "<%= stat["date"] %>");
       <% @stat_columns.each_with_index do |col, j| %>
-        data.setValue(<%= i %>, <%= j + 1 %>, <%= stat[col] %>);
+        data.setValue(<%= i %>, <%= j + 1 %>, <%= stat[col]||0 %>);
       <% end %>
     <% end %>
 

data/lib/mail_engine/configuration.rb

@@ -15,16 +15,16 @@ module MailEngine
       ### Need check below config options
       #
       # log_mail: true
-      # user_class_name: "User"
-      # user_locale_column: "locale"
-      # mount_at: "/admin/mail_engine"
-      # intercept_email: "hlxwell@gmail.com"
-      # default_from: "hlxwell@gmail.com"
-      # access_check_method: "logged_in?"
+      # user_class_name: 'User'
+      # user_locale_column: 'locale'
+      # mount_at: '/admin/mail_engine'
+      # intercept_email: 'your email'
+      # default_from: 'you email'
+      # access_check_method: 'logged_in?'
       # sendgrid:
-      #   sendgrid_user: "a@theplant.jp"
-      #   sendgrid_key: "plant^o^"
-      #   sendgrid_category: "development"
+      #   sendgrid_user: 'you send grid user'
+      #   sendgrid_key: 'you send grid password'
+      #   sendgrid_category: 'your send grid category'
       #
       def config_check
         if MailEngine::Base.current_config.blank?
@@ -51,17 +51,15 @@ module MailEngine
   user_class_name: 'User'
   user_locale_column: 'locale'
   mount_at: '/admin/mail_engine'
-  intercept_email: 'hlxwell@gmail.com'
-  default_from: 'hlxwell@gmail.com'
+  intercept_email: 'your email'
+  default_from: 'you email'
   access_check_method: 'logged_in?'
   sendgrid:
-    sendgrid_user: 'a@theplant.jp'
-    sendgrid_key: 'plant^o^'
-    sendgrid_category: 'development'
+    sendgrid_user: 'you send grid user'
+    sendgrid_key: 'you send grid password'
+    sendgrid_category: 'your send grid category'
 ===============================================
         NOTE
-
-        raise e
       end
 
     end

data/lib/mail_engine/engine.rb

@@ -44,7 +44,9 @@ module MailEngine
       # load config
       MailEngine::Configuration.load_and_check
 
-      MailEngine::USER_MODEL = MailEngine::Base.current_config["user_class_name"].constantize unless defined?(MailEngine::USER_MODEL)
+      if MailEngine::Base.current_config.present? and !defined?(MailEngine::USER_MODEL)
+        MailEngine::USER_MODEL = MailEngine::Base.current_config["user_class_name"].constantize
+      end
     end
   end
 end

data/lib/mail_engine/sendgrid/rest_api.rb

@@ -10,6 +10,7 @@ module MailEngine
       include HTTParty
       base_uri "https://sendgrid.com/api"
       default_params :api_key => MailEngine::Base.current_config["sendgrid"]["sendgrid_key"], :api_user => MailEngine::Base.current_config["sendgrid"]["sendgrid_user"]
+      format :xml
 
       class << self
         # <stats>

data/mail_engine.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mail_engine}
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["michael he"]
-  s.date = %q{2011-03-25}
+  s.date = %q{2012-01-25}
   s.description = %q{Rails system mail management solution.}
   s.email = %q{hlxwell@gmail.com}
   s.extra_rdoc_files = [
@@ -576,51 +576,8 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hlxwell/mail-engine}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Mail Management Solution}
-  s.test_files = [
-    "test/dummy/app/controllers/application_controller.rb",
-    "test/dummy/app/helpers/application_helper.rb",
-    "test/dummy/app/mailers/test/test_mailer.rb",
-    "test/dummy/app/mailers/user_mailer.rb",
-    "test/dummy/app/models/user.rb",
-    "test/dummy/config/application.rb",
-    "test/dummy/config/boot.rb",
-    "test/dummy/config/environment.rb",
-    "test/dummy/config/environments/development.rb",
-    "test/dummy/config/environments/production.rb",
-    "test/dummy/config/environments/test.rb",
-    "test/dummy/config/initializers/backtrace_silencers.rb",
-    "test/dummy/config/initializers/inflections.rb",
-    "test/dummy/config/initializers/mime_types.rb",
-    "test/dummy/config/initializers/secret_token.rb",
-    "test/dummy/config/initializers/session_store.rb",
-    "test/dummy/config/routes.rb",
-    "test/dummy/db/migrate/20110114030841_create_table_mail_template.rb",
-    "test/dummy/db/migrate/20110125094530_create_users.rb",
-    "test/dummy/db/migrate/20110126030525_create_mail_schedules.rb",
-    "test/dummy/db/migrate/20110204114145_create_template_partials.rb",
-    "test/dummy/db/migrate/20110206025002_create_mail_logs.rb",
-    "test/dummy/db/migrate/20110217062316_create_mail_template_files.rb",
-    "test/dummy/db/schema.rb",
-    "test/factories.rb",
-    "test/functional/mail_engine/dashboard_controller_test.rb",
-    "test/functional/mail_engine/mail_dispatcher_test.rb",
-    "test/functional/mail_engine/mail_logs_controller_test.rb",
-    "test/functional/mail_engine/mail_schedules_controller_test.rb",
-    "test/functional/mail_engine/mail_template_files_controller_test.rb",
-    "test/functional/mail_engine/mail_templates_controller_test.rb",
-    "test/functional/mail_engine/reports_controller_test.rb",
-    "test/functional/user_mailer_test.rb",
-    "test/support/integration_case.rb",
-    "test/test_helper.rb",
-    "test/unit/mail_engine/mail_log_test.rb",
-    "test/unit/mail_engine/mail_schedule_test.rb",
-    "test/unit/mail_engine/mail_template_file_test.rb",
-    "test/unit/mail_engine/mail_template_test.rb",
-    "test/unit/mail_engine/template_partial_test.rb",
-    "test/unit/user_test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mail_engine
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 1
-  - 14
-  version: 0.1.14
+  - 15
+  version: 0.1.15
 platform: ruby
 authors: 
 - michael he
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-25 00:00:00 +08:00
+date: 2012-01-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         version: 3.0.0
   requirement: *id001
   prerelease: false
-  name: activesupport
   type: :runtime
+  name: activesupport
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,8 +46,8 @@ dependencies:
         version: "0"
   requirement: *id002
   prerelease: false
-  name: httparty
   type: :runtime
+  name: httparty
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,8 +60,8 @@ dependencies:
         version: "0"
   requirement: *id003
   prerelease: false
-  name: nokogiri
   type: :runtime
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,8 +74,8 @@ dependencies:
         version: "0"
   requirement: *id004
   prerelease: false
-  name: deep_cloneable
   type: :runtime
+  name: deep_cloneable
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,8 +88,8 @@ dependencies:
         version: "0"
   requirement: *id005
   prerelease: false
-  name: rack
   type: :runtime
+  name: rack
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,8 +102,8 @@ dependencies:
         version: "0"
   requirement: *id006
   prerelease: false
-  name: liquid
   type: :runtime
+  name: liquid
 - !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -116,8 +116,8 @@ dependencies:
         version: "0"
   requirement: *id007
   prerelease: false
-  name: kaminari
   type: :runtime
+  name: kaminari
 - !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -130,8 +130,8 @@ dependencies:
         version: "0"
   requirement: *id008
   prerelease: false
-  name: carrierwave
   type: :runtime
+  name: carrierwave
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -144,8 +144,8 @@ dependencies:
         version: "0"
   requirement: *id009
   prerelease: false
-  name: sqlite3-ruby
   type: :development
+  name: sqlite3-ruby
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -158,8 +158,8 @@ dependencies:
         version: "0"
   requirement: *id010
   prerelease: false
-  name: annotate
   type: :development
+  name: annotate
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -172,8 +172,8 @@ dependencies:
         version: "0"
   requirement: *id011
   prerelease: false
-  name: bluecloth
   type: :development
+  name: bluecloth
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
@@ -186,8 +186,8 @@ dependencies:
         version: "0"
   requirement: *id012
   prerelease: false
-  name: yard
   type: :development
+  name: yard
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
@@ -200,8 +200,8 @@ dependencies:
         version: "0"
   requirement: *id013
   prerelease: false
-  name: bundler
   type: :development
+  name: bundler
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
@@ -214,8 +214,8 @@ dependencies:
         version: "0"
   requirement: *id014
   prerelease: false
-  name: jeweler
   type: :development
+  name: jeweler
 - !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
@@ -228,8 +228,8 @@ dependencies:
         version: "0"
   requirement: *id015
   prerelease: false
-  name: rcov
   type: :development
+  name: rcov
 - !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -242,8 +242,8 @@ dependencies:
         version: "0"
   requirement: *id016
   prerelease: false
-  name: reek
   type: :development
+  name: reek
 description: Rails system mail management solution.
 email: hlxwell@gmail.com
 executables: []
@@ -839,49 +839,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Mail Management Solution
-test_files: 
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/mailers/test/test_mailer.rb
-- test/dummy/app/mailers/user_mailer.rb
-- test/dummy/app/models/user.rb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/routes.rb
-- test/dummy/db/migrate/20110114030841_create_table_mail_template.rb
-- test/dummy/db/migrate/20110125094530_create_users.rb
-- test/dummy/db/migrate/20110126030525_create_mail_schedules.rb
-- test/dummy/db/migrate/20110204114145_create_template_partials.rb
-- test/dummy/db/migrate/20110206025002_create_mail_logs.rb
-- test/dummy/db/migrate/20110217062316_create_mail_template_files.rb
-- test/dummy/db/schema.rb
-- test/factories.rb
-- test/functional/mail_engine/dashboard_controller_test.rb
-- test/functional/mail_engine/mail_dispatcher_test.rb
-- test/functional/mail_engine/mail_logs_controller_test.rb
-- test/functional/mail_engine/mail_schedules_controller_test.rb
-- test/functional/mail_engine/mail_template_files_controller_test.rb
-- test/functional/mail_engine/mail_templates_controller_test.rb
-- test/functional/mail_engine/reports_controller_test.rb
-- test/functional/user_mailer_test.rb
-- test/support/integration_case.rb
-- test/test_helper.rb
-- test/unit/mail_engine/mail_log_test.rb
-- test/unit/mail_engine/mail_schedule_test.rb
-- test/unit/mail_engine/mail_template_file_test.rb
-- test/unit/mail_engine/mail_template_test.rb
-- test/unit/mail_engine/template_partial_test.rb
-- test/unit/user_test.rb
+test_files: []
+