actionmessage 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 240081935ff8db8aa9f48415da974a088afd2888
-  data.tar.gz: d5dc250192ff286a4181abb8602e6f6ade11f0d3
+  metadata.gz: ce7496587f302af7f1961a4b08737a5644128544
+  data.tar.gz: c00de1183c0530935dde4bd471d22dcd2470f9b2
 SHA512:
-  metadata.gz: f993a661c89c72745337d194c2f16705b15366354e27c921b21843a2bee638e4f9f842250dec03c810a42a0900900468069111f851542025af1080c1af298b47
-  data.tar.gz: 69fc7546f24538cd834564908d8e75218db970442c40b4e4acab9ac8b9d83bd9af66c15e66b9b66a5f86f32b3faca33f1feb942ac2143819467716dc145e9f8b
+  metadata.gz: 6660e21bd4ff00d3d5421139ec3ca1ea7634bd7a3adea554cca9dbc4043d55117384b4ea6362592319a0daa174da3a503a830aff0b60bce1e5ded77d2f5c7962
+  data.tar.gz: 4bd24eb4d565c2e29196fbcc841676ed535dcd65a46fb687677a023cf879deb8c6b242a879523ece6aa4cd37010c2f6d0c92a6f8e68760b1502b44c461a8b924

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
 rvm:
+  - 2.4.0
   - 2.3.0
+  - 2.2.5
+  - 2.1.10
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -9,7 +9,7 @@ Pull requests are more than welcome!
 [![codecov](https://codecov.io/gh/dballona/actionmessage/branch/master/graph/badge.svg)](https://codecov.io/gh/dballona/actionmessage)
 [![Code Climate](https://codeclimate.com/github/dballona/actionmessage/badges/gpa.svg)](https://codeclimate.com/github/dballona/actionmessage)
 
-## Usage
+## Setup
 
 Install it using bundler:
 
@@ -24,27 +24,29 @@ If you're using Rails, place this on your environment file or application.rb
 require 'action_message/railtie'
 
 config.action_message = {
-	from: "number to send from in international format, e.g.: +11231231234", 
-	adapter: { 
-		name: :twilio,
-		credentials: {
-			account_sid: 'MY TWILIO ACCOUNT SID'.freeze,
-			auth_token: 'MY AUTH TOKEN'.freeze
-		}
-	}
+  from: "number to send from in international format, e.g.: +11231231234", 
+  adapter: { 
+    name: :twilio,
+    credentials: {
+      account_sid: 'MY TWILIO ACCOUNT SID'.freeze,
+      auth_token: 'MY AUTH TOKEN'.freeze
+    }
+  }
 }
 ```
 
+## Usage
+
 In order to generate your message class, you can either place this code
 under app/messages/welcome_message.rb or just use our generators by running
 the following command: `rails g message Welcome send_welcome_sms`
 
 ```ruby
 class WelcomeMessage < ActionMessage::Base
-	def send_welcome_sms(name, phone_number_to_send_message)
-		@name = name
-		sms(to: phone_number_to_send_message)
-	end
+  def send_welcome_sms(name, phone_number_to_send_message)
+    @name = name
+    sms(to: phone_number_to_send_message)
+  end
 end
 ```
 
@@ -53,3 +55,31 @@ Define your views under your view path, such as: app/views/welcome_message/send_
 ```html
 Welcome, <%= @name %>!
 ```
+
+And to send is really simple!
+
+```ruby
+name = 'John Doe'
+phone = '+11231231234'
+
+# To send right away:
+WelcomeMessage.send_welcome_sms(name, phone).deliver_now
+
+# To send through a background job
+WelcomeMessage.send_welcome_sms(name, phone).deliver_later
+```
+
+## Interceptors
+
+In order to prevent sending messages to a specific number or containing any specific text on it's body you can use Interceptors:
+
+```ruby
+# You can use strings (exact comparison)
+ActionMessage::Interceptor.register(to: 'number I want to prevent sending messages')
+
+# Regular expressions
+ActionMessage::Interceptor.register(body: /something innapropriate/i)
+
+# Pass Multiple arguments on the same call
+ActionMessage::Interceptor.register(to: '+11231231234', body: /anything/i)
+```

data/lib/action_message.rb

@@ -3,6 +3,7 @@ require 'abstract_controller'
 require 'action_message/adapters'
 require 'action_message/base'
 require 'action_message/delivery_job'
+require 'action_message/interceptor'
 require 'action_message/message'
 require 'action_message/message_delivery'
 require 'action_message/version'

data/lib/action_message/base.rb

@@ -38,10 +38,10 @@ module ActionMessage
 
       def base_paths
         %w(
-          app/views 
-          app/views/messages 
-          app/views/mailers 
-          app/views/application 
+          app/views
+          app/views/messages
+          app/views/mailers
+          app/views/application
           app/views/layouts
         ).freeze
       end
@@ -67,13 +67,13 @@ module ActionMessage
 
       self.template_name = params[:template_name].presence || template_name
       self.template_path = params[:template_path].presence || template_path
-      
+
       @_message_was_called = true
       lookup_context.view_paths = (lookup_context.view_paths.to_a + self.class.base_paths).flatten.uniq
 
       message.to = params[:to]
       message.debug = params[:debug]
-      message.body = render(full_template_path)
+      message.body = params[:body] || render(full_template_path)
 
       message
     end

data/lib/action_message/interceptor.rb

@@ -0,0 +1,35 @@
+module ActionMessage
+  class Interceptor
+    cattr_accessor :blacklist
+    self.blacklist = {}
+
+    class << self
+      def register(conditions={})
+        raise TypeError, 'Invalid type. Please provide a hash object' unless conditions.methods.include?(:key)
+
+        conditions.each do |attribute, condition|
+          @@blacklist[attribute.to_sym] ||= []
+          @@blacklist[attribute.to_sym].push(condition)
+        end
+      end
+
+
+      def registered_for?(message)
+        @@blacklist.each do |attribute, conditions|
+          value = message.send(attribute.to_sym)
+
+          conditions.each do |condition|
+            return true if value.send(match_method_for(condition), condition)
+          end
+        end
+
+        return false
+      end
+
+      private
+        def match_method_for(condition)
+          condition.is_a?(Regexp)? :=~ : :==
+        end
+    end
+  end
+end

data/lib/action_message/message.rb

@@ -14,8 +14,14 @@ module ActionMessage
     end
 
     def deliver
-      unless debug?
-        # add logger 'Sendimg message from "number" to "number"'
+      if debug?
+        # TODO: add log
+        return nil
+      elsif Interceptor.registered_for?(self)
+        # TODO: add log
+        return nil   
+      else
+        # TODO: add logger 'Sending message from "number" to "number"'
         adapter.send_message(body, to: to)
       end
     end

data/lib/action_message/version.rb

@@ -1,3 +1,3 @@
 module ActionMessage
-  VERSION = '0.0.12'.freeze
+  VERSION = '0.0.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmessage
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Diego Ballona
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-06 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -160,6 +160,7 @@ files:
 - lib/action_message/adapters/twilio.rb
 - lib/action_message/base.rb
 - lib/action_message/delivery_job.rb
+- lib/action_message/interceptor.rb
 - lib/action_message/message.rb
 - lib/action_message/message_delivery.rb
 - lib/action_message/railtie.rb