redmine_crm 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81f91096391decad0088cb36a6242442bd3ac138
-  data.tar.gz: 4095681d0e312ef4d79ab1d0b0c8f182b5c54126
+  metadata.gz: d286086a18f1e63d34a1de9756897a3ceb444da1
+  data.tar.gz: 9755c778cb07f932b12e56ace0427ef9069a7125
 SHA512:
-  metadata.gz: 971e7b697e2a3f57b9933ccdb37ba19b08cc88a3996bab34a2679fc4016d2f16b3cba2fd3f09869b65e7d71f55f6212fc1c93579b4d117d0f12c4608863b1b36
-  data.tar.gz: 0f5ea97bc5eae151e18f726ab48562641d7db6d93ecd1e6acbae52f1a3ff941fc23265d19aa47f3ecd2ae868d1d2090a1be227a0f93e8cb552f7e015aa70389f
+  metadata.gz: 94070dfa1ebbff14f11bdacb788d8792e72f1d6315116ed00fdb00feda03cbca972f1c979f70655f615855788e5e829f84f7c4d8034b7b87464f99a01074dada
+  data.tar.gz: 3547f4981f02dd95f2f5c5e4750ccd6cc5d37d8887320bdf61a598dbb0bc8ab3e7deaa8c46377b635ecf035ae9bf3628b8048ebcaca4e16a2a8f0a1c4d4c1f58

data/README.md

@@ -34,6 +34,18 @@ Create migration with next code:
   end
 end
 ```
+For rcrm_acts_as_viewed You may add column for your model
+with help:
+
+```ruby
+
+YourModel.add_viewings_columns
+
+```
+It will add two column to your table (views and total_views) 
+and view_count will return two number: total view and unique views.
+Without this migration you will get only unique views.
+
 Run migration for plugin:
 
 ```

data/doc/CHANGELOG

@@ -3,6 +3,11 @@
 Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2015 RedmineCRM
 http://www.redminecrm.com/
+
+== 2015-12-13 v0.0.22
+
+* Added a count for unique views of a object.
+
 == 2015-10-29 v0.0.21
 
 * Added space for CHF in currency format

data/lib/redmine_crm/rcrm_acts_as_taggable.rb

@@ -77,11 +77,11 @@ module RedmineCrm
   
         def drop_taggable_table options = {}
           tag_name_table      = options[:tags] || :tags
-          if !self.connection.table_exists?(tag_name_table)
+          if self.connection.table_exists?(tag_name_table)
             self.connection.drop_table tag_name_table
           end
           taggings_name_table = options[:taggings] || :taggings
-          if !self.connection.table_exists?(taggings_name_table)
+          if self.connection.table_exists?(taggings_name_table)
             self.connection.drop_table taggings_name_table
           end
 

data/lib/redmine_crm/rcrm_acts_as_viewed.rb

@@ -138,10 +138,22 @@ module RedmineCrm
           # Get the number of viewings for this object based on the views field,
           # or with a SQL query if the viewed objects doesn't have the views field
           def view_count
-            return self.views || 0 if attributes.has_key? 'views'
+            return ("#{self.total_views}(#{self.views})" || 0) if attributes.has_key? 'views'
             viewings.count
           end
 
+          # Change views count (total_views and views) if it's existing in object
+          # If options[:only_total] == true count of unique views doesn't change
+          def increase_views_count(options)
+            if attributes.has_key?('views') && attributes.has_key?('total_views')
+              target = self
+              target.views = ( (target.views || 0) + 1 ) if !options[:only_total]
+              target.total_views = ( (target.total_views || 0) + 1)
+              target.save(:validate => false)
+              # target.save_without_validation
+            end
+          end
+
           # View the object with or without a viewer - create new or update as needed
           #
           # * <tt>ip</tt> - the viewer ip
@@ -159,14 +171,12 @@ module RedmineCrm
                 view.viewer_id = viewer.id if viewer && !viewer.id.nil?
                 view.ip = ip
                 viewings << view
-                target = self if attributes.has_key? 'views'
-                target.views = ( (target.views || 0) + 1 ) if target
                 view.save
-                target.save_without_validation if target
-                return true
+                increase_views_count(:only_total => false)
               else
-                return false
+                increase_views_count(:only_total => true)
               end
+              true
             end
           end
 
@@ -199,7 +209,8 @@ module RedmineCrm
           # new tables as it will make it as part of the table creation, and not generate
           # ALTER TABLE calls after the fact
           def generate_viewings_columns table
-            table.column :views, :integer
+            table.column :views, :integer #uniq views
+            table.column :total_views, :integer 
           end
 
           # Create the needed columns for acts_as_viewed.
@@ -207,6 +218,7 @@ module RedmineCrm
           def add_viewings_columns
             if !self.content_columns.find { |c| 'views' == c.name }
               self.connection.add_column table_name, :views, :integer, :default => '0'
+              self.connection.add_column table_name, :total_views, :integer, :default => '0'
               self.reset_column_information
             end
           end
@@ -216,6 +228,7 @@ module RedmineCrm
           def remove_viewings_columns
             if self.content_columns.find { |c| 'views' == c.name }
               self.connection.remove_column table_name, :views
+              self.connection.remove_column table_name, :total_views
               self.reset_column_information
             end
           end
@@ -226,17 +239,18 @@ module RedmineCrm
           # To be used during migration, but can also be used in other places
           def create_viewings_table options = {}
             name        = options[:table_name] || :viewings
-            self.connection.create_table(name) do |t|
-              t.column :viewer_id,   :integer
-              t.column :viewed_id,   :integer
-              t.column :viewed_type, :string
-              t.column :ip, :string, :limit => '24'
-              t.column :created_at, :datetime
-            end
-
-            self.connection.add_index name, :viewer_id
-            self.connection.add_index name, [:viewed_type, :viewed_id]
+            if !self.connection.table_exists?(name)
+              self.connection.create_table(name) do |t|
+                t.column :viewer_id,   :integer
+                t.column :viewed_id,   :integer
+                t.column :viewed_type, :string
+                t.column :ip, :string, :limit => '24'
+                t.column :created_at, :datetime
+              end
 
+              self.connection.add_index(name, :viewer_id)
+              self.connection.add_index(name, [:viewed_type, :viewed_id])
+            end
           end
 
           # Drop the viewings table.
@@ -245,7 +259,9 @@ module RedmineCrm
           # To be used during migration, but can also be used in other places
           def drop_viewings_table options = {}
             name = options[:table_name] || :viewings
-            self.connection.drop_table name
+            if self.connection.table_exists?(name)
+              self.connection.drop_table(name)
+            end
           end
 
           # Find all viewings for a specific viewer.

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/test/schema.rb

@@ -22,6 +22,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.column "cached_tag_list", :string
     t.column "user_id", :integer
     t.column "views", :integer, :default => 0
+    t.column "total_views", :integer, :default => 0
   end
 
   create_table "votes", :force => true do |t|

data/test/viewed_test.rb

@@ -12,12 +12,15 @@ class ViewedTest < ActiveSupport::TestCase
     
   
   def test_zero_of_view_count
-    assert_equal issue.view_count, 0
+    assert_equal issue.view_count, "0(0)"
   end
     
   def test_can_view
     issue.view '127.0.0.1', user
-    assert_equal issue.view_count, 1
+    assert_equal issue.view_count, "1(1)"
+    # second view change only total count
+    issue.view '127.0.0.1', user
+    assert_equal issue.view_count, "2(1)"
   end
 
   def test_viewed_by
@@ -29,7 +32,7 @@ class ViewedTest < ActiveSupport::TestCase
   def test_twice_view
     issue.view '127.0.0.1', user
     issue.view '127.0.0.1', user
-    assert_equal issue.view_count, 1
+    assert_equal "2(1)", issue.view_count
   end
     
   def test_viewed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - RedmineCRM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies: []
 description: Common libraries for RedmineCRM plugins for Redmine. Requered Redmine
   from http://redmine.org