alchemy_crm 2.0.1 → 2.0.2

data/config/routes.rb

@@ -1,71 +1,71 @@
 AlchemyCrm::Engine.routes.draw do
 
-	match '/recipients/:h/reads' => 'recipients#reads',
-		:as => 'recipient_reads'
-	
-	match '/recipients/:h/reacts' => 'recipients#reacts',
-		:as => 'recipient_reacts'
-	
-	match '/subscriptions/:token/destroy/:newsletter_id' => 'subscriptions#destroy',
-		:as => 'destroy_subscription'
-	
-	match '/admin/elements/teasables' => 'admin/elements#teasables',
-		:as => 'teasable_elements'
-	
-	match '/admin/elements/teasables' => 'admin/elements#teasables',
-		:as => 'teasable_elements'
-
-	match '/contacts/:token/verify' => 'contacts#verify',
-		:as => 'verify_contact'
-
-	match '/contacts/:token/disable' => 'contacts#disable',
-		:as => 'disable_contact'
-
-	match '/mailings/:m/show/:r' => 'mailings#show',
-		:as => 'show_mailing'
-
-	resources :mailings, :only => [:show]
-
-	resources :contacts do
-		collection do
-			post :signup, :signout
-		end
-	end
-
-	resources :subscriptions do
-		collection do
-			post :overview
-		end
-	end
-
-	namespace :admin do
-
-		resources :contacts do
-			collection do
-				get :import
-				get :autocomplete_tag_list
-				post :import
-			end
-			member { get :export }
-		end
-
-		resources :contact_groups do
-			collection { get :add_filter }
-		end
-
-		resources :tags, :newsletters
-
-		resources :deliveries
-
-		resources :mailings do
-			resources :deliveries
-			collection { get :signout }
-			member do
-				get :copy
-				get :edit_content
-			end
-		end
-
-	end
+  match '/recipients/:h/reads' => 'recipients#reads',
+    :as => 'recipient_reads'
+
+  match '/recipients/:h/reacts' => 'recipients#reacts',
+    :as => 'recipient_reacts'
+
+  match '/subscriptions/:token/destroy/:newsletter_id' => 'subscriptions#destroy',
+    :as => 'destroy_subscription'
+
+  match '/admin/elements/teasables' => 'admin/elements#teasables',
+    :as => 'teasable_elements'
+
+  match '/admin/elements/teasables' => 'admin/elements#teasables',
+    :as => 'teasable_elements'
+
+  match '/contacts/:token/verify' => 'contacts#verify',
+    :as => 'verify_contact'
+
+  match '/contacts/:token/disable' => 'contacts#disable',
+    :as => 'disable_contact'
+
+  match '/mailings/:m/show/:r' => 'mailings#show',
+    :as => 'show_mailing'
+
+  resources :mailings, :only => [:show]
+
+  resources :contacts do
+    collection do
+      post :signup, :signout
+    end
+  end
+
+  resources :subscriptions do
+    collection do
+      post :overview
+    end
+  end
+
+  namespace :admin do
+
+    resources :contacts do
+      collection do
+        get :import
+        get :autocomplete_tag_list
+        post :import
+      end
+      member { get :export }
+    end
+
+    resources :contact_groups do
+      collection { get :add_filter }
+    end
+
+    resources :tags, :newsletters
+
+    resources :deliveries
+
+    resources :mailings do
+      resources :deliveries
+      collection { get :signout }
+      member do
+        get :copy
+        get :edit_content
+      end
+    end
+
+  end
 
 end

data/db/migrate/20111104125306_remove_sent_mailing_pdf_id_from_sent_mailings.rb

@@ -1,6 +1,6 @@
 class RemoveSentMailingPdfIdFromSentMailings < ActiveRecord::Migration
   def self.up
-		remove_column :sent_mailings, :sent_mailing_pdf_id
+    remove_column :sent_mailings, :sent_mailing_pdf_id
   end
 
   def self.down

data/db/migrate/20111124145923_namespace_alchemy_crm_models.rb

@@ -1,17 +1,17 @@
 class NamespaceAlchemyCrmModels < ActiveRecord::Migration
 
-	def change
-		rename_table :mailings,											:alchemy_crm_mailings
-		rename_table :newsletters,									:alchemy_crm_newsletters
-		rename_table :contacts,											:alchemy_crm_contacts
-		rename_table :sent_mailings,								:alchemy_crm_deliveries
-		rename_table :recipients, 									:alchemy_crm_recipients
-		rename_table :contact_groups, 							:alchemy_crm_contact_groups
-		rename_table :contact_group_filters,				:alchemy_crm_contact_group_filters
-		rename_table :newsletter_subscriptions,			:alchemy_crm_subscriptions
-		rename_table :reactions,										:alchemy_crm_reactions
-		rename_table :essence_element_teasers,			:alchemy_essence_element_teasers
-		rename_table :contact_groups_newsletters,		:alchemy_contact_groups_newsletters
-	end
+  def change
+    rename_table :mailings,                     :alchemy_crm_mailings
+    rename_table :newsletters,                  :alchemy_crm_newsletters
+    rename_table :contacts,                     :alchemy_crm_contacts
+    rename_table :sent_mailings,                :alchemy_crm_deliveries
+    rename_table :recipients,                   :alchemy_crm_recipients
+    rename_table :contact_groups,               :alchemy_crm_contact_groups
+    rename_table :contact_group_filters,        :alchemy_crm_contact_group_filters
+    rename_table :newsletter_subscriptions,     :alchemy_crm_subscriptions
+    rename_table :reactions,                    :alchemy_crm_reactions
+    rename_table :essence_element_teasers,      :alchemy_essence_element_teasers
+    rename_table :contact_groups_newsletters,   :alchemy_contact_groups_newsletters
+  end
 
 end

data/db/migrate/20120307160721_rename_alchemy_crm_recipients_sent_mailing_id.rb

@@ -1,5 +1,5 @@
 class RenameAlchemyCrmRecipientsSentMailingId < ActiveRecord::Migration
-	def change
-		rename_column :alchemy_crm_recipients, :sent_mailing_id, :delivery_id
-	end
+  def change
+    rename_column :alchemy_crm_recipients, :sent_mailing_id, :delivery_id
+  end
 end

data/db/migrate/20120320103412_add_indexes_to_alchemy_crm_sha1_columns.rb

@@ -1,7 +1,7 @@
 class AddIndexesToAlchemyCrmSha1Columns < ActiveRecord::Migration
   def change
-  	add_index :alchemy_crm_contacts, :email_sha1
-  	add_index :alchemy_crm_mailings, :sha1
-  	add_index :alchemy_crm_recipients, :sha1
+    add_index :alchemy_crm_contacts, :email_sha1
+    add_index :alchemy_crm_mailings, :sha1
+    add_index :alchemy_crm_recipients, :sha1
   end
 end

data/db/migrate/20120327174301_add_more_indexes_to_alchemy_crm_tables.rb

@@ -1,12 +1,12 @@
 class AddMoreIndexesToAlchemyCrmTables < ActiveRecord::Migration
-	def change
-		add_index :alchemy_crm_recipients, :message_id
-		add_index :alchemy_crm_recipients, :email
-		add_index :alchemy_crm_recipients, :contact_id
-		add_index :alchemy_crm_recipients, :delivery_id
-		add_index :alchemy_crm_contacts, :email
-		add_index :alchemy_crm_reactions, :recipient_id
-		add_index :alchemy_contact_groups_newsletters, [:contact_group_id, :newsletter_id], :name => 'contact_group_newsletter_index', :unique => true
-		add_index :alchemy_crm_subscriptions, [:contact_id, :newsletter_id], :name => 'contact_newsletter_index', :unique => true
-	end
+  def change
+    add_index :alchemy_crm_recipients, :message_id
+    add_index :alchemy_crm_recipients, :email
+    add_index :alchemy_crm_recipients, :contact_id
+    add_index :alchemy_crm_recipients, :delivery_id
+    add_index :alchemy_crm_contacts, :email
+    add_index :alchemy_crm_reactions, :recipient_id
+    add_index :alchemy_contact_groups_newsletters, [:contact_group_id, :newsletter_id], :name => 'contact_group_newsletter_index', :unique => true
+    add_index :alchemy_crm_subscriptions, [:contact_id, :newsletter_id], :name => 'contact_newsletter_index', :unique => true
+  end
 end

data/lib/alchemy_crm.rb

@@ -1,18 +1,18 @@
 if defined?(Rails) && Rails::VERSION::MAJOR == 3
-	require 'acts-as-taggable-on'
-	require 'localized_country_select'
-	require 'rails3-jquery-autocomplete'
-	require 'vcard'
-	require 'csv_magic'
-	require 'digest/sha1'
-	require 'delayed_job_active_record'
-	require 'alchemy_cms'
-	require 'alchemy_crm/version'
-	require 'alchemy_crm/config'
-	require 'alchemy_crm/engine'
-	require 'alchemy_crm/newsletter_layout'
-	require "alchemy_crm/seeder"
-	require "alchemy_crm/i18n_helpers"
+  require 'acts-as-taggable-on'
+  require 'localized_country_select'
+  require 'rails3-jquery-autocomplete'
+  require 'vcard'
+  require 'csv_magic'
+  require 'digest/sha1'
+  require 'delayed_job_active_record'
+  require 'alchemy_cms'
+  require 'alchemy_crm/version'
+  require 'alchemy_crm/config'
+  require 'alchemy_crm/engine'
+  require 'alchemy_crm/newsletter_layout'
+  require "alchemy_crm/seeder"
+  require "alchemy_crm/i18n_helpers"
 else
-	raise "Alchemy CRM 2.0 needs Rails 3.0 or higher. You are currently using Rails #{Rails::VERSION::MAJOR}"
+  raise "Alchemy CRM 2.0 needs Rails 3.0 or higher. You are currently using Rails #{Rails::VERSION::MAJOR}"
 end

data/lib/alchemy_crm/bounced_delivery.rb

@@ -1,46 +1,46 @@
 module AlchemyCrm
-	class BouncedDelivery
+  class BouncedDelivery
 
-		attr_accessor :status_info, :original_message_id
-		attr_accessor :attr_names
-		attr_accessor :message
+    attr_accessor :status_info, :original_message_id
+    attr_accessor :attr_names
+    attr_accessor :message
 
-		def self.from_email(email)
-			returning(bounce = self.new) do
-				plain_part = email.parts.detect do |part|
-					part.content_type == 'text/plain'
-				end
-				bounce.message = plain_part.body.strip
+    def self.from_email(email)
+      returning(bounce = self.new) do
+        plain_part = email.parts.detect do |part|
+          part.content_type == 'text/plain'
+        end
+        bounce.message = plain_part.body.strip
 
-				status_part = email.parts.detect do |part|
-					part.content_type == "message/delivery-status"
-				end
-				statuses = status_part.body.split(/\n/)
+        status_part = email.parts.detect do |part|
+          part.content_type == "message/delivery-status"
+        end
+        statuses = status_part.body.split(/\n/)
 
-				bounce.status_info = statuses.inject({}) do |hash, line|
-					key, value = line.split(/:/)
-					hash[key] = value.strip rescue nil
-					hash
-				end
-				original_message_part = email.parts.detect do |part|
-					part.content_type == "message/rfc822" or
-					part.content_type == "text/rfc822-headers" 
-				end
-				parsed_msg = Mail.parse(original_message_part.body)
-				bounce.original_message_id = parsed_msg.message_id
-			end
-		end
+        bounce.status_info = statuses.inject({}) do |hash, line|
+          key, value = line.split(/:/)
+          hash[key] = value.strip rescue nil
+          hash
+        end
+        original_message_part = email.parts.detect do |part|
+          part.content_type == "message/rfc822" or
+          part.content_type == "text/rfc822-headers"
+        end
+        parsed_msg = Mail.parse(original_message_part.body)
+        bounce.original_message_id = parsed_msg.message_id
+      end
+    end
 
-		def status
-			case status_info['Status']
-			when /^5/
-				'Failure'
-			when /^4/
-				'Temporary Failure'
-			when /^2/
-				'Success'
-			end
-		end
+    def status
+      case status_info['Status']
+      when /^5/
+        'Failure'
+      when /^4/
+        'Temporary Failure'
+      when /^2/
+        'Success'
+      end
+    end
 
-	end
+  end
 end

data/lib/alchemy_crm/config.rb

@@ -1,28 +1,28 @@
 module AlchemyCrm
-	class Config
+  class Config
 
-		# Returns the configuration for given parameter
-		def self.get(name)
-			read_file[name.to_s]
-		end
-		
-		def self.show
-			read_file
-		end
-		
-	private
-		
-		def self.read_file
-			app_config = Rails.root.join('config/alchemy_crm.config.yml')
-			default_config = File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy_crm.config.yml')
-			if File.exist?(app_config)
-				YAML.load_file(app_config)
-			elsif File.exist?(default_config)
-				YAML.load_file(default_config)
-			else
-				raise "No config file found!"
-			end
-		end
-		
-	end
+    # Returns the configuration for given parameter
+    def self.get(name)
+      read_file[name.to_s]
+    end
+
+    def self.show
+      read_file
+    end
+
+  private
+
+    def self.read_file
+      app_config = Rails.root.join('config/alchemy_crm.config.yml')
+      default_config = File.join(File.dirname(__FILE__), '..', '..', 'config/alchemy_crm.config.yml')
+      if File.exist?(app_config)
+        YAML.load_file(app_config)
+      elsif File.exist?(default_config)
+        YAML.load_file(default_config)
+      else
+        raise "No config file found!"
+      end
+    end
+
+  end
 end

data/lib/alchemy_crm/engine.rb

@@ -1,40 +1,40 @@
 module AlchemyCrm
-	class Engine < Rails::Engine
+  class Engine < Rails::Engine
 
-		isolate_namespace AlchemyCrm
-		engine_name 'alchemy_crm'
+    isolate_namespace AlchemyCrm
+    engine_name 'alchemy_crm'
 
-		initializer 'alchemy_crm.register_as_alchemy_module' do
-			Alchemy::Modules.register_module(YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/module_definition.yml')))
-		end
+    initializer 'alchemy_crm.register_as_alchemy_module' do
+      Alchemy::Modules.register_module(YAML.load_file(File.join(File.dirname(__FILE__), '../..', 'config/module_definition.yml')))
+    end
 
-		# Loading authorization rules and register them to auth engine instance
-		initializer "alchemy_crm.add_authorization_rules" do
-			Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
-		end
+    # Loading authorization rules and register them to auth engine instance
+    initializer "alchemy_crm.add_authorization_rules" do
+      Alchemy::AuthEngine.get_instance.load(File.join(File.dirname(__FILE__), '../..', 'config/authorization_rules.rb'))
+    end
 
-		initializer "alchemy_crm.add_newsletter_layouts" do
-			newsletter_layouts_file = Rails.root.join('config', 'alchemy', 'newsletter_layouts.yml')
-			if File.exist? newsletter_layouts_file
-				YAML.load_file(newsletter_layouts_file).each do |newsletter_layout|
-					newsletter_layout['name'] = Mailing::MAILING_PAGE_LAYOUT_PREFIX + newsletter_layout['name']
-					Alchemy::PageLayout.add(newsletter_layout.merge({'newsletter' => true}))
-				end
-			else
-				puts "!!! Alchemy CRM Warning: Newsletter Layouts File not found!\nPlease run 'rails generate alchemy_crm:scaffold' or create a 'newsletter_layouts.yml' file in config/alchemy folder."
-			end
-		end
+    initializer "alchemy_crm.add_newsletter_layouts" do
+      newsletter_layouts_file = Rails.root.join('config', 'alchemy', 'newsletter_layouts.yml')
+      if File.exist? newsletter_layouts_file
+        YAML.load_file(newsletter_layouts_file).each do |newsletter_layout|
+          newsletter_layout['name'] = Mailing::MAILING_PAGE_LAYOUT_PREFIX + newsletter_layout['name']
+          Alchemy::PageLayout.add(newsletter_layout.merge({'newsletter' => true}))
+        end
+      else
+        puts "!!! Alchemy CRM Warning: Newsletter Layouts File not found!\nPlease run 'rails generate alchemy_crm:scaffold' or create a 'newsletter_layouts.yml' file in config/alchemy folder."
+      end
+    end
 
-		# initializer "alchemy_crm.inject_helpers" do
-		# 	ActionView::Base.send :include, AlchemyCrm::BaseHelper
-		# end
+    # initializer "alchemy_crm.inject_helpers" do
+    #   ActionView::Base.send :include, AlchemyCrm::BaseHelper
+    # end
 
-		# Loading all alchemy core extensions found in app folder.
-		config.to_prepare do
-			Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_extension.rb")) do |e|
-				Rails.env.production? ? require(e) : load(e)
-			end
-		end
+    # Loading all alchemy core extensions found in app folder.
+    config.to_prepare do
+      Dir.glob(File.join(File.dirname(__FILE__), "../../app/**/*_extension.rb")) do |e|
+        Rails.env.production? ? require(e) : load(e)
+      end
+    end
 
-	end
+  end
 end