trusty-rad-social-extension 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f928c02404c0c8b6e20583084d3cd03593646781
-  data.tar.gz: 920129933630185191feda75f67acda95d24ec29
+  metadata.gz: aab4a9746aa6bbcc8e956fa3e6262ed2ab389adf
+  data.tar.gz: 2d99ed7c7584525d8afadb672469c3ffcdbec30c
 SHA512:
-  metadata.gz: 4edb0829d9e9d75234881fdffe09552fb5f6caad023c8c4618ab8292ae417fe0278005978e57b332cf0d34aaa5197ec04ac2a9dde78ca84d23fba1ddfe514bf1
-  data.tar.gz: a92416c64a8ed33eeb7eba864b1ac53cd9b786b50091e9d2aa54398a1a16830ed6255688268b70699f0d62569670256004c609b9f648c1401f6a98b3f850cb4a
+  metadata.gz: 1ae7ae6caa303e882f961e048f6991ae8c311469ffb0c57b7e946af91f124c93c9b942e2ae914d692e7fab2738d6368911e0510fa334418002edff309afa11e1
+  data.tar.gz: 7f332f039439f71c69646f016bdbab48faac15ff03c68d00e79f422686fe3756b373f794b2f258cc4ed1cb44ed766a31970b770cfa1b235feb202861266f23e2

data/Gemfile.lock

@@ -1,74 +1,73 @@
 PATH
   remote: .
   specs:
-    trusty-rad-social-extension (2.1.0)
+    trusty-rad-social-extension (2.2.0)
       recaptcha (~> 0.3.6)
+      roadie-rails (~> 1.0.6)
       trusty-cms (~> 2.0.0)
-      trusty-layouts-extension (~> 2.0.0)
+      trusty-layouts-extension (~> 2.0.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    actionmailer (4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.3)
-      actionview (= 4.2.3)
-      activesupport (= 4.2.3)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.3)
-      activesupport (= 4.2.3)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (4.2.3)
-      activesupport (= 4.2.3)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
       globalid (>= 0.3.0)
-    activemodel (4.2.3)
-      activesupport (= 4.2.3)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.2.3)
-      activemodel (= 4.2.3)
-      activesupport (= 4.2.3)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       arel (~> 6.0)
-    activesupport (4.2.3)
+    activesupport (4.2.5.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_tree (2.2.0)
+    acts_as_tree (2.4.0)
       activerecord (>= 3.0.0)
-    addressable (2.3.8)
+    addressable (2.4.0)
     arel (6.0.3)
     builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
+    byebug (8.2.1)
     capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    chunky_png (1.3.4)
-    ckeditor (4.1.3)
+    chunky_png (1.3.5)
+    ckeditor (4.1.6)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.1.0)
-    columnize (0.9.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -81,17 +80,19 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (2.0.3)
+    compass-rails (2.0.5)
       compass (~> 1.0.0)
-      sass-rails (<= 5.0.1)
+      sass-rails (< 5.1)
       sprockets (< 2.13)
+    css_parser (1.3.7)
+      addressable
     daemons (1.2.3)
     database_cleaner (1.3.0)
     delocalize (0.4.0)
       rails (>= 3.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
-    eventmachine (1.0.8)
+    eventmachine (1.0.9.1)
     execjs (2.6.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
@@ -109,7 +110,7 @@ GEM
       haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    highline (1.7.7)
+    highline (1.7.8)
     hike (1.2.3)
     html2haml (2.0.0)
       erubis (~> 2.7.0)
@@ -123,19 +124,19 @@ GEM
     json (1.8.3)
     launchy (2.4.3)
       addressable (~> 2.3)
-    libv8 (3.16.14.11)
-    loofah (2.0.2)
+    libv8 (3.16.14.13)
+    loofah (2.0.3)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    minitest (5.8.0)
+    mime-types (2.99)
+    mini_portile2 (2.0.0)
+    minitest (5.8.4)
     multi_json (1.11.2)
-    mysql (2.9.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mysql2 (0.4.2)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
     poltergeist (1.5.1)
       capybara (~> 2.1)
@@ -144,53 +145,59 @@ GEM
       websocket-driver (>= 0.2.0)
     protected_attributes (1.0.9)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (3.2.0)
-      byebug (~> 5.0)
+    pry-byebug (3.3.0)
+      byebug (~> 8.0)
       pry (~> 0.10)
     rack (1.6.4)
-    rack-cache (1.2)
+    rack-cache (1.6.0)
       rack (>= 0.4)
     rack-test (0.6.3)
       rack (>= 1.0)
     radius (0.7.4)
-    rails (4.2.3)
-      actionmailer (= 4.2.3)
-      actionpack (= 4.2.3)
-      actionview (= 4.2.3)
-      activejob (= 4.2.3)
-      activemodel (= 4.2.3)
-      activerecord (= 4.2.3)
-      activesupport (= 4.2.3)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.3)
+      railties (= 4.2.5.1)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.6)
+    rails-dom-testing (1.0.7)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
+    rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
-    railties (4.2.3)
-      actionpack (= 4.2.3)
-      activesupport (= 4.2.3)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rb-fsevent (0.9.5)
+    rake (10.5.0)
+    rb-fsevent (0.9.7)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
       json (~> 1.4)
     recaptcha (0.3.6)
     ref (2.0.0)
+    roadie (3.1.1)
+      css_parser (~> 1.3.4)
+      nokogiri (>= 1.5.0, < 1.7.0)
+    roadie-rails (1.0.6)
+      railties (>= 3.0, < 4.3)
+      roadie (~> 3.0)
     rspec-core (3.0.4)
       rspec-support (~> 3.0.0)
     rspec-expectations (3.0.4)
@@ -207,23 +214,23 @@ GEM
       rspec-mocks (~> 3.0.0)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.4)
-    ruby_parser (3.7.1)
+    ruby_parser (3.7.3)
       sexp_processor (~> 4.1)
-    sass (3.4.16)
-    sass-rails (5.0.1)
+    sass (3.4.21)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-      tilt (~> 1.1)
-    sexp_processor (4.6.0)
+      tilt (>= 1.1, < 3)
+    sexp_processor (4.6.1)
     slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -231,14 +238,14 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.11)
+    trusty-cms (2.0.13)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -250,7 +257,7 @@ GEM
       haml-rails (~> 0.5)
       highline (~> 1.6)
       jquery-rails (~> 3.1)
-      mysql (~> 2.9)
+      mysql2 (~> 0.4.2)
       protected_attributes (~> 1.0.9)
       rack (~> 1.4)
       rack-cache (~> 1.2)
@@ -271,10 +278,10 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 

data/app/controllers/rad_captcha_filter.rb

@@ -6,8 +6,8 @@ class RadCaptchaFilter
     @controller = controller
   end
 
-  def self.filter controller
-    Filters::RadCaptchaFilter.new(controller).verify
+  def self.before controller
+    RadCaptchaFilter.new(controller).verify
   end
 
   def verify
@@ -23,5 +23,4 @@ class RadCaptchaFilter
     @controller.verify_recaptcha(:private_key => Rails.configuration.captcha_private_key)
   end
 
-
-end
+end

data/app/controllers/social_mailer_controller.rb

@@ -13,7 +13,7 @@ class SocialMailerController < ApplicationController
       :subject => params[:subject]
     }
 
-    RadSocialMailer.social_mail(mailer_options).deliver
+    RadSocialMailer.social_mail(mailer_options).deliver_now
     head :ok
 
   end
@@ -28,4 +28,4 @@ class SocialMailerController < ApplicationController
            }
   end
 
-end
+end

data/app/models/rad_social_mailer.rb

@@ -1,16 +1,21 @@
 require 'mail'
 class RadSocialMailer < ActionMailer::Base
+  include Roadie::Rails::Automatic
 
   def social_mail options
-
-    #binding.pry
-
     from_address = Mail::Address.new options[:from] # ex: "john@example.com"
     from_address.display_name = options[:from_name] # ex: "John Doe"
-    mail(:to => options[:to], :from => from_address.format, :subject => options[:subject]) do |format|
-      format.html {render :text => options[:message]}
-    end
 
-  end
+    @from_name = from_address.display_name
+    @from_email = from_address
+    @message = options[:message]
 
-end
+    mail({
+      to: options[:to],
+      from: @from_email,
+      subject: options[:subject],
+      text: @message,
+      content_type: "text/html"
+     })
+  end
+end

data/lib/trusty-rad-social-extension.rb

@@ -1,8 +1,8 @@
 module TrustyRadSocialExtension
-  VERSION     = "2.1.0"
+  VERSION     = "2.2.0"
   SUMMARY     = "Rad Social for Trusty CMS"
   DESCRIPTION = "Makes Trusty CMS better by adding rad_social!"
   URL         = "http://example.com/rad_social"
-  AUTHORS     = ["Eric Sipple"]
-  EMAIL       = ["sipple@trustarts.org"]
+  AUTHORS     = ["Eric Sipple, Brittany Martin, Danielle Greaves"]
+  EMAIL       = ["sipple@trustarts.org, martin@trustarts.org, greaves@trustarts.org"]
 end

data/trusty-rad-social-extension.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
   # s.add_dependency "something", "~> 1.0.0"
   s.add_dependency "recaptcha", "~> 0.3.6"
   s.add_dependency "trusty-cms",   "~> 2.0.0"
-  s.add_dependency "trusty-layouts-extension", "~> 2.0.0"
+  s.add_dependency "trusty-layouts-extension", "~> 2.0.2"
+  s.add_dependency 'roadie-rails', '~> 1.0.6'
 
   ignores = if File.exist?('.gitignore')
     File.read('.gitignore').split("\n").inject([]) {|a,p| a + Dir[p] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-rad-social-extension
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
-- Eric Sipple
+- Eric Sipple, Brittany Martin, Danielle Greaves
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: recaptcha
@@ -44,17 +44,31 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: roadie-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.6
 description: Makes Trusty CMS better by adding rad_social!
 email:
-- sipple@trustarts.org
+- sipple@trustarts.org, martin@trustarts.org, greaves@trustarts.org
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -84,7 +98,7 @@ files:
 - app/controllers/social_mailer_controller.rb
 - app/helpers/rad_social_helper.rb
 - app/models/rad_social_mailer.rb
-- app/views/rad_social_mailer/social_mail.text.html.haml
+- app/views/rad_social_mailer/social_mail.html.haml
 - app/views/rad_social_mailer/social_mail_form.html.haml
 - app/views/widget/_email_form.html.haml
 - app/views/widget/_horizontal_widget.html.haml