fat_free_crm 0.13.6 → 0.14.0

data/db/seeds.rb

@@ -6,5 +6,4 @@
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
 #   Mayor.create(:name => 'Daley', :city => cities.first)
 
-#~ require Rails.root.join('db/seeds/fields')
-
+# ~ require Rails.root.join('db/seeds/fields')

data/db/seeds/fields.rb

@@ -1,94 +1,93 @@
 {
   'Account' => [
     {
-      :params => {:label => 'General Information', :tooltip => ''},
-      :fields => [
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''}
+      params: { label: 'General Information', tooltip: '' },
+      fields: [
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' }
       ]
     },
     {
-      :params => {:label => 'Contact Information', :tooltip => ''},
-      :fields => [
+      params: { label: 'Contact Information', tooltip: '' },
+      fields: [
 
       ]
     }
   ],
   'Campaign' => [
     {
-      :params => {:label => 'General Information', :tooltip => ''},
-      :fields => [
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''}
+      params: { label: 'General Information', tooltip: '' },
+      fields: [
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' }
       ]
     },
     {
-      :params => {:label => 'Contact Information', :tooltip => ''},
-      :fields => [
+      params: { label: 'Contact Information', tooltip: '' },
+      fields: [
 
       ]
     }
   ],
   'Contact' => [
     {
-      :params => {:label => 'General Information', :tooltip => ''},
-      :fields => [
+      params: { label: 'General Information', tooltip: '' },
+      fields: [
 
       ]
     },
     {
-      :params => {:label => 'Extra Information', :tooltip => ''},
-      :fields => [
+      params: { label: 'Extra Information', tooltip: '' },
+      fields: [
 
       ]
     },
     {
-      :params => {:label => 'Web presence', :tooltip => ''},
-      :fields => [
+      params: { label: 'Web presence', tooltip: '' },
+      fields: [
 
       ]
     }
   ],
   'Lead' => [
     {
-      :params => {:label => 'General Information', :tooltip => ''},
-      :fields => [
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''}
+      params: { label: 'General Information', tooltip: '' },
+      fields: [
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' }
       ]
     },
     {
-      :params => {:label => 'Contact Information', :tooltip => ''},
-      :fields => [
+      params: { label: 'Contact Information', tooltip: '' },
+      fields: [
 
       ]
     }
   ],
   'Opportunity' => [
     {
-      :params => {:label => 'General Information', :tooltip => ''},
-      :fields => [
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''},
-        {:field_type => '', :name => '', :label => '', :required => ''}
+      params: { label: 'General Information', tooltip: '' },
+      fields: [
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' },
+        { field_type: '', name: '', label: '', required: '' }
       ]
     },
     {
-      :params => {:label => 'Contact Information', :tooltip => ''},
-      :fields => [
+      params: { label: 'Contact Information', tooltip: '' },
+      fields: [
 
       ]
     }
   ]
 }.each_with_index do |(klass_name, groups), group_position|
   groups.each do |group|
-    field_group = FieldGroup.create group[:params].merge(:klass_name => klass_name, :position => group_position)
+    field_group = FieldGroup.create group[:params].merge(klass_name: klass_name, position: group_position)
     group[:fields].each_with_index do |params, field_position|
-      Field.create params.merge(:field_group => field_group, :position => field_position)
+      Field.create params.merge(field_group: field_group, position: field_position)
     end
   end
 end
-

data/fat_free_crm.gemspec

@@ -1,5 +1,11 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../vendor/gems/globby-0.1.2/lib', __FILE__)
+require 'globby'
+rules = File.read("#{File.expand_path('..', __FILE__)}/.gitignore").split("\n")
+rules << '.git'
+files = Globby.reject(rules)
+
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'fat_free_crm/version'
 
 Gem::Specification.new do |gem|
@@ -9,42 +15,49 @@ Gem::Specification.new do |gem|
   gem.description = 'An open source, Ruby on Rails customer relationship management platform'
   gem.homepage = 'http://fatfreecrm.com'
   gem.email = ['mike@fatfreecrm.com', 'nathan@fatfreecrm.com', 'warp@fatfreecrm.com', 'steveyken@gmail.com']
-  gem.files = `git ls-files`.split("\n")
+  gem.files = files
   gem.version = FatFreeCRM::VERSION::STRING
-  gem.required_ruby_version = '>= 1.9'
+  gem.required_ruby_version = '>= 2.0.0'
   gem.license = 'MIT'
 
-  gem.add_dependency 'rails',               '~> 3.2.12'
-  gem.add_dependency 'jquery-rails',        '~> 2.1.4' # pegs us to jQuery 1.8
-  gem.add_dependency 'select2-rails'
-  gem.add_dependency 'simple_form',         '~> 2.0.1'
+  gem.add_dependency 'rails',               '~> 4.2.0'
+  gem.add_dependency 'rails-observers'
+  # Sprockets 2.2.3 appears to have a bug resolving assets from the engine update to '>= 3.0.0 once released'
+  gem.add_dependency 'sprockets-rails',     '2.2.2'
+  gem.add_dependency 'responders',          '~> 2.0'
+  gem.add_dependency 'jquery-rails'
+  gem.add_dependency 'jquery-migrate-rails'
+  gem.add_dependency 'jquery-ui-rails'
+  gem.add_dependency 'select2-rails', '~> 3.5.9.3'
+  gem.add_dependency 'simple_form'
   gem.add_dependency 'will_paginate'
   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',         '~> 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'
+  gem.add_dependency 'paper_trail',         '>= 4.0.0.beta2'
+  gem.add_dependency 'authlogic',           '>= 3.4.4'
+  gem.add_dependency 'acts_as_commentable'
+  gem.add_dependency 'acts-as-taggable-on', '>= 3.4.3'
   gem.add_dependency 'dynamic_form'
   gem.add_dependency 'haml'
   gem.add_dependency 'sass'
-  gem.add_dependency 'acts_as_list',        '~> 0.1.4'
-  gem.add_dependency 'ffaker',              '>= 1.12.0'
-  gem.add_dependency 'cancan'
+  gem.add_dependency 'acts_as_list'
+  gem.add_dependency 'ffaker',              '>= 2'
+  gem.add_dependency 'cancancan'
   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 'responds_to_parent'
   gem.add_dependency 'rails3-jquery-autocomplete'
-  gem.add_dependency 'valium'
   gem.add_dependency 'psych', '~> 1'        if RUBY_VERSION.to_f < 2.0
   gem.add_dependency 'thor'
   gem.add_dependency 'rails_autolink'
+  gem.add_dependency 'coffee-script-source', '~>1.8.0' # pegged until https://github.com/jashkenas/coffeescript/issues/3829 is resolved
+  gem.add_dependency 'country_select'
 
   # FatFreeCRM has released it's own versions of the following gems:
   #-----------------------------------------------------------------
-  gem.add_dependency 'ransack_ui',          '>= 1.1.0'
-  gem.add_dependency 'ransack',             '1.1.0' # not compatible with 1.2.X yet
+  gem.add_dependency 'ransack_ui',          '>= 1.3.1'
+  gem.add_dependency 'ransack',             '~> 1.6.2'
   gem.add_dependency 'email_reply_parser_ffcrm'
 end

data/lib/development_tasks/license.rake

@@ -9,45 +9,45 @@
 # with schema information.
 
 namespace :license do
-  FILES = {:ruby => [
-              "app/**/*.rb",
-              "app/**/*.coffee",
-              "lib/**/*.rake",
-              "lib/fat_free_crm/**/*.rb",
-              "lib/fat_free_crm.rb",
-              "spec/**/*.rb",
-              "spec/spec_helper.rb",
-              "config/**/*.rb",
-              "config/settings.default.yml"
-           ],
-           :js => [
+  FILES = { ruby: [
+    "app/**/*.rb",
+    "app/**/*.coffee",
+    "lib/**/*.rake",
+    "lib/fat_free_crm/**/*.rb",
+    "lib/fat_free_crm.rb",
+    "spec/**/*.rb",
+    "spec/spec_helper.rb",
+    "config/**/*.rb",
+    "config/settings.default.yml"
+  ],
+            js: [
               "app/assets/javascripts/**/*.js",
               "app/assets/stylesheets/**/*.sass", # Sass also uses javascript style comments
               "app/assets/stylesheets/**/*.scss"
-           ],
-           :css => [
+            ],
+            css: [
               "app/assets/stylesheets/**/*.css"
-           ]}
-  
-  LICENSE_RB = %Q{# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+            ] }
+
+  LICENSE_RB = %{# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # 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
 #------------------------------------------------------------------------------
 }
-  LICENSES = {:ruby => LICENSE_RB,
-              :js   => LICENSE_RB.gsub(/^#/, "//"),
-              :css  => LICENSE_RB.gsub(/^# Fat Free/, "/*\n * Fat Free").
-                                  gsub(/^#/, " \*").sub(/---\n/, "---\n */")}
+  LICENSES = { ruby: LICENSE_RB,
+               js: LICENSE_RB.gsub(/^#/, "//"),
+               css: LICENSE_RB.gsub(/^# Fat Free/, "/*\n * Fat Free")
+                    .gsub(/^#/, " \*").sub(/---\n/, "---\n */") }
+
+  REGEXPS  = { ruby: /^# Fat Free CRM\n# Copyright \(C\).*?\n(#.*\n)*#-{10}-*\n*/,
+               js: /^\/\/ Fat Free CRM\n\/\/ Copyright \(C\).*?\n(\/\/.*\n)*\/\/-{10}-*\n*/,
+               css: /^\/\*\n \* Fat Free CRM\n \* Copyright \(C\).*?\n( \*.*\n)* \*-{10}-*\n \*\/\n*/ }
 
-  REGEXPS  = {:ruby => /^# Fat Free CRM\n# Copyright \(C\).*?\n(#.*\n)*#-{10}-*\n*/,
-              :js   => /^\/\/ Fat Free CRM\n\/\/ Copyright \(C\).*?\n(\/\/.*\n)*\/\/-{10}-*\n*/,
-              :css  => /^\/\*\n \* Fat Free CRM\n \* Copyright \(C\).*?\n( \*.*\n)* \*-{10}-*\n \*\/\n*/}
-  
   def expand_globs(globs)
-    globs.map{|f| Dir.glob(f) }.flatten.uniq
+    globs.map { |f| Dir.glob(f) }.flatten.uniq
   end
-  
+
   desc "Add license info to beginning of files"
   task :add do
     FILES.each do |lang, globs|
@@ -55,12 +55,12 @@ namespace :license do
         puts "== Adding license to '#{file}'..."
         old_content = File.read(file)
         new_content = LICENSES[lang] + old_content.sub(REGEXPS[lang], '')
-        
+
         File.open(file, "wb") { |f| f.puts new_content }
       end
     end
   end
-  
+
   desc "Remove license from files"
   task :remove do
     FILES.each do |lang, globs|

data/lib/fat_free_crm.rb

@@ -12,9 +12,7 @@ module FatFreeCRM
       engine? ? Engine : Application
     end
 
-    def root
-      application.root
-    end
+    delegate :root, to: :application
 
     # Are we running as an engine?
     def engine?
@@ -24,7 +22,6 @@ module FatFreeCRM
     def application?
       !engine?
     end
-
   end
 end
 
@@ -54,7 +51,6 @@ require "fat_free_crm/fields"
 require "fat_free_crm/sortable"
 require "fat_free_crm/tabs"
 require "fat_free_crm/callback"
-require "fat_free_crm/plugin"
 require "fat_free_crm/view_factory"
 
 require "country_select"

data/lib/fat_free_crm/callback.rb

@@ -7,8 +7,8 @@ module FatFreeCRM
   module Callback
     @@classes   = []  # Classes that inherit from FatFreeCRM::Callback::Base.
     @@responder = {}  # Class instances that respond to (i.e. implement) hook methods.
-                      # Also includes class instances that implement a
-                      # set of view hook operations (insert_after, replace, etc).
+    # Also includes class instances that implement a
+    # set of view hook operations (insert_after, replace, etc).
 
     # Adds a class inherited from from FatFreeCRM::Callback::Base.
     #--------------------------------------------------------------------------
@@ -22,7 +22,7 @@ module FatFreeCRM
     # Finds class instance that responds to given method.
     #------------------------------------------------------------------------------
     def self.responder(method)
-      @@responder[method] ||= @@classes.map { |klass| klass.instance }.select { |instance| instance.respond_to?(method) }
+      @@responder[method] ||= @@classes.map(&:instance).select { |instance| instance.respond_to?(method) }
     end
 
     # Invokes the hook named :method and captures its output.
@@ -35,14 +35,13 @@ module FatFreeCRM
       str
     end
 
-
     #                             [View] Hooks
     # -----------------------------------------------------------------------------
 
     # Find class instances that contain operations for the given view hook.
     #------------------------------------------------------------------------------
     def self.view_responder(method)
-      @@responder[method] ||= @@classes.map { |klass| klass.instance }.select { |instance| instance.class.view_hooks[method] }
+      @@responder[method] ||= @@classes.map(&:instance).select { |instance| instance.class.view_hooks[method] }
     end
     # Invokes the view hook Proc stored under :hook and captures its output.
     # => Instead of defining methods on the class, view hooks are
@@ -78,14 +77,25 @@ module FatFreeCRM
         attr_accessor :view_hooks
 
         def add_view_hook(hook, proc, position)
-          @view_hooks[hook] += [{:proc => proc,
-                                 :position => position}]
+          @view_hooks[hook] += [{ proc: proc,
+                                  position: position }]
+        end
+
+        def insert_before(hook, &block)
+          add_view_hook(hook, block,        :before)
+        end
+
+        def insert_after(hook, &block)
+          add_view_hook(hook, block,        :after)
         end
 
-        def insert_before(hook, &block); add_view_hook(hook, block,        :before);  end
-        def insert_after(hook, &block);  add_view_hook(hook, block,        :after);   end
-        def replace(hook, &block);       add_view_hook(hook, block,        :replace); end
-        def remove(hook);                add_view_hook(hook, Proc.new{""}, :replace); end
+        def replace(hook, &block)
+          add_view_hook(hook, block,        :replace)
+        end
+
+        def remove(hook)
+          add_view_hook(hook, proc { "" }, :replace)
+        end
       end
     end # class Base
 
@@ -105,19 +115,19 @@ module FatFreeCRM
           # -- replace || original block
           # -- after
           view_data = "".html_safe
-          hooks[:before].each{|data| view_data << data }
+          hooks[:before].each { |data| view_data << data }
           # Only render the original view block if there are no pending :replace operations
           if hooks[:replace].empty?
             view_data << if block_given?
-                capture(&block)
-              else
-                # legacy view hooks
-                FatFreeCRM::Callback.hook(method, caller, context)
+                           capture(&block)
+                         else
+                           # legacy view hooks
+                           FatFreeCRM::Callback.hook(method, caller, context)
               end
           else
-            hooks[:replace].each{|data| view_data << data }
+            hooks[:replace].each { |data| view_data << data }
           end
-          hooks[:after].each{|data| view_data << data }
+          hooks[:after].each { |data| view_data << data }
 
           view_data
 
@@ -127,10 +137,8 @@ module FatFreeCRM
         end
       end
     end # module Helper
-
   end # module Callback
 end # module FatFreeCRM
 
-
 ActionView::Base.send(:include, FatFreeCRM::Callback::Helper)
 ActionController::Base.send(:include, FatFreeCRM::Callback::Helper)

data/lib/fat_free_crm/comment_extensions.rb

@@ -19,7 +19,7 @@ module FatFreeCRM
 
     module InstanceMethods
       def add_comment_by_user(comment_body, user)
-        comments.create(:comment => comment_body, :user => user) if comment_body.present?
+        comments.create(comment: comment_body, user: user) if comment_body.present?
       end
     end
   end

data/lib/fat_free_crm/core_ext.rb

@@ -3,4 +3,4 @@
 # 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
 #------------------------------------------------------------------------------
-Dir[ File.dirname(__FILE__) + "/core_ext/*.rb" ].each { |file| require(file) }
+Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each { |file| require(file) }