text_message_rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ed8db9bab0015b9afb253c1c295348b76fcfd14
-  data.tar.gz: c0707f4cc5528b0ed36f942f0fb98ce14ec1f767
+  metadata.gz: 61f00a8c0971b843dbdeae388b1dba6cc4f44a37
+  data.tar.gz: 66b743b50f707d7bf04114f42a472433b8990f60
 SHA512:
-  metadata.gz: 5f386a532342730dc6372235cfa660c2d4d096b15719ab193126f1d0f80bef1f2735661cc372ac1b963370fd23d35cb8c9113050c4d86fa88be1a5d56119c5ac
-  data.tar.gz: 29d47f73dcef3bf0115c281288d0ed9ab0fd47a8ecfdef9fdf3d97e2884ace798a6bc0535b0dba32ec50836034f13de4d4dfbd6c1263e34b24bf4e6633879f19
+  metadata.gz: a8808ff498efa8a2bb5e45e7d18d32086f934cb7864c50880acbab6cd773d3b40411b6eb1dd46cb19840d041fdb622c1295df33f413cc4bc7dae61c74a9d2266
+  data.tar.gz: 4d5ff71644396b4a1c744cacb31aad987e9c3912797457af47b69a2435fd14cda13730c93db2e789e43ce8ed5fddf7d6a5f77b4757a1addc6457def3fab5432e

data/lib/text_message_rails/controller.rb

@@ -27,13 +27,16 @@ module TextMessage
 		# Defines #render_to_body, needed by #render.
 		include ::TextMessage::Rendering
 
+    attr_reader :params
+
 		# Instanciate a new TextMessage object.
 		#
 		# Then calls +method_name+ with the given +args+.
-		def initialize(method_name, *args)
+		def initialize(method_name, *params)
 			@recipients = []
+      @params = params
 			super()
-			process(method_name, *args)
+			process(method_name, *params)
 		end
 
 		# Basic Recipients handling
@@ -42,6 +45,10 @@ module TextMessage
 			@recipients = recipients || []
 		end
 
+    def delivery
+      TextMessage::Delivery.new(self, action_name, *params)
+    end
+
 		class << self
 
       def default_url_options=(options)

data/lib/text_message_rails/delivery.rb

@@ -11,8 +11,13 @@ module TextMessage
     # By providing a +TextMessage::Base+ subclass +text_message_class+, a method name to call
     # +text_message_method+ and a set of arguments to this method +args+, we allow
     # for lazy processing of the text_message action.
-    def initialize(text_message_class, text_message_method, *args)
-      @text_message_class = text_message_class.kind_of?(Class) ? text_message_class : text_message_class.constantize
+    def initialize(text_message_controller, text_message_method, *args)
+      if text_message_controller.kind_of?(TextMessage::Controller)
+        @obj = text_message_controller
+        @text_message_class = @obj.class
+      else
+        @text_message_class = text_message_controller.kind_of?(Class) ? text_message_controller : text_message_controller.constantize
+      end
       @text_message_method = text_message_method
       @args = args
     end
@@ -24,7 +29,7 @@ module TextMessage
 
     # computes the body of the TextMessage
     def body
-      renderer.render(view_context, template: "#{templates_dir}/#{@text_message_method}")
+      @body ||= renderer.render(view_context, template: "#{templates_dir}/#{@text_message_method}")
     end
 
     # The name of the templates which holds the templates.
@@ -33,7 +38,7 @@ module TextMessage
     #   TextMessageDemo.new.templates_dir => "text_message demo"
     #   # so for exemple TextMessageDemo#toto will lookup for text_message_demo/toto{.text.erb}
     def templates_dir
-      @text_message_class.to_s.underscore
+      @text_message_class.name.to_s.underscore
     end
 
   end

data/lib/text_message_rails/delivery_methods.rb

@@ -6,6 +6,7 @@ module TextMessage
     # Defivers a TextMessage
     def deliver_now!
       @text_message_class.deliver_text_message(self)
+      @obj.response_body = body
     end
 
     # Posts a ActionJob job to call +deliver_now!+ later

data/lib/text_message_rails/rendering.rb

@@ -17,7 +17,11 @@ module TextMessage
 
     # Use custom rendeing class with helpers loaded
     def view_context # :nodoc:
-      @view_context ||= TemplateContext.new(renderer, view_assigns, self)
+      @view_context ||= if defined?(ApplicationController)
+                          ApplicationController.view_context_class.new(renderer, view_assigns, self)
+                        else
+                           TemplateContext.new(renderer, view_assigns, self)
+                         end
     end
 
     # Simple out-of-the box ActionView::Renderer
@@ -28,20 +32,22 @@ module TextMessage
 
     #
     # Private class to render provide rendering context with helpers
+    # (when there is no ApplicationController: rails API etc.)
     #
 
     class TemplateContext < ActionView::Base #:nodoc:
       # Load route helpers
       include Rails.application.routes.url_helpers
-      # load tag helpers (link_to ...)
+      # load tag helpers (link_to ...) and all relevant default helpers
       include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::DateHelper
+      include ActionView::Helpers::NumberHelper
+      include ActionView::Helpers::TextHelper
+      include ActionView::Helpers::TranslationHelper
 
       # Default options for urls
       def default_url_options
-        TextMessage::Controller.default_url_options.merge({
-          #action: action_name,
-          #controller: controller.class.name.underscore
-        })
+        TextMessage::Controller.default_url_options
       end
     end
 

data/lib/text_message_rails/version.rb

@@ -1,3 +1,3 @@
 module TextMessage
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: text_message_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Aurélien Noce