fat_free_crm 0.16.4 → 0.17.1

data/spec/views/tasks/new.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/tasks/new" do
   include TasksHelper
 
   before do
-    login_and_assign
+    login
     assign(:task, FactoryGirl.build(:task))
     assign(:users, [current_user])
     assign(:bucket, Setting.task_bucket[1..-1] << ["On Specific Date...", :specific_time])

data/spec/views/tasks/uncomplete.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/tasks/uncomplete" do
   include TasksHelper
 
   before do
-    login_and_assign
+    login
     assign(:bucket, [])
   end
 

data/spec/views/tasks/update.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/tasks/update" do
   include TasksHelper
 
   before do
-    login_and_assign
+    login
   end
 
   describe "Changing due date" do

data/spec/views/users/avatar.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/users/avatar" do
   include UsersHelper
 
   before do
-    login_and_assign
+    login
     assign(:user, current_user)
   end
 

data/spec/views/users/change_password.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/users/change_password" do
   include UsersHelper
 
   before do
-    login_and_assign
+    login
     assign(:user, @user = current_user)
   end
 

data/spec/views/users/edit.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/users/edit" do
   include UsersHelper
 
   before do
-    login_and_assign
+    login
     assign(:user, @user = current_user)
   end
 

data/spec/views/users/password.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/users/password" do
   include UsersHelper
 
   before do
-    login_and_assign
+    login
     assign(:user, current_user)
   end
 

data/spec/views/users/update.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/users/update" do
   include UsersHelper
 
   before do
-    login_and_assign
+    login
     assign(:user, @user = current_user)
   end
 

data/spec/views/users/upload_avatar.js.haml_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -9,7 +11,7 @@ describe "/users/upload_avatar" do
   include UsersHelper
 
   before do
-    login_and_assign
+    login
   end
 
   describe "no errors:" do
@@ -31,7 +33,7 @@ describe "/users/upload_avatar" do
     before do
       @avatar = FactoryGirl.build_stubbed(:avatar, entity: current_user)
       @avatar.errors.add(:image, "error")
-      allow(current_user).to receive(:avatar).and_return(@avatar)
+      allow_any_instance_of(User).to receive(:avatar).and_return(@avatar)
       assign(:user, @user = current_user)
     end
 

data/vendor/assets/javascripts/textarea_autocomplete.js

@@ -172,7 +172,7 @@
     //_data[_count].lineHeight = $(ta).css("font-size");
 
     var ta_id = $(ta).attr('id')
-    $(ta).after("<div class='areacomplete-dropdown' id='areacomplete_"+ta_id+"'><ul class='auto-list chzn-results'></ul></div>");
+    $(ta).after("<div class='areacomplete-dropdown' id='areacomplete_"+ta_id+"'><ul class='auto-list'></ul></div>");
     _data[_count].list = $('.auto-list').first()
 
     registerEvents(_data[_count]);

data/vendor/gems/globby-0.1.2/lib/globby/glob.rb

@@ -49,7 +49,7 @@ module Globby
     def to_regexp
       parts = @pattern.split(GLOB_TOKENIZER) - [""]
 
-      result = parts.first.sub!(/\A\//, '') ? '\A' : '(\A|/)'
+      result = String.new(parts.first.sub!(/\A\//, '') ? '\A' : '(\A|/)')
       parts.each do |part|
         result << part_to_regexp(part)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_free_crm
 version: !ruby/object:Gem::Version
-  version: 0.16.4
+  version: 0.17.1
 platform: ruby
 authors:
 - Michael Dvorkin
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -564,6 +564,7 @@ files:
 - Procfile
 - README.md
 - Rakefile
+- Vagrantfile
 - app/assets/images/1x1.gif
 - app/assets/images/asterisk.gif
 - app/assets/images/avatar.jpg
@@ -581,7 +582,6 @@ files:
 - app/assets/javascripts/admin/fields.js.coffee
 - app/assets/javascripts/application.js.erb
 - app/assets/javascripts/crm.js.coffee
-- app/assets/javascripts/crm_chosen.js.coffee
 - app/assets/javascripts/crm_classes.js.coffee
 - app/assets/javascripts/crm_comments.js.coffee
 - app/assets/javascripts/crm_loginout.js.coffee
@@ -601,7 +601,6 @@ files:
 - app/assets/stylesheets/application.css.erb
 - app/assets/stylesheets/base.scss
 - app/assets/stylesheets/common.scss
-- app/assets/stylesheets/ffcrm_chosen.scss
 - app/assets/stylesheets/fields.scss
 - app/assets/stylesheets/format_buttons.css.scss
 - app/assets/stylesheets/groups.css.scss
@@ -1037,6 +1036,7 @@ files:
 - config.ru
 - config/application.rb
 - config/boot.rb
+- config/brakeman.ignore
 - config/database.mysql.mac.yml
 - config/database.mysql.yml
 - config/database.postgres.docker.yml
@@ -1177,6 +1177,8 @@ files:
 - db/migrate/20150227123054_remove_last_request_at_from_users.rb
 - db/migrate/20150427131956_create_index_related_type.rb
 - db/migrate/20160511053730_add_account_contacts_index.rb
+- db/migrate/20180102075234_add_account_counter_caches.rb
+- db/migrate/20180103223438_add_minlength_to_field.rb
 - db/schema.rb
 - db/seeds.rb
 - db/seeds/fields.rb
@@ -1473,10 +1475,6 @@ files:
 - vendor/assets/images/jquery-ui/ui-icons_466bb1_256x240.png
 - vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png
 - vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
-- vendor/assets/javascripts/ajax-chosen-jquery.js
-- vendor/assets/javascripts/ajax-chosen.jquery.coffee
-- vendor/assets/javascripts/chosen-jquery.js
-- vendor/assets/javascripts/chosen.jquery.coffee
 - vendor/assets/javascripts/jquery.disable.js
 - vendor/assets/javascripts/jquery_timeago/index.js
 - vendor/assets/javascripts/jquery_timeago/jquery.timeago.cz.js
@@ -1548,11 +1546,9 @@ files:
 - vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-sv-SE.js
 - vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-th.js
 - vendor/assets/javascripts/jquery_ui_datepicker/jquery.ui.datepicker-zh-CN.js
-- vendor/assets/javascripts/lib/abstract-chosen.coffee
 - vendor/assets/javascripts/lib/select-parser.coffee
 - vendor/assets/javascripts/rating.js
 - vendor/assets/javascripts/textarea_autocomplete.js
-- vendor/assets/stylesheets/chosen.css.sass
 - vendor/assets/stylesheets/jquery-ui.custom.scss
 - vendor/assets/stylesheets/modalbox.css
 - vendor/gems/globby-0.1.2/LICENSE.txt
@@ -1577,7 +1573,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -1585,7 +1581,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fat Free CRM

data/app/assets/javascripts/crm_chosen.js.coffee

@@ -1,29 +0,0 @@
-# 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
-#------------------------------------------------------------------------------
-(($) ->
-
-  window.crm ||= {}
-
-  # Use the 'ajax_chosen' class on select boxes that need to lookup values from server
-  # Each select should have a 'data-url' attribute to specify the autocomplete path
-  #----------------------------------------------------------------------------
-  crm.makeAjaxChosen = ->
-    $("select.ajax_chosen").each ->
-      $(this).ajaxChosen({
-        url: $(this).data('url')
-        jsonTermKey: "auto_complete_query",
-        minTermLength: 2},
-        null,
-        {allow_single_deselect: true, show_on_activate: true}
-      )
-
-  $(document).ready ->
-    crm.makeAjaxChosen()
-
-  $(document).ajaxComplete ->
-    crm.makeAjaxChosen()
-
-) jQuery

data/app/assets/stylesheets/ffcrm_chosen.scss

@@ -1,69 +0,0 @@
-// 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
-//------------------------------------------------------------------------------
-// Chosen CSS Tweaks
-//------------------------------------------------------------------------------
-
-.chzn-container {
-  margin-top: 3px;
-  margin-left: -1px; }
-
-.chzn-container .chzn-results li {
-  line-height: 15px;
-  padding: 4px 7px 4px;
-  border-bottom: none; }
-
-// Multiselect
-//------------------------------------------------------------------------------
-.chzn-container-multi .chzn-choices li {
-  clear: none; }
-
-.chzn-container-multi .chzn-choices .search-field input {
-  height: auto; }
-
-// Single select
-//------------------------------------------------------------------------------
-.chzn-container-single .chzn-single {
-  height: 21px;
-  line-height: 21px; }
-
-.chzn-container-single .chzn-single div b {
-  background-position-y: -1px; }
-
-.chzn-container-single .chzn-single abbr {
-  top: 5px; }
-
-// Address fields have extra margin
-table.address {
-  .chzn-container {
-    margin-top: 5px; } }
-
-// Basic styling for standard selects and other inputs
-//------------------------------------------------------------------------------
-input {
-  height: 17px;
-  font-size: 13px; }
-
-input[type=submit], input[type=file] {
-  height: auto; }
-
-select {
-  height: 23px;
-  color: #444444;
-  background-color: white;
-  background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, #eeeeee), color-stop(0.5, white));
-  background-image: -webkit-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -moz-linear-gradient(center bottom, #eeeeee 0%, white 50%);
-  background-image: -o-linear-gradient(top, #eeeeee 0%, white 50%);
-  background-image: -ms-linear-gradient(top, #eeeeee 0%, white 50%);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff',GradientType=0 );
-  background-image: linear-gradient(top, #eeeeee 0%, white 50%);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -moz-background-clip: padding;
-  -webkit-background-clip: padding-box;
-  background-clip: padding-box;
-  border: 1px solid #aaaaaa; }

data/vendor/assets/javascripts/ajax-chosen-jquery.js

@@ -1,2 +0,0 @@
-//= require chosen-jquery
-//= require ajax-chosen.jquery

data/vendor/assets/javascripts/ajax-chosen.jquery.coffee

@@ -1,171 +0,0 @@
-# Thanks to https://raw.github.com/meltingice/ajax-chosen/master/src/ajax-chosen.coffee
-
-do ($ = jQuery) ->
-
-  $.fn.ajaxChosen = (settings = {}, callback, chosenOptions = {}) ->
-    defaultOptions =
-      minTermLength: 3
-      afterTypeDelay: 500
-      jsonTermKey: "term"
-      keepTypingMsg: "Keep typing..."
-      lookingForMsg: "Looking for"
-
-    # This will come in handy later.
-    select = @
-
-    chosenXhr = null
-
-    # Merge options with defaults
-    options = $.extend {}, defaultOptions, $(select).data(), settings
-
-    # Load chosen. To make things clear, I have taken the liberty
-    # of using the .chzn-autoselect class to specify input elements
-    # we want to use with ajax autocomplete.
-    @chosen(if chosenOptions then chosenOptions else {})
-
-    @each ->
-      # Now that chosen is loaded normally, we can bootstrap it with
-      # our ajax autocomplete code.
-      $(@).next('.chzn-container')
-        .find(".search-field > input, .chzn-search > input")
-        .bind 'keyup', ->
-          # This code will be executed every time the user types a letter
-          # into the input form that chosen has created
-
-          # Retrieve the current value of the input form
-          untrimmed_val = $(@).val()
-          val = $.trim $(@).val()
-
-          # Depending on how much text the user has typed, let them know
-          # if they need to keep typing or if we are looking for their data
-          msg = if val.length < options.minTermLength then options.keepTypingMsg else options.lookingForMsg + " '#{val}'"
-          select.next('.chzn-container').find('.no-results').text(msg)
-
-          # If input text has not changed ... do nothing
-          return false if val is $(@).data('prevVal')
-
-          # Set the current search term so we don't execute the ajax call if
-          # the user hits a key that isn't an input letter/number/symbol
-          $(@).data('prevVal', val)
-
-          # At this point, we have a new term/query ... the old timer
-          # is no longer valid.  Clear it.
-
-          # We delay searches by a small amount so that we don't flood the
-          # server with ajax requests.
-          clearTimeout(@timer) if @timer
-
-          # Some simple validation so we don't make excess ajax calls. I am
-          # assuming you don't want to perform a search with less than 3
-          # characters.
-          return false if val.length < options.minTermLength
-
-          # This is a useful reference for later
-          field = $(@)
-
-          # Default term key is `term`.  Specify alternative in options.options.jsonTermKey
-          options.data = {} unless options.data?
-          options.data[options.jsonTermKey] = val
-          options.data = options.dataCallback(options.data) if options.dataCallback?
-
-          # If the user provided an ajax success callback, store it so we can
-          # call it after our bootstrapping is finished.
-          success = options.success
-
-          # Create our own callback that will be executed when the ajax call is
-          # finished.
-          options.success = (data) ->
-            # Exit if the data we're given is invalid
-            return unless data?
-
-            # Go through all of the <option> elements in the <select> and remove
-            # ones that have not been selected by the user.  For those selected
-            # by the user, add them to a list to filter from the results later.
-            selected_values = []
-            select.find('option').each ->
-              if not $(@).is(":selected")
-                $(@).remove()
-              else
-                selected_values.push $(@).val() + "-" + $(@).text()
-            select.find('optgroup:empty').each ->
-              $(@).remove()
-
-
-            # Send the ajax results to the user callback so we can get an object of
-            # value => text pairs to inject as <option> elements.
-            items = if callback? then callback(data, field) else data
-
-
-            nbItems = 0
-
-            # Iterate through the given data and inject the <option> elements into
-            # the DOM if it doesn't exist in the selector already
-            $.each items, (i, element) ->
-              nbItems++
-
-              if element.group
-                group = select.find("optgroup[label='#{element.text}']")
-                group = $("<optgroup />") unless group.size()
-
-                group.attr('label', element.text)
-                  .appendTo(select)
-                $.each element.items, (i, element) ->
-                  if typeof element == "string"
-                    value = i;
-                    text = element;
-                  else
-                    value = element.value;
-                    text = element.text;
-                  if $.inArray(value + "-" + text, selected_values) == -1
-                    $("<option />")
-                      .attr('value', value)
-                      .html(text)
-                      .appendTo(group)
-              else
-                if typeof element == "string"
-                  value = i;
-                  text = element;
-                else
-                  value = element.value;
-                  text = element.text;
-                if $.inArray(value + "-" + text, selected_values) == -1
-                  $("<option />")
-                    .attr('value', value)
-                    .html(text)
-                    .appendTo(select)
-
-            if nbItems
-              # Tell chosen that the contents of the <select> input have been updated
-              # This makes chosen update its internal list of the input data.
-              select.trigger("liszt:updated")
-            else
-              # If there are no results, display the no_results text
-              select.data().chosen.no_results_clear()
-              select.data().chosen.no_results field.val()
-
-            # Finally, call the user supplied callback (if it exists)
-            settings.success(data) if settings.success?
-
-            # For some reason, the contents of the input field get removed once you
-            # call trigger above. Often, this can be very annoying (and can make some
-            # searches impossible), so we add the value the user was typing back into
-            # the input field.
-            field.val(untrimmed_val)
-
-            # Because non-ajax Chosen isn't constantly re-building results, when it
-            # DOES rebuild results (during liszt:updated above, it clears the input
-            # search field before scaling it.  This causes the input field width to be
-            # at it's minimum, which is about 25px.
-
-            # The proper way to fix this would be create a new method in chosen for
-            # rebuilding results without clearing the input field.  Or to call
-            # Chosen.search_field_scale() after resetting the value above.  This isn't
-            # possible with the current state of Chosen.  The quick fix is to simply reset
-            # the width of the field after we reset the value of the input text.
-            # field.css('width','auto')
-
-          # Execute the ajax call to search for autocomplete data with a timer
-          @timer = setTimeout ->
-            chosenXhr.abort() if chosenXhr
-            chosenXhr = $.ajax(options)
-          , options.afterTypeDelay