redmine_crm 0.0.38 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ade85cd3ada9dbdf2283e26488fc7a8ae0eeb93
-  data.tar.gz: 1c872961e53a3f1186ee4283cb08a15b264b3fe2
+  metadata.gz: cec54924c890caa40b9affa944a8cf4186e4ca7c
+  data.tar.gz: 1b0b5395bc2f1e5f2c03ee4504725a6cbb153b57
 SHA512:
-  metadata.gz: 07c4211ffc5be1a3322a8eec1dc7ccfdaabe77b8edc8cade7a486b0a51852a728b78144c31c3f5c998c18ef11d954a24000f646f58f23bb98e57723dda3dca4d
-  data.tar.gz: 6527ee07dbcc1e52cd240e03c70dbf6ac00d32ef43b0af638940572896eb239e8cc7bb444927a74570845ca3501d474615a584fb126860fa52401499c9ef24bd
+  metadata.gz: 2cbb08c06c06fa75356b93d25a23483f776b1c96a9f505f1ace7a54ae6123057dc1972145a93dd0632cf3ac8c8260c88513ec9d333f5912d4c39653d5a1c7406
+  data.tar.gz: 29c51f79b3d048c7d4ad59ff48be8f2757c85230fb1b5aa082fa4d07033d867142f3331d804363c10567d0f7aadfca404f273570f0056eb6ae440d7cb6291e60

data/README.md

@@ -73,7 +73,7 @@ puts message.save_draft
 # => true
 
 # You can also save draft linked to a particular user.
-Message.new(subject: 'baz').save_draft(current_user)
+Message.new(subject: 'baz').save_draft(user: current_user)
 
 # And restore message from some user's draft.
 user_draft = Message.drafts(current_user).last
@@ -94,9 +94,15 @@ user_message.save!
 puts Message.drafts(current_user).count
 # => 0
 
-# Draft won't be saved for a persisted instance.
-puts user_message.save_draft
+# Drafts will be saved only for new (not persisted) or changed instances.
+puts Message.new.save_draft
+# => true
+persisted = Message.last
+puts persisted.save_draft
 # => false
+persisted.subject = 'other subject'
+puts persisted.save_draft
+# => true
 ```
 
 ### Tags

data/doc/CHANGELOG

@@ -4,6 +4,12 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2018 RedmineUP
 https://www.redmineup.com/
 
+== 2018-09-28 v0.0.40
+
+* acts_as_draftable adopted for Redmine projects
+* New Liquid Drops: JournalsDrop, JournalDrop, TimeEntriesDrop, TimeEntryDrop
+* New liquid properties for issues: done_ratio, estimated_hours, spent_hours, total_spent_hours, total_estimated_hours, is_private, closed_on, assignee, tracker, status, priority, category, version, time_entries, parent, project, subtasks, notes, journals
+
 == 2018-03-28 v0.0.37
 
 * Added rcrm_acts_as_draftable

data/lib/redmine_crm.rb

@@ -27,11 +27,14 @@ require 'redmine_crm/liquid/drops/issues_drop'
 require 'redmine_crm/liquid/drops/news_drop'
 require 'redmine_crm/liquid/drops/projects_drop'
 require 'redmine_crm/liquid/drops/users_drop'
+require 'redmine_crm/liquid/drops/time_entries_drop'
 
 require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/helpers/form_tag_helper'
 require 'redmine_crm/assets_manager'
 
+require 'redmine_crm/compatibility/application_controller_patch'
+
 module RedmineCrm
   GEM_NAME = 'redmine_crm'.freeze
 end

data/lib/redmine_crm/acts_as_draftable/rcrm_acts_as_draftable.rb

@@ -55,7 +55,7 @@ module RedmineCrm
         end
 
         attr_accessor :draft_id
-        after_create :clear_draft
+        before_save :clear_draft
 
         extend RedmineCrm::ActsAsDraftable::ClassMethods
         include RedmineCrm::ActsAsDraftable::InstanceMethods
@@ -74,39 +74,56 @@ module RedmineCrm
         target = draft.target_type.constantize.new
         target.load_from_draft(draft.data)
 
-        target.send("#{draft_parent}=", draft.parent) if draft_parent
         target.draft_id = draft.id
         target
       end
 
       def drafts(user)
-        Draft.where(user: user, target_type: name)
+        Draft.where(user_id: user.id, target_type: name)
       end
     end # ClassMethods
 
     module InstanceMethods
-      def save_draft(user = nil)
-        return false unless self.new_record?
-
-        draft = Draft.find_by_id(self.draft_id) || Draft.new
+      def save_draft
+        return false unless new_record? || changed?
 
+        draft = self.draft || Draft.new
         draft.data = dump_to_draft
+        draft.user_id = User.current.try(:id)
+        draft.parent = parent_for_draft
         draft.target_type = self.class.name
-        draft.user = user
-        draft.parent = self.send(self.class.draft_parent) if self.class.draft_parent
 
         result = draft.save
         self.draft_id = draft.id if result
         result
       end
 
-      def update_draft(user, attributes)
+      def update_draft(attributes)
         with_transaction_returning_status do
           assign_attributes(attributes)
-          save_draft(user)
+          save_draft
         end
       end
 
+      def draft
+        Draft.find_by_id(draft_id)
+      end
+
+      def parent_for_draft
+        return self if id.present?
+
+        self.class.draft_parent.present? ? send(self.class.draft_parent) : self
+      end
+
+      def last_draft
+        @last_draft ||= RedmineCrm::ActsAsDraftable::Draft.where(
+          target_type: self.class.name,
+          parent_type: parent_for_draft.try(:class).try(:to_s),
+          parent_id:   parent_for_draft.try(:id),
+          user_id:     User.current.try(:id)
+        ).last
+      end
+
       def dump_to_draft
         Marshal.dump(instance_values)
       end
@@ -119,11 +136,9 @@ module RedmineCrm
         end
       end
 
-      private
-
       def clear_draft
-        if draft = Draft.find_by_id(self.draft_id)
-          self.draft_id = nil if draft.destroy
+        if last_draft && last_draft.destroy
+          self.draft_id = nil
         end
       end
     end # InstanceMethods
@@ -135,7 +150,7 @@ module RedmineCrm
         connection.create_table :drafts do |t|
           t.string :target_type, limit: 150, null: false
           t.references :user
-          t.references :parent, polymorphic: true, index: true
+          t.references :parent, polymorphic: true
           t.binary :data, limit: 16777215, null: false
           t.datetime :updated_at, null: false
         end

data/lib/redmine_crm/acts_as_viewed/rcrm_acts_as_viewed.rb

@@ -104,8 +104,8 @@ module RedmineCrm
           self.acts_as_viewed_options = { :viewing_class => viewing_class,
                                           :viewer_class => viewer_class }
           class_eval do
-            has_many :viewings, :as => :viewed, :dependent => :delete_all, :class_name => viewing_class.to_s
-            has_many(:viewers, :through => :viewings, :class_name => viewer_class.to_s)
+            has_many :viewings, as: :viewed, dependent: :delete_all, class_name: viewing_class.to_s
+            has_many :viewers, through: :viewings, class_name: viewer_class.to_s
 
             before_create :init_viewing_fields
           end
@@ -113,9 +113,9 @@ module RedmineCrm
           # Add to the User (or whatever the viewer is) a has_many viewings
           viewer_as_class = viewer_class.constantize
           return if viewer_as_class.instance_methods.include?('find_in_viewings')
-          viewer_as_class.class_eval <<-EOS
-            has_many :viewings, foreign_key: :viewer_id, class_name: '#{viewing_class.to_s}', dependent: :delete_all
-          EOS
+          viewer_as_class.class_eval do
+            has_many :viewings, foreign_key: :viewer_id, class_name: viewing_class.to_s, dependent: :delete_all
+          end
         end
       end
 

data/lib/redmine_crm/compatibility/application_controller_patch.rb

@@ -0,0 +1,29 @@
+module RedmineCrm
+  module Patches
+    module ApplicationControllerPatch
+      def self.included(base) # :nodoc:
+        base.extend(ClassMethods)
+        base.class_eval do
+          unloadable # Send unloadable so it will not be unloaded in development
+        end
+      end
+
+      module ClassMethods
+        def before_action(*filters, &block)
+          before_filter(*filters, &block)
+        end
+
+        def skip_before_action(*filters, &block)
+          skip_before_filter(*filters, &block)
+        end
+      end
+    end
+  end
+end
+
+unless ActionController::Base.methods.include?(:before_action)
+  ActionController::Base.send(
+    :include,
+    RedmineCrm::Patches::ApplicationControllerPatch
+  )
+end

data/lib/redmine_crm/currency/loader.rb

@@ -3,13 +3,12 @@ module RedmineCrm
     module Loader
       DATA_PATH = File.expand_path("../../../../config", __FILE__)
 
-      # Loads and returns the currencies stored in JSON files in the config directory.
+      # Loads and returns the currencies stored in JSON files
+      # in the config directory.
       #
       # @return [Hash]
       def load_currencies
-        currencies = parse_currency_file("currency_iso.json")
-        # currencies.merge! parse_currency_file("currency_non_iso.json")
-        # currencies.merge! parse_currency_file("currency_backwards_compatible.json")
+        parse_currency_file('currency_iso.json')
       end
 
       private
@@ -17,7 +16,7 @@ module RedmineCrm
       def parse_currency_file(filename)
         json = File.read("#{DATA_PATH}/#{filename}")
         json.force_encoding(::Encoding::UTF_8) if defined?(::Encoding)
-        JSON.parse(json, :symbolize_names => true)
+        JSON.parse(json, symbolize_names: true)
       end
     end
   end

data/lib/redmine_crm/liquid/drops/issues_drop.rb

@@ -16,6 +16,10 @@ module RedmineCrm
         end
       end
 
+      def visible
+        @visible ||= @all.select(&:visible?)
+      end
+
       def each(&block)
         all.each(&block)
       end
@@ -36,7 +40,13 @@ module RedmineCrm
                :start_date,
                :due_date,
                :overdue?,
-               :completed_percent,
+               :done_ratio,
+               :estimated_hours,
+               :spent_hours,
+               :total_spent_hours,
+               :total_estimated_hours,
+               :is_private?,
+               :closed_on,
                :updated_on,
                :created_on,
                :to => :@issue
@@ -57,10 +67,104 @@ module RedmineCrm
         @user ||= UserDrop.new(@issue.author)
       end
 
+      def assignee
+        @assignee ||= UserDrop.new(@issue.assigned_to)
+      end
+
+      def tracker
+        @tracker ||= @issue.tracker && @issue.tracker.name
+      end
+
+      def status
+        @status ||= @issue.status && @issue.status.name
+      end
+
+      def priority
+        @priority ||= @issue.priority && @issue.priority.name
+      end
+
+      def category
+        @category ||= @issue.category && @issue.category.name
+      end
+
+      def version
+        @version ||= @issue.fixed_version && @issue.fixed_version.name
+      end
+
+      def time_entries
+        @time_entries ||= TimeEntriesDrop.new @issue.time_entries
+      end
+
+      def parent
+        @parent ||= IssueDrop.new @issue.parent if @issue.parent 
+      end
+
+      def project
+        @project ||= ProjectDrop.new @issue.project if @issue.project 
+      end
+
+      def subtasks
+        @subtasks ||= IssuesDrop.new @issue.children 
+      end
+
+      def notes
+        @notes ||= @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil).order(:created_on).map(&:notes)
+      end
+
+      def journals
+        @journals ||= JournalsDrop.new @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil)
+      end
+
       def custom_field_values
         @issue.custom_field_values
       end      
 
     end
+
+    class JournalsDrop < ::Liquid::Drop
+      def initialize(journals)
+        @journals = journals
+      end
+
+      def all
+        @all ||= @journals.map do |journal|
+          JournalDrop.new journal
+        end
+      end
+
+      def visible
+        @visible ||= @all.select(&:visible?)
+      end
+
+      def each(&block)
+        all.each(&block)
+      end
+
+      def size
+        @journals.size
+      end
+    end
+
+    class JournalDrop < ::Liquid::Drop
+      delegate :id,
+               :notes,
+               :created_on,
+               :private_notes,
+               :to => :@journal
+
+      def initialize(journal)
+        @journal = journal
+      end
+
+      def user
+        @user ||= UserDrop.new(@journal.user)
+      end
+
+      def issue
+        @issue ||= IssueDrop.new @journal.issue if @journal.issue 
+      end
+
+    end
+
   end
 end

data/lib/redmine_crm/liquid/drops/projects_drop.rb

@@ -67,7 +67,7 @@ module RedmineCrm
       end
 
       def issues
-        @issues ||= IssuesDrop.new @project.issues.visible
+        @issues ||= IssuesDrop.new @project.issues
       end
 
       def users

data/lib/redmine_crm/liquid/drops/time_entries_drop.rb

@@ -0,0 +1,64 @@
+module RedmineCrm
+  module Liquid
+    class TimeEntriesDrop < ::Liquid::Drop
+      def initialize(time_entries)
+        @time_entries = time_entries
+      end
+
+      def all
+        @all ||= @time_entries.map do |time_entry|
+          TimeEntryDrop.new time_entry
+        end
+      end
+
+      def visible
+        @visible ||= @all.select(&:visible?)
+      end
+
+      def each(&block)
+        all.each(&block)
+      end
+
+      def size
+        @time_entries.size
+      end
+    end
+
+    class TimeEntryDrop < ::Liquid::Drop
+      include ActionView::Helpers::UrlHelper
+
+      delegate :id,
+               :hours,
+               :comments,
+               :spent_on,
+               :tyear,
+               :tmonth,
+               :tweek,
+               :visible?,
+               :updated_on,
+               :created_on,
+               :to => :@time_entry
+
+      def initialize(time_entry)
+        @time_entry = time_entry
+      end
+
+      def user
+        @user ||= UserDrop.new(@time_entry.user)
+      end
+
+      def issue
+        @issue ||= IssueDrop.new(@time_entry.issue)
+      end
+
+      def activity
+        @activity ||= @time_entry.activity && @time_entry.activity.name
+      end
+
+      def custom_field_values
+        @time_entry.custom_field_values
+      end      
+
+    end
+  end
+end

data/lib/redmine_crm/money_helper.rb

@@ -39,9 +39,9 @@ module RedmineCrm
     end
 
     def all_currencies
-      Currency.table.inject([]) do |array, (id, attributes)|
+      Currency.table.inject([]) do |array, (_, attributes)|
         array ||= []
-        array << ["#{attributes[:name]}" + (attributes[:symbol].blank? ? "" : " (#{attributes[:symbol]})"), attributes[:iso_code]]
+        array << [attributes[:name].to_s + (attributes[:symbol].blank? ? '' : " (#{attributes[:symbol]})"), attributes[:iso_code]]
         array
       end.sort{|x, y| x[0] <=> y[0]}
     end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.38'
+  VERSION = '0.0.40'
 end

data/test/acts_as_draftable/draft_test.rb

@@ -4,7 +4,7 @@ class DraftTest < ActiveSupport::TestCase
   def test_restore
     issue = Issue.new(subject: 'some subject', description: 'some description')
 
-    issue.save_draft(current_user)
+    issue.save_draft
     restored_issue = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id).restore
 
     assert_equal issue.subject, restored_issue.subject
@@ -13,9 +13,9 @@ class DraftTest < ActiveSupport::TestCase
 
   def test_restore_all
     first_issue = Issue.new(subject: 'first subject')
-    first_issue.save_draft(current_user)
+    first_issue.save_draft
     second_issue = Issue.new(subject: 'second subject')
-    second_issue.save_draft(current_user)
+    second_issue.save_draft
 
     restored_issues = RedmineCrm::ActsAsDraftable::Draft.restore_all
     assert_equal [first_issue.subject, second_issue.subject], restored_issues.map(&:subject).sort

data/test/acts_as_draftable/rcrm_acts_as_draftable_test.rb

@@ -34,16 +34,18 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
   end
 
   def test_drafts
+    Issue.rcrm_acts_as_draftable parent: :project
     issue = Issue.new
-    issue.save_draft(current_user)
+    issue.save_draft
 
     assert_equal 1, Issue.drafts(current_user).count
     assert_equal RedmineCrm::ActsAsDraftable::Draft, Issue.drafts(current_user).first.class
   end
 
   def test_from_draft
+    Issue.rcrm_acts_as_draftable parent: :project
     issue = Issue.new(subject: 'subject')
-    issue.save_draft(current_user)
+    issue.save_draft
 
     issue_from_draft = Issue.from_draft(issue.draft_id)
 
@@ -56,11 +58,11 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
 
   def test_draft_deleted_after_save
     issue = Issue.new(subject: 'subject')
-    issue.save_draft(current_user)
+    issue.save_draft
 
     issue_from_draft = Issue.from_draft(issue.draft_id)
 
-    assert_difference 'Issue.count', 1 do
+    assert_difference 'Issue.count' do
       assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', -1 do
         issue_from_draft.save!
       end
@@ -78,7 +80,7 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
     Project.rcrm_acts_as_draftable
 
     project = Project.new
-    project.save_draft(current_user)
+    project.save_draft
 
     assert_raises do
       Issue.from_draft(project.draft_id)
@@ -89,7 +91,7 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
     assert_equal String, Issue.new.dump_to_draft.class
   end
 
-  def test_load_to_draft
+  def test_load_from_draft
     attributes = {subject: 'subject', description: 'description'}
     draft = Issue.new(attributes).dump_to_draft
 
@@ -101,17 +103,17 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
   end
 
   def test_save_draft
-    attributes = {subject: 'subject'}
+    Issue.rcrm_acts_as_draftable parent: :project
+    attributes = { subject: 'subject' }
     issue = Issue.new(attributes)
 
-    assert_difference 'Issue.count', 0 do
-      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 1 do
-        result = issue.save_draft(current_user)
+    assert_no_difference 'Issue.count' do
+      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count' do
+        result = issue.save_draft
         assert_equal true, result
       end
     end
-    assert_equal Fixnum, issue.draft_id.class
-
+    assert_not_nil issue.draft_id
 
     draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
     assert_equal 'Issue', draft.target_type
@@ -119,36 +121,24 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
     assert_equal attributes[:subject], draft.restore.subject
   end
 
-  def test_save_draft_without_user
-    issue = Issue.new
-
-    assert_difference 'Issue.count', 0 do
-      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 1 do
-        result = issue.save_draft
-        assert_equal true, result
-      end
-    end
-
-    draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
-    assert_nil draft.user_id
-  end
-
   def test_save_draft_with_associations
+    Issue.rcrm_acts_as_draftable parent: :project
     issue = Issue.new(project: projects(:second_project))
-    issue.save_draft(current_user)
+    issue.save_draft
 
     draft = RedmineCrm::ActsAsDraftable::Draft.find(issue.draft_id)
     assert_equal issue.project.name, draft.restore.project.name
   end
 
   def test_save_draft_updates_existing_draft
+    Issue.rcrm_acts_as_draftable parent: :project
     issue = Issue.new
-    issue.save_draft(current_user)
+    issue.save_draft
 
     issue.subject = 'changed subject'
-    assert_difference 'Issue.count', 0 do
-      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 0 do
-        issue.save_draft(current_user)
+    assert_no_difference 'Issue.count' do
+      assert_no_difference 'RedmineCrm::ActsAsDraftable::Draft.count' do
+        issue.save_draft
       end
     end
 
@@ -156,20 +146,24 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
     assert_equal issue.subject, draft.restore.subject
   end
 
-  def test_save_draft_does_not_save_persisted_model
-    issue = Issue.new
-    issue.save_draft(current_user)
-    issue.save!
-    assert_equal false, issue.save_draft(current_user)
+  def test_save_draft_does_not_save_persisted_object
+    issue = issues(:second_issue)
+    assert_equal false, issue.save_draft
+  end
+
+  def test_save_draft_saves_persisted_but_changed_object
+    issue = issues(:second_issue)
+    issue.subject = 'changed subject'
+    assert_equal true, issue.save_draft
   end
 
   def test_update_draft
     issue = Issue.new(subject: 'subject')
-    issue.save_draft(current_user)
+    issue.save_draft
 
-    assert_difference 'Issue.count', 0 do
-      assert_difference 'RedmineCrm::ActsAsDraftable::Draft.count', 0 do
-        issue.update_draft(current_user, subject: 'updated_subject')
+    assert_no_difference 'Issue.count' do
+      assert_no_difference 'RedmineCrm::ActsAsDraftable::Draft.count' do
+        issue.update_draft(subject: 'updated_subject')
       end
     end
 

data/test/schema.rb

@@ -2,6 +2,8 @@ ActiveRecord::Schema.define version: 0 do
 
   create_table :drafts, force: true do |t|
     t.string :target_type
+    t.integer :target_id
+    t.references :project
     t.references :user
     t.references :parent, polymorphic: true
     t.binary :data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.40
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-23 00:00:00.000000000 Z
+date: 2018-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -111,6 +111,7 @@ files:
 - lib/redmine_crm/acts_as_votable/vote.rb
 - lib/redmine_crm/acts_as_votable/voter.rb
 - lib/redmine_crm/assets_manager.rb
+- lib/redmine_crm/compatibility/application_controller_patch.rb
 - lib/redmine_crm/currency.rb
 - lib/redmine_crm/currency/formatting.rb
 - lib/redmine_crm/currency/heuristics.rb
@@ -122,6 +123,7 @@ files:
 - lib/redmine_crm/liquid/drops/issues_drop.rb
 - lib/redmine_crm/liquid/drops/news_drop.rb
 - lib/redmine_crm/liquid/drops/projects_drop.rb
+- lib/redmine_crm/liquid/drops/time_entries_drop.rb
 - lib/redmine_crm/liquid/drops/users_drop.rb
 - lib/redmine_crm/liquid/filters/arrays.rb
 - lib/redmine_crm/liquid/filters/base.rb