rails_select_on_includes 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd354db4009d6e0c4c40221bad19154f1e9cec5
-  data.tar.gz: cb4b7b875b789b4b30ac4bbf34871925e7369627
+  metadata.gz: 58c0c965a81e2298fa093659f4b8cd490987b7ba
+  data.tar.gz: 40f53bca05f1f013bd7757702bb378db03bcbd21
 SHA512:
-  metadata.gz: 98edd5f5bf633ddecde9deba40f809d9eb141d68f6283f57a1d5ce801760f5f792a04deabc4fa9d0dc477f6e5648c750d975f09dcf8b63cc41d63cbe76ec71de
-  data.tar.gz: e947fe4263df0ebb145810acefaddfa23da1467daf312c5703d7e574872bcac4f7399917a7cc7623eaf1b6b20fa9d4b1b28d3f60f1cb22fc5ec763b4ff4a450a
+  metadata.gz: 4cf96d2b09cafac42251f840afb79f7fcabbb60f6ab7d51642d1a26014cf3563390064e6f77454a70983df04eba1132801a989af3c84a87b0b3527d60af4726f
+  data.tar.gz: 3b9381419cf0f8d44bc9cc23b8088016863b3c7759cf37fcf04c2ad8f48238b34123ba2314e2f684b0e99f6b3368d78a2d83b92c6d0841975c8b6bdf2a13457a

data/README.md

@@ -1,9 +1,16 @@
+# New Features
+Selected virtual attributes will be now typecasted as usual attributes
+
+#Rails version
+Supports rails 4.x and rails 5 now! 
+Maser is now runs on 5.x, rails_4 branch is for rails 4 support
+
 # RailsSelectOnIncludes
 
-This gem solves issue in rails: https://github.com/rails/rails/issues/15185 for base_class.
+This gem solves issue in rails: https://github.com/rails/rails/issues/15185 for base_class. 
 
 It was impossible to select virtual attributes to object from its relations or any other way 
-when using includes and where. 
+when using includes and where ( actually when includes becomes eager_load, i.e. when you add not SOME_CONDITION, but SOME_CONDITION_ON_INCLUDES, http://blog.bigbinary.com/2013/07/01/preload-vs-eager-load-vs-joins-vs-includes.html ). 
 
 Example from upper rails issue: 
 
@@ -30,7 +37,7 @@ post.comments.first.testval # Undefined method!
 
 Данный gem решает проблему в рельсах с виртуальными аттрибутами при использовании includes, 
 когда рельсы собирают в запрос в joins с алиасами на все аттрибуты. В настоящий момент в модель не собираются 
-никаким боком виртуальные аттрибуты.
+никаким боком виртуальные аттрибуты ( имеется ввиду когда includes ведет себя как eager_load и создает сложный одинарный запрос, подробнее: http://blog.bigbinary.com/2013/07/01/preload-vs-eager-load-vs-joins-vs-includes.html ).
 
 В частности проблема описана здесь: https://github.com/rails/rails/issues/15185 
 
@@ -56,12 +63,16 @@ post.comments.first.testval # Undefined method!
 ```
 
 
-## Installation
+## Installation 
 
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'rails_select_on_includes'
+#rails 4
+gem 'rails_select_on_includes', '~> 0.4.10' 
+
+#rails 5
+gem 'rails_select_on_includes', '~> 0.5.6' 
 ```
 
 And then execute:
@@ -74,31 +85,31 @@ Or install it yourself as:
 
 ## Usage
 
-Works out of the box, gently monkey-patching base-class alias columns. It not affecting query creation, 
-since query already contains all columns, i.e. to_sql returns same string.
-Works with selection in all formats:
+Works out of the box, monkey-patches base-class alias columns, for select attributes, and JoinBase with JoinDependency to proper typecasting. 
 
-1 'table_name.column' or 'table_name.column as column_1' or "distinct on(..) table_name.column as column_1"  
+It not affecting query creation, since query already contains all columns, i.e. to_sql returns same string.
+Works with selection in all formats:
 
-2 { table_name: column } or { table_name: [column1, column2] }
+  1. 'table_name.column' or 'table_name.column as column_1' will be parsed! distinct on can be used also
+  2. '(subquery with AS) AS column_1 '
+  3. Select with aliased arel function: .select(Comment.arel_table[:id].count.as('comments_count'))
+  4. Select with aliased arel attirubte: .select(Comment.arel_table[:column].as('column_alias'))
 
-3 { table_name: 2 } where 2 relates to upper syntax
 
 ## Usage (рус)
 
-Работает из коробки, нежно манки-патча алиасы прямо перед инстанцированием коллекции, не влияет на создаваемый запрос в БД т.е to_sql не меняется.  
+Работает из коробки, нежно манки-патча алиасы прямо перед инстанцированием коллекции, а так же не менее нежно JoinBase и JoinDependency :), чтобы полученные аттрибуты были приличных типов, а не только строк, не влияет на создаваемый запрос в БД т.е to_sql не меняется.  
 
 Поддерживает select в следующих форматах :
 
-1 'table_name.column' or 'table_name.column as column_1' or "distinct on(..) table_name.column as column_1"  
-
-2 { table_name: column } or { table_name: [column1, column2] }
-
-3 { table_name: 2 } where 2 relates to upper syntax
+  1. 'table_name.column' or 'table_name.column as column_1' will be parsed! distinct on can be used also
+  2. '(subquery with AS) AS column_1 '
+  3. Select with aliased arel function: .select(Comment.arel_table[:id].count.as('comments_count'))
+  4. Select with aliased arel attirubte: .select(Comment.arel_table[:column].as('column_alias'))
 
 ## Testing 
 
-Comming soon :)
+rake test
 
 ## Contributing
 

data/Rakefile

@@ -1,2 +1,9 @@
 require "bundler/gem_tasks"
-task :default => :spec
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/lib/rails_select_on_includes.rb

@@ -20,21 +20,21 @@ require 'active_support/core_ext/string/filters'
     @virtual_attributes_names = []
   end
   # valid formats are:
-  # 1 'table_name.column' or 'table_name.column as column_1' will be parsed! distinct on can be used also
-  # 2 {table_name: column} or { table_name: [column1, column2] }
-  # 3 table_name: 2
+  # 'table_name.column' or 'table_name.column as column_1' will be parsed! distinct on can be used also
+  # '(subquery with AS) AS column_1 '
+  # Select with aliased arel function: .select(Comment.arel_table[:id].count.as('comments_count'))
+  # Select with aliased arel attirubte: .select(Comment.arel_table[:column].as('column_alias'))
   def update_aliases_to_select_values( select_values )
     return if select_values.blank?
     select_values.each do |sv|
+
       # if sv is symbol that we assume that its a base table column and it will be aliased and added as usual
       # all we need is some specials joins+select from related tables
       case sv
-        when Hash
-          flatten_hash_values(sv).each { |sub_sv| add_virtual_attribute(sub_sv) }
-        when String
+       when String
           sv.split( ", " ).each do |sub_sv|
             if sub_sv[/.+ as .+/i]
-              add_virtual_attribute(sub_sv[/ as .+/i][4..-1].strip)
+              add_virtual_attribute(sub_sv.rpartition(/ as /i).last.strip)
             elsif sub_sv[/.+\.[^\*]+/]
               add_virtual_attribute(sub_sv[/\..+/][1..-1].strip)
             end

data/lib/rails_select_on_includes/version.rb

@@ -1,3 +1,3 @@
 module RailsSelectOnIncludes
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 end

data/rails_select_on_includes.gemspec

@@ -32,6 +32,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", ">=5"
 
+  spec.add_development_dependency "rails", ">=5"
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'sqlite3'
+
+  spec.add_development_dependency 'pry-byebug'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_select_on_includes
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - alekseyl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-20 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Patching rails include/select/virtual attributes issue ( https://github.com/rails/rails/issues/15185
   )
 email:
@@ -61,12 +103,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".idea/.name"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/rails_select_on_includes.iml"
-- ".idea/vcs.xml"
-- ".idea/workspace.xml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Patching rails include/select/virtual attributes issue