alchemy_crm 2.0.1 → 2.0.2

data/app/models/alchemy_crm/contact_group.rb

@@ -1,26 +1,26 @@
 # encoding: UTF-8
 module AlchemyCrm
-	class ContactGroup < ActiveRecord::Base
+  class ContactGroup < ActiveRecord::Base
 
-		acts_as_taggable_on :contact_tags
+    acts_as_taggable_on :contact_tags
 
-		has_many :filters, :dependent => :destroy, :class_name => "AlchemyCrm::ContactGroupFilter"
+    has_many :filters, :dependent => :destroy, :class_name => "AlchemyCrm::ContactGroupFilter"
 
-		validates_presence_of :name
+    validates_presence_of :name
 
-		accepts_nested_attributes_for :filters, :allow_destroy => true
+    accepts_nested_attributes_for :filters, :allow_destroy => true
 
-		def contacts
-			Contact.tagged_with(self.contact_tags, :any => true).where(filters_sql_string)
-		end
+    def contacts
+      Contact.tagged_with(self.contact_tags, :any => true).where(filters_sql_string)
+    end
 
-		def filters_sql_string
-			filters.map(&:sql_string).join(' AND ')
-		end
+    def filters_sql_string
+      filters.map(&:sql_string).join(' AND ')
+    end
 
-		def humanized_name
-			"#{self.name} (#{self.contacts.length})"
-		end
+    def humanized_name
+      "#{self.name} (#{self.contacts.length})"
+    end
 
-	end
+  end
 end

data/app/models/alchemy_crm/contact_group_filter.rb

@@ -1,26 +1,26 @@
 # encoding: UTF-8
 module AlchemyCrm
-	class ContactGroupFilter < ActiveRecord::Base
+  class ContactGroupFilter < ActiveRecord::Base
 
-		belongs_to :contact_group
+    belongs_to :contact_group
 
-		OPERATORS = [
-			[::I18n.t(:like, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Contains'), "LIKE"],
-			[::I18n.t(:not_like, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Contains not'), "NOT LIKE"],
-			[::I18n.t(:equals, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Equals'), "="],
-			[::I18n.t(:equals_not, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Equals not'), "!="]
-		]
+    OPERATORS = [
+      [::I18n.t(:like, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Contains'), "LIKE"],
+      [::I18n.t(:not_like, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Contains not'), "NOT LIKE"],
+      [::I18n.t(:equals, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Equals'), "="],
+      [::I18n.t(:equals_not, :scope => 'alchemy_crm.contact_group_filter_operators', :default => 'Equals not'), "!="]
+    ]
 
-		def sql_string
-			return "" if column.blank? || operator.blank? || prepared_value.blank?
-			"`#{Contact.table_name}`.`#{column}` #{operator} '#{prepared_value}'"
-		end
+    def sql_string
+      return "" if column.blank? || operator.blank? || prepared_value.blank?
+      "`#{Contact.table_name}`.`#{column}` #{operator} '#{prepared_value}'"
+    end
 
-	private
+  private
 
-		def prepared_value
-			operator =~ /LIKE/ ? "%#{value}%" : "#{value}"
-		end
+    def prepared_value
+      operator =~ /LIKE/ ? "%#{value}%" : "#{value}"
+    end
 
-	end
+  end
 end

data/app/models/alchemy_crm/delivery.rb

@@ -1,57 +1,57 @@
 # encoding: UTF-8
 module AlchemyCrm
-	class Delivery < ActiveRecord::Base
-
-		attr_accessor :chunk_delay
-
-		belongs_to :mailing
-		has_many :recipients, :dependent => :destroy
-
-		after_create :recipients_from_mailing_contacts
-
-		scope :delivered, where("`alchemy_crm_deliveries`.`delivered_at` IS NOT NULL")
-		scope :pending, where("`alchemy_crm_deliveries`.`delivered_at` IS NULL")
-
-		def delivered?
-			!self.delivered_at.nil?
-		end
-
-		# Sending mails in chunks.
-		def send_chunks(options={})
-			raise "No Mailing Given" if mailing.blank?
-			@chunk_delay = 0
-			recipients.each_slice(self.class.settings(:send_mails_in_chunks_of)) do |recipients_chunk|
-				send_mail_chunk(recipients_chunk, options)
-				@chunk_delay += 1
-			end
-			update_attribute(:delivered_at, Time.now)
-		end
-		handle_asynchronously :send_chunks, :run_at => proc { |m| m.deliver_at || Time.now }
-
-		# Send the mail chunk via delayed_job and waiting some time before next is enqueued
-		def send_mail_chunk(recipients_chunk, options)
-			recipients_chunk.each do |recipient|
-				mail = MailingsMailer.build(mailing, recipient, options).deliver
-				recipient.update_attribute(:message_id, mail.message_id)
-			end
-		end
-		handle_asynchronously :send_mail_chunk, :run_at => proc { |m| (m.chunk_delay * m.class.settings(:send_mail_chunks_every)).minutes.from_now }
-
-		def self.settings(name)
-			AlchemyCrm::Config.get(name)
-		end
-
-	private
-
-		def recipients_from_mailing_contacts
-			raise "No Mailing Given" if mailing.blank?
-			mailing.contacts_not_having_email_yet.each do |contact|
-				recipients << Recipient.create!(
-					:email => contact.email,
-					:contact => contact
-				)
-			end
-		end
-
-	end
+  class Delivery < ActiveRecord::Base
+
+    attr_accessor :chunk_delay
+
+    belongs_to :mailing
+    has_many :recipients, :dependent => :destroy
+
+    after_create :recipients_from_mailing_contacts
+
+    scope :delivered, where("`alchemy_crm_deliveries`.`delivered_at` IS NOT NULL")
+    scope :pending, where("`alchemy_crm_deliveries`.`delivered_at` IS NULL")
+
+    def delivered?
+      !self.delivered_at.nil?
+    end
+
+    # Sending mails in chunks.
+    def send_chunks(options={})
+      raise "No Mailing Given" if mailing.blank?
+      @chunk_delay = 0
+      recipients.each_slice(self.class.settings(:send_mails_in_chunks_of)) do |recipients_chunk|
+        send_mail_chunk(recipients_chunk, options)
+        @chunk_delay += 1
+      end
+      update_attribute(:delivered_at, Time.now)
+    end
+    handle_asynchronously :send_chunks, :run_at => proc { |m| m.deliver_at || Time.now }
+
+    # Send the mail chunk via delayed_job and waiting some time before next is enqueued
+    def send_mail_chunk(recipients_chunk, options)
+      recipients_chunk.each do |recipient|
+        mail = MailingsMailer.build(mailing, recipient, options).deliver
+        recipient.update_attribute(:message_id, mail.message_id)
+      end
+    end
+    handle_asynchronously :send_mail_chunk, :run_at => proc { |m| (m.chunk_delay * m.class.settings(:send_mail_chunks_every)).minutes.from_now }
+
+    def self.settings(name)
+      AlchemyCrm::Config.get(name)
+    end
+
+  private
+
+    def recipients_from_mailing_contacts
+      raise "No Mailing Given" if mailing.blank?
+      mailing.contacts_not_having_email_yet.each do |contact|
+        recipients << Recipient.create!(
+          :email => contact.email,
+          :contact => contact
+        )
+      end
+    end
+
+  end
 end

data/app/models/alchemy_crm/element_extension.rb

@@ -1,28 +1,28 @@
 # Extending Alchemys Element model
 Alchemy::Element.class_eval do
 
-	def update_from_element(source, url)
-		self.contents.each do |content|
-			source_content = source.contents.find_by_name(content.name)
-			if !source_content.blank? && source_content.essence_type == content.essence_type
-				case content.essence_type
-					when "Alchemy::EssenceText"
-					content.essence.body = source_content.essence.body
-					when "Alchemy::EssenceRichtext"
-					content.essence.body = source_content.essence.body
-					when "Alchemy::EssencePicture"
-					content.essence.picture_id = source_content.essence.picture_id
-					when "Alchemy::EssenceAttachment"
-					content.essence.attachment_id = source_content.essence.attachment_id
-				end
-				content.essence.save
-			end
-		end
-		teaser = self.contents.where(:essence_type => "Alchemy::EssenceElementTeaser").first
-		if !teaser.essence.blank?
-			teaser.essence.url = url
-			teaser.essence.save
-		end
-	end
+  def update_from_element(source, url)
+    self.contents.each do |content|
+      source_content = source.contents.find_by_name(content.name)
+      if !source_content.blank? && source_content.essence_type == content.essence_type
+        case content.essence_type
+          when "Alchemy::EssenceText"
+          content.essence.body = source_content.essence.body
+          when "Alchemy::EssenceRichtext"
+          content.essence.body = source_content.essence.body
+          when "Alchemy::EssencePicture"
+          content.essence.picture_id = source_content.essence.picture_id
+          when "Alchemy::EssenceAttachment"
+          content.essence.attachment_id = source_content.essence.attachment_id
+        end
+        content.essence.save
+      end
+    end
+    teaser = self.contents.where(:essence_type => "Alchemy::EssenceElementTeaser").first
+    if !teaser.essence.blank?
+      teaser.essence.url = url
+      teaser.essence.save
+    end
+  end
 
 end

data/app/models/alchemy_crm/mailing.rb

@@ -1,93 +1,93 @@
 # encoding: UTF-8
 module AlchemyCrm
-	class Mailing < ActiveRecord::Base
-
-		MAILING_PAGE_LAYOUT_PREFIX = "newsletter_layout_"
-
-		belongs_to :page, :dependent => :destroy, :class_name => 'Alchemy::Page'
-		has_many :deliveries, :dependent => :destroy
-		has_many :recipients, :through => :deliveries
-		belongs_to :newsletter
-
-		validates_presence_of :name
-		validates_presence_of :newsletter_id, :on => :create
-
-		before_create :set_sha1
-		after_create :create_page
-
-		# Returns all contacts found via newsletter.
-		def newsletter_contacts
-			return [] if newsletter.blank?
-			newsletter.contacts
-		end
-
-		# Returns all contacts found via newsletter contacts and additional email addresses.
-		def contacts
-			(newsletter_contacts + contacts_from_additional_email_addresses).uniq
-		end
-
-		def contacts_count
-			return 0 if contacts.blank?
-			contacts.count
-		end
-
-		def contacts_not_having_email_yet
-			return contacts if recipients.empty?
-			contacts.select { |c| !recipients.collect(&:email).include?(c.email) }
-		end
-
-		# Returns a list of all email addresses for contacts that have not got any email yet.
-		def emails
-			contacts_not_having_email_yet.collect(&:email)
-		end
-
-		# Return a list of email addresses from additional_email_addresses field.
-		def additional_emails
-			return [] if additional_email_addresses.blank?
-			additional_email_addresses.gsub(/\s/,'').split(',').uniq
-		end
-
-		# Returns a list of contacts found or initialized by email address from additional_email_addresses field.
-		def contacts_from_additional_email_addresses
-			additional_emails.collect{ |email| Contact.find_or_initialize_by_email(:email => email) }
-		end
-
-		# Makes a copy of another mailing.
-		def self.copy(id)
-			source = self.find(id)
-			new(source.attributes.merge(
-				"name" => "#{source.name} (#{::I18n.t(:copy, :scope => :alchemy_crm, :default => 'Copy')})"
-			).except("id", "updated_at", "created_at", "sha1", "salt", "page_id"))
-		end
-
-		def next_pending_delivery
-			deliveries.pending.first
-		end
-
-	private
-
-		def create_page
-			mailing_root = Alchemy::Page.find_by_name('Alchemy CRM Rootpage')
-			raise "Alchemy CRM Rootpage not found. Did you seed the database?" if mailing_root.blank?
-			mailing_page = Alchemy::Page.new(
-				:name => "Mailing #{self.name}",
-				:sitemap => false,
-				:page_layout => newsletter.layout,
-				:language => Alchemy::Language.get_default,
-				:parent_id => mailing_root.id
-			)
-			if mailing_page.save
-				self.page = mailing_page
-				save
-			else
-				raise "Error while creating Mailingpage: #{mailing_page.errors.full_messages}"
-			end
-		end
-
-		def set_sha1
-			self.salt = [Array.new(6){rand(256).chr}.join].pack("m")[0..7]
-			self.sha1 = Digest::SHA1.hexdigest(Time.now.to_i.to_s + salt)
-		end
-
-	end
+  class Mailing < ActiveRecord::Base
+
+    MAILING_PAGE_LAYOUT_PREFIX = "newsletter_layout_"
+
+    belongs_to :page, :dependent => :destroy, :class_name => 'Alchemy::Page'
+    has_many :deliveries, :dependent => :destroy
+    has_many :recipients, :through => :deliveries
+    belongs_to :newsletter
+
+    validates_presence_of :name
+    validates_presence_of :newsletter_id, :on => :create
+
+    before_create :set_sha1
+    after_create :create_page
+
+    # Returns all contacts found via newsletter.
+    def newsletter_contacts
+      return [] if newsletter.blank?
+      newsletter.contacts
+    end
+
+    # Returns all contacts found via newsletter contacts and additional email addresses.
+    def contacts
+      (newsletter_contacts + contacts_from_additional_email_addresses).uniq
+    end
+
+    def contacts_count
+      return 0 if contacts.blank?
+      contacts.count
+    end
+
+    def contacts_not_having_email_yet
+      return contacts if recipients.empty?
+      contacts.select { |c| !recipients.collect(&:email).include?(c.email) }
+    end
+
+    # Returns a list of all email addresses for contacts that have not got any email yet.
+    def emails
+      contacts_not_having_email_yet.collect(&:email)
+    end
+
+    # Return a list of email addresses from additional_email_addresses field.
+    def additional_emails
+      return [] if additional_email_addresses.blank?
+      additional_email_addresses.gsub(/\s/,'').split(',').uniq
+    end
+
+    # Returns a list of contacts found or initialized by email address from additional_email_addresses field.
+    def contacts_from_additional_email_addresses
+      additional_emails.collect{ |email| Contact.find_or_initialize_by_email(:email => email) }
+    end
+
+    # Makes a copy of another mailing.
+    def self.copy(id)
+      source = self.find(id)
+      new(source.attributes.merge(
+        "name" => "#{source.name} (#{::I18n.t(:copy, :scope => :alchemy_crm, :default => 'Copy')})"
+      ).except("id", "updated_at", "created_at", "sha1", "salt", "page_id"))
+    end
+
+    def next_pending_delivery
+      deliveries.pending.first
+    end
+
+  private
+
+    def create_page
+      mailing_root = Alchemy::Page.find_by_name('Alchemy CRM Rootpage')
+      raise "Alchemy CRM root page not found. Did you seed the database?" if mailing_root.blank?
+      mailing_page = Alchemy::Page.new(
+        :name => "Mailing #{name}",
+        :sitemap => false,
+        :page_layout => newsletter.layout,
+        :language => Alchemy::Language.get_default,
+        :parent_id => mailing_root.id
+      )
+      if mailing_page.save
+        self.page = mailing_page
+        save
+      else
+        raise "Error while creating mailing page: #{mailing_page.errors.full_messages.join(' ')}"
+      end
+    end
+
+    def set_sha1
+      self.salt = [Array.new(6){rand(256).chr}.join].pack("m")[0..7]
+      self.sha1 = Digest::SHA1.hexdigest(Time.now.to_i.to_s + salt)
+    end
+
+  end
 end

data/app/models/alchemy_crm/newsletter.rb

@@ -1,48 +1,48 @@
 # encoding: UTF-8
 module AlchemyCrm
-	class Newsletter < ActiveRecord::Base
+  class Newsletter < ActiveRecord::Base
 
-		has_and_belongs_to_many :contact_groups, :join_table => 'alchemy_contact_groups_newsletters'
-		has_many :mailings
-		has_many :subscriptions
-		has_many :subscribers, :through => :subscriptions, :uniq => true, :source => :contact
+    has_and_belongs_to_many :contact_groups, :join_table => 'alchemy_contact_groups_newsletters'
+    has_many :mailings
+    has_many :subscriptions
+    has_many :subscribers, :through => :subscriptions, :uniq => true, :source => :contact
 
-		validates_presence_of :name
-		validates_presence_of :layout
+    validates_presence_of :name
+    validates_presence_of :layout
 
-		before_destroy :can_delete_mailings?
+    before_destroy :can_delete_mailings?
 
-		scope :subscribables, where(:public => true)
+    scope :subscribables, where(:public => true)
 
-		def contacts
-			(verified_contact_group_contacts + verified_subscribers).uniq
-		end
+    def contacts
+      (verified_contact_group_contacts + verified_subscribers).uniq
+    end
 
-		def contacts_count
-			return 0 if contacts.blank?
-			contacts.length
-		end
+    def contacts_count
+      return 0 if contacts.blank?
+      contacts.length
+    end
 
-		# get all uniq contacts from my contact groups
-		def verified_contact_group_contacts
-			contact_groups.collect { |contact_group| contact_group.contacts.available }.flatten.uniq
-		end
+    # get all uniq contacts from my contact groups
+    def verified_contact_group_contacts
+      contact_groups.collect { |contact_group| contact_group.contacts.available }.flatten.uniq
+    end
 
-		def humanized_name
-			"#{name} (#{contacts_count})"
-		end
+    def humanized_name
+      "#{name} (#{contacts_count})"
+    end
 
-		def verified_subscribers
-			subscribers.available.includes(:subscriptions).where(:alchemy_crm_subscriptions => {:verified => true, :wants => true})
-		end
+    def verified_subscribers
+      subscribers.available.includes(:subscriptions).where(:alchemy_crm_subscriptions => {:verified => true, :wants => true})
+    end
 
-		def can_delete_mailings?
-			raise "Cannot delete Newsletter because of referencing Mailings with IDs (#{mailings.collect(&:id).join(", ")})" if(mailings.length != 0)
-		end
+    def can_delete_mailings?
+      raise "Cannot delete Newsletter because of referencing Mailings with IDs (#{mailings.collect(&:id).join(", ")})" if(mailings.length != 0)
+    end
 
-		def layout_name
-			NewsletterLayout.display_name_for(layout)
-		end
+    def layout_name
+      NewsletterLayout.display_name_for(layout)
+    end
 
-	end
+  end
 end