textris 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c892d39927e7381aa8d34757802e9102d3341681
-  data.tar.gz: 63b2c323d52306386dd787c4304c98f458023715
+  metadata.gz: 5932f935ac05fd8ca113cb3e218b171153b106c6
+  data.tar.gz: 10c63364aeef04d95d9b6382c9949d1ff867bb47
 SHA512:
-  metadata.gz: 2a8b73f20130a57a8b226eff56d89cc39b1b875265edc2bcc1fea1b5cc519bfb72f009bb709436e6490de1e29715955f2faae1f33a3e341b81e4ba99b4d4db55
-  data.tar.gz: 1ade51f79ebf729434c12c9a470500da2c99e0c4b87af1c01f102c2f41a05bde92f5cc2fc6e36866c9201e57fae632e308edbfcda86190467d2f3c076e3f77df
+  metadata.gz: 8f371b94fd9a376866847ef1b0faef2896431fa90e526327a66081600b9988f4446b6a3466390512f971ddeeb6fb7d548b545315d7e9ba2393efe2c0fe4a0fcd
+  data.tar.gz: d46bb126af552ef5008fd1aa6a5d3b2e68d16a5f22cd0952b1fb6f3255f7eb55bb571957d7b2c0fe1d68e0e0761cba6de95ad34495af9095f9cc6dff7a892896

data/README.md

@@ -1,10 +1,11 @@
 # textris
 
-[![GitHub version](https://badge.fury.io/gh/visualitypl%2Ftextris.svg)](http://badge.fury.io/gh/visualitypl%2Ftextris)
-[![Build Status](https://scrutinizer-ci.com/g/visualitypl/textris/badges/build.png?b=master)](https://scrutinizer-ci.com/g/visualitypl/textris/build-status/master)
-[![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)
-[![Code Climate](https://codeclimate.com/github/visualitypl/textris/badges/gpa.svg)](https://codeclimate.com/github/visualitypl/textris)
-[![Test Coverage](https://codeclimate.com/github/visualitypl/textris/badges/coverage.svg)](https://codeclimate.com/github/visualitypl/textris)
+[![Gem Version](https://img.shields.io/gem/v/textris.svg?style=flat-square&label=version)](https://rubygems.org/gems/textris)
+[![Downloads](https://img.shields.io/gem/dt/textris.svg?style=flat-square)](https://rubygems.org/gems/textris)
+[![Build Status](https://img.shields.io/circleci/project/visualitypl/textris/master.svg?style=flat-square&label=build)](https://circleci.com/gh/visualitypl/textris/tree/master)
+[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/visualitypl/textris.svg?style=flat-square)](https://scrutinizer-ci.com/g/visualitypl/textris/?branch=master)
+[![Code Climate](https://img.shields.io/codeclimate/github/visualitypl/textris.svg?style=flat-square)](https://codeclimate.com/github/visualitypl/textris)
+[![Test Coverage](https://img.shields.io/codeclimate/coverage/github/visualitypl/textris.svg?style=flat-square)](https://codeclimate.com/github/visualitypl/textris)
 
 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.
 

data/lib/textris.rb

@@ -22,6 +22,20 @@ end
 
 require 'textris/base'
 require 'textris/message'
+
+begin
+  require 'active_job'
+rescue LoadError
+  require 'textris/delay/active_job/missing'
+
+  Textris::Message.include(Textris::Delay::ActiveJob::Missing)
+else
+  require 'textris/delay/active_job'
+  require 'textris/delay/active_job/job'
+
+  Textris::Message.include(Textris::Delay::ActiveJob)
+end
+
 require 'textris/delivery'
 require 'textris/delivery/base'
 require 'textris/delivery/test'

data/lib/textris/base.rb

@@ -43,17 +43,22 @@ module Textris
       send(@action, *@args)
     end
 
+    def render_content
+      set_instance_variables_for_rendering
+
+      render(:template => template_name, :formats => ['text'])
+    end
+
     protected
 
     def text(options = {})
-      set_instance_variables_for_rendering
-
       options = self.class.with_defaults(options)
       options.merge!(
-        :texter  => self.class,
-        :action  => @action,
-        :content => options[:body].is_a?(String) ? options[:body] : render(
-          :template => template_name, :formats => ['text']))
+        :texter   => self.class,
+        :action   => @action,
+        :args     => @args,
+        :content  => options[:body].is_a?(String) ? options[:body] : nil,
+        :renderer => self)
 
       ::Textris::Message.new(options)
     end

data/lib/textris/delay/active_job.rb

@@ -0,0 +1,21 @@
+module Textris
+  module Delay
+    module ActiveJob
+      def deliver_now
+        deliver
+      end
+
+      def deliver_later(options = {})
+        job = Textris::Delay::ActiveJob::Job
+
+        [:wait, :wait_until, :queue].each do |option|
+          if options.has_key?(option)
+            job.set(option => options[option])
+          end
+        end
+
+        job.perform_later(texter(:raw => true).to_s, action.to_s, args)
+      end
+    end
+  end
+end

data/lib/textris/delay/active_job/job.rb

@@ -0,0 +1,17 @@
+module Textris
+  module Delay
+    module ActiveJob
+      class Job < ::ActiveJob::Base
+        queue_as :textris
+
+        def perform(texter, action, args)
+          texter = texter.safe_constantize
+
+          if texter.present?
+            texter.new(action, *args).call_action.deliver_now
+          end
+        end
+      end
+    end
+  end
+end

data/lib/textris/delay/active_job/missing.rb

@@ -0,0 +1,14 @@
+module Textris
+  module Delay
+    module ActiveJob
+      module Missing
+        def active_job_missing(*args)
+          raise(LoadError, "ActiveJob is required to delay sending messages")
+        end
+
+        alias_method :deliver_now,   :active_job_missing
+        alias_method :deliver_later, :active_job_missing
+      end
+    end
+  end
+end

data/lib/textris/message.rb

@@ -1,10 +1,11 @@
 module Textris
   class Message
-    attr_reader :content, :from_name, :from_phone, :to, :texter, :action
+    attr_reader :content, :from_name, :from_phone, :to, :texter, :action, :args
 
     def initialize(options = {})
-      @to      = parse_to      options[:to]
-      @content = parse_content options[:content]
+      @to       = parse_to      options[:to]
+      @content  = parse_content options[:content] if options[:content].present?
+      @renderer = options[:renderer]
 
       if options.has_key?(:from)
         @from_name, @from_phone = parse_from options[:from]
@@ -13,7 +14,7 @@ module Textris
         @from_phone = options[:from_phone]
       end
 
-      unless @content.present?
+      unless @content.present? || @renderer.respond_to?(:render)
         raise(ArgumentError, "Content must be provided")
       end
 
@@ -23,6 +24,7 @@ module Textris
 
       @texter = options[:texter]
       @action = options[:action]
+      @args   = options[:args]
     end
 
     def deliver
@@ -34,8 +36,10 @@ module Textris
       self
     end
 
-    def texter
-      if @texter.present?
+    def texter(options = {})
+      if options[:raw]
+        @texter
+      elsif @texter.present?
         @texter.to_s.split('::').last.to_s.sub(/Texter$/, '')
       end
     end
@@ -52,6 +56,10 @@ module Textris
       end
     end
 
+    def content
+      @content ||= @renderer.render_content
+    end
+
     private
 
     def parse_from(from)

data/lib/textris/version.rb

@@ -1,3 +1,3 @@
 module Textris
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: textris
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Karol Słuszniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-17 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: phony
   requirement: !ruby/object:Gem::Requirement
@@ -190,6 +204,9 @@ files:
 - README.md
 - lib/textris.rb
 - lib/textris/base.rb
+- lib/textris/delay/active_job.rb
+- lib/textris/delay/active_job/job.rb
+- lib/textris/delay/active_job/missing.rb
 - lib/textris/delay/sidekiq.rb
 - lib/textris/delay/sidekiq/missing.rb
 - lib/textris/delay/sidekiq/proxy.rb