active_flag 2.1.0 → 2.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 92070a4cfdecda2177518adcf91809607614849a64566c05361669b030775c27
4
- data.tar.gz: 2f9cb34e47a8cce372521d22a8faca84befd100c2d2cf664e96c44565cd0966f
3
+ metadata.gz: f0c50a1adb7f1144bb845ebe3495fbe228941a6d50260058ab4394a3c38000cb
4
+ data.tar.gz: 3a979d8a5bbcaea494b0b777517ba4874681bb7f55785b4baeeba69a3e6c5956
5
5
  SHA512:
6
- metadata.gz: 2335c49a3c24629650c5bc197d577b2e3faaff940e0afde74f8c01d1d001329d1f094d0ba7bdb2df65480e10917ff6614e9b8bd2d598af9a664de9d0e6e491f8
7
- data.tar.gz: a0f6a1a9ecce9dfb935300762b7baf77d3b37b08a8a3ef8ba74403e1ed3148681f3440269606f9c06d6f6e42e7f70ee14165f208b00fbf66df5017475aaadfc5
6
+ metadata.gz: c1a4fc979d15b430241681d90f6ec907694218155d1689f8205a0291714d14243b3df77d6f9ef9e1de805827f91beb7b43ccc6b83c492e319f01887fd9712557
7
+ data.tar.gz: 5845188ecbc52515197b2fb8ecd7277c4015f58a87a359de244fe9894bd173939942d22c0eb7552d003006fedab3aeb0381dfe50db4f360d6fa4d0947e8b1f84
@@ -1,3 +1,3 @@
1
1
  module ActiveFlag
2
- VERSION = '2.1.0'
2
+ VERSION = '2.1.1'
3
3
  end
data/lib/active_flag.rb CHANGED
@@ -29,14 +29,17 @@ module ActiveFlag
29
29
  end
30
30
 
31
31
  # Reference to definition
32
- define_singleton_method column.to_s.pluralize do
32
+ relation_method_name = column.to_s.pluralize
33
+ define_singleton_method relation_method_name do
33
34
  active_flags[column]
34
35
  end
35
36
 
36
37
  if respond_to?(:generated_relation_methods, true)
37
- send(:generated_relation_methods).module_eval do
38
- define_method column.to_s.pluralize do
39
- klass.active_flags[column].with_scope(self)
38
+ unless relation_method_conflict?(relation_method_name)
39
+ send(:generated_relation_methods).module_eval do
40
+ define_method relation_method_name do
41
+ klass.active_flags[column].with_scope(self)
42
+ end
40
43
  end
41
44
  end
42
45
  end
@@ -71,5 +74,13 @@ module ActiveFlag
71
74
  ]
72
75
  end
73
76
  end
77
+
78
+ private
79
+
80
+ def relation_method_conflict?(method_name)
81
+ name = method_name.to_sym
82
+ ActiveRecord::Relation.method_defined?(name) ||
83
+ ActiveRecord::Relation.private_method_defined?(name)
84
+ end
74
85
  end
75
86
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: active_flag
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.0
4
+ version: 2.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kenn Ejima