acts_as_footprintable 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e8915ee9a150cadf7601e9f54d18ee0d373f6c9
-  data.tar.gz: bbbf50a358d50691ac80a361b0139e6b56405efd
+  metadata.gz: a5511b19bf736e594da831847c7e5680ed541f45
+  data.tar.gz: 587ada66643a68366b0099661d9a3f420f373f76
 SHA512:
-  metadata.gz: 250b5cc290a53082fd2af8b2f692d9ec43025d420807ce16983f2a0f6288f0cf68309e7fcea4cec920b2d6eddbb01d445adf5637e94f280a0f834cc8396f03e8
-  data.tar.gz: e49ee10b5b6ba5fed9fff2e525f0f424b75e263094badf48ee8841af9cf1b05d7ebab2b78f732b9aba7d99bcd442b7d055fc29423ada85b9cf138fc37a503597
+  metadata.gz: 1b3ee4db822262a0e47e15d49959b50552bb26b7c088163fb2006341e96fc62a5a897c2d48f2b5919eca9ca9eb7d2c070e05b34efd6ff0e7edaee0856c24e02c
+  data.tar.gz: 266229cf82bb0245dd70a330a527cff8619ef19734fdf59b4f010eadc383eb18336b5e7bd6b68f076e0b6acc9751ae1ebd1bc41425cf248fb07d6edd0d9db063

data/.travis.yml

@@ -1,10 +1,11 @@
 language: ruby
 rvm:
-  - 2.3.1
-  - 2.2.5
+  - 2.4.0
+  - 2.3.3
+  - 2.2.6
   - 2.1.10
-  - 2.0.0
 env:
+  - "RAILS_VERSION=5.0.0"
   - "RAILS_VERSION=4.2.0"
   - "RAILS_VERSION=4.1.0"
   - "RAILS_VERSION=4.0.0"

data/Gemfile

@@ -5,7 +5,6 @@ source 'https://rubygems.org'
 gemspec
 
 rails_version = ENV['RAILS_VERSION'] || 'default'
-
 rails = case rails_version
           when 'master'
             { :github => 'rails/rails' }
@@ -17,5 +16,5 @@ rails = case rails_version
 
 gem 'rails', rails
 group :development do
-  gem 'combustion', github: 'patorash/combustion', branch: 'master'
+  gem 'combustion', '~> 0.5'
 end

data/lib/acts_as_footprintable/footprint.rb

@@ -10,8 +10,8 @@ module ActsAsFootprintable
     belongs_to :footprintable, :polymorphic => true
     belongs_to :footprinter, :polymorphic => true
 
-    scope :for_type, lambda{|klass| where(:footprintable_type => klass)}
-    scope :by_type,  lambda{|klass| where(:footprinter_type   => klass)}
+    scope :for_type, lambda{|klass| where(:footprintable_type => klass.name)}
+    scope :by_type,  lambda{|klass| where(:footprinter_type   => klass.name)}
 
     validates :footprintable_id, :presence => true
     validates :footprinter_id, :presence => true

data/lib/acts_as_footprintable/footprinter.rb

@@ -39,8 +39,13 @@ module ActsAsFootprintable
 
     def recent_footprint_ids(target, limit=nil)
       recent_footprints = target.group("#{table_name}.footprintable_id, #{table_name}.footprintable_type").
-          select("#{table_name}.footprintable_id, #{table_name}.footprintable_type, MAX(#{table_name}.created_at)")
-      records = footprints.where("(#{table_name}.footprintable_id, #{table_name}.footprintable_type, #{table_name}.created_at) IN (#{recent_footprints.arel.to_sql})")
+          select("#{table_name}.footprintable_id, #{table_name}.footprintable_type, MAX(#{table_name}.created_at) AS created_at")
+      recent_footprints_conditions = recent_footprints.map{ |recent_footprint| recent_footprint.attributes.select{ |_, v| !v.nil?} }
+      columns = recent_footprints_conditions.first.keys.map{|column| "#{table_name}.#{column}" }.join(',')
+      values = recent_footprints_conditions.map { |row|
+        "(#{row.values.map{|value| ActiveRecord::Base::sanitize(value)}.join(',')})"
+      }.join(',')
+      records = footprints.where("(#{columns}) IN (#{values})")
       records = records.order("footprints.created_at desc")
       records = records.limit(limit) unless limit.nil?
       records.pluck(:id)

data/lib/acts_as_footprintable/version.rb

@@ -1,4 +1,4 @@
 # coding: utf-8
 module ActsAsFootprintable
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_footprintable
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Toyoaki Oko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-10 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Rails gem to allowing records to leave footprints