redmine_crm 0.0.32 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53e88df183eaac044b20107ec4bb73502d92239a
-  data.tar.gz: b37a3fea030250fba44999d8070c374003570273
+  metadata.gz: 5242b016d5072c81150cb2008b3fc7633a96216f
+  data.tar.gz: b3f77eb78ff97c6c06ef28e57b8d17af8d7f8e34
 SHA512:
-  metadata.gz: 017078dd495d19f831c5d5981e202e230c082de7d3dbb39adf42b4fb8f05d01a782cce1864b50c5767e1292725e0d6c938bdc3c1af448707449a8e3f37d01e25
-  data.tar.gz: 735298c2dab4727a52483e097cc8cdfdfdec0d443d3fb746d5ec7146ea5f77350b58b2ec60bcdf51aeecbcdaf7b74db95b69fc37335b8ccde3964a65172c0a7a
+  metadata.gz: ef26d5b1ee5e367ef7240ca961cdeb3bbaaf75b0af6c2c68f779b988302998cd2ee2b69c7a21ac48b22ea18f6ffb141cfa42afb033ca1dc7c0389cd97b395aa4
+  data.tar.gz: f0779bd48b8225c24411e243b4dcb7a8b17b359e51dc57dd894c57f9388e3dcdc3316edd9ee67fb48b223828246025dc083b2034e157cb02d550c4d2c338dde1

data/bitbucket-pipelines.yml

@@ -12,6 +12,6 @@ pipelines:
           - bundler --version
           - bundle install
           - gem install byebug
-          - gem install rails -v 4.2.7.1
+          - gem install rails -v 5.1.2
           - gem install sqlite3
           - rake test

data/config/currency_iso.json

@@ -2528,5 +2528,17 @@
     "thousands_separator": ",",
     "iso_numeric": "967",
     "smallest_denomination": 5
+  },
+  "btc": {
+    "priority": 100,
+    "iso_code": "BTC",
+    "name": "Bitcoin",
+    "symbol": "฿",
+    "subunit": "sat",
+    "subunit_to_unit": 100000000,
+    "symbol_first": false,
+    "html_entity": "฿",
+    "decimal_mark": ",",
+    "thousands_separator": "."
   }
 }

data/doc/CHANGELOG

@@ -4,6 +4,16 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2017 RedmineUP
 https://www.redmineup.com/
 
+== 2017-12-18 v0.0.33
+
+* Rails 5 support (Redmine 4)
+* rcrm_acts_as_list (Redmine 4)
+* Bitcoin currency support
+
+== 2017-07-18 v0.0.32
+
+* charjs added
+
 == 2017-05-29 v0.0.31
 
 * select2 controls for contacts and people

data/lib/redmine_crm.rb

@@ -1,5 +1,6 @@
 require 'redmine_crm/version'
 
+require 'redmine_crm/acts_as_list/list'
 require 'redmine_crm/acts_as_taggable/tag'
 require 'redmine_crm/acts_as_taggable/tag_list'
 require 'redmine_crm/acts_as_taggable/tagging'
@@ -26,8 +27,9 @@ require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/assets_manager'
 
 if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Votable)
+  ActiveRecord::Base.include(RedmineCrm::ActsAsList::List)
   ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Voter)
+  ActiveRecord::Base.extend(RedmineCrm::ActsAsVotable::Votable)
 end
 
 RedmineCrm::AssetsManager.install_assets

data/lib/redmine_crm/acts_as_list/list.rb

@@ -0,0 +1,282 @@
+module RedmineCrm
+  module ActsAsList
+    module List
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
+      # The class that has this specified needs to have a +position+ column defined as an integer on
+      # the mapped database table.
+      #
+      # Todo list example:
+      #
+      #   class TodoList < ActiveRecord::Base
+      #     has_many :todo_items, :order => "position"
+      #   end
+      #
+      #   class TodoItem < ActiveRecord::Base
+      #     belongs_to :todo_list
+      #     acts_as_list :scope => :todo_list
+      #   end
+      #
+      #   todo_list.first.move_to_bottom
+      #   todo_list.last.move_higher
+      module ClassMethods
+        # Configuration options are:
+        #
+        # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
+        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt>
+        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible
+        #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
+        #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
+        def rcrm_acts_as_list(options = {})
+
+          configuration = { :column => "position", :scope => "1 = 1" }
+          configuration.update(options) if options.is_a?(Hash)
+
+          configuration[:scope] = "#{configuration[:scope]}_id".intern if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
+
+          if configuration[:scope].is_a?(Symbol)
+            scope_condition_method = %(
+              def scope_condition
+                if #{configuration[:scope].to_s}.nil?
+                  "#{configuration[:scope].to_s} IS NULL"
+                else
+                  "#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
+                end
+              end
+            )
+          else
+            scope_condition_method = "def scope_condition() \"#{configuration[:scope]}\" end"
+          end
+
+          class_eval <<-EOV
+            include RedmineCrm::ActsAsList::List::InstanceMethods
+
+            def rcrm_acts_as_list_class
+              ::#{self.name}
+            end
+
+            def position_column
+              '#{configuration[:column]}'
+            end
+
+            #{scope_condition_method}
+
+            before_destroy :remove_from_list
+            before_create  :add_to_list_bottom
+          EOV
+        end
+      end
+
+      # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
+      # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
+      # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
+      # the first in the list of all chapters.
+      module InstanceMethods
+        # Insert the item at the given position (defaults to the top position of 1).
+        def insert_at(position = 1)
+          insert_at_position(position)
+        end
+
+        # Swap positions with the next lower item, if one exists.
+        def move_lower
+          return unless lower_item
+
+          rcrm_acts_as_list_class.transaction do
+            lower_item.decrement_position
+            increment_position
+          end
+        end
+
+        # Swap positions with the next higher item, if one exists.
+        def move_higher
+          return unless higher_item
+
+          rcrm_acts_as_list_class.transaction do
+            higher_item.increment_position
+            decrement_position
+          end
+        end
+
+        # Move to the bottom of the list. If the item is already in the list, the items below it have their
+        # position adjusted accordingly.
+        def move_to_bottom
+          return unless in_list?
+          rcrm_acts_as_list_class.transaction do
+            decrement_positions_on_lower_items
+            assume_bottom_position
+          end
+        end
+
+        # Move to the top of the list. If the item is already in the list, the items above it have their
+        # position adjusted accordingly.
+        def move_to_top
+          return unless in_list?
+          rcrm_acts_as_list_class.transaction do
+            increment_positions_on_higher_items
+            assume_top_position
+          end
+        end
+
+        # Move to the given position
+        def move_to=(pos)
+          case pos.to_s
+          when 'highest'
+            move_to_top
+          when 'higher'
+            move_higher
+          when 'lower'
+            move_lower
+          when 'lowest'
+            move_to_bottom
+          end
+          reset_positions_in_list
+        end
+
+        def reset_positions_in_list
+          rcrm_acts_as_list_class.where(scope_condition).reorder("#{position_column} ASC, id ASC").each_with_index do |item, i|
+            unless item.send(position_column) == (i + 1)
+              rcrm_acts_as_list_class.where({:id => item.id}).
+                update_all({position_column => (i + 1)})
+            end
+          end
+        end
+
+        # Removes the item from the list.
+        def remove_from_list
+          if in_list?
+            decrement_positions_on_lower_items
+            update_attribute position_column, nil
+          end
+        end
+
+        # Increase the position of this item without adjusting the rest of the list.
+        def increment_position
+          return unless in_list?
+          update_attribute position_column, self.send(position_column).to_i + 1
+        end
+
+        # Decrease the position of this item without adjusting the rest of the list.
+        def decrement_position
+          return unless in_list?
+          update_attribute position_column, self.send(position_column).to_i - 1
+        end
+
+        # Return +true+ if this object is the first in the list.
+        def first?
+          return false unless in_list?
+          self.send(position_column) == 1
+        end
+
+        # Return +true+ if this object is the last in the list.
+        def last?
+          return false unless in_list?
+          self.send(position_column) == bottom_position_in_list
+        end
+
+        # Return the next higher item in the list.
+        def higher_item
+          return nil unless in_list?
+          rcrm_acts_as_list_class.where(
+            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
+          ).first
+        end
+
+        # Return the next lower item in the list.
+        def lower_item
+          return nil unless in_list?
+          rcrm_acts_as_list_class.where(
+            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
+          ).first
+        end
+
+        # Test if this record is in a list
+        def in_list?
+          !send(position_column).nil?
+        end
+
+        private
+
+        def add_to_list_top
+          increment_positions_on_all_items
+        end
+
+        def add_to_list_bottom
+          self[position_column] = bottom_position_in_list.to_i + 1
+        end
+
+        # Overwrite this method to define the scope of the list changes
+        def scope_condition() "1" end
+
+        # Returns the bottom position number in the list.
+        #   bottom_position_in_list    # => 2
+        def bottom_position_in_list(except = nil)
+          item = bottom_item(except)
+          item ? item.send(position_column) : 0
+        end
+
+        # Returns the bottom item
+        def bottom_item(except = nil)
+          conditions = scope_condition
+          conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
+          rcrm_acts_as_list_class.where(conditions).reorder("#{position_column} DESC").first
+        end
+
+        # Forces item to assume the bottom position in the list.
+        def assume_bottom_position
+          update_attribute(position_column, bottom_position_in_list(self).to_i + 1)
+        end
+
+        # Forces item to assume the top position in the list.
+        def assume_top_position
+          update_attribute(position_column, 1)
+        end
+
+        # This has the effect of moving all the higher items up one.
+        def decrement_positions_on_higher_items(position)
+          rcrm_acts_as_list_class.
+            where("#{scope_condition} AND #{position_column} <= #{position}").
+            update_all("#{position_column} = (#{position_column} - 1)")
+        end
+
+        # This has the effect of moving all the lower items up one.
+        def decrement_positions_on_lower_items
+          return unless in_list?
+          rcrm_acts_as_list_class.
+            where("#{scope_condition} AND #{position_column} > #{send(position_column).to_i}").
+            update_all("#{position_column} = (#{position_column} - 1)")
+        end
+
+        # This has the effect of moving all the higher items down one.
+        def increment_positions_on_higher_items
+          return unless in_list?
+          rcrm_acts_as_list_class.
+            where("#{scope_condition} AND #{position_column} < #{send(position_column).to_i}").
+            update_all("#{position_column} = (#{position_column} + 1)")
+        end
+
+        # This has the effect of moving all the lower items down one.
+        def increment_positions_on_lower_items(position)
+          rcrm_acts_as_list_class.
+            where("#{scope_condition} AND #{position_column} >= #{position}").
+            update_all("#{position_column} = (#{position_column} + 1)")
+        end
+
+        # Increments position (<tt>position_column</tt>) of all items in the list.
+        def increment_positions_on_all_items
+          rcrm_acts_as_list_class.
+            where("#{scope_condition}").
+            update_all("#{position_column} = (#{position_column} + 1)")
+        end
+
+        def insert_at_position(position)
+          remove_from_list
+          increment_positions_on_lower_items(position)
+          self.update_attribute(position_column, position)
+        end
+      end
+    end
+  end
+end

data/lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb

@@ -24,7 +24,8 @@ module RedmineCrm
           include RedmineCrm::ActsAsTaggable::Taggable::InstanceMethods
           extend RedmineCrm::ActsAsTaggable::Taggable::SingletonMethods
 
-          alias_method_chain :reload, :tag_list
+          alias_method :reload_without_tag_list, :reload
+          alias_method :reload, :reload_with_tag_list
 
           class_eval do
             def self.taggable?
@@ -230,8 +231,8 @@ module RedmineCrm
           # scope(:find)
 
           conditions = []
-          conditions << send(:sanitize_conditions, options.delete(:conditions)) if options[:conditions]
-          conditions << send(:sanitize_conditions, scope) if scope
+          conditions << send(:sanitize_sql, options.delete(:conditions)) if options[:conditions]
+          conditions << send(:sanitize_sql, scope) if scope
           conditions << "#{Tagging.table_name}.taggable_type = #{quote_string_value(base_class.name)}"
           conditions << type_condition unless descends_from_active_record?
           conditions.compact!
@@ -253,7 +254,7 @@ module RedmineCrm
 
        private
         def quote_string_value(object)
-          sanitize(object)
+          connection.quote(object)
         end
 
         def tags_condition(tags, table_name = Tag.table_name)

data/lib/redmine_crm/acts_as_viewed/rcrm_acts_as_viewed.rb

@@ -144,7 +144,8 @@ module RedmineCrm
             target = self
             target.views = ((target.views || 0) + 1) unless options[:only_total]
             target.total_views = ((target.total_views || 0) + 1)
-            target.save(:validate => false)
+            target.record_timestamps = false
+            target.save(:validate => false, :touch => false)
             # target.save_without_validation
           end
         end

data/lib/redmine_crm/acts_as_votable/votable.rb

@@ -235,7 +235,7 @@ module RedmineCrm
             updates[scope_cache_field :cached_weighted_average, vote_scope] = weighted_average(true, vote_scope)
           end
         end
-
+        self.record_timestamps = false
         if (::ActiveRecord::VERSION::MAJOR == 3) && (::ActiveRecord::VERSION::MINOR != 0)
           self.update_attributes(updates, :without_protection => true) if !updates.empty?
         else

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -41,6 +41,7 @@ files:
 - doc/CHANGELOG
 - doc/LICENSE.txt
 - lib/redmine_crm.rb
+- lib/redmine_crm/acts_as_list/list.rb
 - lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb
 - lib/redmine_crm/acts_as_taggable/tag.rb
 - lib/redmine_crm/acts_as_taggable/tag_list.rb