fat_free_crm 0.12.3 → 0.13.0

data/config/routes.rb

@@ -22,7 +22,7 @@ Rails.application.routes.draw do
   match '/home/redraw',   :as => :redraw
 
   resource  :authentication
-  resources :comments
+  resources :comments, :except => [:new, :show]
   resources :emails
   resources :passwords
 

data/config/settings.default.yml

@@ -72,8 +72,6 @@
   :authentication             : :plain
   :user_name                  : ""
   :password                   : ""
-#  :delivery_method            : :smtp   # This is the default. Can be :smtp, :sendmail, :test, :file
-
 
 # Settings for the Email dropbox (IMAP)
 # - Connection settings for the IMAP account, server and folders.
@@ -197,27 +195,80 @@
 
 # Main and Admin Tabs
 #------------------------------------------------------------------------------
-:tabs: [
-  { :active : true,  :text : :tab_dashboard,     :url : { :controller : "home"                   } },
-  { :active : false, :text : :tab_tasks,         :url : { :controller : "tasks"                  } },
-  { :active : false, :text : :tab_campaigns,     :url : { :controller : "campaigns"              } },
-  { :active : false, :text : :tab_leads,         :url : { :controller : "leads"                  } },
-  { :active : false, :text : :tab_accounts,      :url : { :controller : "accounts"               } },
-  { :active : false, :text : :tab_contacts,      :url : { :controller : "contacts"               } },
-  { :active : false, :text : :tab_opportunities, :url : { :controller : "opportunities"          } },
-  { :active : false, :text : :tab_team,          :url : { :controller : "users",
-                                                          :action :     "opportunities_overview" } }
-
-]
-
-:admin_tabs: [
-  { :active : true,  :text : :admin_tab_users,    :url : { :controller : "admin/users"    } },
-  { :active : true,  :text : :admin_tab_groups,   :url : { :controller : "admin/groups"   } },
-  { :active : false, :text : :admin_tab_fields,   :url : { :controller : "admin/fields"   } },
-  { :active : false, :text : :admin_tab_tags,     :url : { :controller : "admin/tags"     } },
-  { :active : false, :text : :admin_tab_settings, :url : { :controller : "admin/settings" } },
-  { :active : false, :text : :admin_tab_plugins,  :url : { :controller : "admin/plugins"  } }
-]
+:tabs:
+- :active: true
+  :text: :tab_dashboard
+  :icon: :fa-dashboard
+  :url:
+    :controller: home
+- :active: false
+  :text: :tab_tasks
+  :icon: :fa-check-square-o
+  :url:
+    :controller: tasks
+- :active: false
+  :text: :tab_campaigns
+  :icon: :fa-bar-chart-o
+  :url:
+    :controller: campaigns
+- :active: false
+  :text: :tab_leads
+  :icon: :fa-tasks
+  :url:
+    :controller: leads
+- :active: false
+  :text: :tab_accounts
+  :icon: :fa-users
+  :url:
+    :controller: accounts
+- :active: false
+  :text: :tab_contacts
+  :icon: :fa-user
+  :url:
+    :controller: contacts
+- :active: false
+  :text: :tab_opportunities
+  :icon: :fa-money
+  :url:
+    :controller: opportunities
+- :active: false
+  :text: :tab_team
+  :icon: :fa-globe
+  :url:
+    :controller: users
+    :action: opportunities_overview
+
+:admin_tabs:
+- :active: true
+  :text: :admin_tab_users
+  :icon: :fa-user
+  :url:
+    :controller: admin/users
+- :active: true
+  :text: :admin_tab_groups
+  :icon: :fa-users
+  :url:
+    :controller: admin/groups
+- :active: false
+  :text: :admin_tab_fields
+  :icon: :fa-list-alt
+  :url:
+    :controller: admin/fields
+- :active: false
+  :text: :admin_tab_tags
+  :icon: :fa-tags
+  :url:
+    :controller: admin/tags
+- :active: false
+  :text: :admin_tab_settings
+  :icon: :fa-cogs
+  :url:
+    :controller: admin/settings
+- :active: false
+  :text: :admin_tab_plugins
+  :icon: :fa-plus-circle
+  :url:
+    :controller: admin/plugins
 
 # Account Category. To add custom account type use string value, for example:
 #

data/custom_plan.rb

@@ -0,0 +1,11 @@
+require 'zeus/rails'
+
+class CustomPlan < Zeus::Rails
+
+  # def my_custom_command
+  #  # see https://github.com/burke/zeus/blob/master/docs/ruby/modifying.md
+  # end
+
+end
+
+Zeus.plan = CustomPlan.new

data/db/migrate/20131207033244_add_user_id_to_lists.rb

@@ -0,0 +1,6 @@
+class AddUserIdToLists < ActiveRecord::Migration
+  def change
+    add_column :lists, :user_id, :integer, :default => nil
+    add_index :lists, :user_id
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121221033947) do
+ActiveRecord::Schema.define(:version => 20131207033244) do
 
   create_table "account_contacts", :force => true do |t|
     t.integer  "account_id"
@@ -282,8 +282,11 @@ ActiveRecord::Schema.define(:version => 20121221033947) do
     t.text     "url"
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
+    t.integer  "user_id"
   end
 
+  add_index "lists", ["user_id"], :name => "index_lists_on_user_id"
+
   create_table "opportunities", :force => true do |t|
     t.integer  "user_id"
     t.integer  "campaign_id"

data/fat_free_crm.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'paperclip'
   # Manually added paperclip gem dependency "cocaine" in order to fix load error: "no such file to load -- cocaine"
   gem.add_dependency 'cocaine'
-  gem.add_dependency 'paper_trail'
+  gem.add_dependency 'paper_trail',         '~> 2.7.0' # not ready for v3 yet
   gem.add_dependency 'authlogic',           '3.1.0'
   gem.add_dependency 'acts_as_commentable', '~> 3.0.1'
   gem.add_dependency 'acts-as-taggable-on', '~> 2.3.3'
@@ -33,16 +33,16 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'acts_as_list',        '~> 0.1.4'
   gem.add_dependency 'ffaker',              '>= 1.12.0'
   gem.add_dependency 'cancan'
+  gem.add_dependency 'font-awesome-rails'
   gem.add_dependency 'premailer'
   gem.add_dependency 'nokogiri'
   gem.add_dependency 'responds_to_parent',  '>= 1.1.0'
   gem.add_dependency 'rails3-jquery-autocomplete'
   gem.add_dependency 'valium'
+  gem.add_dependency 'psych', '~> 1'        if RUBY_VERSION.to_f < 2.0
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------
-  gem.add_dependency 'ransack_ffcrm',       '~> 0.7.1'
   gem.add_dependency 'ransack_ui',          '>= 1.1.0'
-  gem.add_dependency 'ajax-chosen-rails',   '>= 0.2.1'  # (now depends on chosen-rails_ffcrm)
   gem.add_dependency 'email_reply_parser_ffcrm'
 end

data/lib/fat_free_crm.rb

@@ -9,22 +9,12 @@ module FatFreeCRM
     # Return either Application or Engine,
     # depending on how Fat Free CRM has been loaded
     def application
-      engine? ? Engine : Application
+      defined?(FatFreeCRM::Engine) ? Engine : Application
     end
 
     def root
       application.root
     end
-
-    # Are we running as an engine?
-    def engine?
-      defined?(FatFreeCRM::Engine).present?
-    end
-
-    def application?
-      !engine?
-    end
-
   end
 end
 

data/lib/fat_free_crm/export_csv.rb

@@ -7,7 +7,7 @@ require "csv"
 
 module FatFreeCRM
   class ExportCSV
-  
+
     # CSV export. Based on to_csv Rails plugin by Ary Djmal
     # https://github.com/arydjmal/to_csv
     #----------------------------------------------------------------------------
@@ -16,7 +16,7 @@ module FatFreeCRM
       # Infer column types from the first item in the array
       klass = items.first.class
       columns = klass.columns.map(&:name).reject { |column| column =~ /password|token/ }
-      columns << 'tags'
+      columns << 'tags' if klass.taggable?
       CSV.generate do |csv|
         csv << columns.map { |column| klass.human_attribute_name(column) }
         items.each do |item|
@@ -30,6 +30,6 @@ module FatFreeCRM
         end
       end
     end
-  
+
   end
 end

data/lib/fat_free_crm/fields.rb

@@ -42,6 +42,16 @@ module FatFreeCRM
         end
       end
 
+      # Shows custom field select options in ransack search form
+      def ransack_column_select_options
+        field_groups.each_with_object({}) do |group, hash|
+          group.fields.select{|f| f.collection.present? }.each do |field|
+            hash[field.name] = field.collection.each_with_object({}) do |option, options|
+              options[option] = option
+            end
+          end
+        end
+      end
     end
 
     module InstanceMethods

data/lib/fat_free_crm/gem_dependencies.rb

@@ -18,8 +18,6 @@ require 'paperclip'
 require 'simple_form'
 require 'will_paginate'
 require 'authlogic'
-require 'chosen-rails'
-require 'ajax-chosen-rails'
 require 'ransack'
 require 'ransack_ui'
 require 'paper_trail'
@@ -29,6 +27,7 @@ require 'valium'
 require 'ffaker'
 require 'premailer'
 require 'nokogiri'
+require 'font-awesome-rails'
 
 # Load redcloth if available (for textile markup in emails)
 begin

data/lib/fat_free_crm/i18n.rb

@@ -3,34 +3,38 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
+require 'pathname'
+
 module FatFreeCRM
   module I18n
 
     #----------------------------------------------------------------------------
     def t(*args)
       if args.size == 1
-        super(args.first, :default => args.first.to_s)
+        super(args.first, default: args.first.to_s)
       elsif args.second.is_a?(Hash)
         super(*args)
       elsif args.second.is_a?(Fixnum)
-        super(args.first, :count => args.second)
+        super(args.first, count: args.second)
       else
-        super(args.first, :value => args.second)
+        super(args.first, value: args.second)
       end
     end
 
     # Scan config/locales directory for Fat Free CRM localization files
     # (i.e. *_fat_free_crm.yml) and return locale part of the file name.
+    # We can't use ::I18n.available_locales because rails provides it's own
+    # translations too and we only want the locales that Fat Free CRM supports.
     #----------------------------------------------------------------------------
     def locales
-      @@locales ||= Dir.entries("#{Rails.root}/config/locales").grep(/_fat_free_crm\.yml$/) { |f| f.sub("_fat_free_crm.yml", "") }
+      @@locales ||= ::I18n.load_path.grep(/_fat_free_crm\.yml$/).map{ |path| Pathname.new(path).basename.to_s.match(/(.*)_fat_free_crm\.yml/)[1] }.uniq
     end
 
     # Return a hash where the key is locale name, and the value is language name
     # as defined in the locale_fat_free_crm.yml file.
     #----------------------------------------------------------------------------
     def languages
-      @@languages ||= Hash[ locales.map{ |locale| [ locale, t(:language, :locale => locale) ] } ]
+      @@languages ||= Hash[ locales.map{ |locale| [ locale, t(:language, locale: locale) ] } ]
     end
   end
 end

data/lib/fat_free_crm/version.rb

@@ -6,8 +6,8 @@
 module FatFreeCRM
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 12
-    TINY  = 3
+    MINOR = 13
+    TINY  = 0
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

data/lib/fat_free_crm/view_factory.rb

@@ -3,6 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
+
 module FatFreeCRM
 
   # A view factory keeps track of views and the contexts in which they are available.
@@ -15,7 +16,7 @@ module FatFreeCRM
   # Icon is optional. If specified, it will be passed to asset_path.
   #
   class ViewFactory
-  
+
     include Comparable
 
     @@views = []
@@ -24,13 +25,13 @@ module FatFreeCRM
     # Class methods
     #----------------------------------------------------------------------------
     class << self
-    
+
       # Register with the view factory
       #----------------------------------------------------------------------------
       def register(view)
         @@views << view unless @@views.map(&:id).include?(view.id)
       end
-      
+
       # Return views that are available based on context
       #----------------------------------------------------------------------------
       def views_for(options = {})
@@ -41,7 +42,7 @@ module FatFreeCRM
           view.controllers.include?(controller) and view.actions.include?(action) and (name.present? ? view.name == name : true)
         end
       end
-      
+
       # Return template name of the current view
       # pass in options[:name] to specify view name
       #----------------------------------------------------------------------------
@@ -72,12 +73,14 @@ module FatFreeCRM
     end
 
     private
-    
+
     # This defines what it means for one view to be different to another
     #----------------------------------------------------------------------------
     def generate_id
        [name, controllers.sort, actions.sort].flatten.map(&:to_s).map(&:underscore).join('_')
     end
 
+    ActiveSupport.run_load_hooks(:fat_free_crm_view_factory, self)
+
   end
 end

data/lib/tasks/ffcrm/config.rake

@@ -25,20 +25,17 @@ namespace :ffcrm do
     #
     desc "Ensures all yaml files in the config folder are readable by Psych. If not, assumes file is in the Syck format and converts it for you [creates a new file]."
     task :syck_to_psych do
-      error_count = 0
-      total_files = 0
+      require 'fileutils'
+      require 'syck'
+      require 'psych'
       Dir[File.join(Rails.root, 'config', '**', '*.yml')].each do |file|
-        begin
-          Psych.load_file(file)
-        rescue Psych::SyntaxError => e
-          puts e # prints error message with line number
-          File.open("#{file}.new", 'w') {|f| f.puts Psych.dump(Syck.load_file(file)) }
-          puts "Have written Psych compatible file to #{file}.new"
-          error_count += 1
-        end
-        total_files += 1
+        YAML::ENGINE.yamler = 'syck'
+        puts "Converting #{file}"
+        yml = YAML.load( File.read(file) )
+        FileUtils.cp file, "#{file}.bak"
+        YAML::ENGINE.yamler = 'psych'
+        File.open(file, 'w'){ |file| file.write(YAML.dump(yml)) }
       end
-      puts "Scanned #{total_files} yml files. Found #{error_count} problems (see above)."
     end
 
   end

data/lib/tasks/ffcrm/missing_translations.rake

@@ -13,7 +13,8 @@ namespace :ffcrm do
       base_locale = 'en-US'
 
       [[base_locale, args[:locale]],
-       ["#{base_locale}_fat_free_crm", "#{args[:locale]}_fat_free_crm"]].each do |locale_file_names|
+       ["#{base_locale}_fat_free_crm", "#{args[:locale]}_fat_free_crm"],
+       ["#{base_locale}_ransack", "#{args[:locale]}_ransack"]].each do |locale_file_names|
         detector = MissingTranslationDetector.new locale_file_names.first,
                                                   locale_file_names.last
         detector.detect

data/spec/controllers/admin/users_controller_spec.rb

@@ -54,8 +54,10 @@ describe Admin::UsersController do
   #----------------------------------------------------------------------------
   describe "GET new" do
     it "assigns a new user as @user and renders [new] template" do
+      @user = User.new
+
       xhr :get, :new
-      expect(assigns[:user]).to be_new_record
+      assigns[:user].attributes.should == @user.attributes
       response.should render_template("admin/users/new")
     end
   end
@@ -115,7 +117,7 @@ describe Admin::UsersController do
 
       it "assigns a newly created user as @user and renders [create] template" do
         @user = FactoryGirl.build(:user, :username => @username, :email => @email)
-        User.stub!(:new).and_return(@user)
+        User.stub(:new).and_return(@user)
 
         xhr :post, :create, :user => { :username => @username, :email => @email, :password => @password, :password_confirmation => @password }
         assigns[:user].should == @user
@@ -138,7 +140,7 @@ describe Admin::UsersController do
     describe "with invalid params" do
       it "assigns a newly created but unsaved user as @user and re-renders [create] template" do
         @user = FactoryGirl.build(:user, :username => "", :email => "")
-        User.stub!(:new).and_return(@user)
+        User.stub(:new).and_return(@user)
 
         xhr :post, :create, :user => {}
         assigns[:user].should == @user
@@ -239,7 +241,7 @@ describe Admin::UsersController do
 
       xhr :delete, :destroy, :id => @user.id
       flash[:warning].should_not == nil
-      lambda { User.find(@user) }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect { User.find(@user) }.not_to raise_error()
       response.should render_template("admin/users/destroy")
     end
   end