alchemy_crm 2.0.5 → 2.1.0a

data/.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 rvm:
+  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - ree
 branches:
   only:
-    - 2.0-stable
+    - master
 before_script:
-  - "sh -c 'cd spec/dummy; RAILS_ENV=test bundle exec rake db:setup'"
+  - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"
 script: "bundle exec rspec spec"

data/Gemfile

@@ -3,17 +3,17 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in alchemy_crm.gemspec
 gemspec
 
+gem "alchemy_cms", :github => "magiclabs/alchemy_cms"
+
 group :development do
   if !ENV["CI"]
     gem 'guard-spork'
-    gem 'debugger', :platform => :ruby_19
+    gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
     gem 'ruby-debug', :platform => :ruby_18
   end
 end
 
 group :test do
-  gem 'sqlite3'
   gem "database_cleaner"
   gem 'email_spec'
-  gem 'factory_girl'
 end

data/README.md

@@ -1,7 +1,7 @@
 Alchemy CRM Module
 ==================
 
-[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_crm.png?branch=2.0-stable)](http://travis-ci.org/magiclabs/alchemy_crm)
+[![Build Status](https://secure.travis-ci.org/magiclabs/alchemy_crm.png?branch=master)](http://travis-ci.org/magiclabs/alchemy_crm)
 
 Building and sending Newsletters has never been easier!
 
@@ -22,7 +22,7 @@ http://guides.alchemy-cms.com/getting_started.html
 2. Put this line into your projects `Gemfile`:
 
         # Gemfile
-        gem "alchemy_crm", :git => 'git://github.com/magiclabs/alchemy_crm', :branch => '2.0-stable'
+        gem "alchemy_crm", :git => 'git://github.com/magiclabs/alchemy_crm'
 
 Or install it via Rubygems:
 

data/alchemy_crm.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{A fully featured CRM / Newsletter and Mailings Module for Alchemy CMS.}
   gem.homepage      = "http://alchemy-cms.com"
   gem.license       = 'BSD New'
-  gem.required_ruby_version = '>= 1.9.2'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
@@ -18,15 +17,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = AlchemyCrm::VERSION
 
-  gem.add_dependency 'alchemy_cms', ["~> 2.1.12"]
+  gem.add_dependency 'alchemy_cms', ["~> 2.2.rc14"]
   gem.add_dependency 'vcard', ['~> 0.1.1']
-  gem.add_dependency 'csv_magic', ['~> 0.2.3']
+  gem.add_dependency 'csv_magic', ['~> 0.3.0']
   gem.add_dependency 'delayed_job_active_record', ["~> 0.3.2"]
   gem.add_dependency 'acts-as-taggable-on', ['~> 2.1.0']
   gem.add_dependency 'rails3-jquery-autocomplete', ['~> 1.0.4']
   gem.add_dependency "magic-localized_country_select", ["~> 0.2.0"]
 
-  gem.add_development_dependency 'rspec-rails', ["~> 2.8.0"]
-  gem.add_development_dependency 'sqlite3', ["~> 1.3.5"]
+  gem.add_development_dependency(%q<rspec-rails>)
+  gem.add_development_dependency(%q<sqlite3>)
 
 end

data/app/controllers/alchemy_crm/admin/contacts_controller.rb

@@ -1,5 +1,4 @@
 # encoding: UTF-8
-
 module AlchemyCrm
   module Admin
     class ContactsController < AlchemyCrm::Admin::BaseController
@@ -26,28 +25,6 @@ module AlchemyCrm
 
       before_filter :load_tags, :only => [:new, :edit]
 
-      def index
-        if params[:query].blank?
-          @contacts = Contact.scoped
-        else
-          search_terms = ActiveRecord::Base.sanitize("%#{params[:query]}%")
-          @contacts = Contact.where(Contact::SEARCHABLE_ATTRIBUTES.map { |attribute|
-            "#{Contact.table_name}.#{attribute} LIKE #{search_terms}"
-          }.join(" OR "))
-        end
-        respond_to do |format|
-          format.html {
-            @contacts = @contacts.page(params[:page] || 1).per(per_page_value_for_screen_size)
-          }
-          format.csv {
-            export_file_as(:csv)
-          }
-          format.xls {
-            export_file_as(:xls)
-          }
-        end
-      end
-
       def new
         @contact = Contact.new(:country => ::I18n.locale.to_s.upcase)
         render :layout => false
@@ -70,13 +47,9 @@ module AlchemyCrm
       end
 
       def export
-        if params[:id].present?
-          @contact = Contact.find(params[:id])
-          @contact.to_vcard
-          send_file("#{Rails.root.to_s}/tmp/#{@contact.fullname}.vcf")
-        else
-          render :layout => false
-        end
+        @contact = Contact.find(params[:id])
+        @contact.to_vcard
+        send_file("#{Rails.root.to_s}/tmp/#{@contact.fullname}.vcf")
       end
 
       def autocomplete_tag_list
@@ -139,12 +112,6 @@ module AlchemyCrm
         content.starts_with?("BEGIN:VCARD")
       end
 
-      def export_file_as(format)
-        @columns = AlchemyCrm::Contact::EXPORTABLE_COLUMNS
-        filename = "#{AlchemyCrm::Contact.model_name.human(:count => @contacts.count)}-#{Time.now.strftime('%Y-%m-%d_%H-%M')}"
-        send_data render_to_string, :type => format.to_sym, :filename => "#{filename}.#{format}"
-      end
-
     end
   end
 end

data/app/controllers/alchemy_crm/admin/mailings_controller.rb

@@ -28,7 +28,7 @@ module AlchemyCrm
       end
 
       def update
-        @mailing.update_attributes(params[:mailing], :as => current_user.role.to_sym)
+        @mailing.update_attributes(params[:mailing])
         render_errors_or_redirect(
           @mailing,
           :back,

data/app/helpers/alchemy/pages_helper_extension.rb

@@ -6,9 +6,9 @@ Alchemy::PagesHelper.module_eval do
     }
     options = default_options.merge(options)
     if @page.layout_description['newsletter']
-      render :partial => "alchemy/newsletter_layouts/#{@page.page_layout.downcase}.#{options[:render_format]}.erb"
+      render :partial => "alchemy/newsletter_layouts/#{@page.page_layout.downcase}", :format => options[:render_format]
     else
-      render :partial => "alchemy/page_layouts/#{@page.page_layout.downcase}.#{options[:render_format]}.erb"
+      render :partial => "alchemy/page_layouts/#{@page.page_layout.downcase}", :format => options[:render_format]
     end
   rescue ActionView::MissingTemplate
     warning("PageLayout: '#{@page.page_layout}' not found. Rendering standard page_layout.")

data/app/helpers/alchemy_crm/mailings_helper.rb

@@ -4,19 +4,19 @@ module AlchemyCrm
     include Alchemy::PagesHelper
 
     # Renders the newsletter layout for +@mailing.page+
-    # 
+    #
     # The +@mailing.page.page_layout+ must have a +newsletter_layout+ prefix.
     # The partial itself is named without the +newsletter_layout+ prefix.
     # The partial resists in +/app/views/newsletter_layouts/+
-    # 
+    #
     # === Example:
-    # 
+    #
     # Given a mailing page with a +standard+ layout has partials named +_standard.html.erb+ and +_standard.text.erb+
     # But the page page_layout attribute is +newsletter_layout_standard+
-    # 
+    #
     def render_newsletter_layout(options={})
       options = {:format => 'html'}.update(options)
-      render "alchemy/newsletter_layouts/#{@page.page_layout.downcase.gsub(Regexp.new(Mailing::MAILING_PAGE_LAYOUT_PREFIX), '')}.#{options[:format]}.erb"
+      render :partial => "alchemy/newsletter_layouts/#{@page.page_layout.downcase.gsub(Regexp.new(Mailing::MAILING_PAGE_LAYOUT_PREFIX), '')}", :format => options[:format]
     end
 
     # Renders the tracking image that records the receivement of the mailing inside the mail client.
@@ -32,23 +32,23 @@ module AlchemyCrm
     end
 
     # Renders a link to the unsubscribe page.
-    # 
+    #
     # Please notice that you have to create a page with a +newsletter_signout+ page layout and this page has to be public.
-    # 
+    #
     # The text inside the link is translated.
-    # 
+    #
     # === Example translation:
-    # 
+    #
     #   de:
     #     alchemy_crm:
     #       unsubscribe: 'abmelden'
-    # 
+    #
     # === Options:
-    # 
+    #
     #   html_options [Hash] # Passed to the link. Useful for styling the link with inline css.
-    # 
+    #
     # You can pass an optional block thats gets passed to +link_to+
-    # 
+    #
     def link_to_unsubscribe_page(html_options={})
       text = ::I18n.t(:unsubscribe, :scope => :alchemy_crm)
       if block_given?
@@ -77,20 +77,20 @@ module AlchemyCrm
     end
 
     # Renders a notice to open the mailing inside a browser, if it does not displays correctly.
-    # 
+    #
     # The notice and the link inside are translated via I18n.
-    # 
+    #
     # === Example translation:
-    # 
+    #
     #   de:
     #     alchemy_crm:
     #       here: 'hier'
     #       read_in_browser_notice: "Falls der Newsletter nicht richtig dargestellt wird, klicken Sie bitte %{link}."
-    # 
+    #
     # === Options:
-    # 
+    #
     #   html_options [Hash] # Passed to the link. Useful for styling the link with inline css.
-    # 
+    #
     def read_in_browser_notice(html_options = {})
       return "" if @recipient.nil?
       ::I18n.t(
@@ -110,35 +110,35 @@ module AlchemyCrm
     end
 
     # Use this helper to render an image from your server.
-    # 
+    #
     # The notice and the link inside are translated via I18n.
-    # 
+    #
     # === Example:
-    # 
+    #
     #   <%= image_from_server_tag('logo.png', :alt => 'Logo', :width => 230, :height => 116, :style => 'outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;') %>
     #   => <img src="http://example.com/assets/logo.png"
-    #  
+    #
     # === Options:
-    # 
+    #
     #   html_options [Hash] # Passed to the image_tag helper.
-    # 
+    #
     def image_from_server_tag(image, html_options={})
       image_tag([current_server, Rails.application.config.assets.prefix, image].join('/'), html_options)
     end
 
     # Renders a link that tracks the reaction of a recipient.
-    # 
+    #
     # After getting tracked the controller redirects to the url passed in.
-    # 
+    #
     # It has the same arguments that the Rails +link_to+ helper has.
-    # 
+    #
     # === Example:
-    # 
+    #
     #   <%= tracked_link_tag('read more', :r => 'http://example.com/my-article', :style => 'color: black') %>
     #   => <a href="http://example.com/recipient/s3cr3tSh41/reacts?r=http%3A%2F%2Fexample.com%2Fmy-article" style="color: black">
-    # 
+    #
     # *NOTE:* You can even pass a block like you could for +link_to+ helper from Rails.
-    # 
+    #
     def tracked_link_tag(*args)
       if block_given?
         link_to(tracked_url_for(args.first), args.last) do

data/app/models/alchemy_crm/contact.rb

@@ -5,7 +5,7 @@ module AlchemyCrm
 
     acts_as_taggable
 
-    ACCESSIBLE_ATTRIBUTES = [
+    attr_accessible(
       :salutation,
       :title,
       :firstname,
@@ -22,10 +22,7 @@ module AlchemyCrm
       :verified,
       :disabled,
       :tag_list
-    ]
-
-    attr_accessible(*ACCESSIBLE_ATTRIBUTES)
-    attr_accessible(*ACCESSIBLE_ATTRIBUTES, :as => :admin)
+    )
 
     has_many :subscriptions, :dependent => :destroy
     has_many :newsletters, :through => :subscriptions, :uniq => true
@@ -47,40 +44,16 @@ module AlchemyCrm
     scope :enabled, where(:disabled => false)
     scope :available, verified.enabled
 
-    SEARCHABLE_ATTRIBUTES = [
-      "salutation",
-      "title",
-      "firstname",
-      "lastname",
-      "company",
-      "address",
-      "zip",
-      "city",
-      "country",
-      "email",
-      "phone",
-      "mobile",
-      "cached_tag_list"
-    ]
-
-    EXPORTABLE_COLUMNS = SEARCHABLE_ATTRIBUTES + [
-      "verified",
-      "disabled"
-    ]
-
     COLUMN_NAMES = [
-      [::I18n.t(:salutation, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Salutation'), "salutation"],
       [::I18n.t(:title, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Title'), "title"],
+      [::I18n.t(:salutation, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Salutation'), "salutation"],
       [::I18n.t(:firstname, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Firstname'), "firstname"],
       [::I18n.t(:lastname, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Lastname'), "lastname"],
-      [::I18n.t(:company, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Company'), "company"],
       [::I18n.t(:address, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Address'), "address"],
       [::I18n.t(:zip, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Zipcode'), "zip"],
       [::I18n.t(:city, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'City'), "city"],
       [::I18n.t(:country, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Country'), "country"],
-      [::I18n.t(:email, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Email'), "email"],
-      [::I18n.t(:phone, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Phone'), "phone"],
-      [::I18n.t(:mobile, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Mobile'), "mobile"]
+      [::I18n.t(:company, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Company'), "company"]
     ]
 
     INTERPOLATION_NAME_METHODS = %w(fullname name_with_title firstname lastname name email)

data/app/models/alchemy_crm/contact_group.rb

@@ -2,6 +2,12 @@
 module AlchemyCrm
   class ContactGroup < ActiveRecord::Base
 
+    attr_accessible(
+      :name,
+      :contact_tag_list,
+      :filters_attributes
+    )
+
     acts_as_taggable_on :contact_tags
 
     has_many :filters, :dependent => :destroy, :class_name => "AlchemyCrm::ContactGroupFilter"

data/app/models/alchemy_crm/contact_group_filter.rb

@@ -2,6 +2,12 @@
 module AlchemyCrm
   class ContactGroupFilter < ActiveRecord::Base
 
+    attr_accessible(
+      :column,
+      :operator,
+      :value
+    )
+
     belongs_to :contact_group
 
     OPERATORS = [

data/app/models/alchemy_crm/delivery.rb

@@ -2,6 +2,12 @@
 module AlchemyCrm
   class Delivery < ActiveRecord::Base
 
+    attr_accessible(
+      :mailing_id,
+      :deliver_at,
+      :mailing
+    )
+
     attr_accessor :chunk_delay
 
     belongs_to :mailing

data/app/models/alchemy_crm/mailing.rb

@@ -2,6 +2,15 @@
 module AlchemyCrm
   class Mailing < ActiveRecord::Base
 
+    attr_accessible(
+      :newsletter_id,
+      :name,
+      :subject,
+      :additional_email_addresses,
+      :creator_id,
+      :updater_id
+    )
+
     MAILING_PAGE_LAYOUT_PREFIX = "newsletter_layout_"
 
     belongs_to :page, :dependent => :destroy, :class_name => 'Alchemy::Page'

data/app/models/alchemy_crm/newsletter.rb

@@ -2,6 +2,13 @@
 module AlchemyCrm
   class Newsletter < ActiveRecord::Base
 
+    attr_accessible(
+      :name,
+      :layout,
+      :public,
+      :contact_group_ids
+    )
+
     has_and_belongs_to_many :contact_groups, :join_table => 'alchemy_contact_groups_newsletters'
     has_many :mailings
     has_many :subscriptions

data/app/models/alchemy_crm/recipient.rb

@@ -1,6 +1,11 @@
 module AlchemyCrm
   class Recipient < ActiveRecord::Base
 
+    attr_accessible(
+      :email,
+      :contact
+    )
+
     belongs_to :delivery
     belongs_to :contact
     has_many :reactions

data/app/views/alchemy_crm/admin/contact_groups/index.html.erb

@@ -35,7 +35,7 @@
     <th class="tools" style="width: 40px"></th>
   </tr>
   <%- end -%>
-  <%= render @contact_groups %>
+  <%= render :partial => "alchemy_crm/admin/contact_groups/contact_group", :collection => @contact_groups %>
 </table>
 
 <%= render 'alchemy/admin/partials/pagination_links', :items => @contact_groups, :scope => alchemy_crm %>

data/app/views/alchemy_crm/admin/contacts/index.html.erb

@@ -29,17 +29,6 @@
         :size => '400x300'
       },
       :if_permitted_to => [:import, :alchemy_crm_admin_contacts]
-    },
-    {
-      :icon => :file_download,
-      :label => alchemy_crm_t(:export_contacts),
-      :url => alchemy_crm.export_admin_contacts_path(:query => params[:query]),
-      :title => alchemy_crm_t(:export_contacts),
-      :overlay_options => {
-        :title => alchemy_crm_t(:export_contacts),
-        :size => '200x150'
-      },
-      :if_permitted_to => [:index, :alchemy_crm_admin_contacts]
     }
   ]
 ) %>
@@ -57,6 +46,6 @@
     <th class="tools" style="width: 60px"></th>
   </tr>
   <%- end -%>
-  <%= render @contacts %>
+  <%= render :partial => "alchemy_crm/admin/contacts/contact", :collection => @contacts %>
 </table>
 <%= render 'alchemy/admin/partials/pagination_links', :items => @contacts, :scope => alchemy_crm %>

data/app/views/alchemy_crm/admin/deliveries/index.html.erb

@@ -21,7 +21,7 @@
         <th class="center"><%= translate_model_attribute(:delivery, :delivered?) %></th>
         <th class="center"><%= alchemy_crm_t(:statistics) %></th>
       </tr>
-      <%= render @deliveries %>
+      <%= render :partial => "alchemy_crm/admin/deliveries/delivery", :collection => @deliveries %>
     </table>
   </div>
 </div>

data/app/views/alchemy_crm/admin/mailings/index.html.erb

@@ -34,6 +34,6 @@
     <th class="tools" style="width: 88px"></th>
   </tr>
   <%- end -%>
-  <%= render @mailings %>
+  <%= render :partial => "alchemy_crm/admin/mailings/mailing", :collection => @mailings %>
 </table>
 <%= render 'alchemy/admin/partials/pagination_links', :items => @mailings %>

data/app/views/alchemy_crm/admin/newsletters/index.html.erb

@@ -36,7 +36,7 @@
     <th class="tools" style="width: 44px"></th>
   </tr>
   <%- end -%>
-  <%= render @newsletters %>
+  <%= render :partial => "alchemy_crm/admin/newsletters/newsletter", :collection => @newsletters %>
 </table>
 
 <%= render 'alchemy/admin/partials/pagination_links', :items => @newsletters, :scope => alchemy_crm %>

data/config/locales/alchemy_crm.de.yml

@@ -52,8 +52,6 @@ de:
     errors_while_importing: 'Es sind Fehler beim Importieren aufgetaucht!'
     errors_while_importing_contacts: 'Diese Kontakte konnten auf Grund von Fehlern nicht importiert werden:'
     export_contact: Kontakt exportieren
-    export_contacts: Kontakte exportieren
-    'false': ''
     fake_contact_attributes:
       firstname: Kim
       lastname: Muster
@@ -95,7 +93,6 @@ de:
     or_replace_it_with_an_existing_tag: 'Oder Sie ersetzen es durch ein vorhandenes Tag'
     please_check_highlighted_vcards_on_errors: "Bitte überprüfen Sie die markierten Visitenkarten auf Fehler."
     please_choose: 'Bitte wählen'
-    'Please choose format': 'Bitte wählen Sie ein Format'
     please_confirm: Bitte bestätigen
     read_in_browser_notice: "Falls der Newsletter nicht richtig dargestellt wird, klicken Sie bitte %{link}."
     remove_filter: 'Filter entfernen'
@@ -106,7 +103,6 @@ de:
     salutations:
       mr: Herr
       ms: Frau
-      mrs: Frau
     sent_mailings: 'Versendete Mailings'
     seperate_tags_with_comma: 'Mehrere Tags mit Komma trennen.'
     seperate_emails_with_comma: 'Die E-Mail-Adressen bitte mit Komma trennen.'
@@ -127,21 +123,16 @@ de:
     signout_form:
       button_label: abbestellen
     statistics: Statistiken
-    tags_get_created_while_tagging_contacts: 'Tags werden automatisch erstellt, sobald Sie es bei einem Kontakt das erste mal verwenden.'
     this_mailing_has_not_been_delivered_yet: 'Dieses Mailing wurde noch nie versendet'
     this_list_shows_all_deliveries: Dies ist eine Liste aller Sendungen dieses Mailings
     total_recipients_count: Empfänger insgesamt
-    'true': 'Ja'
+    tags_get_created_while_tagging_contacts: 'Tags werden automatisch erstellt, sobald Sie es bei einem Kontakt das erste mal verwenden.'
     without: ohne
     you_can_rename_this_tag: "Sie können dieses Tag umbenennen"
     you_can_open_statistics_for_delivered_mailings: Für bereits versendete Mailings können Statistiken aufgerufen werden
     you_have_no_contact_groups_yet: 'Sie haben noch keine Empfänger Zielgruppen gebildet'
 
   activerecord:
-    models:
-      alchemy_crm/contact:
-        one: Kontakt
-        other: Kontakte
     attributes:
       acts_as_taggable_on/tag:
         contacts_count: Anzahl der Kontakte
@@ -161,10 +152,10 @@ de:
         contact_group_contacts_count: Anzahl der Zielgruppenkontakte
         contact_groups: Zielgruppen
       alchemy_crm/contact:
-        salutation: Anrede
+        salutation: "Anrede*"
         title: Titel
-        firstname: Vorname
-        lastname: Name
+        firstname: "Vorname*"
+        lastname: "Name*"
         company: Firma
         address: Adresse
         zip: PLZ
@@ -172,11 +163,10 @@ de:
         country: Land
         phone: Telefon
         mobile: Mobil
-        email: E-Mail
+        email: "E-Mail*"
         verified: verifiziert
         disabled: abgemeldet
         tag_list: Tags
-        cached_tag_list: Tags
       alchemy_crm/contact_group:
         contacts_count: Anzahl der Kontakte
     errors:

data/config/locales/alchemy_crm.en.yml

@@ -13,7 +13,6 @@ en:
       csv_format: 'A comma seperated file (.csv) with a list of contacts'
     import_format_notice: 'You may import '
     invalid_file_type: 'Invalid file type: %{mime_type}'
-    'false': ''
     text_interpolation_notice: "Tip: You can insert the contact's name with %{name}."
     mail_text_interpolation_notice: "Tip: You can insert the contact's name with %{name}. Please insert the confirmation link with %{link}."
     mandatory_fields: "*Mandatory"
@@ -24,20 +23,20 @@ en:
     salutations:
       mr: Mr
       ms: Ms
-      mrs: Mrs
     show_as_plain_text: "Show as plain text"
     show_statistics: "Statistics for %{name} from %{date}"
     subscribe_form:
       button_label: subscribe
     signout_form:
       button_label: unsubscribe
-    'true': 'Yes'
 
   activerecord:
     attributes:
       alchemy_crm/contact:
+        salutation: "Salutation*"
+        firstname: "Firstname*"
+        lastname: "Lastname*"
         tag_list: Tags
-        cached_tag_list: Tags
         disabled: unsubscribed
     errors:
       models:

data/config/routes.rb

@@ -43,7 +43,6 @@ AlchemyCrm::Engine.routes.draw do
     resources :contacts do
       collection do
         get :import
-        get :export
         get :autocomplete_tag_list
         post :import
       end

data/lib/alchemy_crm/version.rb

@@ -1,3 +1,3 @@
 module AlchemyCrm
-  VERSION = "2.0.5"
+  VERSION = "2.1.0a"
 end

data/lib/generators/alchemy_crm/scaffold/files/elements.yml

@@ -1,4 +1,3 @@
-
 # These elements are added by the Alchemy CRM module.
 
 - name: newsletter_signup_form

data/lib/generators/alchemy_crm/scaffold/files/page_layouts.yml

@@ -1,4 +1,3 @@
-
 # These page layouts are added by the Alchemy CRM module.
 
 - name: newsletter_signup

data/lib/generators/alchemy_crm/scaffold/scaffold_generator.rb

@@ -16,8 +16,8 @@ module AlchemyCrm
         copy_file "newsletters.text.erb", "#{Rails.root}/app/views/layouts/alchemy/newsletters.text.erb"
         copy_file "newsletter_layouts.yml", "#{Rails.root}/config/alchemy/newsletter_layouts.yml"
 
-        append_file "#{Rails.root}/config/alchemy/elements.yml", File.open(File.expand_path('files/elements.yml', File.dirname(__FILE__))).read
-        append_file "#{Rails.root}/config/alchemy/page_layouts.yml", File.open(File.expand_path('files/page_layouts.yml', File.dirname(__FILE__))).read
+        append_file "#{Rails.root}/config/alchemy/elements.yml", YAML.load_file(File.expand_path('files/elements.yml', File.dirname(__FILE__))).to_yaml.gsub(/^-{3}\s{2}/, "\n# These elements are added by the Alchemy CRM module.\n\n")
+        append_file "#{Rails.root}/config/alchemy/page_layouts.yml", YAML.load_file(File.expand_path('files/page_layouts.yml', File.dirname(__FILE__))).to_yaml.gsub(/^^-{3}\s{2}/, "\n# These page layouts are added by the Alchemy CRM module.\n\n")
 
       end
 

data/spec/spec_helper.rb

@@ -15,10 +15,6 @@ def configure
   require "rails/test_help"
   require "rspec/rails"
   require "email_spec"
-  require 'factory_girl'
-
-  require 'authlogic/test_case'
-  include Authlogic::TestCase
 
   ActionMailer::Base.delivery_method = :test
   ActionMailer::Base.perform_deliveries = true

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_crm
 version: !ruby/object:Gem::Version
-  version: 2.0.5
-  prerelease: 
+  version: 2.1.0a
+  prerelease: 5
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-25 00:00:00.000000000 Z
+date: 2012-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.rc14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.rc14
 - !ruby/object:Gem::Dependency
   name: vcard
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -128,33 +128,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '0'
 description: A fully featured CRM / Newsletter and Mailings Module for Alchemy CMS.
   Building and sending Newsletters has never been easier!
 email:
@@ -252,12 +252,9 @@ files:
 - app/views/alchemy_crm/admin/contacts/_form.html.erb
 - app/views/alchemy_crm/admin/contacts/destroy.rjs
 - app/views/alchemy_crm/admin/contacts/edit.html.erb
-- app/views/alchemy_crm/admin/contacts/export.html.erb
 - app/views/alchemy_crm/admin/contacts/import.html.erb
 - app/views/alchemy_crm/admin/contacts/import.js.erb
-- app/views/alchemy_crm/admin/contacts/index.csv.erb
 - app/views/alchemy_crm/admin/contacts/index.html.erb
-- app/views/alchemy_crm/admin/contacts/index.xls.erb
 - app/views/alchemy_crm/admin/contacts/new.html.erb
 - app/views/alchemy_crm/admin/contacts/vcf_import_result.html.erb
 - app/views/alchemy_crm/admin/deliveries/_delivery.html.erb
@@ -307,7 +304,6 @@ files:
 - config/authorization_rules.rb
 - config/initializers/assets.rb
 - config/initializers/delayed_job.rb
-- config/initializers/xls_mime_type.rb
 - config/locales/alchemy.de.yml
 - config/locales/alchemy.en.yml
 - config/locales/alchemy_crm.de.yml
@@ -363,7 +359,6 @@ files:
 - lib/tasks/routes.rake
 - spec/alchemy_mailings_spec.rb
 - spec/config_spec.rb
-- spec/controllers/alchemy_crm/admin/contacts_controller_spec.rb
 - spec/controllers/alchemy_crm/contacts_controller_spec.rb
 - spec/controllers/alchemy_crm/mailings_controller_spec.rb
 - spec/controllers/alchemy_crm/recipients_controller_spec.rb
@@ -407,7 +402,6 @@ files:
 - spec/models/alchemy_crm/mailing_spec.rb
 - spec/models/alchemy_crm/newsletter_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories.rb
 - vendor/assets/javascripts/autocomplete-rails.js
 homepage: http://alchemy-cms.com
 licenses:
@@ -421,16 +415,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '0'
+      segments:
+      - 0
+      hash: 4506134847143980101
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 1068326471216601821
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -440,7 +434,6 @@ summary: A fully featured CRM / Newsletter and Mailings Module for Alchemy CMS.
 test_files:
 - spec/alchemy_mailings_spec.rb
 - spec/config_spec.rb
-- spec/controllers/alchemy_crm/admin/contacts_controller_spec.rb
 - spec/controllers/alchemy_crm/contacts_controller_spec.rb
 - spec/controllers/alchemy_crm/mailings_controller_spec.rb
 - spec/controllers/alchemy_crm/recipients_controller_spec.rb
@@ -484,4 +477,3 @@ test_files:
 - spec/models/alchemy_crm/mailing_spec.rb
 - spec/models/alchemy_crm/newsletter_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories.rb

data/app/views/alchemy_crm/admin/contacts/export.html.erb

@@ -1,32 +0,0 @@
-<div class="with_padding">
-  <p><%= alchemy_crm_t('Please choose format') %></p>
-  <table id="export_format">
-    <tr>
-      <td class="submit">
-        <%= link_to(
-          'Excel',
-          alchemy_crm.admin_contacts_path(
-            :format => :xls,
-            :query => params[:query]
-          ),
-          :class => 'button'
-        ) %>
-      </td>
-    </tr>
-    <tr>
-      <td class="submit">
-        <%= link_to(
-          'CSV',
-          alchemy_crm.admin_contacts_path(
-            :format => :csv,
-            :query => params[:query]
-          ),
-          :class => 'button'
-        ) %>
-      </td>
-    </tr>
-  </table>
-</div>
-<script type="text/javascript">
-  $('.button', '#export_format').on('click', Alchemy.closeCurrentWindow);
-</script>

data/app/views/alchemy_crm/admin/contacts/index.csv.erb

@@ -1,17 +0,0 @@
-<% csv = CSV.generate(:col_sep => ";", :row_sep => "\r\n", :force_quotes => true) do |csv| %>
-  <% csv << @columns.map { |h| AlchemyCrm::Contact.human_attribute_name(h) } %>
-  <% @contacts.each do |contact| %>
-    <%
-    csv << @columns.map do |a|
-      value = contact.send(a).to_s.strip
-      if a == 'salutation' && !value.blank?
-        ::I18n.t(value.to_sym, :scope => 'alchemy_crm.salutations', :default => value)
-      elsif !value.blank? && a == 'verified' || a == 'disabled'
-        alchemy_crm_t(value.to_sym)
-      else
-        value
-      end
-    end %>
-  <% end %>
-<% end %>
-<%= raw csv %>

data/app/views/alchemy_crm/admin/contacts/index.xls.erb

@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
-  xmlns:o="urn:schemas-microsoft-com:office:office"
-  xmlns:x="urn:schemas-microsoft-com:office:excel"
-  xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
-  xmlns:html="http://www.w3.org/TR/REC-html40">
-  <Worksheet ss:Name="<%= AlchemyCrm::Contact.model_name.human(:count => @contacts.count) -%>">
-    <Table>
-      <Row>
-      <% @columns.each do |col| %>
-        <Cell>
-          <Data ss:Type="String"><%= AlchemyCrm::Contact.human_attribute_name(col) %></Data>
-        </Cell>
-      <% end %>
-      </Row>
-    <% @contacts.each do |contact| %>
-      <Row>
-      <% @columns.each do |col| %>
-        <% value = contact.send(col).to_s.strip %>
-        <Cell>
-        <% if col == 'salutation' && !value.blank? %>
-          <Data ss:Type="String"><%= ::I18n.t(value.to_sym, :scope => 'alchemy_crm.salutations', :default => value) %></Data>
-        <% elsif !value.blank? && (col == 'verified' || col == 'disabled') %>
-          <Data ss:Type="String"><%= alchemy_crm_t(value) %></Data>
-        <% else %>
-          <Data ss:Type="String"><%= value %></Data>
-        <% end %>
-        </Cell>
-      <% end %>
-      </Row>
-    <% end %>
-    </Table>
-  </Worksheet>
-</Workbook>

data/config/initializers/xls_mime_type.rb

@@ -1 +0,0 @@
-Mime::Type.register "application/xls", :xls

data/spec/controllers/alchemy_crm/admin/contacts_controller_spec.rb

@@ -1,110 +0,0 @@
-require 'spec_helper'
-
-module AlchemyCrm
-  describe Admin::ContactsController do
-
-    render_views
-
-    describe 'exporting contacts' do
-
-      let(:contact) { FactoryGirl.create(:contact) }
-      let(:jane)    { FactoryGirl.create(:contact, :salutation => 'ms', :firstname => 'Jane', :email => 'jane@doe.com') }
-
-      before do
-        activate_authlogic
-        Alchemy::UserSession.create FactoryGirl.create(:admin_user)
-        contact
-      end
-
-      context "as csv file" do
-
-        it "should return contacts as attached csv file" do
-          get :index, :format => 'csv', :use_route => :alchemy_crm
-          response.content_type.should == 'text/csv'
-          response.headers['Content-Disposition'].should match /attachment/
-        end
-
-        it "file should contain translated headers" do
-          get :index, :format => 'csv', :use_route => :alchemy_crm
-          response.body.should match /Firstname/
-        end
-
-        it "file should contain translated salutation" do
-          get :index, :format => 'csv', :use_route => :alchemy_crm
-          response.body.should match /Mr/
-        end
-
-        it "contacts shouldn't be paginated" do
-          jane
-          controller.stub!(:per_page_value_for_screen_size).and_return(1)
-          get :index, :format => 'csv', :use_route => :alchemy_crm
-          response.body.should match /Jane/
-        end
-
-        it "filename should contain timestamp" do
-          get :index, :format => 'csv', :use_route => :alchemy_crm
-          response.headers['Content-Disposition'].should match /[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}-[0-9]{2}/
-        end
-
-        context "with search query" do
-
-          before { jane }
-
-          it "should return only the matched contacts" do
-            get :index, :format => 'csv', :use_route => :alchemy_crm, :query => 'Jon'
-            response.body.should match /Jon/
-            response.body.should_not match /Jane/
-          end
-
-        end
-
-      end
-
-      context "as xls file" do
-
-        it "should return contacts as attached xls file" do
-          get :index, :format => 'xls', :use_route => :alchemy_crm
-          response.content_type.should == 'application/xls'
-          response.headers['Content-Disposition'].should match /attachment/
-        end
-
-        it "file should contain translated headers" do
-          get :index, :format => 'xls', :use_route => :alchemy_crm
-          response.body.should match /Firstname/
-        end
-
-        it "file should contain translated salutation" do
-          get :index, :format => 'xls', :use_route => :alchemy_crm
-          response.body.should match /Mr/
-        end
-
-        it "contacts shouldn't be paginated" do
-          jane
-          controller.stub!(:per_page_value_for_screen_size).and_return(1)
-          get :index, :format => 'xls', :use_route => :alchemy_crm
-          response.body.should match /Jane/
-        end
-
-        it "filename should contain timestamp" do
-          get :index, :format => 'xls', :use_route => :alchemy_crm
-          response.headers['Content-Disposition'].should match /[0-9]{4}-[0-9]{2}-[0-9]{2}_[0-9]{2}-[0-9]{2}/
-        end
-
-        context "with search query" do
-
-          before { jane }
-
-          it "should return only the matched contacts" do
-            get :index, :format => 'xls', :use_route => :alchemy_crm, :query => 'Jon'
-            response.body.should match /Jon/
-            response.body.should_not match /Jane/
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-end

data/spec/support/factories.rb

@@ -1,21 +0,0 @@
-FactoryGirl.define do
-
-  factory :user, :class => 'Alchemy::User' do
-    email 'john@doe.com'
-    login "jdoe"
-    password 's3cr3t'
-    password_confirmation 's3cr3t'
-
-    factory :admin_user do
-      role "admin"
-    end
-  end
-
-  factory :contact, :class => 'AlchemyCrm::Contact' do
-    salutation 'mr'
-    firstname  'Jon'
-    lastname   'Doe'
-    email      'jon@doe.com'
-  end
-
-end