alchemy_crm 2.0.4.1 → 2.0.5

data/.travis.yml

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

data/alchemy_crm.gemspec

@@ -9,6 +9,7 @@ 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")
@@ -19,7 +20,7 @@ Gem::Specification.new do |gem|
 
   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 'csv_magic', ['~> 0.2.3']
   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']

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

@@ -40,8 +40,10 @@ module AlchemyCrm
             @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"
+            export_file_as(:csv)
+          }
+          format.xls {
+            export_file_as(:xls)
           }
         end
       end
@@ -68,9 +70,13 @@ module AlchemyCrm
       end
 
       def export
-        @contact = Contact.find(params[:id])
-        @contact.to_vcard
-        send_file("#{Rails.root.to_s}/tmp/#{@contact.fullname}.vcf")
+        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
       end
 
       def autocomplete_tag_list
@@ -133,6 +139,12 @@ 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/views/alchemy_crm/admin/contacts/export.html.erb

@@ -0,0 +1,32 @@
+<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,7 +1,17 @@
-<%- 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 %>
+<% 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.html.erb

@@ -33,10 +33,12 @@
     {
       :icon => :file_download,
       :label => alchemy_crm_t(:export_contacts),
-      :url => alchemy_crm.admin_contacts_path(:format => :csv, :query => params[:query]),
+      :url => alchemy_crm.export_admin_contacts_path(:query => params[:query]),
       :title => alchemy_crm_t(:export_contacts),
-      :overlay => false,
-      :loading_indicator => false,
+      :overlay_options => {
+        :title => alchemy_crm_t(:export_contacts),
+        :size => '200x150'
+      },
       :if_permitted_to => [:index, :alchemy_crm_admin_contacts]
     }
   ]

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

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

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

data/config/locales/alchemy_crm.de.yml

@@ -53,6 +53,7 @@ de:
     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
@@ -94,6 +95,7 @@ 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'
@@ -125,16 +127,21 @@ 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
-    tags_get_created_while_tagging_contacts: 'Tags werden automatisch erstellt, sobald Sie es bei einem Kontakt das erste mal verwenden.'
+    'true': 'Ja'
     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

data/config/locales/alchemy_crm.en.yml

@@ -13,6 +13,7 @@ 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"
@@ -30,6 +31,7 @@ en:
       button_label: subscribe
     signout_form:
       button_label: unsubscribe
+    'true': 'Yes'
 
   activerecord:
     attributes:

data/config/routes.rb

@@ -43,6 +43,7 @@ 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.4.1"
+  VERSION = "2.0.5"
 end

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

@@ -5,7 +5,7 @@ module AlchemyCrm
 
     render_views
 
-    describe 'csv rendering' do
+    describe 'exporting contacts' do
 
       let(:contact) { FactoryGirl.create(:contact) }
       let(:jane)    { FactoryGirl.create(:contact, :salutation => 'ms', :firstname => 'Jane', :email => 'jane@doe.com') }
@@ -16,42 +16,90 @@ module AlchemyCrm
         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
+      context "as csv file" do
 
-      it "csv file should contain translated headers" do
-        get :index, :format => 'csv', :use_route => :alchemy_crm
-        response.body.should match /Firstname/
-      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 salutation" do
-        get :index, :format => 'csv', :use_route => :alchemy_crm
-        response.body.should match /Mr/
-      end
+        it "file should contain translated headers" do
+          get :index, :format => 'csv', :use_route => :alchemy_crm
+          response.body.should match /Firstname/
+        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 "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
 
-      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
+      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 }
 
-        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
 
-        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_crm
 version: !ruby/object:Gem::Version
-  version: 2.0.4.1
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: delayed_job_active_record
   requirement: !ruby/object:Gem::Requirement
@@ -252,10 +252,12 @@ 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
@@ -305,6 +307,7 @@ 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
@@ -418,10 +421,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3633263896018909153
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -430,7 +430,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3633263896018909153
+      hash: 1068326471216601821
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24