calculated_attributes 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b751dd8a58b1f4de0e48f23776273daa460cdf81
-  data.tar.gz: 0caef728cf0c2314840f443ee08fd57d50eef14e
+  metadata.gz: 2b2dd0e9f52299a368d2b049c1db8ba7d42c1c7d
+  data.tar.gz: ec77da383307dfd1cf345a32bddcc5639f9deeaf
 SHA512:
-  metadata.gz: 82e7bc56070d8594c59b590a70fbdd7f71445e2fabee1599382e2776c099ced798fce0035bd134ceb0b742a0378804638554555ea55d28ec25df85a2a318abcd
-  data.tar.gz: 02e510a66e63e67f636f1a41a2073a2c952f321974c2ace9e0b4f6eaed6327b45ed23d8d8b243188d927c77bf0dc0529669230aacba99b3801bc878bf9e2710d
+  metadata.gz: 5dd5735365b4d0f7ecc94ae7667c918ec3fe452f5eb537ab1613905aa20ee0d954f820c800f42ce5df42221ea52e621479308a2fc9733c195761504993f116a0
+  data.tar.gz: 1f05b7e90a8a33e2c021f12ac9fe77d67aa042cb56b145e7f94d2d1ad620f9cca77c5a7e26e37beee1df008888fab863a217a05838d439670a406fde5ed679b2

data/README.md

@@ -91,7 +91,7 @@ end
 In Rails 4.x, you cannot call `count` on a relation with calculated attributes, e.g.
 
 ```ruby
-`Post.scoped.calculated(:comments_count).count`
+Post.scoped.calculated(:comments_count).count
 ```
 
 will error. This is because of an [ActiveRecord issue](https://github.com/rails/rails/blob/master/activerecord/lib/active_record/relation/calculations.rb#L368-L375) that does not permit Arel nodes in the count method.

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.0.18)
+    calculated_attributes (0.0.19)
       activerecord (>= 3.2.20)
 
 GEM

data/gemfiles/rails4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.0.18)
+    calculated_attributes (0.0.19)
       activerecord (>= 3.2.20)
 
 GEM

data/gemfiles/rails4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.0.18)
+    calculated_attributes (0.0.19)
       activerecord (>= 3.2.20)
 
 GEM

data/lib/calculated_attributes.rb

@@ -71,15 +71,9 @@ ActiveRecord::Relation.send(:include, Module.new do
     args.each do |arg|
       lam = klass.calculated.calculated[arg] || klass.base_class.calculated.calculated[arg]
       sql = lam.call
-      if sql.is_a? String
-        new_projection = Arel.sql("(#{sql})").as(arg.to_s)
-        new_projection.calculated_attr!
-        projections.push new_projection
-      else
-        new_projection = sql.as(arg.to_s)
-        new_projection.calculated_attr!
-        projections.push new_projection
-      end
+      new_projection = sql.is_a?(String) ? Arel.sql("(#{sql})").as(arg.to_s) : sql.as(arg.to_s)
+      new_projection.calculated_attr!
+      projections.push new_projection
     end
     select(projections)
   end
@@ -100,9 +94,76 @@ module ActiveRecord
       apply_join_dependency(relation, join_dependency)
     end
   end
-end
 
-module ActiveRecord
+  module AttributeMethods
+    module ClassMethods
+      # Generates all the attribute related methods for columns in the database
+      # accessors, mutators and query methods.
+      def define_attribute_methods
+        case ActiveRecord::VERSION::MAJOR
+        when 3
+          unless defined?(@attribute_methods_mutex)
+            msg = "It looks like something (probably a gem/plugin) is overriding the " \
+                  "ActiveRecord::Base.inherited method. It is important that this hook executes so " \
+                  "that your models are set up correctly. A workaround has been added to stop this " \
+                  "causing an error in 3.2, but future versions will simply not work if the hook is " \
+                  "overridden. If you are using Kaminari, please upgrade as it is known to have had " \
+                  "this problem.\n\n"
+            msg << "The following may help track down the problem:"
+
+            meth = method(:inherited)
+            if meth.respond_to?(:source_location)
+              msg << " #{meth.source_location.inspect}"
+            else
+              msg << " #{meth.inspect}"
+            end
+            msg << "\n\n"
+
+            ActiveSupport::Deprecation.warn(msg)
+
+            @attribute_methods_mutex = Mutex.new
+          end
+
+          # Use a mutex; we don't want two thread simaltaneously trying to define
+          # attribute methods.
+          @attribute_methods_mutex.synchronize do
+            return if attribute_methods_generated?
+            superclass.define_attribute_methods unless self == base_class
+            columns_to_define =
+              if defined?(calculated) && calculated.instance_variable_get('@calculations')
+                calculated_keys = calculated.instance_variable_get('@calculations').keys
+                column_names.reject { |c| calculated_keys.include? c.intern }
+              else
+                column_names
+              end
+            super(columns_to_define)
+            columns_to_define.each { |name| define_external_attribute_method(name) }
+            @attribute_methods_generated = true
+          end
+
+        when 4
+          return false if @attribute_methods_generated
+          # Use a mutex; we don't want two threads simultaneously trying to define
+          # attribute methods.
+          generated_attribute_methods.synchronize do
+            return false if @attribute_methods_generated
+            superclass.define_attribute_methods unless self == base_class
+            columns_to_define =
+              if defined?(calculated) && calculated.instance_variable_get('@calculations')
+                calculated_keys = calculated.instance_variable_get('@calculations').keys
+                column_names.reject { |c| calculated_keys.include? c.intern }
+              else
+                column_names
+              end
+            super(columns_to_define)
+            @attribute_methods_generated = true
+          end
+          true
+        end
+      end
+    end
+  end
+
   module Associations
     class JoinDependency
       attr_writer :calculated_columns

data/lib/calculated_attributes/version.rb

@@ -1,3 +1,3 @@
 module CalculatedAttributes
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal