fat_free_crm 0.11.1 → 0.11.2

data/lib/fat_free_crm/permissions.rb

@@ -32,26 +32,13 @@ module FatFreeCRM
           # to implement Recycle Bin/Restore and 2) to honor permissions when
           # displaying "object deleted..." in the activity log.
           #
-          has_many :permissions, :as => :asset, :include => :user
-          #
-          # The :my named scope accepts an optional Hash. For example:
-          #   Account.my(:user => User.first, :order => "updated_at DESC", :limit => 20)
-          #
-          # The defaults are:
-          #   :user  => currenly logged in user
-          #   :order => primary key descending
-          #   :limit => none
-          #
-          scope :my, lambda { |*args|
-            options = args[0] || {}
-            includes(:permissions).
-            where("#{quoted_table_name}.user_id     = :user OR " <<
-                  "#{quoted_table_name}.assigned_to = :user OR " <<
-                  "permissions.user_id              = :user OR " <<
-                  "#{quoted_table_name}.access = 'Public'", :user => options[:user] || User.current_user).
-            order(options[:order] || "#{quoted_table_name}.id DESC").
-            limit(options[:limit]) # nil selects all records
+          has_many :permissions, :as => :asset
+
+          scope :my, lambda {
+            current_ability = Ability.new(User.current_user)
+            accessible_by(current_ability).readonly(false)
           }
+
           include FatFreeCRM::Permissions::InstanceMethods
           extend  FatFreeCRM::Permissions::SingletonMethods
         end

data/lib/fat_free_crm/renderers.rb

@@ -28,11 +28,3 @@ ActionController::Renderers.add :xls do |obj, options|
   send_data str, :type => :xls,
     :disposition => "attachment; filename=#{filename}.xls"
 end
-
-ActionController::Renderers.add :atom do |obj, options|
-  render 'shared/index.atom.builder'
-end
-
-ActionController::Renderers.add :rss do |obj, options|
-  render 'shared/index.rss.builder'
-end

data/lib/fat_free_crm/tabs.rb

@@ -19,7 +19,7 @@ module FatFreeCRM
   class Tabs
     cattr_accessor :main
     cattr_accessor :admin
-    
+
     # Class methods.
     #----------------------------------------------------------------------------
     class << self

data/lib/fat_free_crm/version.rb

@@ -19,7 +19,7 @@ module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 11
-    TINY  = 1
+    TINY  = 2
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/plugins/country_select/lib/country_select.rb

@@ -21,8 +21,8 @@ module ActionView
         country_options += options_for_select(priority_countries, selected)
         country_options += "<option value=\"\" disabled=\"disabled\">-------------</option>\n"
 
-        other_countries = COUNTRIES.select{|c| !priority_countries.include?(c[0]) } 
-        return country_options + options_for_select(other_countries, selected)
+        other_countries = COUNTRIES.select{|c| !priority_countries.include?(c[0]) }
+        return (country_options + options_for_select(other_countries, selected)).html_safe
       end
       # All the countries included in the country_options output.
 

data/lib/tasks/mail_processing.rake

@@ -0,0 +1,60 @@
+# Fat Free CRM
+# Copyright (C) 2008-2011 by Michael Dvorkin
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#------------------------------------------------------------------------------
+
+namespace :ffcrm do
+  namespace :dropbox do
+    desc "Run dropbox crawler and process incoming emails"
+    task :run => :environment do
+      require "fat_free_crm/mail_processor/dropbox"
+      FatFreeCRM::MailProcessor::Dropbox.new.run(dry_run = false)
+    end
+    namespace :run do
+      desc "[Dry run] - Run dropbox crawler and process incoming emails"
+      task :dry => :environment do
+        require "fat_free_crm/mail_processor/dropbox"
+        FatFreeCRM::MailProcessor::Dropbox.new.run(dry_run = true)
+      end
+    end
+
+    desc "Set up email dropbox based on currently loaded settings"
+    task :setup => :environment do
+      require "fat_free_crm/mail_processor/dropbox"
+      FatFreeCRM::MailProcessor::Dropbox.new.setup
+    end
+  end
+
+  namespace :comment_replies do
+    desc "Run comment inbox crawler and process incoming emails"
+    task :run => :environment do
+      require "fat_free_crm/mail_processor/comment_replies"
+      FatFreeCRM::MailProcessor::CommentReplies.new.run(dry_run = false)
+    end
+    namespace :run do
+      desc "[Dry run] - Run comment inbox crawler and process incoming emails"
+      task :dry => :environment do
+        require "fat_free_crm/mail_processor/comment_replies"
+        FatFreeCRM::MailProcessor::CommentReplies.new.run(dry_run = true)
+      end
+    end
+
+    desc "Set up comment inbox based on currently loaded settings"
+    task :setup => :environment do
+      require "fat_free_crm/mail_processor/comment_replies"
+      FatFreeCRM::MailProcessor::CommentReplies.new.setup
+    end
+  end
+end

data/spec/controllers/admin/users_controller_spec.rb

@@ -142,7 +142,6 @@ describe Admin::UsersController do
         response.should render_template("admin/users/create")
       end
     end
-
   end
 
   # PUT /admin/users/1
@@ -196,7 +195,6 @@ describe Admin::UsersController do
         response.should render_template("admin/users/update")
       end
     end
-
   end
 
   # GET /admin/users/1/confirm                                             AJAX

data/spec/controllers/{accounts_controller_spec.rb → entities/accounts_controller_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe AccountsController do
   def get_data_for_sidebar
@@ -34,7 +34,7 @@ describe AccountsController do
 
     it "should filter out accounts by category" do
       categories = %w(customer vendor)
-      controller.session[:filter_by_account_category] = categories.join(',')
+      controller.session[:accounts_filter] = categories.join(',')
       @accounts = [
         FactoryGirl.create(:account, :user => @current_user, :category => categories.first),
         FactoryGirl.create(:account, :user => @current_user, :category => categories.last)
@@ -80,7 +80,7 @@ describe AccountsController do
 
     describe "with mime type of JSON" do
       it "should render all accounts as json" do
-        @controller.should_receive(:get_list_of_records).and_return(accounts = mock("Array of Accounts"))
+        @controller.should_receive(:get_accounts).and_return(accounts = mock("Array of Accounts"))
         accounts.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -91,7 +91,7 @@ describe AccountsController do
 
     describe "with mime type of XML" do
       it "should render all accounts as xml" do
-        @controller.should_receive(:get_list_of_records).and_return(accounts = mock("Array of Accounts"))
+        @controller.should_receive(:get_accounts).and_return(accounts = mock("Array of Accounts"))
         accounts.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -130,7 +130,7 @@ describe AccountsController do
     describe "with mime type of JSON" do
       it "should render the requested account as json" do
         @account = FactoryGirl.create(:account, :user => @current_user)
-        Account.stub_chain(:my, :find).and_return(@account)
+        Account.should_receive(:find).and_return(@account)
         @account.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -142,7 +142,7 @@ describe AccountsController do
     describe "with mime type of XML" do
       it "should render the requested account as xml" do
         @account = FactoryGirl.create(:account, :user => @current_user)
-        Account.stub_chain(:my, :find).and_return(@account)
+        Account.should_receive(:find).and_return(@account)
         @account.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -281,7 +281,6 @@ describe AccountsController do
         response.should render_template("accounts/edit")
       end
     end
-
   end
 
   # POST /accounts
@@ -333,7 +332,6 @@ describe AccountsController do
         response.should render_template("accounts/create")
       end
     end
-
   end
 
   # PUT /accounts/1
@@ -609,7 +607,7 @@ describe AccountsController do
   #----------------------------------------------------------------------------
   describe "responding to POST filter" do
     it "should expose filtered accounts as @accounts and render [index] template" do
-      session[:filter_by_account_category] = "customer,vendor"
+      session[:accounts_filter] = "customer,vendor"
       @accounts = [ FactoryGirl.create(:account, :category => "partner", :user => @current_user) ]
 
       xhr :post, :filter, :category => "partner"

data/spec/controllers/{campaigns_controller_spec.rb → entities/campaigns_controller_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe CampaignsController do
 
@@ -36,7 +36,7 @@ describe CampaignsController do
     end
 
     it "should filter out campaigns by status" do
-      controller.session[:filter_by_campaign_status] = "planned,started"
+      controller.session[:campaigns_filter] = "planned,started"
       @campaigns = [
         FactoryGirl.create(:campaign, :user => @current_user, :status => "started"),
         FactoryGirl.create(:campaign, :user => @current_user, :status => "planned")
@@ -85,7 +85,7 @@ describe CampaignsController do
 
     describe "with mime type of JSON" do
       it "should render all campaigns as JSON" do
-        @controller.should_receive(:get_list_of_records).and_return(@campaigns = [])
+        @controller.should_receive(:get_campaigns).and_return(@campaigns = [])
         @campaigns.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -96,7 +96,7 @@ describe CampaignsController do
 
     describe "with mime type of XML" do
       it "should render all campaigns as xml" do
-        @controller.should_receive(:get_list_of_records).and_return(@campaigns = [])
+        @controller.should_receive(:get_campaigns).and_return(@campaigns = [])
         @campaigns.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -135,7 +135,7 @@ describe CampaignsController do
     describe "with mime type of JSON" do
       it "should render the requested campaign as JSON" do
         @campaign = FactoryGirl.create(:campaign, :id => 42, :user => @current_user)
-        Campaign.stub_chain(:my, :find).and_return(@campaign)
+        Campaign.should_receive(:find).and_return(@campaign)
         @campaign.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -147,7 +147,7 @@ describe CampaignsController do
     describe "with mime type of XML" do
       it "should render the requested campaign as XML" do
         @campaign = FactoryGirl.create(:campaign, :id => 42, :user => @current_user)
-        Campaign.stub_chain(:my, :find).and_return(@campaign)
+        Campaign.should_receive(:find).and_return(@campaign)
         @campaign.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -647,7 +647,7 @@ describe CampaignsController do
   describe "responding to POST filter" do
 
     it "should expose filtered campaigns as @campaigns and render [index] template" do
-      session[:filter_by_campaign_status] = "planned,started"
+      session[:campaigns_filter] = "planned,started"
       @campaigns = [ FactoryGirl.create(:campaign, :status => "completed", :user => @current_user) ]
 
       xhr :post, :filter, :status => "completed"

data/spec/controllers/{contacts_controller_spec.rb → entities/contacts_controller_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe ContactsController do
 
@@ -53,7 +53,7 @@ describe ContactsController do
 
     describe "with mime type of JSON" do
       it "should render all contacts as JSON" do
-        @controller.should_receive(:get_list_of_records).and_return(contacts = mock("Array of Contacts"))
+        @controller.should_receive(:get_contacts).and_return(contacts = mock("Array of Contacts"))
         contacts.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -64,7 +64,7 @@ describe ContactsController do
 
     describe "with mime type of XML" do
       it "should render all contacts as xml" do
-        @controller.should_receive(:get_list_of_records).and_return(contacts = mock("Array of Contacts"))
+        @controller.should_receive(:get_contacts).and_return(contacts = mock("Array of Contacts"))
         contacts.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -103,7 +103,7 @@ describe ContactsController do
     describe "with mime type of JSON" do
       it "should render the requested contact as JSON" do
         @contact = FactoryGirl.create(:contact, :id => 42)
-        Contact.stub_chain(:my, :find).and_return(@contact)
+        Contact.should_receive(:find).and_return(@contact)
         @contact.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -115,7 +115,7 @@ describe ContactsController do
     describe "with mime type of XML" do
       it "should render the requested contact as xml" do
         @contact = FactoryGirl.create(:contact, :id => 42)
-        Contact.stub_chain(:my, :find).and_return(@contact)
+        Contact.should_receive(:find).and_return(@contact)
         @contact.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -151,7 +151,6 @@ describe ContactsController do
         response.code.should == "404" # :not_found
       end
     end
-
   end
 
   # GET /contacts/new
@@ -279,7 +278,6 @@ describe ContactsController do
         response.should render_template("contacts/edit")
       end
     end
-
   end
 
   # POST /contacts
@@ -372,9 +370,7 @@ describe ContactsController do
         assigns(:opportunity).should == @opportunity
         response.should render_template("contacts/create")
       end
-
     end
-
   end
 
   # PUT /contacts/1

data/spec/controllers/{leads_controller_spec.rb → entities/leads_controller_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe LeadsController do
 
@@ -29,7 +29,7 @@ describe LeadsController do
     end
 
     it "should filter out leads by status" do
-      controller.session[:filter_by_lead_status] = "new,contacted"
+      controller.session[:leads_filter] = "new,contacted"
       @leads = [
         FactoryGirl.create(:lead, :status => "new", :user => @current_user),
         FactoryGirl.create(:lead, :status => "contacted", :user => @current_user)
@@ -78,7 +78,7 @@ describe LeadsController do
 
     describe "with mime type of JSON" do
       it "should render all leads as JSON" do
-        @controller.should_receive(:get_list_of_records).and_return(leads = mock("Array of Leads"))
+        @controller.should_receive(:get_leads).and_return(leads = mock("Array of Leads"))
         leads.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -89,7 +89,7 @@ describe LeadsController do
 
     describe "with mime type of XML" do
       it "should render all leads as xml" do
-        @controller.should_receive(:get_list_of_records).and_return(leads = mock("Array of Leads"))
+        @controller.should_receive(:get_leads).and_return(leads = mock("Array of Leads"))
         leads.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -126,7 +126,7 @@ describe LeadsController do
     describe "with mime type of JSON" do
       it "should render the requested lead as JSON" do
         @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user)
-        Lead.stub_chain(:my, :find).and_return(@lead)
+        Lead.should_receive(:find).and_return(@lead)
         @lead.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -138,7 +138,7 @@ describe LeadsController do
     describe "with mime type of XML" do
       it "should render the requested lead as xml" do
         @lead = FactoryGirl.create(:lead, :id => 42, :user => @current_user)
-        Lead.stub_chain(:my, :find).and_return(@lead)
+        Lead.should_receive(:find).and_return(@lead)
         @lead.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -229,7 +229,6 @@ describe LeadsController do
         response.body.should == 'window.location.href = "/campaigns";'
       end
     end
-
   end
 
   # GET /leads/1/edit                                                      AJAX
@@ -299,7 +298,6 @@ describe LeadsController do
         response.should render_template("leads/edit")
       end
     end
-
   end
 
   # POST /leads
@@ -1027,7 +1025,7 @@ describe LeadsController do
   describe "responding to POST filter" do
 
     it "should filter out leads as @leads and render :index action" do
-      session[:filter_by_lead_status] = "contacted,rejected"
+      session[:leads_filter] = "contacted,rejected"
 
       @leads = [ FactoryGirl.create(:lead, :user => @current_user, :status => "new") ]
       xhr :post, :filter, :status => "new"

data/spec/controllers/{opportunities_controller_spec.rb → entities/opportunities_controller_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe OpportunitiesController do
 
@@ -35,7 +35,7 @@ describe OpportunitiesController do
     end
 
     it "should filter out opportunities by stage" do
-      controller.session[:filter_by_opportunity_stage] = "prospecting,negotiation"
+      controller.session[:opportunities_filter] = "prospecting,negotiation"
       @opportunities = [
         FactoryGirl.create(:opportunity, :user => @current_user, :stage => "negotiation"),
         FactoryGirl.create(:opportunity, :user => @current_user, :stage => "prospecting")
@@ -83,7 +83,7 @@ describe OpportunitiesController do
 
     describe "with mime type of JSON" do
       it "should render all opportunities as JSON" do
-        @controller.should_receive(:get_list_of_records).and_return(opportunities = mock("Array of Opportunities"))
+        @controller.should_receive(:get_opportunities).and_return(opportunities = mock("Array of Opportunities"))
         opportunities.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -94,7 +94,7 @@ describe OpportunitiesController do
 
     describe "with mime type of JSON" do
       it "should render all opportunities as JSON" do
-        @controller.should_receive(:get_list_of_records).and_return(opportunities = mock("Array of Opportunities"))
+        @controller.should_receive(:get_opportunities).and_return(opportunities = mock("Array of Opportunities"))
         opportunities.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -105,7 +105,7 @@ describe OpportunitiesController do
 
     describe "with mime type of XML" do
       it "should render all opportunities as xml" do
-        @controller.should_receive(:get_list_of_records).and_return(opportunities = mock("Array of Opportunities"))
+        @controller.should_receive(:get_opportunities).and_return(opportunities = mock("Array of Opportunities"))
         opportunities.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -144,7 +144,7 @@ describe OpportunitiesController do
     describe "with mime type of JSON" do
       it "should render the requested opportunity as JSON" do
         @opportunity = FactoryGirl.create(:opportunity, :id => 42)
-        Opportunity.stub_chain(:my, :find).and_return(@opportunity)
+        Opportunity.should_receive(:find).and_return(@opportunity)
         @opportunity.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -156,7 +156,7 @@ describe OpportunitiesController do
     describe "with mime type of XML" do
       it "should render the requested opportunity as xml" do
         @opportunity = FactoryGirl.create(:opportunity, :id => 42)
-        Opportunity.stub_chain(:my, :find).and_return(@opportunity)
+        Opportunity.should_receive(:find).and_return(@opportunity)
         @opportunity.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -201,7 +201,6 @@ describe OpportunitiesController do
         response.code.should == "404" # :not_found
       end
     end
-
   end
 
   # GET /opportunities/new
@@ -248,7 +247,6 @@ describe OpportunitiesController do
         response.body.should == 'window.location.href = "/accounts";'
       end
     end
-
   end
 
   # GET /opportunities/1/edit                                              AJAX
@@ -678,9 +676,7 @@ describe OpportunitiesController do
         xhr :put, :update, :id => 42, :opportunity => { :name => nil }, :account => { :id => 99 }
         assigns(:account).should == @account
       end
-
     end
-
   end
 
   # DELETE /opportunities/1
@@ -910,7 +906,7 @@ describe OpportunitiesController do
   describe "responding to GET filter" do
 
     it "should expose filtered opportunities as @opportunity and render [filter] template" do
-      session[:filter_by_opportunity_stage] = "negotiation,analysis"
+      session[:opportunities_filter] = "negotiation,analysis"
       @opportunities = [ FactoryGirl.create(:opportunity, :stage => "prospecting", :user => @current_user) ]
       @stage = Setting.unroll(:opportunity_stage)
 
@@ -927,8 +923,5 @@ describe OpportunitiesController do
 
       session[:opportunities_current_page].should == 1
     end
-
   end
-
 end
-