maktoub 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9392ef94eb6ba44154c9ab47cd45a38ad2708d6d
-  data.tar.gz: 9a233656e7ff759cea64fb7d6c97860e3c33bb92
+  metadata.gz: 7701c2c470bac6ecc1aef1ed21be948f1b6fd3aa
+  data.tar.gz: 98c10d551dd0e0ce3e1205646df72134d4a2338a
 SHA512:
-  metadata.gz: f03f0ecc323683ef970883791afa3a95c85315c0d64d8674e926be75c1daf8e85c02cfe769336a98b35b8d829e6ce091f0414dff70b667848809bf100b65e717
-  data.tar.gz: 568845bb9c8acda1de2343583965ca9d115c01905058d7ac94925680dbaca30dc092dc6ad9dad16c8a788879d88d2496676cb5ad47f4a925f0d11c99a1ab2839
+  metadata.gz: 9b2b382839020311e092633494e0358249bcb1e678978d9320a169a86913df279de7ee3c12b280a146fb21ad1d5fe05038246b47d883c48e3b13d8275df4b393
+  data.tar.gz: 9d15a5881e0effe0f8e1e7552bbed9ff030e2ada99659651f8d71ca55bc1fd3974a6474574f17d3259de651c6dd540fc86da3172f49c671e8ff6e1414f90f2b8

data/README.rdoc

@@ -12,6 +12,10 @@ Maktoub is a Ruby on Rails engine for email newsletters.
 
 Then 'bundle install'
 
+== Compatibility
+  
+Compatible with Rails 4+. For Rails 3.1+ use version 0.3.1
+
 == Usage
 
 === Configuration

data/app/mailers/maktoub/newsletter_mailer.rb

@@ -12,20 +12,14 @@ module Maktoub
       @subject = newsletter_name.humanize.titleize
       @email = params[:email]
       @newsletter_name = newsletter_name
-      mail_fields = {
-        
-      }
-
-      premailer = Premailer.new(render("maktoub/newsletters/#{newsletter_name}").to_s,
-                        with_html_string: true,
-                        link_query_string: "utm_source=newsletter&utm_medium=email&utm_campaign=#{CGI::escape(@subject)}"
-                      )
 
       mail(
         subject: @subject,
         to: params[:email],
-        body: premailer.to_inline_css, 
-        content_type: "text/html"
+        with_html_string: true,
+        link_query_string: "utm_source=newsletter&utm_medium=email&utm_campaign=#{CGI::escape(@subject)}",
+        template_path: 'maktoub/newsletters',
+        template_name: newsletter_name
       )
     end
   end

data/app/views/maktoub/newsletters/readme.html.erb

@@ -0,0 +1,10 @@
+<h1>Readme</h1>
+<p>Place your newsletter partials in your views/maktoub/newsletters folder. The partial name is converted into the newsletter subject. </p>
+
+<p>Multipart emails:</p>
+<ul>
+  <li>To send html only emails, only include an html template</li>
+  <li>To send text only emails, only include a text template</li>
+  <li>To send multipart emails, include both template types</li>
+</ul>
+

data/app/views/maktoub/newsletters/readme.text.erb

@@ -0,0 +1,8 @@
+README
+
+Place your newsletter partials in your views/maktoub/newsletters folder. The partial name is converted into the newsletter subject.
+
+To send html only emails, only include an html template
+To send text only emails, only include a text template
+To send multipart emails, include both template types
+

data/lib/maktoub.rb

@@ -32,7 +32,7 @@ module Maktoub
     end
     
     def unsubscribe(email)
-      if subscribers.class == ActiveRecord::Relation 
+      if subscribers.class.respond_to?(:to_sql) #check if ActiveRecord relation
         subscribers.where(email_field => email).first.send(unsubscribe_method)
       else
         subscribers.select do |s| 

data/lib/maktoub/version.rb

@@ -1,4 +1,4 @@
 module Maktoub
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maktoub
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Zaid Zawaideh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,8 @@ files:
 - app/views/layouts/maktoub/_styles.erb
 - app/views/layouts/maktoub/application.html.erb
 - app/views/layouts/maktoub/newsletter_mailer.erb
-- app/views/maktoub/newsletters/readme.erb
+- app/views/maktoub/newsletters/readme.html.erb
+- app/views/maktoub/newsletters/readme.text.erb
 - app/views/maktoub/subscribers/edit.html.erb
 - app/views/maktoub/subscribers/update.html.erb
 - config/routes.rb

data/app/views/maktoub/newsletters/readme.erb

@@ -1,3 +0,0 @@
-<h1>Readme</h1>
-<p>Place your newsletter partials in your views/maktoub/newsletters folder. The partial name is converted into the newsletter subject.</p>
-