camaleon_mailchimp 0.0.1 → 0.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59b9b2da65e3f63e6462246b1b7c96a53cfb90c0
-  data.tar.gz: 124848d87d8748172d8f8f5982aed820008be02a
+  metadata.gz: a9e776ce4cb8f1f415064c900e6357d0ebff414b
+  data.tar.gz: 2a4448b63a1c6d7b9147a37449aad23ef91b41fb
 SHA512:
-  metadata.gz: 5689a4bfbd2eef0c0871f92ffc63b4cfff67c7ec33ef843bf837673b329462fa841cd2a19ec7630b3a79773cf0dccc7f73f0ebb6770ed8d8dc1f71711f518b0f
-  data.tar.gz: 47f39ff6f1c94ec6ba3260201060b8b6a4c964fa82f71947161dd7ebd0904ee0d2efb2e0339b9e3d37d7168a94528f4668afd77dc805887f990fa4a817229202
+  metadata.gz: 946e9ad7ca5c5b80ef623b76a65a5eb176fdee3bee4e38a8189d7b81fd56b0d980c474793cadd7530cbbb5c22d66e12ace46daf1f0aa111e1adaebe924d55d29
+  data.tar.gz: b288963ab166bc7395f681fd7ccef50b41bd93cd7c97ec1df1d95909ff2686574674d60c5838d69b11041af11ca47ad19f2d2fd2886705934c00007a7646b7a8

data/app/controllers/plugins/camaleon_mailchimp/admin_controller.rb

@@ -1,4 +1,4 @@
-class Plugins::CamaleonMailchimp::AdminController < Apps::PluginsAdminController
+class Plugins::CamaleonMailchimp::AdminController < CamaleonCms::Apps::PluginsAdminController
   include Plugins::CamaleonMailchimp::MainHelper
 
   def settings

data/app/controllers/plugins/camaleon_mailchimp/front_controller.rb

@@ -1,8 +1,17 @@
-class Plugins::CamaleonMailchimp::FrontController < Apps::PluginsFrontController
+class Plugins::CamaleonMailchimp::FrontController < CamaleonCms::Apps::PluginsFrontController
   include Plugins::CamaleonMailchimp::MainHelper
-  def index
-    # actions for frontend module
-  end
 
-  # add custom methods below
+  skip_before_action :verify_authenticity_token
+
+  def hook
+    case params[:type]
+      when 'subscribe' then
+        subscribe_hook(params)
+      when 'unsubscribe' then
+        unsubscribe_hook(params)
+      when 'cleaned' then
+        user_cleaned_hook(param)
+    end
+    render :nothing => true
+  end
 end

data/app/helpers/plugins/camaleon_mailchimp/main_helper.rb

@@ -42,10 +42,37 @@ module Plugins::CamaleonMailchimp::MainHelper
     end
   end
 
+  def subscribe_hook(hook_data)
+    subscription_date = hook_data[:fired_at]
+    extra_data = hook_data[:data]
+    extra_data[:list_id]
+    extra_data[:email]
+    if extra_data[:list_id] == the_mailchimp_list_id
+      user = CamaleonCms::User.find_by_email(extra_data[:email])
+      user.update_mailchimp_values(1, subscription_date, '')
+    end
+  end
+
+  def unsubscribe_hook(hook_data)
+    extra_data = hook_data[:data]
+    user = CamaleonCms::User.find_by_email(extra_data[:email])
+    user.mailchimp_unsubscribe!(extra_data[:list_id]) unless user.nil?
+  end
+
+  # Equals that unsubscribe hook
+  def user_cleaned_hook(hook_data)
+    unsubscribe_hook(hook_data)
+  end
+
+  def the_mailchimp_list_id
+    plugin_config = current_site.get_meta('mailchimp_config')
+    plugin_config[:list_id]
+  end
+
   private
 
   def generate_custom_field_newsletter
-    group = User.first.get_user_field_groups(current_site).where({slug: 'plugin_mailchimp_user_data'})
+    group = CamaleonCms::User.first.get_user_field_groups(current_site).where({slug: 'plugin_mailchimp_user_data'})
     unless group.present?
       new_group = group.create({name: 'Mailchimp user data', slug: 'plugin_mailchimp_user_data', description: 'Mailchimp newsletter user subscription data'})
       new_group.add_field({:name => "t('plugin.mailchimp.user.newsletter_subscribed')", :slug => 'mailchimp_newsletter_subscribed'}, {field_key: 'checkbox', default_value: false})

data/app/views/plugins/camaleon_mailchimp/_update_user_more_action.erb

@@ -31,7 +31,7 @@
       </div>
       <div class="modal-body">
         <p><%= t('plugin.mailchimp.modal.subscribe.body') %></p>
-        <%= form_for @user, url: @user.new_record? ? admin_users_path : admin_plugins_camaleon_mailchimp_subscribe_path(@user), html: {class: 'form-ajax-mailchimp-subscribe'} do |f| %>
+        <%= form_for @user, url: @user.new_record? ? cama_admin_users_path : admin_plugins_camaleon_mailchimp_subscribe_path(@user), html: {class: 'form-ajax-mailchimp-subscribe'} do |f| %>
             <div class="modal-body form-horizontal form-group-separated">
               <div class="modal-footer">
                 <button type="submit" class="btn btn-danger mailchimp-subscribe-btn"><%= t('plugin.mailchimp.modal.subscribe.submit') %></button>
@@ -55,7 +55,7 @@
       </div>
       <div class="modal-body">
         <p><%= t('plugin.mailchimp.modal.unsubscribe.body') %></p>
-        <%= form_for @user, url: @user.new_record? ? admin_users_path : admin_plugins_camaleon_mailchimp_unsubscribe_path(@user), html: {class: 'form-ajax-mailchimp-unsubscribe'} do |f| %>
+        <%= form_for @user, url: @user.new_record? ? cama_admin_users_path : admin_plugins_camaleon_mailchimp_unsubscribe_path(@user), html: {class: 'form-ajax-mailchimp-unsubscribe'} do |f| %>
             <div class="modal-body form-horizontal form-group-separated">
               <div class="modal-footer">
                 <button type="submit" class="btn btn-danger"><%= t('plugin.mailchimp.modal.unsubscribe.submit') %></button>
@@ -85,7 +85,7 @@
         } else {
           $.fn.alert({title: res.message.msg, close: res.message.close});
           $("#modal_plugin_mailchimp_subscribe").modal('hide');
-          window.location.href = '<%= admin_users_path %>';
+          window.location.href = '<%= cama_admin_users_path %>';
         }
       }
     });
@@ -103,7 +103,7 @@
         } else {
           $.fn.alert({title: res.message.msg, close: res.message.close});
           $("#modal_plugin_mailchimp_unsubscribe").modal('hide');
-          window.location.href = '<%= admin_users_path %>';
+          window.location.href = '<%= cama_admin_users_path %>';
         }
       }
     });

data/app/views/plugins/camaleon_mailchimp/admin/settings.html.erb

@@ -19,7 +19,7 @@
         </div>
       </div>
       <div class="panel-footer">
-        <a class="btn btn-default" href="<%= url_for admin_plugins_path %>"><%= t('admin.button.back') %></a>
+        <a class="btn btn-default" href="<%= url_for cama_admin_plugins_path %>"><%= t('admin.button.back') %></a>
         <button class="btn btn-primary pull-right" type="submit"><%= t('admin.button.submit') %></button>
       </div>
     </div>

data/config/custom_models.rb

@@ -1,6 +1,6 @@
 require 'gibbon'
 # Extending User Model to add newsletter attributes
-User.class_eval do
+CamaleonCms::User.class_eval do
 
   def the_newsletter_subscribed?
     self.get_field_value('mailchimp_newsletter_subscribed').to_s.to_bool
@@ -11,6 +11,7 @@ User.class_eval do
   end
 
   def the_mailchimp_member_id
+
     self.get_field_value('mailchimp_member_id').to_s
   end
 
@@ -44,18 +45,15 @@ User.class_eval do
     end
   end
 
-  def mailchimp_unsubscribe!
+  def mailchimp_unsubscribe!(list_id = nil)
     begin
-      body_value = {
-        status: 'unsubscribed'
-      }
       plugin_config = current_site.get_meta('mailchimp_config')
       mailchimp_api_key = plugin_config[:api_key]
-      list_id = plugin_config[:list_id]
+      mailchimp_list_id = list_id.nil? ? plugin_config[:list_id] : list_id
       member_id = the_mailchimp_member_id
-      Rails.logger.info "[Mailchimp plugin] Start unsubscribe list: #{list_id} api: #{mailchimp_api_key} member_id: #{member_id}"
-      gibbon = Gibbon::Request.new(api_key: mailchimp_api_key)
-      gibbon.lists(list_id).members(member_id).update(body: body_value)
+      Rails.logger.info "[Mailchimp plugin] Start unsubscribe list: #{mailchimp_list_id} api: #{mailchimp_api_key} member_id: #{member_id}"
+      gibbon = Gibbon::API.new(mailchimp_api_key)
+      gibbon.lists.unsubscribe(:id => mailchimp_list_id, :email => {:email => email}, :send_notify => true)
       mailchimp_update_unsubscription_values!
     rescue Gibbon::MailChimpError => exception
       Rails.logger.error "[Mailchimp plugin error] exception: #{exception} title: #{exception.title} detail: #{exception.detail} body: #{exception.body}"
@@ -66,6 +64,21 @@ User.class_eval do
     end
   end
 
+  def update_mailchimp_values(subscribed, enabled_at, member_id)
+    field_groups = self.get_user_field_groups(current_site).where({:slug => 'plugin_mailchimp_user_data'}).first
+    field_newsletter_subscribed = field_groups.get_field('mailchimp_newsletter_subscribed')
+    field_newsletter_enabled_at = field_groups.get_field('mailchimp_newsletter_enabled_at')
+    field_member_id = field_groups.get_field('mailchimp_member_id')
+
+    values_to_save = {
+      :mailchimp_newsletter_subscribed => {id: field_newsletter_subscribed.id, values: [subscribed]},
+      :mailchimp_newsletter_enabled_at => {id: field_newsletter_enabled_at.id, values: [enabled_at]},
+      :mailchimp_member_id => {id: field_member_id.id, values: [member_id]}
+    }
+
+    set_field_values(values_to_save)
+  end
+
   private
 
   def mailchimp_api_subscribe
@@ -80,32 +93,11 @@ User.class_eval do
     plugin_config = current_site.get_meta('mailchimp_config')
     mailchimp_api_key = plugin_config[:api_key]
     list_id = plugin_config[:list_id]
-    gibbon = Gibbon::Request.new(api_key: mailchimp_api_key)
-    gibbon.lists(list_id).members.create(body: body_value)
+    gibbon = Gibbon::API.new(mailchimp_api_key)
+    # gibbon.lists(list_id).members.create(body: body_value)
+    gibbon.lists.subscribe({:id => list_id, :email => {:email => email}, :merge_vars => {:FNAME => meta[:first_name], :LNAME => meta[:last_name]}})
   end
 
-  #
-  # def mailchimp_api_update_subscription
-  #   begin
-  #     body_value = {
-  #       email_address: email,
-  #       status: 'subscribed',
-  #       merge_fields: {
-  #         FNAME: meta[:first_name],
-  #         LNAME: meta[:last_name]
-  #       }
-  #     }
-  #     plugin_config = current_site.get_meta('mailchimp_config')
-  #     mailchimp_api_key = plugin_config[:api_key]
-  #     list_id = plugin_config[:list_id]
-  #     gibbon = Gibbon::Request.new(api_key: mailchimp_api_key)
-  #     gibbon.lists(list_id).members(mem).update(body: body_value)
-  #   rescue Gibbon::MailChimpError => exception
-  #     Rails.logger.error "[Mailchimp plugin error] exception: #{exception} title: #{exception.title} detail: #{exception.detail} body: #{exception.body}"
-  #     nil
-  #   end
-  # end
-
   def mailchimp_update_unsubscription_values!
     update_mailchimp_values(0, '', '')
   end
@@ -113,21 +105,5 @@ User.class_eval do
   def mailchimp_update_subscription_values!(new_member)
     update_mailchimp_values(1, Time.zone.now, new_member['id'])
   end
-
-
-  def update_mailchimp_values(subscribed, enabled_at, member_id)
-    field_groups = self.get_user_field_groups(current_site).where({:slug => 'plugin_mailchimp_user_data'}).first
-    field_newsletter_subscribed = field_groups.get_field('mailchimp_newsletter_subscribed')
-    field_newsletter_enabled_at = field_groups.get_field('mailchimp_newsletter_enabled_at')
-    field_member_id = field_groups.get_field('mailchimp_member_id')
-
-    values_to_save = {
-      :mailchimp_newsletter_subscribed => {id: field_newsletter_subscribed.id, values: [subscribed]},
-      :mailchimp_newsletter_enabled_at => {id: field_newsletter_enabled_at.id, values: [enabled_at]},
-      :mailchimp_member_id => {id: field_member_id.id, values: [member_id]}
-    }
-
-    set_field_values(values_to_save)
-  end
 end
 

data/config/routes.rb

@@ -5,6 +5,7 @@ Rails.application.routes.draw do
     namespace :plugins do
       namespace 'camaleon_mailchimp' do
         get 'index' => 'front#index'
+        post 'hooks' => 'front#hook'
       end
     end
   end

data/lib/camaleon_mailchimp/version.rb

@@ -1,3 +1,3 @@
 module CamaleonMailchimp
-  VERSION = "0.0.1"
+  VERSION = '0.0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_mailchimp
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3.1
 platform: ruby
 authors:
-- Raúl Anatol
+- raulanatol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2015-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.1'
 description: ": Description of CamaleonMailchimp."
 email:
 - raul@natol.es
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ": Summary of CamaleonMailchimp."