maily_herald-webui 0.8.0 → 0.9.0

data/config/routes.rb

@@ -9,7 +9,7 @@ MailyHerald::Webui::Engine.routes.draw do
     member do
       post "subscribe/:entity_id", action: :subscribe, as: :subscribe_to
       post "unsubscribe/:entity_id", action: :unsubscribe, as: :unsubscribe_from
-      get "context_variables(/:context)", action: :context_variables, as: :context_variables
+      get "context_attributes(/:context)", action: :context_attributes, as: :context_attributes
     end
   end
   resources "subscriptions" do
@@ -17,7 +17,7 @@ MailyHerald::Webui::Engine.routes.draw do
       post "toggle"
     end
   end
-  resources "one_time_mailings" do
+  resources "ad_hoc_mailings" do
     collection do 
       get "archived"
       post "update_form"
@@ -28,6 +28,16 @@ MailyHerald::Webui::Engine.routes.draw do
       get "preview/:entity_id", action: :preview, as: :preview
     end
   end
+  resources "one_time_mailings" do
+    collection do 
+      get "archived"
+      post "update_form"
+    end
+    member do
+      post "toggle"
+      get "preview/:entity_id", action: :preview, as: :preview
+    end
+  end
   resources "periodical_mailings" do
     collection do 
       get "archived"
@@ -58,7 +68,7 @@ MailyHerald::Webui::Engine.routes.draw do
     end
   end
 
-  post "switch_mode/:mode", to: "sessions#switch_mode", as: "switch_mode"
+  post "settings/:setting/switch", to: "sessions#switch_setting", as: "switch_setting"
 
 
 

data/lib/maily_herald/webui/form_builder.rb

@@ -13,7 +13,12 @@ module MailyHerald
         @control_col = options[:control_col] || default_control_col
         @inline_errors = options[:inline_errors] != false
         @help_scope = options[:help_scope]
-        super
+
+        if Rails::VERSION::MAJOR >= 4.2
+          super
+        else
+          super object_name, object, template, options
+        end
       end
 
       def prepend_and_append_input(options, &block)
@@ -99,7 +104,7 @@ module MailyHerald
 
       def maily_from_field options = {}, html_options = {}
         form_group_builder(:from, options.merge(wrapper_class: "mailing-from")) do
-          radio1 = content_tag(:label, content_tag(:span, @template.radio_button_tag(:mailing_from, "default", !object.from.present?), class: "radio-btn") + @template.display_mailing_from(object), class: "radio")
+          radio1 = content_tag(:label, content_tag(:span, @template.radio_button_tag(:mailing_from, "default", !object.from.present?), class: "radio-btn") + @template.tw("mailings.from.default", email: object.mailer.default[:from]), class: "radio")
           radio2 = content_tag(:label, content_tag(:span, @template.radio_button_tag(:mailing_from, "specify", object.from.present?), class: "radio-btn") + tw("mailings.from.specify"), class: "radio")
 
           field = prepend_and_append_input(options) do

data/lib/maily_herald/webui/menu_manager.rb

@@ -51,6 +51,7 @@ module MailyHerald
           @items = [
             {:name => :dashboard, :title => :label_dashboard, :url => Proc.new{ root_path }},
             {:name => :lists, :title => :label_list_plural, :url => Proc.new{ lists_path }},
+            {:name => :ad_hoc_mailings, :title => :label_ad_hoc_mailing_plural, :url => Proc.new{ ad_hoc_mailings_path }},
             {:name => :one_time_mailings, :title => :label_one_time_mailing_plural, :url => Proc.new{ one_time_mailings_path }},
             {:name => :periodical_mailings, :title => :label_periodical_mailing_plural, :url => Proc.new{ periodical_mailings_path }},
             {:name => :sequences, :title => :label_sequence_plural, :url => Proc.new{ sequences_path }},

data/lib/maily_herald/webui/version.rb

@@ -1,5 +1,5 @@
 module MailyHerald
   module Webui
-    VERSION = "0.8.0"
+    VERSION = "0.9.0"
   end
 end

data/maily_herald-webui.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |s|
   s.email       = ["lukasz@sology.eu"]
   s.homepage    = "https://github.com/Sology/maily_herald-webui"
   s.license     = "LGPL-3.0"
-  s.description = s.summary = "Web UI for MailyHerald - Email marketing solution for Ruby on Rails applications"
+  s.description = s.summary = "Web UI for MailyHerald - Email processing solution for Ruby on Rails applications"
 
   s.files        = `git ls-files`.split("\n")
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files   = `git ls-files -- {spec,features}/**/`.split("\n")
 
-	s.add_dependency 'maily_herald'
+	s.add_dependency 'maily_herald', "~>0.9.2"
 	s.add_dependency "smart_listing", "~>1.1.0"
 	s.add_dependency "haml"
 	s.add_dependency "coffee-rails"

data/spec/dummy/app/models/user.rb

@@ -1,5 +1,6 @@
 class User < ActiveRecord::Base
-  # attr_accessible :title, :body
+  scope :active, lambda { where(active: true) }
+  scope :inactive, lambda { where(active: false) }
   
   def to_s
     self.name

data/spec/dummy/bin/spring

@@ -1,17 +1,14 @@
 #!/usr/bin/env ruby
 
-# This file loads spring without using Bundler, in order to be fast
-# It gets overwritten when you run the `spring binstub` command
+# This file loads spring without using Bundler, in order to be fast.
+# It gets overwritten when you run the `spring binstub` command.
 
 unless defined?(Spring)
   require "rubygems"
   require "bundler"
 
-  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    spring \((.*?)\)$.*?^$/m)
-    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
-    ENV["GEM_HOME"] = ""
-    Gem.paths = ENV
-
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    Gem.paths = { "GEM_PATH" => [Bundler.bundle_path.to_s, *Gem.path].uniq }
     gem "spring", match[1]
     require "spring/binstub"
   end

data/spec/dummy/config/application.rb

@@ -4,7 +4,7 @@ require File.expand_path('../boot', __FILE__)
 require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
-require "active_resource/railtie"
+#require "active_resource/railtie"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
@@ -53,13 +53,16 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = true
+    # config.active_record.whitelist_attributes = true
 
     # Enable the asset pipeline
     config.assets.enabled = true
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    config.action_mailer.default_options = { from: "hello@mailyherald.org" }
+    config.action_mailer.default_url_options = { host: "mailyherald.org" }
   end
 end
 

data/spec/dummy/config/environments/development.rb

@@ -23,16 +23,18 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  #config.active_record.auto_explain_threshold_in_seconds = 0.5
 
   # Do not compress assets
   config.assets.compress = false
 
   # Expands the lines which load the assets
   config.assets.debug = true
-  config.serve_static_assets = true
+  config.serve_static_files = true
+
+  config.eager_load = false
 end

data/spec/dummy/config/environments/test.rb

@@ -30,8 +30,10 @@ Dummy::Application.configure do
   config.action_mailer.delivery_method = :test
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/spec/dummy/config/initializers/maily_herald.rb

@@ -1,11 +1,8 @@
 MailyHerald.setup do |config|
-  config.default_from = "no-reply@maily_herald.com"
   config.token_redirect {|subscription| "/" }
 
   config.context :all_users do |context|
-    context.title = "All users"
-    context.scope {User.scoped}
-    context.destination_attribute = :email
+    context.scope {User.active}
     context.destination {|user| user.email}
     context.attributes do |user| 
       attribute_group(:user) do
@@ -22,33 +19,47 @@ MailyHerald.setup do |config|
   end
 
   config.list :generic_list do |list|
-    list.title = "Generic list"
     list.context_name = :all_users
-    list.token_custom_action do |controller, subscription|
-      user = subscription.entity
-      user.name = "changed"
-      user.save!
-      controller.redirect_to "/custom"
-    end
+  end
+
+  config.list :locked_list, locked: true do |list|
+    list.context_name = :all_users
+  end
+
+  config.one_time_mailing :locked_mailing, locked: true do |mailing|
+    mailing.enable
+    mailing.title = "Test mailing"
+    mailing.subject = "Test mailing"
+    mailing.list = :generic_list
+    mailing.start_at = "user.created_at"
+    mailing.template = "User name: {{user.name}}."
   end
 
   config.one_time_mailing :test_mailing do |mailing|
-    mailing.enabled = true
+    mailing.enable
     mailing.title = "Test mailing"
     mailing.subject = "Test mailing"
     mailing.list = :generic_list
+    mailing.start_at = "user.created_at"
     mailing.template = "User name: {{user.name}}."
   end
 
-  config.one_time_mailing :sample_mail do |mailing|
-    mailing.enabled = true
-    mailing.title = "Sample mailing"
+  config.one_time_mailing :one_time_mail, locked: true do |mailing|
+    mailing.enable
+    mailing.title = "One time mailing"
+    mailing.list = :generic_list
+    mailing.mailer_name = "CustomOneTimeMailer"
+    mailing.start_at = "user.created_at"
+  end
+
+  config.ad_hoc_mailing :ad_hoc_mail do |mailing|
+    mailing.enable
+    mailing.title = "Ad hoc mailing"
     mailing.list = :generic_list
-    mailing.mailer_name = "TestMailer"
   end
 
   config.sequence :newsletters do |seq|
-    seq.enabled = true
+    seq.enable
     seq.title = "Newsletters"
     seq.list = :generic_list
     seq.start_at = "user.created_at"
@@ -57,38 +68,26 @@ MailyHerald.setup do |config|
       mailing.subject = "Test mailing #1"
       mailing.template = "User name: {{user.name}}."
       mailing.absolute_delay = 1.hour
-      mailing.enabled = true
+      mailing.enable
     end
     seq.mailing :second_mail do |mailing|
       mailing.title = "Test mailing #2"
       mailing.subject = "Test mailing #2"
       mailing.template = "User name: {{user.name}}."
       mailing.absolute_delay = 3.hours
-      mailing.enabled = true
+      mailing.enable
     end
     seq.mailing :third_mail do |mailing|
       mailing.title = "Test mailing #3"
       mailing.subject = "Test mailing #3"
       mailing.template = "User name: {{user.name}}."
       mailing.absolute_delay = 6.hours
-      mailing.enabled = true
+      mailing.enable
     end
   end
 
   config.periodical_mailing :weekly_summary do |mailing|
-    mailing.enabled = true
-    mailing.title = "Weekly summary"
-    mailing.subject = "Weekly summary"
-    mailing.start_at = "user.created_at"
-    mailing.list = :generic_list
-    mailing.title = "Test periodical mailing"
-    mailing.template = "User name: {{user.name}}."
-    mailing.period = 7.days
-    mailing.conditions = "user.weekly_notifications"
-  end
-
-  config.periodical_mailing :weekly_summary_sg do |mailing|
-    mailing.enabled = true
+    mailing.enable
     mailing.title = "Weekly summary"
     mailing.subject = "Weekly summary"
     mailing.start_at = "user.created_at"
@@ -96,6 +95,6 @@ MailyHerald.setup do |config|
     mailing.title = "Test periodical mailing"
     mailing.template = "User name: {{user.name}}."
     mailing.period = 7.days
-    mailing.conditions = "user.weekly_notifications"
+    mailing.conditions = "user.weekly_notifications == true"
   end
 end

data/spec/dummy/config/maily_herald.yml

@@ -0,0 +1,4 @@
+---
+:verbose: false
+:logfile: log/maily_herald.log
+:pidfile: tmp/pids/maily_herald.pid

data/spec/dummy/config/sidekiq.yml

@@ -0,0 +1,5 @@
+---
+:verbose: false
+:pidfile: ./tmp/pids/sidekiq.pid
+:logfile: ./log/sidekiq.log
+:concurrency:  25

data/spec/dummy/db/migrate/20130723074347_create_users.rb

@@ -3,6 +3,7 @@ class CreateUsers < ActiveRecord::Migration
     create_table :users do |t|
       t.string      :name
       t.string      :email
+      t.boolean     :active, :default => true
       t.boolean     :weekly_notifications, :default => true
 
       t.timestamps

data/spec/dummy/db/migrate/20150602133024_create_maily_herald_tables.maily_herald.rb

@@ -0,0 +1,54 @@
+# This migration comes from maily_herald (originally 20150205120443)
+class CreateMailyHeraldTables < ActiveRecord::Migration
+  def change
+    create_table :maily_herald_dispatches do |t|
+      t.string            :type,                                        null: false
+      t.integer           :sequence_id
+      t.integer           :list_id,                                     null: false
+      t.text              :conditions
+      t.text              :start_at
+      t.string            :mailer_name
+      t.string            :name,                                        null: false
+      t.string            :title
+      t.string            :subject
+      t.string            :from
+      t.string            :state,             default: "disabled"
+      t.text              :template
+      t.integer           :absolute_delay
+      t.integer           :period
+      t.boolean           :override_subscription
+
+      t.timestamps
+    end
+		add_index :maily_herald_dispatches, :name, unique: true
+
+    create_table :maily_herald_subscriptions do |t|
+      t.integer           :entity_id,                                   null: false
+      t.integer           :list_id,                                     null: false
+      t.string            :entity_type,                                 null: false
+      t.string            :token,                                       null: false
+      t.text              :settings
+      t.text              :data
+      t.boolean           :active,             default: false,       null: false
+      t.datetime          :delivered_at
+
+      t.timestamps
+    end
+
+    create_table :maily_herald_logs do |t|
+      t.integer           :entity_id,                                   null: false
+      t.string            :entity_type,                                 null: false
+      t.string            :entity_email
+      t.integer           :mailing_id
+      t.string            :status,                                      null: false
+      t.text              :data
+      t.datetime          :processing_at
+    end
+
+    create_table :maily_herald_lists do |t|
+      t.string            :name,                                        null: false
+      t.string            :title
+      t.string            :context_name
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -9,71 +9,68 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140804152250) do
+ActiveRecord::Schema.define(version: 20150602133024) do
 
-  create_table "maily_herald_dispatches", :force => true do |t|
-    t.string   "type",                                     :null => false
+  create_table "maily_herald_dispatches", force: :cascade do |t|
+    t.string   "type",                                       null: false
     t.integer  "sequence_id"
-    t.string   "context_name"
+    t.integer  "list_id",                                    null: false
     t.text     "conditions"
+    t.text     "start_at"
     t.string   "mailer_name"
-    t.string   "name",                                     :null => false
+    t.string   "name",                                       null: false
     t.string   "title"
     t.string   "subject"
     t.string   "from"
+    t.string   "state",                 default: "disabled"
     t.text     "template"
     t.integer  "absolute_delay"
     t.integer  "period"
-    t.boolean  "enabled",               :default => false
     t.boolean  "override_subscription"
-    t.datetime "created_at",                               :null => false
-    t.datetime "updated_at",                               :null => false
-    t.text     "start_at"
-    t.integer  "list_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  add_index "maily_herald_dispatches", ["context_name"], :name => "index_maily_herald_dispatches_on_context_name"
-  add_index "maily_herald_dispatches", ["name"], :name => "index_maily_herald_dispatches_on_name", :unique => true
+  add_index "maily_herald_dispatches", ["name"], name: "index_maily_herald_dispatches_on_name", unique: true
 
-  create_table "maily_herald_lists", :force => true do |t|
-    t.string "name",         :null => false
+  create_table "maily_herald_lists", force: :cascade do |t|
+    t.string "name",         null: false
     t.string "title"
     t.string "context_name"
-    t.string "token_action"
   end
 
-  create_table "maily_herald_logs", :force => true do |t|
-    t.integer  "entity_id",     :null => false
-    t.string   "entity_type",   :null => false
+  create_table "maily_herald_logs", force: :cascade do |t|
+    t.integer  "entity_id",     null: false
+    t.string   "entity_type",   null: false
+    t.string   "entity_email"
     t.integer  "mailing_id"
-    t.string   "status",        :null => false
+    t.string   "status",        null: false
     t.text     "data"
     t.datetime "processing_at"
-    t.integer  "sequence_id"
   end
 
-  create_table "maily_herald_subscriptions", :force => true do |t|
-    t.integer  "entity_id",                           :null => false
-    t.string   "entity_type",                         :null => false
-    t.string   "token",                               :null => false
+  create_table "maily_herald_subscriptions", force: :cascade do |t|
+    t.integer  "entity_id",                    null: false
+    t.integer  "list_id",                      null: false
+    t.string   "entity_type",                  null: false
+    t.string   "token",                        null: false
     t.text     "settings"
     t.text     "data"
-    t.boolean  "active",           :default => false, :null => false
+    t.boolean  "active",       default: false, null: false
     t.datetime "delivered_at"
-    t.datetime "created_at",                          :null => false
-    t.datetime "updated_at",                          :null => false
-    t.integer  "list_id"
-    t.datetime "next_delivery_at"
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
-  create_table "users", :force => true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "name"
     t.string   "email"
-    t.boolean  "weekly_notifications", :default => true
-    t.datetime "created_at",                             :null => false
-    t.datetime "updated_at",                             :null => false
+    t.boolean  "active",               default: true
+    t.boolean  "weekly_notifications", default: true
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
 end