textris 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 809b477aaf1b029a62e607a176a28fd472d39278
-  data.tar.gz: f016ff50375a87cb76639ada746e94a1fe5b147e
+  metadata.gz: cb703c3bd61fb19f5b040f6225d6c390fc1c2473
+  data.tar.gz: a42312ca7c46a2f18dc15b739c58ae87157b85c4
 SHA512:
-  metadata.gz: 35fdb014b8dd1c9fd44900d6faf8c0e02919975df0d597e1cfe5268f3cfad74d23c54e1c4a90f46c9261155dece5b9c80a7b49eb76378df264f786615f423428
-  data.tar.gz: a7e10be07676138514db7c118e68f12c55bab309ab7ce40f989f7a8640b8055d464de2d29507ff44606763c116b887392de06094b16921a669b8fcfe15848cf9
+  metadata.gz: e30b26878f3cc4894b9b3189a29579c1b4fdc06a7f84a5a3bbf598c9be940725fd14304d34fb1a3d2e8a6598aa044810b0311335ca4807b889abb32fa1f98650
+  data.tar.gz: 43f57914ef22307eb2095b787f68763c1a5ce0ac0069b1225d2f349d5f89687c977052cb4617df16daaa3773be3cb71753cc6dbac5d077b2058db8a47b05e58b

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/visualitypl/textris.svg)](https://travis-ci.org/visualitypl/textris)
 [![Code Climate](https://codeclimate.com/github/visualitypl/textris/badges/gpa.svg)](https://codeclimate.com/github/visualitypl/textris)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/visualitypl/textris/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/visualitypl/textris/?branch=master)
 
 Simple gem for implementing texter classes which allow sending SMS messages in similar way to how e-mails are implemented and sent with ActionMailer-based mailers.
 
@@ -13,7 +14,7 @@ Unlike similar gems, **textris** has some unique features:
 - multiple, per-environment configurable and chainable delivery methods
 - extensible with any number of custom delivery methods (also chainable)
 - support for testing using self-explanatory `Textris::Base.deliveries`
-- simple, extensible and fully tested code written from the ground up instead of copying guts of *ActionMailer*
+- simple, extensible, fully tested code written from the ground up instead of copying *ActionMailer*
 
 ## Installation
 
@@ -23,7 +24,7 @@ Add to `Gemfile`:
 gem 'textris'
 ```
 
-And run:
+Then run:
 
     bundle install
 
@@ -174,14 +175,14 @@ config.textris_mail_body_template = '%{content}'
 
 You can use the following interpolations in your mail templates:
 
-- `%{app}`: application name (like `AppName`)
-- `%{env}`: enviroment name (like `test` or `production`)
-- `%{texter}`: texter name (like `User`)
-- `%{action}`: action name (like `welcome`)
-- `%{from_name}`: name of the sender (like `Our Team`)
-- `%{from_phone}`: phone number of the sender (like `48666777888`)
-- `%{to_phone}`: phone number of the recipient (like `48111222333`)
-- `%{content}`: message content (like `Welcome to our system, Mr Jones!`)
+- `%{app}`: application name (e.g. `AppName`)
+- `%{env}`: enviroment name (e.g. `test` or `production`)
+- `%{texter}`: texter name (e.g. `User`)
+- `%{action}`: action name (e.g. `welcome`)
+- `%{from_name}`: name of the sender (e.g. `Our Team`)
+- `%{from_phone}`: phone number of the sender (e.g. `48666777888`)
+- `%{to_phone}`: phone number of the recipient (e.g. `48111222333`)
+- `%{content}`: message content (e.g. `Welcome to our system, Mr Jones!`)
 
 You can add optional interpolation modifiers using the `%{variable:modifiers}` syntax. These are most useful for making names e-mail friendly. The following modifiers are available:
 

data/lib/textris/delivery/mail.rb

@@ -42,39 +42,37 @@ module Textris
             "%{content}"
         end
 
-        def apply_template(template, message, vars)
+        def apply_template(template, message, variables)
           template.gsub(/\%\{[a-z_:]+\}/) do |match|
             directive = match.gsub(/[%{}]/, '')
-            var       = directive.split(':').first
+            key       = directive.split(':').first
             modifiers = directive.split(':')[1] || ''
 
-            content = get_template_interpolation(var, message, vars)
+            content = get_template_interpolation(key, message, variables)
             content = apply_template_modifiers(content, modifiers.chars)
+            content = 'unknown' unless content.present?
 
             content
           end
         end
 
-        def get_template_interpolation(var, message, vars)
-          content = case var
+        def get_template_interpolation(key, message, variables)
+          content = case key
+          when 'app', 'env'
+            get_rails_variable(key)
+          when 'texter', 'action', 'from_name', 'from_phone', 'content'
+            message.send(key)
+          else
+            variables[key.to_sym]
+          end.to_s.strip
+        end
+
+        def get_rails_variable(var)
+          case var
           when 'app'
             Rails.application.class.parent_name
           when 'env'
             Rails.env
-          when 'texter'
-            message.texter.to_s.split('::').last.to_s.sub(/Texter$/, '')
-          when 'action', 'from_name'
-            message.send(var)
-          when 'content', 'from_phone'
-            message.send(var)
-          else
-            value = vars[var.to_sym]
-          end.to_s.strip
-
-          if content.present?
-            content
-          else
-            'unknown'
           end
         end
 

data/lib/textris/message.rb

@@ -34,17 +34,29 @@ module Textris
       self
     end
 
+    def texter
+      if @texter.present?
+        @texter.to_s.split('::').last.to_s.sub(/Texter$/, '')
+      end
+    end
+
     private
 
     def parse_from(from)
-      if from.blank?
-        nil
-      elsif (matches = from.match(/(.*)\<(.*)\>\s*$/).to_a).size == 3 &&
+      parse_from_dual(from) || parse_from_singular(from)
+    end
+
+    def parse_from_dual(from)
+      if (matches = from.to_s.match(/(.*)\<(.*)\>\s*$/).to_a).size == 3 &&
           Phony.plausible?(matches[2])
         [matches[1].strip, Phony.normalize(matches[2])]
-      elsif Phony.plausible?(from)
+      end
+    end
+
+    def parse_from_singular(from)
+      if Phony.plausible?(from)
         [nil, Phony.normalize(from)]
-      else
+      elsif from.present?
         [from.strip, nil]
       end
     end

data/lib/textris/version.rb

@@ -1,3 +1,3 @@
 module Textris
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textris
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Karol Słuszniak
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: scrutinizer-ocular
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement