calculable_attrs 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e991a08e392e45d1e2b104e38cd2b9a9df2bfd29
-  data.tar.gz: 11557f072e7892c33b7f711bf10ca484bebd00b1
+  metadata.gz: ecc688e611d2c4ae90744580be8781f6b195b131
+  data.tar.gz: 128a18247d8821f4bf88695e73323661087732a7
 SHA512:
-  metadata.gz: 607b9f7f49bf1994e1542b15e2163ccb32be18489aa7d1066a7ad039fdba685952bff04e717d838099ac409614f6e1b1fa679d49eaac598cb35d3a5b53533ef3
-  data.tar.gz: 157c20cf228d1a9b747df3dbebf62cc4cf5dd2f9b43d028a038014bf4da9c2cce14374e0e6e3c9e06e8c2fc0efef63c5e5cb245438a12764624811447e8832b4
+  metadata.gz: dab3a4979da1031dc462552ca32384c889ad178561a58737006bae457d343be26b1be33d5ef00f2fd845f8ad3e469ab108460de2e236d9df41f5a49c10e6c928
+  data.tar.gz: febab48f25d4a64e30e6029aaa8c444bb5389feb329abb550c0e808020b354ed54764fce2cd849a3447c81faa064c542c2d04581d39ef86bf6a1e238832caaa8

data/lib/calculable_attrs/active_record/relation.rb

@@ -91,7 +91,7 @@ module CalculableAttrs::ActiveRecord::Relation
     original_sql = relation.to_sql
 
     sql_parser = CalculableAttrs::Utils::SqlParser.new(original_sql)
-    select_sql_snippets = [sql_parser.first_select_snippet]
+    #select_sql_snippets = [sql_parser.first_select_snippet]
     where_sql_snippet = sql_parser.last_where_snippet
     relation.reset
 
@@ -104,12 +104,12 @@ module CalculableAttrs::ActiveRecord::Relation
         " AS #{ joined_relation_name }" +
         " ON #{ joined_relation_name }.#{ calcualtor.calculable_foreign_key } = #{ klass.table_name }.id"
 
-      calculable_values_sql = attrs_to_calculate.map do |attr|
-        attr_name = "#{ klass.name.underscore }_#{ attr }"
-        left_join_sql.sub!(" AS #{ attr }", " AS #{ attr_name }")
-        klass.send(:sanitize_sql, ["COALESCE(#{ joined_relation_name }.#{ attr_name }, ?) AS #{ attr_name }", calcualtor.default(attr)])
-      end.join(',')
-      select_sql_snippets << calculable_values_sql
+      # calculable_values_sql = attrs_to_calculate.map do |attr|
+      #   attr_name = "#{ klass.name.underscore }_#{ attr }"
+      #   left_join_sql.sub!(" AS #{ attr }", " AS #{ attr_name }")
+      #   klass.send(:sanitize_sql, ["COALESCE(#{ joined_relation_name }.#{ attr_name }, ?) AS #{ attr_name }", calcualtor.default(attr)])
+      # end.join(',')
+      # select_sql_snippets << calculable_values_sql
 
       if where_sql_snippet
         attrs_to_calculate.each do |attr|
@@ -119,7 +119,7 @@ module CalculableAttrs::ActiveRecord::Relation
             "#{ klass.table_name.underscore }.\"#{ attr }\"",
             "\"#{ klass.table_name.underscore }\".\"#{ attr }\"",
           ]
-          replacement_name = "#{ joined_relation_name }.#{ klass.name.underscore }_#{ attr }"
+          replacement_name = "#{ joined_relation_name }.#{ attr }"
           replacement = klass.send(:sanitize_sql, ["COALESCE(#{ replacement_name }, ?)", calcualtor.default(attr)])
           original_names.each { |original_name| where_sql_snippet.gsub!(original_name, replacement) }
         end
@@ -128,13 +128,13 @@ module CalculableAttrs::ActiveRecord::Relation
       relation.joins!(left_join_sql)
 
     end
-    sql_select = select_sql_snippets.join(',')
+    #sql_select = select_sql_snippets.join(',')
     #relation.rewhere(where_sql_snippet) if where_sql_snippet
     if where_sql_snippet
       relation.where_values = nil
       relation.where!(where_sql_snippet)
     end
-    relation._select!(sql_select)
+    #relation._select!(sql_select)
     relation
   end
 
@@ -142,12 +142,13 @@ module CalculableAttrs::ActiveRecord::Relation
 
   def apped_calculable_attrs
     append_included_calculable_attrs
-    append_joinded_calculable_attrs
+    #append_joinded_calculable_attrs
   end
 
   def append_included_calculable_attrs
     unless calculable_attrs_included.empty?
-      attrs = calculable_attrs_included - calculable_attrs_joined
+      #attrs = calculable_attrs_included - calculable_attrs_joined
+      attrs = calculable_attrs_included | calculable_attrs_joined
       models_calculable_scopes = collect_calculable_scopes(attrs)
       collect_models_ids(models_calculable_scopes, @records, attrs)
       models_calculable_scopes.values.each { |scope| scope.calculate }

data/lib/calculable_attrs/version.rb

@@ -1,3 +1,3 @@
 module CalculableAttrs
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculable_attrs
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Dmitry Sharkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Simplifies work with dynamically calculable fields.