subscribed_to 0.3.0 → 0.3.1

data/README.rdoc

@@ -54,9 +54,11 @@ Other options:
 
   rails generate subscribed_to:install MODEL
 
-If you run the generator with <tt>--skip-migration</tt>, then you must be sure to to include the <tt>subscribed_to_list</tt> column in some other migration.
+If you run the generator with <tt>--skip-migration</tt>, then you must be sure to to include the
+<tt>subscribed_to_list</tt> and <tt>mail_chimp_id</tt> columns in some other migration.
 
   t.boolean :subscribed_to_list, :default => false
+  t.integer :mail_chimp_id
 
 Be sure to run the migration before you continue.
 
@@ -66,6 +68,10 @@ After the initializer has been generated, you must set your mail service configu
 
 ==== Mail Chimp
 
+Activate the gem. Can be disabled for development, staging, etc environtments. Activated only in production environment by default.
+
+  config.active = true
+
 Set your API key
 
   mail_chimp_config.api_key = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX-us1"

data/config/routes.rb

@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
-  namespace :subscribed_to do
-    match "mail_chimp" => "mail_chimp_web_hooks#create", :via => :post
+  if SubscribedTo.active
+    namespace :subscribed_to do
+      match "mail_chimp" => "mail_chimp_web_hooks#create", :via => :post
+    end
   end
 end

data/lib/subscribed_to/mail_chimp/config.rb

@@ -17,7 +17,7 @@ module SubscribedTo
         end
       end
 
-      hash_accessor :api_key, :lists, :secret_key, :enabled_models
+      hash_accessor :active, :api_key, :lists, :secret_key, :enabled_models
 
       def initialize(config = {})
         merge!(config)

data/lib/subscribed_to/mail_chimp/web_hook.rb

@@ -24,7 +24,7 @@ module SubscribedTo
     #
     # 5) Click "Update"
     class WebHook
-      LIMIT = 120
+      LIMIT = 10
       attr_accessor :enabled_models
 
       # Handles MailChimp webhook request.

data/lib/subscribed_to/mail_chimp.rb

@@ -5,6 +5,18 @@ require 'hominid'
 module SubscribedTo
   # Module for MailChimp subscription interaction
   module MailChimp
+    module ClassMethods
+      # Returns the list id for the class as defined in mail_chimp
+      def list_id
+        SubscribedTo.mail_chimp_config.lists[@list_key][:id]
+      end
+
+      # Returns the hash of merge vars for the class as defined in mail_chimp
+      def merge_vars
+        SubscribedTo.mail_chimp_config.lists[@list_key][:merge_vars]
+      end
+    end
+
     module InstanceMethods
       private
 

data/lib/subscribed_to/version.rb

@@ -2,7 +2,7 @@ module SubscribedTo
   module Version  #:nodoc:
     MAJOR = 0
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

data/lib/subscribed_to.rb

@@ -4,7 +4,15 @@ require 'active_record_extensions'
 require 'subscribed_to/mail_chimp'
 
 module SubscribedTo
+  # Activate the gem.
+  #
+  # Can be disabled for development, staging, etc environtments.
+  # Activated only in production environment by default.
+  mattr_accessor :active
+  @@active = Rails.env == "production"
+
   # Mailing list service to interact with.
+  #
   # Options: :mail_chimp, :constant_contact
   # Currently only supports Mail Chimp
   mattr_accessor :service
@@ -44,31 +52,26 @@ module SubscribedTo
     # The only paramter it takes is a symbol which corresponds to a list in the <tt>mail_chimp_config.lists</tt> hash.
     #   subscribed_to :mailing_list
     def subscribed_to(id)
-      include InstanceMethods
-      include MailChimp::InstanceMethods if SubscribedTo.service == :mail_chimp
-
-      @list_key = id.to_sym
-
-      # We need to reference which models are enabled, and which list they belong to when processing the webhooks.
-      SubscribedTo.mail_chimp_config.enabled_models[self.list_id].blank? ?
-        SubscribedTo.mail_chimp_config.enabled_models[self.list_id] = [self.to_s] :
-        SubscribedTo.mail_chimp_config.enabled_models[self.list_id] << self.to_s
-
-      class_eval do
-        after_create :subscribe_to_list
-        after_update :update_list_member
+      if SubscribedTo.active  # don't activate all the gem goodies if we're not active
+        include InstanceMethods
+        if SubscribedTo.service == :mail_chimp
+          extend MailChimp::ClassMethods
+          include MailChimp::InstanceMethods
+        end
+
+        @list_key = id.to_sym
+
+        # We need to reference which models are enabled, and which list they belong to when processing the webhooks.
+        SubscribedTo.mail_chimp_config.enabled_models[self.list_id].blank? ?
+          SubscribedTo.mail_chimp_config.enabled_models[self.list_id] = [self.to_s] :
+          SubscribedTo.mail_chimp_config.enabled_models[self.list_id] << self.to_s
+
+        class_eval do
+          after_create :subscribe_to_list
+          after_update :update_list_member
+        end
       end
     end
-
-    # Returns the list id for the class as defined in mail_chimp
-    def list_id
-      SubscribedTo.mail_chimp_config.lists[@list_key][:id]
-    end
-
-    # Returns the hash of merge vars for the class as defined in mail_chimp
-    def merge_vars
-      SubscribedTo.mail_chimp_config.lists[@list_key][:merge_vars]
-    end
   end
 
   # Provides instance methods which should be overwritten in service modules

data/spec/app/controllers/subscribed_to/mail_chimp_web_hooks_spec.rb

@@ -85,8 +85,8 @@ describe SubscribedTo::MailChimpWebHooksController do
 
   context "for an existing user" do
     before(:each) do
-      # user was updated 2:01 ago
-      pretend_now_is(Time.zone.now - 121.seconds) do
+      # user was updated 0:11 ago
+      pretend_now_is(Time.zone.now - 11.seconds) do
         @user = Factory.build(:subscribed_user)
         @user.stubs(:subscribe_to_list)
         @user.save

data/spec/dummy/config/initializers/subscribed_to.rb

@@ -1,4 +1,6 @@
 SubscribedTo.setup do |config|
+  config.active = true
+
   config.service = :mail_chimp
 
   config.mail_chimp do |mail_chimp_config|

data/spec/lib/subscribed_to/mail_chimp/web_hook_spec.rb

@@ -27,14 +27,14 @@ describe SubscribedTo::MailChimp::WebHook do
   end
 
   it "should rate limit updates via the api to once every 2 minutes" do
-    # user was updated 2:01 ago
-    pretend_now_is(Time.zone.now - 120.seconds) do
+    # user was updated 0:10 ago
+    pretend_now_is(Time.zone.now - 10.seconds) do
       @user = Factory.build(:non_subscribed_user)
       @user.stubs(:subscribe_to_list)
       @user.save
     end
 
-    # pretend it's 1:59 from last update
+    # pretend it's 0:09 from last update
     pretend_now_is(Time.zone.now - 1.seconds) do
       expect do
         SubscribedTo::MailChimp::WebHook.process({
@@ -46,8 +46,8 @@ describe SubscribedTo::MailChimp::WebHook do
       end.not_to change { @user.reload.email }.to("my.new@email.com")
     end
 
-    # pretend it's 2:01 from last update
-    pretend_now_is(Time.zone.now + 120.seconds) do
+    # pretend it's 0:11 from last update
+    pretend_now_is(Time.zone.now + 10.seconds) do
       expect do
         SubscribedTo::MailChimp::WebHook.process({
           "type" => "upemail",
@@ -70,8 +70,8 @@ describe SubscribedTo::MailChimp::WebHook do
 
   context "for a new user" do
     before(:each) do
-      # user was updated 2:01 ago
-      pretend_now_is(Time.zone.now - 121.seconds) do
+      # user was updated 0:11 ago
+      pretend_now_is(Time.zone.now - 11.seconds) do
         @user = Factory.build(:non_subscribed_user)
         @user.stubs(:subscribe_to_list)
         @user.save
@@ -99,8 +99,8 @@ describe SubscribedTo::MailChimp::WebHook do
 
   context "for an existing user" do
     before(:each) do
-      # user was updated 2:01 ago
-      pretend_now_is(Time.zone.now - 121.seconds) do
+      # user was updated 0:11 ago
+      pretend_now_is(Time.zone.now - 11.seconds) do
         @user = Factory.build(:subscribed_user)
         @user.stubs(:subscribe_to_list)
         @user.save

data/subscribed_to.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{subscribed_to}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["whtt-eric"]

metadata

@@ -2,7 +2,7 @@
 name: subscribed_to
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - whtt-eric
@@ -233,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4004874530137465166
+      hash: 4150440090271491481
       segments: 
       - 0
       version: "0"