chimpmunk 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c60fcdbf6b7dfda454a5d0061d798af3c67d8973
-  data.tar.gz: 305e8d6ea4982a9dd33b117c6c0ee8e7bfd6ffac
+  metadata.gz: a980ab3ac42186d0fe40586f7cbded021271d44f
+  data.tar.gz: 383c24bcdcbf03f459f5a6ca33cde42c19e15516
 SHA512:
-  metadata.gz: 0f45bdfb37ae8b43fa769e396c57459cef38d1a5f065361a8318cc203a2cd532500556343dd09881556b5d221655c8bacc5790cdb4eccbcf91e879038a54e563
-  data.tar.gz: 7552591f37ca4ba7e9648429999f8c8ae943f50a4f1432d883106e60a5d627c5faaa533812fc6530247944554824e8004d23e1d52b62442e1ae5e19dc0cb0b59
+  metadata.gz: 8123420f18835fc092dee804515bf778eb1c5146e423f074e944b3bc95120f6eeb9d23cee70a34dd00c329a5826b45bb3d5fb2d51b8aec8ce434eb427d8edf3a
+  data.tar.gz: 68c2147e4611ef3c6e865cbb550028b1eeed9fb5d237995148100ef6c1fbc854fbedc76cb83f70f26e8d11618a6206bc037ac6dd60486a5b319f5193ce486649

data/README.md

@@ -78,14 +78,6 @@ in `app/models` :
         associated :one, :user		# will have one :email_campaign_comment
         editable_areas :posts
         
-        #
-        # 	must have a content method 	
-        #
-        def content
-			sections = {}
-			{sections: sections}
-        end
-        
         rails_admin do
         	edit do
         		field :title
@@ -111,7 +103,7 @@ in `app/models` :
 in `app/views/chimpmunk/_posts.html.haml`, you should have an `mc:edit` somewhere in your template called 'posts'
 
 ```
-	- campaign.email_campaign_posts.map(&:post).each do |post|
+	- posts.each do |post|
 		.post.span-6
 			%h1= post.name
 			%p= post.body

data/chimpmunk.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord',  ['>= 3.2', '< 5']
   spec.add_dependency 'gibbon', '>= 1.1'
-  spec.add_dependency 'paperclip', '>= 4.1'
+  spec.add_dependency 'paperclip', '>= 3.4'
+  spec.add_development_dependency 'rspec-rails'
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/db/migrate/1_chimpmunk_migration.rb

@@ -43,6 +43,7 @@ class ChimpmunkMigration < ActiveRecord::Migration
       t.string :campaign_kind
       t.integer :template_id
       t.references :email_list_group, index: true
+      t.string :type
 
       t.timestamps
     end

data/lib/chimpmunk/email_campaign.rb

@@ -3,17 +3,6 @@ module Chimpmunk
   class EmailCampaign < ::ActiveRecord::Base
     attr_accessor :skip_update_callbacks, :skip_create_callbacks
 
-    #
-    #   dynamic class methods for all mc_edit types
-    #
-    [:tags, :headers, :texts, :images].each do |mc_edit_type|
-      self.class_eval <<-EOF
-        def self.mc_edit_#{mc_edit_type}
-          @@mc_edit_#{mc_edit_type}
-        end
-      EOF
-    end
-
     # rails 3
     attr_accessible :title, :from_email, :from_name, :email_list_id, :subject, :email_template_id, :mailchimp_list_id, :send_date, 
       :mailchimp_campaign_id, :emails_sent, :clicked, :opened, :status, :hard_bounces, :soft_bounces, :unsubscribes, :forwards, 
@@ -46,9 +35,16 @@ module Chimpmunk
     #   create header associations
     #
     def self.headers(*headers)
-      @@mc_edit_headers = headers
+      class << self; attr_accessor :mc_edit_headers; end
+      @mc_edit_headers = headers
+
       headers.each do |header|
-        has_one header.to_sym, -> { where(name: header.to_s) }, class_name: 'Chimpmunk::EmailCampaignHeader', foreign_key: :email_campaign_id
+        if Rails::VERSION::MAJOR == 4
+          has_one header.to_sym, -> { where(name: header.to_s) }, class_name: 'Chimpmunk::EmailCampaignHeader', foreign_key: :email_campaign_id, dependent: :destroy
+        else
+          attr_accessible[:default] << "#{header}_attributes"
+          has_one header.to_sym, conditions: { name: header.to_s }, class_name: 'Chimpmunk::EmailCampaignHeader', foreign_key: :email_campaign_id, dependent: :destroy
+        end
         accepts_nested_attributes_for header.to_sym, allow_destroy: true
       end
     end
@@ -57,9 +53,16 @@ module Chimpmunk
     #   create text associations
     #
     def self.texts(*texts)
-      @@mc_edit_texts = texts
+      class << self; attr_accessor :mc_edit_texts; end
+      @mc_edit_texts = texts
+
       texts.each do |text|
-        has_one text.to_sym, -> { where(name: text.to_s) }, class_name: 'Chimpmunk::EmailCampaignText', foreign_key: :email_campaign_id
+        if Rails::VERSION::MAJOR == 4
+          has_one text.to_sym, -> { where(name: text.to_s) }, class_name: 'Chimpmunk::EmailCampaignText', foreign_key: :email_campaign_id, dependent: :destroy
+        else
+          attr_accessible[:default] << "#{text}_attributes"
+          has_one text.to_sym, conditions: { name: text.to_s }, class_name: 'Chimpmunk::EmailCampaignText', foreign_key: :email_campaign_id, dependent: :destroy
+        end
         accepts_nested_attributes_for text.to_sym, allow_destroy: true
       end
     end
@@ -68,9 +71,16 @@ module Chimpmunk
     #   create image associations
     #
     def self.images(*images)
-      @@mc_edit_images = images
+      class << self; attr_accessor :mc_edit_images; end
+      @mc_edit_images = images
+
       images.each do |image|
-        has_one image.to_sym, -> { where(name: image.to_s) }, class_name: 'Chimpmunk::EmailCampaignImage', foreign_key: :email_campaign_id
+        if Rails::VERSION::MAJOR == 4
+          has_one image.to_sym, -> { where(name: image.to_s) }, class_name: 'Chimpmunk::EmailCampaignImage', foreign_key: :email_campaign_id, dependent: :destroy
+        else
+          attr_accessible[:default] << "#{image}_attributes"
+          has_one image.to_sym, conditions: { name: image.to_s }, class_name: 'Chimpmunk::EmailCampaignImage', foreign_key: :email_campaign_id, dependent: :destroy
+        end
         accepts_nested_attributes_for image.to_sym, allow_destroy: true
       end
     end
@@ -79,16 +89,57 @@ module Chimpmunk
     #   store mc:edit tag names
     #
     def self.editable_areas(*mc_edit_tags)
-      @@mc_edit_tags = mc_edit_tags
+      class << self; attr_accessor :mc_edit_editable_areas; end
+      @mc_edit_editable_areas = mc_edit_tags
     end
 
     #
     #   create has_many associations
     #
     def self.associated(association_type, *associations)
+      if association_type == :many
+        class << self; attr_accessor :mc_edit_has_many; end
+        @mc_edit_has_many = associations
+      else
+        class << self; attr_accessor :mc_edit_has_one; end
+        @mc_edit_has_one = associations
+      end
+
       associations.each do |association|
+        # TODO: figure out has_one attr_accessible
+        # TODO: test relations in rails 4
+        if association_type == :many
+          if Rails::VERSION::MAJOR == 3
+            attr_accessible[:default] << "#{association.to_s.singularize}_ids"
+
+            self.class_eval <<-EOF
+              after_save do
+                self.email_campaign_#{association}.destroy_all
+                self.#{association.to_s.singularize}_ids.each{|xid| self.email_campaign_#{association}.create(#{association.to_s.singularize}_id: xid)}
+              end
+            EOF
+          end
+        else
+          if Rails::VERSION::MAJOR == 3
+            singular = association.to_s.singularize
+            singular_id = "#{singular}_id"
+            attr_accessible[:default] << singular_id
+            attr_accessor singular_id.to_sym
+            self.class_eval <<-EOF
+              after_save do
+                if self.property_id
+                  e = EmailCampaign#{singular.titleize}.where(email_campaign_id: self.id).first_or_initialize
+                  e.#{singular_id} = self.#{singular_id}
+                  e.save
+                end
+              end
+            EOF
+          end
+        end
+
         association_name = "email_campaign_#{association}".to_sym
-        send("has_#{association_type}", association_name, foreign_key: 'email_campaign_id')
+        send("has_#{association_type}", association_name, foreign_key: 'email_campaign_id', dependent: :destroy)
+        send("has_#{association_type}", association, through: association_name )
         accepts_nested_attributes_for association_name, allow_destroy: true
       end
     end
@@ -198,24 +249,50 @@ module Chimpmunk
       sections = {}
 
       # headers
-      @@mc_edit_headers.each do |tag|
-        sections[tag] = self.send(tag).text
+      if headers = self.class.instance_variable_get('@mc_edit_headers')
+        headers.each do |tag|
+          sections[tag] = self.send(tag).text
+        end
       end
 
       # texts
-      @@mc_edit_texts.each do |tag|
-        sections[tag] = self.send(tag).text
+      if texts = self.class.instance_variable_get('@mc_edit_texts')
+        texts.each do |tag|
+          sections[tag] = self.send(tag).text
+        end
       end
 
       # images
-      @@mc_edit_images.each do |tag|
-        sections[tag] = "<img src='http://#{Chimpmunk.domain_name}#{self.send(tag).image.url}' />"
+      if images = self.class.instance_variable_get('@mc_edit_images')
+        images.each do |tag|
+          sections[tag] = "<img src='http://#{Chimpmunk.domain_name}#{self.send(tag).image.url}' />"
+        end
+      end
+
+      # has_many
+      if has_many = self.class.instance_variable_get('@mc_edit_has_many')
+        has_many.each do |tag|
+          if File.directory?("app/views/chimpmunk") && !Dir["app/views/chimpmunk/_#{tag}**"].empty?
+            sections[tag] = action_view.render "chimpmunk/#{tag}", campaign: self, tag.to_sym => self.send(tag)
+          end
+        end
+      end
+
+      # has_one
+      if has_one = self.class.instance_variable_get('@mc_edit_has_one')
+        has_one.each do |tag|
+          if File.directory?("app/views/chimpmunk") && !Dir["app/views/chimpmunk/_#{tag}**"].empty?
+            sections[tag] = action_view.render "chimpmunk/#{tag}", campaign: self, tag.to_sym => self.send(tag)
+          end
+        end
       end
 
       # editable areas (partials)
-      @@mc_edit_tags.each do |tag|
-        if File.directory?("app/views/chimpmunk") && !Dir["app/views/chimpmunk/_#{tag}**"].empty?
-          sections[tag] = action_view.render "chimpmunk/#{tag}", campaign: self
+      if editable_areas = self.class.instance_variable_get('@mc_edit_editable_areas')
+        editable_areas.each do |tag|
+          if File.directory?("app/views/chimpmunk") && !Dir["app/views/chimpmunk/_#{tag}**"].empty?
+            sections[tag] = action_view.render "chimpmunk/#{tag}", campaign: self
+          end
         end
       end
 
@@ -328,7 +405,7 @@ module Chimpmunk
       else
         opts[:options][:list_id] = self.email_list.try(:mailchimp_id)
       end
-      
+
       response = Chimpmunk.mailchimp.campaigns.create(opts)
       if response["errors"].nil?
         self.skip_update_callbacks = true
@@ -338,48 +415,46 @@ module Chimpmunk
       end
     end
 
-    if defined?(RailsAdmin)
-
-      rails_admin do
-        navigation_label 'Mailchimp'
+    rails_admin do
+      navigation_label 'Mailchimp'
 
-        list do
-          field :title
-          field :email_list
-          field :status
-          field :emails_sent
-          field :opened_percentage do
-            label "Opened"
-          end
-          field :clicked_percentage do
-            label "Clicked"
-          end
-          field :subject
-          field :from_email
-          field :from_name
+      list do
+        field :title
+        field :email_list
+        field :status
+        field :emails_sent
+        field :opened_percentage do
+          label "Opened"
         end
+        field :clicked_percentage do
+          label "Clicked"
+        end
+        field :subject
+        field :from_email
+        field :from_name
+      end
 
-        edit do
-          field :title
-          field :email_list do
-            inline_add false
-            inline_edit false
-          end
-          field :email_list_group
-          field :email_template do
-            inline_add false
-            inline_edit false
-          end
-          field :subject
-          field :from_name do
-            default_value 'FIXME'
-          end
-          field :from_email do
-            default_value 'FIXME'
-          end
-          field :send_date
+      edit do
+        field :title
+        field :email_list do
+          inline_add false
+          inline_edit false
         end
+        field :email_list_group
+        field :email_template do
+          inline_add false
+          inline_edit false
+        end
+        field :subject
+        field :from_name do
+          default_value 'FIXME'
+        end
+        field :from_email do
+          default_value 'FIXME'
+        end
+        field :send_date
       end
-    end
+    end if defined?(RailsAdmin)
+
   end
 end

data/lib/chimpmunk/email_campaign_header.rb

@@ -14,6 +14,6 @@ module Chimpmunk
           end
         end
       end
-    end
+    end if defined?(RailsAdmin)
   end
 end

data/lib/chimpmunk/email_campaign_image.rb

@@ -5,11 +5,17 @@ module Chimpmunk
     has_attached_file :image, styles: {original: '1000x1000>'}
     validates_attachment_content_type :image, :content_type => /\Aimage\/.*\Z/
 
+    attr_accessible :image if defined?(ActiveModel::MassAssignmentSecurity)
+
     rails_admin do
       visible false
       edit do
-        field :image
+        field :image do
+          label do
+            bindings[:object].name
+          end
+        end
       end
-    end
+    end if defined?(RailsAdmin)
   end
 end

data/lib/chimpmunk/email_campaign_text.rb

@@ -3,6 +3,8 @@ module Chimpmunk
   class EmailCampaignText < ::ActiveRecord::Base
     belongs_to :email_campaign
 
+    attr_accessible :text if defined?(ActiveModel::MassAssignmentSecurity)
+
     rails_admin do
       visible false
       edit do
@@ -12,6 +14,6 @@ module Chimpmunk
           end
         end
       end
-    end
+    end if defined?(RailsAdmin)
   end
 end

data/lib/chimpmunk/email_list.rb

@@ -37,33 +37,29 @@ module Chimpmunk
 
     private
 
-    if defined?(RailsAdmin)
+    rails_admin do
+      navigation_label 'Mailchimp'
 
-      rails_admin do
-        navigation_label 'Mailchimp'
-
-        edit do
-          field :mailchimp_id do
-            label 'Mailchimp ID'
-            read_only true
-          end
-          field :name do
-            read_only true
-          end
-          field :default_from_name do
-            read_only true
-          end
-          field :default_from_email do
-            read_only true
-          end
-          field :default_subject do
-            read_only true
-          end
-          field :email_list_groupings
+      edit do
+        field :mailchimp_id do
+          label 'Mailchimp ID'
+          read_only true
+        end
+        field :name do
+          read_only true
+        end
+        field :default_from_name do
+          read_only true
+        end
+        field :default_from_email do
+          read_only true
         end
+        field :default_subject do
+          read_only true
+        end
+        field :email_list_groupings
       end
-
-    end
+    end if defined?(RailsAdmin)
 
   end
 end

data/lib/chimpmunk/email_list_group.rb

@@ -69,30 +69,29 @@ module Chimpmunk
       )
     end
 
-    if defined?(RailsAdmin)
-      rails_admin do
-        navigation_label 'Mailchimp'
-        visible false
-        edit do
-          field :name
-          field :email_subscribers do
-            column_width 1200
-            associated_collection_scope do
-              form = bindings[:form]
-              binding_object = bindings[:object]
-              list = if form
-                bindings[:form].options[:parent_builder].options[:parent_builder].object
-              elsif binding_object
-                binding_object.email_list_grouping.email_list
-              end
-              
-              Proc.new { |scope|
-                scope = scope.where(email_list_id: list.id, subscribed: true)
-              } if list
+    rails_admin do
+      navigation_label 'Mailchimp'
+      visible false
+      edit do
+        field :name
+        field :email_subscribers do
+          column_width 1200
+          associated_collection_scope do
+            form = bindings[:form]
+            binding_object = bindings[:object]
+            list = if form
+              bindings[:form].options[:parent_builder].options[:parent_builder].object
+            elsif binding_object
+              binding_object.email_list_grouping.email_list
             end
+            
+            Proc.new { |scope|
+              scope = scope.where(email_list_id: list.id, subscribed: true)
+            } if list
           end
         end
       end
-    end
+    end if defined?(RailsAdmin)
+    
   end
 end

data/lib/chimpmunk/email_list_grouping.rb

@@ -86,17 +86,16 @@ module Chimpmunk
       end
     end
 
-    if defined?(RailsAdmin)
-      rails_admin do
-        navigation_label 'Mailchimp'
-        visible false
-
-        edit do
-          field :email_list
-          field :name
-          field :email_list_groups
-        end
+    rails_admin do
+      navigation_label 'Mailchimp'
+      visible false
+
+      edit do
+        field :email_list
+        field :name
+        field :email_list_groups
       end
-    end
+    end if defined?(RailsAdmin)
+
   end
 end

data/lib/chimpmunk/email_subscriber.rb

@@ -44,31 +44,30 @@ module Chimpmunk
 
     private
 
-    if defined?(RailsAdmin)
-      rails_admin do
-        navigation_label 'Mailchimp'
-        list do
-          field :mailchimp_id
-          field :first_name
-          field :last_name
-          field :email
-          field :subscribed
-          field :email_list
+    rails_admin do
+      navigation_label 'Mailchimp'
+      list do
+        field :mailchimp_id
+        field :first_name
+        field :last_name
+        field :email
+        field :subscribed
+        field :email_list
+      end
+      edit do
+        field :email_list do
+          inline_add false
+          inline_edit false 
         end
-        edit do
-          field :email_list do
-            inline_add false
-            inline_edit false 
-          end
-          field :mailchimp_id do
-            label "Mailchimp ID"
-            read_only true
-          end
-          field :first_name
-          field :last_name
-          field :email
+        field :mailchimp_id do
+          label "Mailchimp ID"
+          read_only true
         end
+        field :first_name
+        field :last_name
+        field :email
       end
-    end
+    end if defined?(RailsAdmin)
+
   end
 end

data/lib/chimpmunk/email_template.rb

@@ -13,42 +13,41 @@ module Chimpmunk
     #
     def self.refresh_email_templates
       Chimpmunk.mailchimp.templates.list()["user"].each do |template|
-      EmailTemplate.find_or_create_by(
+      EmailTemplate.where(
         mailchimp_id: "#{template["id"]}",
         name: template["name"],
         layout: template["layout"],
         preview_image: template["preview_image"]
-      )
+      ).first_or_create
       end
     end
 
     private 
 
-    if defined?(RailsAdmin)
-      rails_admin do  
-        navigation_label 'Mailchimp'
-        # visible false   
-        show do
-          field :name
-          field :layout
-          field :preview_image do
-            pretty_value do
-              "<img src='#{value}' />".html_safe
-            end
+    rails_admin do  
+      navigation_label 'Mailchimp'
+      # visible false   
+      show do
+        field :name
+        field :layout
+        field :preview_image do
+          pretty_value do
+            "<img src='#{value}' />".html_safe
           end
         end
-        edit do
-          field :mailchimp_id do
-            read_only true
-          end
-          field :name do
-            read_only true
-          end
-          field :preview_image do
-            read_only :true
-          end
+      end
+      edit do
+        field :mailchimp_id do
+          read_only true
+        end
+        field :name do
+          read_only true
+        end
+        field :preview_image do
+          read_only :true
         end
       end
-    end
+    end if defined?(RailsAdmin)
+    
   end
 end

data/lib/chimpmunk/version.rb

@@ -1,3 +1,3 @@
 module Chimpmunk
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/chimpmunk/email_campaign_spec.rb

@@ -134,7 +134,7 @@ describe Chimpmunk::EmailCampaign do
 
         describe 'editable areas' do
           it 'should have the correct editable areas' do
-            expect(TestEmailCampaign.mc_edit_tags).to include(:first)
+            expect(TestEmailCampaign.mc_edit_editable_areas).to include(:first)
           end
         end
 
@@ -156,9 +156,22 @@ describe Chimpmunk::EmailCampaign do
       end
 
       describe 'refresh_email_campaign_stats' do
-        
+        it 'should update the email campaign with the stats' do
+          @email_campaign.mailchimp_campaign_id = "1"
+          Chimpmunk::EmailCampaign.texts
+          Chimpmunk::EmailCampaign.headers
+          Chimpmunk::EmailCampaign.images
+          @email_campaign.save
+          expect{Chimpmunk::EmailCampaign.refresh_email_campaign_stats}.to change{@email_campaign.reload.emails_sent}.from(nil).to(100)
+        end
       end
     end
 
+    describe 'instance methods' do
+
+    end
+    describe 'send_campaign' do
+      
+    end
   end
 end 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH << '.' unless $LOAD_PATH.include?('.')
 $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 require 'logger'
 
+require 'rails'
 require 'active_record'
 require 'gibbon'
 
@@ -22,6 +23,10 @@ module Chimpmunk
   def self.mailchimp
     @mailchimp ||= ::Gibbon::API.new
   end
+
+  def self.domain_name
+    'test.com'
+  end
 end
 
 # require 'rails'

data/spec/support/stubs.rb

@@ -24,16 +24,25 @@ def gibbon_stubs
   )
   allow_any_instance_of(Gibbon::APICategory).to receive(:list).with({status:"sent"}).and_return(
     {'data' => [
+      'id' => '1',
+      'summary' =>
       {
-        'title' => 'refreshed',
-        'type' => 'test',
-        'list_id' => 1,
-        'subject' => 'test subject',
-        'from_email' => 'new@from.test',
-        'from_name' => 'test name',
-        'template_id' => 1,
-        'id' => 99999
-      }
-    ]}
+        'emails_sent' => 100,
+        'unique_opens' => 100,
+        'unique_clicked' => 100,
+        'hard_bounces' => 100,
+        'soft_bounces' => 100,
+        'unsubscribes' => 100,
+        'forwards' => 100,
+        'forwards_opens' => 100,
+        'opens' => 100,
+        'last_open' => Time.now,
+        'unique_opens' => 100,
+        'non_unique_clicks' => 100,
+        'users_who_clicked' => 100,
+        'unique_likes' => 100,
+        'facebook_likes' => 100
+      }]
+    }
   )
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chimpmunk
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Nick Franken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -50,14 +50,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement