mongo_mapper 0.15.5 → 0.15.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ae0bcdb6320444b591dc779d739c553ba371c86e8465c4547c5e35423fe37ade
4
- data.tar.gz: 270341e4efc65ba09578c2ba889c3c2e560610cf6eddfa7889fee19ded37c760
3
+ metadata.gz: ab17d58378959cb58a5f2168fe0f9c7740628b4fa470547c708cf9d9740ef668
4
+ data.tar.gz: fcba32755feb7d0a439f8d2f0217a2a99092b8cf48317ef6b1f13265874595de
5
5
  SHA512:
6
- metadata.gz: 3af02a093ffb4f9b13f48557bd83689c5cdcf35e434c00b152be18ad33e520e9ffbf1b7817b90ac4d363fe6f4452bab2ee66c5c450aca65981cc29ac2e74fe89
7
- data.tar.gz: '09f802a3351959d626e23b4a6fa331ef10749a3b2f259440b527b26a25a23d0f0684c1e2bf0001938357e76fe5664da481ff298b572e665ded6afe0feb5fb286'
6
+ metadata.gz: 2b0fa4d463705845f6b445c0e4e5d367b931822bb20992704bec606ad133ba4342a426a15785faf237ab91a98b9ff3835c17ee53a520eabe995e129a9c0f3ec6
7
+ data.tar.gz: cb57c4f3128a2f3dcb2a80dfd61b3ed473931b600876cf1ab5b00c0a51fe14cf0ba7f503e1779470ef9027957252738aa7e0e7bd9136fe20fbbd31d3c6177eda
@@ -81,7 +81,7 @@ module MongoMapper
81
81
  # :nocov:
82
82
  if defined?(PhusionPassenger)
83
83
  PhusionPassenger.on_event(:starting_worker_process) do |forked|
84
- connection.connect if forked
84
+ connection.reconnect if forked
85
85
  end
86
86
  end
87
87
  # :nocov:
@@ -9,7 +9,7 @@ module MongoMapper
9
9
  when !persisted?
10
10
  "#{self.class.name}/new"
11
11
  when timestamp = self[:updated_at]
12
- "#{self.class.name}/#{id}-#{timestamp.to_s(:number)}"
12
+ "#{self.class.name}/#{id}-#{timestamp.to_formatted_s(:number)}"
13
13
  else
14
14
  "#{self.class.name}/#{id}"
15
15
  end
@@ -18,4 +18,4 @@ module MongoMapper
18
18
  end
19
19
  end
20
20
  end
21
- end
21
+ end
@@ -49,9 +49,9 @@ module MongoMapper
49
49
  class << self
50
50
  alias_method :__original_#{callback}, :#{callback}
51
51
 
52
- def #{callback}(*args, &block)
52
+ def #{callback}(*args, **options, &block)
53
53
  embedded_callbacks_on if @embedded_callbacks_status.nil?
54
- __original_#{callback}(*args, &block)
54
+ __original_#{callback}(*args, **options, &block)
55
55
  end
56
56
  end
57
57
  CALLBACK
@@ -1,7 +1,15 @@
1
1
  # encoding: UTF-8
2
2
  module MongoMapper
3
3
  module Plugins
4
- include ActiveSupport::DescendantsTracker
4
+ if defined?(ActiveSupport::DescendantsTracker::DescendantsArray)
5
+ DescendantsArray = ::ActiveSupport::DescendantsTracker::DescendantsArray
6
+ else
7
+ DescendantsArray = ::Array
8
+ end
9
+
10
+ def self.direct_descendants_hash
11
+ @direct_descendants_hash ||= Hash.new { |h,k| h[k] = DescendantsArray.new }
12
+ end
5
13
 
6
14
  def plugins
7
15
  @plugins ||= []
@@ -14,9 +22,18 @@ module MongoMapper
14
22
  plugins << mod
15
23
  end
16
24
 
25
+ def direct_descendants
26
+ Plugins.direct_descendants_hash[self]
27
+ end
28
+
17
29
  def included(base = nil)
18
30
  direct_descendants << base if base
19
31
  super
20
32
  end
33
+
34
+ def inherited(subclass)
35
+ direct_descendants << subclass
36
+ super
37
+ end
21
38
  end
22
39
  end
@@ -1,4 +1,4 @@
1
1
  # encoding: UTF-8
2
2
  module MongoMapper
3
- Version = '0.15.5'
3
+ Version = '0.15.6'
4
4
  end