alchemy_crm 2.0.3 → 2.0.4.1

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - ree
 branches:
   only:
-    - master
+    - 2.0-stable
 before_script:
   - "sh -c 'cd spec/dummy && RAILS_ENV=test bundle exec rake db:schema:load'"
 script: "bundle exec rspec spec"

data/Gemfile

@@ -6,7 +6,7 @@ gemspec
 group :development do
   if !ENV["CI"]
     gem 'guard-spork'
-    gem 'ruby-debug19', :require => 'ruby-debug', :platform => :ruby_19
+    gem 'debugger', :platform => :ruby_19
     gem 'ruby-debug', :platform => :ruby_18
   end
 end
@@ -15,4 +15,5 @@ group :test do
   gem 'sqlite3'
   gem "database_cleaner"
   gem 'email_spec'
+  gem 'factory_girl'
 end

data/README.md

@@ -1,6 +1,8 @@
 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)
+
 Building and sending Newsletters has never been easier!
 
 About
@@ -20,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'
+        gem "alchemy_crm", :git => 'git://github.com/magiclabs/alchemy_crm', :branch => '2.0-stable'
 
 Or install it via Rubygems:
 
@@ -47,7 +49,7 @@ Or install it via Rubygems:
 6. Seed the database:
 
     1. Put this line into your projects `db/seeds.rb` file:
-        
+
             AlchemyCrm::Seeder.seed!
 
     2. And run this rake task:

data/alchemy_crm.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = AlchemyCrm::VERSION
 
-  gem.add_dependency 'alchemy_cms', ["~> 2.1.9"]
+  gem.add_dependency 'alchemy_cms', ["~> 2.1.12"]
   gem.add_dependency 'vcard', ['~> 0.1.1']
   gem.add_dependency 'csv_magic', ['~> 0.2.2']
   gem.add_dependency 'delayed_job_active_record', ["~> 0.3.2"]

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

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+
 module AlchemyCrm
   module Admin
     class ContactsController < AlchemyCrm::Admin::BaseController
@@ -25,6 +26,26 @@ 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 {
+            @columns = AlchemyCrm::Contact::EXPORTABLE_COLUMNS
+            send_data render_to_string, :content_type => 'text/csv', :disposition => 'attachment', :filename => "contacts-#{Time.now.strftime('%Y-%m-%d_%H-%M')}.csv"
+          }
+        end
+      end
+
       def new
         @contact = Contact.new(:country => ::I18n.locale.to_s.upcase)
         render :layout => false

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

@@ -66,7 +66,8 @@ module AlchemyCrm
       def destroy
         @delivery = Delivery.find(params[:id])
         @delivery.destroy
-        render :js => "window.location.replace('#{admin_mailings_path}'); Alchemy.growl('#{successfully_canceled_delivery}')"
+        flash[:notice] = alchemy_crm_t(:successfully_canceled_delivery)
+        render :js => "window.location.replace('#{admin_mailings_path}')"
       end
 
     private

data/app/models/alchemy_crm/contact.rb

@@ -5,7 +5,7 @@ module AlchemyCrm
 
     acts_as_taggable
 
-    attr_accessible(
+    ACCESSIBLE_ATTRIBUTES = [
       :salutation,
       :title,
       :firstname,
@@ -22,7 +22,10 @@ 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
@@ -34,7 +37,7 @@ module AlchemyCrm
       validates_presence_of field.to_sym
     end
     validates_presence_of :email
-    validates_uniqueness_of :email
+    validates_uniqueness_of :email, :if => proc { email.present? }
     validates_format_of :email, :with => ::Authlogic::Regex.email, :if => proc { errors[:email].blank? }
 
     before_save :update_sha1, :if => proc { email_sha1.blank? || email_changed? }
@@ -44,16 +47,40 @@ 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(:title, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Title'), "title"],
       [::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(: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(:company, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => 'Company'), "company"]
+      [::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"]
     ]
 
     INTERPOLATION_NAME_METHODS = %w(fullname name_with_title firstname lastname name email)

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

@@ -0,0 +1,7 @@
+<%- csv = CSV.generate(:col_sep => ";", :row_sep => "\r\n", :force_quotes => true) do |csv| -%>
+  <%- csv << @columns.map { |h| ::I18n.t(h, :scope => 'activerecord.attributes.alchemy_crm/contact', :default => h.humanize) } -%>
+  <%- @contacts.each do |contact| -%>
+    <%- csv << @columns.map { |a| value = contact.send(a).to_s.strip; a == 'salutation' && !value.blank? ? ::I18n.t(value.to_sym, :scope => 'alchemy_crm.salutations', :default => value) : value } -%>
+  <%- end -%>
+<%- end -%>
+<%=raw csv %>

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

@@ -29,6 +29,15 @@
         :size => '400x300'
       },
       :if_permitted_to => [:import, :alchemy_crm_admin_contacts]
+    },
+    {
+      :icon => :file_download,
+      :label => alchemy_crm_t(:export_contacts),
+      :url => alchemy_crm.admin_contacts_path(:format => :csv, :query => params[:query]),
+      :title => alchemy_crm_t(:export_contacts),
+      :overlay => false,
+      :loading_indicator => false,
+      :if_permitted_to => [:index, :alchemy_crm_admin_contacts]
     }
   ]
 ) %>

data/app/views/csv_magic/import_errors.html.erb

@@ -39,6 +39,6 @@
   <% end -%>
 </table>
 
-<p style="margin: 8px 0; height: 25px">>
+<p style="margin: 8px 0; height: 25px">
   <%= link_to t(:continue), admin_contacts_path, :class => 'button' %>
 </p>

data/config/locales/alchemy_crm.de.yml

@@ -52,6 +52,7 @@ 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
     fake_contact_attributes:
       firstname: Kim
       lastname: Muster
@@ -103,6 +104,7 @@ 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.'
@@ -152,10 +154,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
@@ -163,10 +165,11 @@ 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

@@ -23,6 +23,7 @@ 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:
@@ -33,10 +34,8 @@ en:
   activerecord:
     attributes:
       alchemy_crm/contact:
-        salutation: "Salutation*"
-        firstname: "Firstname*"
-        lastname: "Lastname*"
         tag_list: Tags
+        cached_tag_list: Tags
         disabled: unsubscribed
     errors:
       models:

data/lib/alchemy_crm/version.rb

@@ -1,3 +1,3 @@
 module AlchemyCrm
-  VERSION = "2.0.3"
+  VERSION = "2.0.4.1"
 end

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

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

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

@@ -1,3 +1,4 @@
+
 # 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", 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")
+        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
 
       end
 

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

@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+module AlchemyCrm
+  describe Admin::ContactsController do
+
+    render_views
+
+    describe 'csv rendering' 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
+
+      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 "csv file should contain translated headers" do
+        get :index, :format => 'csv', :use_route => :alchemy_crm
+        response.body.should match /Firstname/
+      end
+
+      it "csv 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
+
+  end
+end

data/spec/spec_helper.rb

@@ -15,6 +15,10 @@ 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

data/spec/support/factories.rb

@@ -0,0 +1,21 @@
+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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_crm
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-09-14 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.9
+        version: 2.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: 2.1.12
 - !ruby/object:Gem::Dependency
   name: vcard
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ files:
 - app/views/alchemy_crm/admin/contacts/edit.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/new.html.erb
 - app/views/alchemy_crm/admin/contacts/vcf_import_result.html.erb
@@ -359,6 +360,7 @@ 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
@@ -402,6 +404,7 @@ 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:
@@ -418,7 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1964275261730037542
+      hash: -3633263896018909153
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -427,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1964275261730037542
+      hash: -3633263896018909153
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -437,6 +440,7 @@ 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
@@ -480,3 +484,4 @@ test_files:
 - spec/models/alchemy_crm/mailing_spec.rb
 - spec/models/alchemy_crm/newsletter_spec.rb
 - spec/spec_helper.rb
+- spec/support/factories.rb