msg 0.2.2 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b88a93492b109ffaa4839e7e61ec167a59fa31d8
+  data.tar.gz: 211467207140b27eedc29f646e80653a67ae4ab4
+SHA512:
+  metadata.gz: 4444926204e8fc879def1105333fdb887fb58fb7b063998939647801394aa7505738e16a59ed6f4d51087ed368fff74dd7575207d8cd4593182abdf8a9e8bb59
+  data.tar.gz: d246acdd8a896366c8700fbe98bf5a022cbc8ab8da677aacbb2e7cf413b909a5a8ed97641c5838f86b4430b0370a117f1c2667db4ad9ff1a9e126e4b0dafa2b2

data/README.md

@@ -5,5 +5,3 @@
 * SES account required
 
 * receiver classes must respond to :name, :email and :for_email
-
-* must set devise mailer if using

data/app/assets/stylesheets/msg.css.sass

@@ -51,12 +51,6 @@ h2
     &:hover
       color: $red
 
-h2.section
-  font-size: 1.25em
-  line-height: 26px
-  clear: left
-  margin-top: 2em
-
 #sending
   position: relative
   width: 580px

data/app/controllers/msg/messages_controller.rb

@@ -35,7 +35,7 @@ module Msg
     end
 
     def create
-      @message.update_attributes(params[:message])
+      @message.update_attributes(message_params)
       respond_with @message
     end
 
@@ -44,7 +44,7 @@ module Msg
     end
 
     def update
-      @message.update_attributes(params[:message])
+      @message.update_attributes(message_params)
       respond_with @message
     end
 
@@ -56,7 +56,7 @@ module Msg
   protected
 
     def build_message
-      @message = Msg::Message.new(params[:message])
+      @message = Msg::Message.new
     end
 
     def get_message
@@ -66,6 +66,10 @@ module Msg
     def get_transactional_messages
       @transactional_messages = Msg::Message.transactional
     end
+    
+    def message_params
+      params.require(:message).permit(:subject, :body, :function, :description, :transactional, :saved, :from_name, :from_address)
+    end
 
     def get_saved_messages
       @show = params[:show] || 10

data/app/controllers/msg/sendings_controller.rb

@@ -26,7 +26,7 @@ module Msg
     end
 
     def create
-      @sending.update_attributes(params[:sending])
+      @sending.update_attributes(sending_params)
       respond_with @sending
     end
 
@@ -54,5 +54,12 @@ module Msg
       @page = params[:page] || 1
       @sendings = Msg::Sending.order("created_at DESC").page(@page).per(@show)
     end
+    
+    def sending_params
+      parameter_names = [:message_id, :envelopes_attributes] + Msg.receiving_classes.map{|klass| "#{klass.underscore}_group"}
+      Rails.logger.warn "permitted parameter_names: #{parameter_names.inspect}"
+      params.require(:sending).permit(*parameter_names)
+    end
+    
   end
 end

data/app/models/msg/bounce.rb

@@ -1,6 +1,5 @@
 module Msg
   class Bounce < ActiveRecord::Base
-    attr_accessible :email, :envelope, :bounce_type, :bounce_subtype, :raw_message, :reporter, :diagnostic, :status
     belongs_to :envelope
 
     validates :email, :presence => true

data/app/models/msg/envelope.rb

@@ -1,7 +1,5 @@
 module Msg
   class Envelope < ActiveRecord::Base
-    attr_accessible :receiver, :sending
-    
     belongs_to :sending
     belongs_to :receiver, :polymorphic => true
     has_many :bounces

data/app/models/msg/message.rb

@@ -2,8 +2,6 @@ require 'mustache'
 
 module Msg
   class Message < ActiveRecord::Base
-    attr_accessible :subject, :body, :function, :description, :transactional, :saved, :from_name, :from_address
-
     has_many :sendings
     belongs_to :created_by, :class_name => Msg.user_class
 
@@ -16,9 +14,9 @@ module Msg
       address = from_address? ? from_address : Msg.default_from_address
       "#{name} <#{address}>"
     end
-    
-    def render_for(receiver)
-      values = receiver.for_email.reverse_merge(Msg.email_values)
+
+    def render_for(receiver, token=nil)
+      values = receiver.for_email(token).reverse_merge(Msg.email_values)
       Mustache.render(body, values)
     end
 

data/app/models/msg/sending.rb

@@ -1,7 +1,5 @@
 module Msg
   class Sending < ActiveRecord::Base
-    attr_accessible :message_id, :envelopes_attributes
-
     belongs_to :message
     belongs_to :created_by, :class_name => Msg.user_class
     has_many :envelopes, :dependent => :destroy
@@ -33,14 +31,12 @@ module Msg
       define_method  :"#{key}_group=" do |name|
         self.receiving_class = key
         self.receiving_group = name
-        self.receivers = klass.messaging_groups[name.to_sym].call unless name == 'selected'
+        self.receivers = klass.messaging_groups[name.to_sym].call
       end
-      attr_accessible :"#{key}_group"
       
       define_method  :"#{key}_receiver_ids" do
         self.envelopes.map(&:receiver_id) if self.receiving_class == key
       end
-      attr_accessible :"#{key}_receiver_ids"
 
       # class_receiver_ids= is called from the SendingsController and given a list of receiver ids of this class.
       # they are instantiated and passed to receivers=

data/app/views/msg/bounces/_report.html.haml

@@ -1,8 +1,8 @@
 - bounces ||= @bounces || Msg::Bounce.order('created_at DESC').limit(5)
 
-#bouncebox{:data => {:refreshable => true, :url => msg.bounces_path(:format => :js)}}
+%section#bouncebox{:data => {:refreshable => true, :url => msg.bounces_path(:format => :js)}}
   - if bounces.any?
-    %h3
+    %h2.section
       = link_to t(:bounce_report), msg.bounces_url
   
     %ul.bounces

data/app/views/msg/messages/_action_menu.html.haml

@@ -1,4 +1,4 @@
-- if editable?(message)
+- if can? :edit, message
   .menu{:data => {:for => "message_#{message.id}"}}
     %ul.actions
       %li

data/app/views/msg/messages/index.html.haml

@@ -9,10 +9,12 @@
     = t :saved_messages
     %span.action
       = link_to t(:create_message), msg.new_message_url, :class => "add minimal", :data => {:action => "popup", :affected => "#saved_messages"}
-  = render "msg/messages/saved_messages"
 
-  %p.action
-    = link_to t(:create_message), msg.new_message_url, :class => "add", :data => {:action => "popup", :affected => "#saved_messages"}
+  = render "msg/messages/saved_messages"
+  
+  - if can? :create, Msg::Message
+    %p.action
+      = link_to t(:create_message), msg.new_message_url, :class => "add", :data => {:action => "popup", :affected => "#saved_messages"}
 
 -content_for :margin do
   = render :partial => "msg/bounces/report"

data/app/views/msg/sendings/_form.html.haml

@@ -18,22 +18,9 @@
           - count = proc.call.count
           %li.group
             = f.radio_button "#{key}_group", name, :data => {:action => "reveal", :converse => "ul.choose_receivers"}, :disabled => count == 0
-            %label{:for => "sending_#{key}_group_#{name}"} 
-              = t("msg.groups.#{name}")
-              %span.note
-                = t(:receiver_count, :count => count)
-            
-        %li.group
-          = f.radio_button "#{key}_group", :selected, :data => {:action => "reveal", :affected => "ul.choose_receivers"}
-          %label{:for => "sending_#{key}_group_selected"} 
-            = t("msg.groups.selected")
-          
-          %ul.choose_receivers
-            - klass.constantize.order('name ASC').each do |rec|
-              %li.receiver
-                = check_box_tag "sending[#{key}_receiver_ids][]", rec.id, false, :id => "sending_#{key}_receiver_ids_#{rec.id}"
-                %label{:for => "sending_#{key}_receiver_ids_#{rec.id}"}
-                  = rec.name
+            %label{:for => "sending_#{key}_group_#{name}", :class => count == 0 ? "disabled" : ""} 
+              = t("msg.groups.#{name}") + ":"
+              = count
 
   // #todo: update the preview on selection, and add a control to page through the selected group of people
   %iframe.body{:src => msg.preview_message_url(message, :receiver_type => receiver.class.to_s.downcase.underscore.to_s, :receiver_id => receiver.id)}

data/app/views/msg/sendings/_report.html.haml

@@ -1,7 +1,7 @@
 - sendings ||= @sendings || Msg::Sending.order('created_at DESC').limit(5)
 
-#sentbox{:data => {:refreshable => true, :url => msg.sendings_path(:format => :js, :show => 5)}}
-  %h3
+%section#sentbox{:data => {:refreshable => true, :url => msg.sendings_path(:format => :js, :show => 5)}}
+  %h2.section
     = link_to t(:sent_report), msg.sendings_url
     
   %ul.sendings

data/config/locales/en.yml

@@ -25,7 +25,7 @@ en:
   message_from_name: "Sender name"
   message_from_note: "Leave both address fields blank to use the default"
   receiver_count:
-    zero: "(nobody)"
+    zero: "nobody)"
     one: "(one person)"
     other: "(%{count} people)"
   save_message: "Save message"

data/lib/msg.rb

@@ -21,9 +21,15 @@ module Msg
   class MsgError < StandardError; end
   class EmailInvalid < MsgError; end
 
-
   class << self
 
+    def add_receiving_class(klass, options)
+      k = klass.to_s
+      receiving_classes << k unless receiving_classes.include?(k)
+      klass.messaging_groups = options[:groups] || []
+      Msg::Sending.add_receiver_hooks(klass, options)
+    end
+
     def setup
       yield self
     end
@@ -72,18 +78,5 @@ module Msg
       @@sending_domain ||= ActionMailer::Base.default_url_options[:host]
     end
 
-
-
-
-
-    def add_receiving_class(klass, options)
-      Rails.logger.warn ">>> Msg.add_receiving_class #{klass}"
-      
-      k = klass.to_s
-      receiving_classes << k unless receiving_classes.include?(k)
-      klass.messaging_groups = options[:groups] || []
-      Msg::Sending.add_receiver_hooks(klass, options)
-    end
-
   end
 end

data/lib/msg/engine.rb

@@ -4,9 +4,6 @@ module Msg
 
     initializer "msg.integration" do |app|
       ActiveRecord::Base.send :include, Msg::Receivers
-      ActiveSupport.on_load :action_controller do
-        helper Msg::MsgHelper
-      end
     end
 
     config.generators do |g|

data/lib/msg/receivers.rb

@@ -8,29 +8,23 @@ module Msg
   end
   
   module ActiveRecordClassMethods
-    # +receives_messages+ ...
-    
+
     def receives_messages(options={})
-      include ReceiverInstanceMethods
       has_many :envelopes, :as => :receiver, :class_name => "Msg::Envelope"
       Msg.add_receiving_class(self, options)
     end
     
     # Messaging groups are usually defined by passing a :groups parameter to `receives_messages`, 
-    # but you can also override the messaging_groups methods if that's easier.
+    # but you can also override the messaging_groups methods if your groups don't resolve to scopes 
+    # or other class methods.
     #
     def messaging_groups
-      Thread.current["messaging_groups_#{self.to_s.underscore}"]  ||= []
-      # @messaging_groups ||= []
+      Thread.current["messaging_groups_#{self.to_s.underscore}"] ||= []
     end
     
-    # Messaging groups are always held as a hash of name => lambda { retrieval action }, and in a complex
-    # case they can be passed in that form. If all the groups correspond to scopes on the receiving class,
-    # you can alternatively supply a list of scope names. It will be expanded to simple lambdas here.
+    # Messaging groups can be passed in as procs or method names. Usually it's just a list of scopes,
+    # which you can supply as a simple array of names.
     #
-    #   receives_messages :groups => [:scope_name, :other_scope_name]
-    #
-    
     def messaging_groups=(groups)
       if groups.is_a?(Array)
         groups = groups.each_with_object({}) do |grp, hash|
@@ -47,18 +41,8 @@ module Msg
         self.send name
       end
     end
-    
-  end
-  
-  module ReceiverInstanceMethods
-    
-    
-    
+
   end
 end
 
 
-
-
-
-

data/lib/msg/version.rb

@@ -1,3 +1,3 @@
 module Msg
-  VERSION = "0.2.2"
+  VERSION = "0.5.0"
 end

data/spec/controllers/msg/envelopes_controller_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-include Devise::TestHelpers
 module Msg
   describe EnvelopesController do
 

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

@@ -1,7 +1,4 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable,
-         :recoverable# ,
-         #          :confirmable
   receives_messages({})
 
   def for_email

data/spec/dummy/config/routes.rb

@@ -2,7 +2,6 @@ Dummy::Application.routes.draw do
 
   mount Msg::Engine => "/msg", :as => :msg
 
-  devise_for :users
   resources :users
   root :to => "users#index"
 

data/spec/spec_helper.rb

@@ -59,13 +59,6 @@ Spork.prefork do
     config.after(:each) do
       DatabaseCleaner.clean
     end
-
-  end
-
-  ## controller methods
-  # devise sign_in
-  def sign_in_admin
-    sign_in FactoryGirl.create(:admin)
   end
 
 end

metadata

@@ -1,244 +1,214 @@
 --- !ruby/object:Gem::Specification
 name: msg
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - William Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2014-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.13
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: roadie
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-ses
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Msg is a general-purpose messaging engine for rails 3 apps. Use it to
-  compose, revise, send and resend messages to selected or generated groups of user-like
-  objects. It uses a simple mustache-based template system and brings your devise
-  email templates into the database so that they too are editable and resendable.
+description: Msg is a general-purpose messaging engine for rails apps. Use it to compose,
+  revise, send and resend messages to selected or generated groups of user-like objects.
+  It uses a simple mustache-based template system.
 email:
 - will@spanner.org
 executables: []
@@ -256,8 +226,6 @@ files:
 - app/controllers/msg/envelopes_controller.rb
 - app/controllers/msg/messages_controller.rb
 - app/controllers/msg/sendings_controller.rb
-- app/helpers/msg/msg_helper.rb
-- app/mailers/msg/devise_mailer.rb
 - app/mailers/msg/msg_mailer.rb
 - app/models/msg/bounce.rb
 - app/models/msg/envelope.rb
@@ -326,7 +294,6 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -335,12 +302,8 @@ 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/2013032210540_users.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -367,27 +330,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/spanner/msg
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes your email more flavoursome.
 test_files:
 - spec/controllers/msg/bounces_controller_spec.rb
@@ -408,7 +370,6 @@ test_files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -417,12 +378,8 @@ 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/2013032210540_users.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html