activerecord-virtual_attributes 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eb66edc1ea95e2bad4b8ca67ba68e802d257a6638187c5a4ab9bbcf57edd874
-  data.tar.gz: 14ac958d16ffc4ffb75550b4df809bdd498f1da534d9a038fc4b652ddb10b34b
+  metadata.gz: 6f8bd112296732146d0d98ed5f2f490b6d72361bc965d16d092f0712d6061767
+  data.tar.gz: 5dbbc67687d1143f69f18292f2cbdefe5166b69c8e034d5050cd2d203730ac5d
 SHA512:
-  metadata.gz: b5c5dbb47c9be302fdb1baf536e38a19aec2db9fe9db997152855b3bafe2dd61cc508f9c1f33f920649ae21713d295000360394fa7b9e4c4861b7b7cc8073ec9
-  data.tar.gz: 036c41c76720cdddb1ea74722b58f6998fbd1956b092eb77ac5dff8f5f913ca7df43f740bcbe60f4226de17e28c9cccfc9f2b9fe9af3c69051195b2749470b47
+  metadata.gz: fd7ab60cefbb59e9c77f197f755822e530d95e52fc67fb0f9eea261473abfae8a34713957e756fa328c2128982a3af344eae629d5d3b9b8bdaec14f671985a07
+  data.tar.gz: a08eecd9ed665f9276fe098a95108df2d7e566751b6a8e0ed5ca39d34738a3dd5638df1e33517f41b6016ae446c4cb470dac1ed49c2a48613c7f515c8c72ec7b

data/.codeclimate.yml

@@ -0,0 +1,30 @@
+---
+version: '2'
+prepare:
+  fetch:
+  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
+    path: ".rubocop_base.yml"
+  - url: https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_cc_base.yml
+    path: ".rubocop_cc_base.yml"
+checks:
+  argument-count:
+    enabled: false
+  complex-logic:
+    enabled: false
+  file-lines:
+    enabled: false
+  method-complexity:
+    config:
+      threshold: 11
+  method-count:
+    enabled: false
+  method-lines:
+    enabled: false
+  nested-control-flow:
+    enabled: false
+  return-statements:
+    enabled: false
+plugins:
+  rubocop:
+    enabled: true
+    config: ".rubocop_cc.yml"

data/.rubocop.yml

@@ -0,0 +1,3 @@
+inherit_from:
+- https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml
+- .rubocop_local.yml

data/.rubocop_cc.yml

@@ -0,0 +1,4 @@
+inherit_from:
+- .rubocop_base.yml
+- .rubocop_cc_base.yml
+- .rubocop_local.yml

data/.travis.yml

@@ -1,27 +1,28 @@
 ---
-sudo: false
 language: ruby
-#cache:
-#  bundler: true
+cache: bundler
 rvm:
-  - 2.4.1
-#  - 2.5
-
+- 2.4.1
+- 2.5.3
 services:
- - postgresql
- - mysql
-
+- postgresql
+- mysql
 env:
-  - DB=sqlite3
-  - DB=pg
-  - DB=mysql2
-
+- DB=sqlite3
+- DB=pg
+- DB=mysql2
 gemfile:
-  - gemfiles/virtual_attributes_50.gemfile
-  - gemfiles/virtual_attributes_51.gemfile
-#  - gemfiles/virtual_attributes_52.gemfile
-
-
+- gemfiles/virtual_attributes_50.gemfile
+- gemfiles/virtual_attributes_51.gemfile
+#- gemfiles/virtual_attributes_52.gemfile
+before_install:
+- 'echo ''gem: --no-ri --no-rdoc --no-document'' > ~/.gemrc'
 before_script:
-  - sh -c "if [ '$DB' = 'pg' ]; then psql -c 'DROP DATABASE IF EXISTS virtual_attributes;' ; psql -c ' CREATE DATABASE virtual_attributes;' ; fi"
-  - sh -c "if [ '$DB' = 'mysql2' ]; then mysql -e 'DROP DATABASE IF EXISTS virtual_attributes; CREATE DATABASE virtual_attributes;'; fi"
+- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64
+  > ./cc-test-reporter
+- chmod +x ./cc-test-reporter
+- "./cc-test-reporter before-build"
+- sh -c "if [ '$DB' = 'pg' ]; then psql -c 'DROP DATABASE IF EXISTS virtual_attributes;' ; psql -c ' CREATE DATABASE virtual_attributes;' ; fi"
+- sh -c "if [ '$DB' = 'mysql2' ]; then mysql -e 'DROP DATABASE IF EXISTS virtual_attributes; CREATE DATABASE virtual_attributes;'; fi"
+after_script:
+- "./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT"

data/CHANGELOG.md

@@ -5,6 +5,13 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [Unreleased]
 
+## Version [1.1.0] <small>2019-04-23</small>
+
+* add legacy types for VirtualAttribute::Types
+* fix rails 5.1 bug with includes
+* remove reference to MiqPreloader
+* climate code fixes
+
 ## Version [1.0.0] <small>2019-03-05</small>
 
 * renamed to activerecord-virtual_attributes
@@ -16,5 +23,6 @@ a nice looking [Changelog](http://keepachangelog.com).
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.0.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.1.0...HEAD
+[1.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v0.1.0...v1.0.0

data/README.md

@@ -1,5 +1,10 @@
 # VirtualAttributes
 
+[![Build Status](https://travis-ci.org/ManageIQ/activerecord-virtual_attributes.svg?branch=master)](https://travis-ci.org/ManageIQ/activerecord-virtual_attributes)
+[![Maintainability](https://api.codeclimate.com/v1/badges/e1a0c26941c00f4edb55/maintainability)](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/e1a0c26941c00f4edb55/test_coverage)](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/test_coverage)
+[![Security](https://hakiri.io/github/ManageIQ/activerecord-virtual_attributes/master.svg)](https://hakiri.io/github/ManageIQ/activerecord-virtual_attributes/master)
+
 This allows you to define a ruby method that acts like an attribute or relation.
 
 Sometimes you have a model with an attribute defined in ruby, but you want to sort by it or filter by it.
@@ -43,4 +48,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Manage
 
 ## License
 
-The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+This project is available as open source under the terms of the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
+

data/activerecord-virtual_attributes.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "appraisal"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "simplecov"
 end

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -58,7 +58,7 @@ module ActiveRecord
 
   module Associations
     class Preloader
-      prepend Module.new {
+      prepend(Module.new {
         def preloaders_for_one(association, records, scope)
           klass_map = records.compact.group_by(&:class)
 
@@ -67,14 +67,14 @@ module ActiveRecord
             preload(subset, virtuals)
           end
 
-          records_with_association = klass_map.select { |k, rs| k.reflect_on_association(association) }.flat_map { |k, rs| rs }
+          records_with_association = klass_map.select { |k, _rs| k.reflect_on_association(association) }.flat_map { |_k, rs| rs }
           if records_with_association.any?
             loaders.concat(super(association, records_with_association, scope))
           end
 
           loaders
         end
-      }
+      })
     end
 
     # FIXME: Hopefully we can get this into Rails core so this is no longer
@@ -187,13 +187,17 @@ module ActiveRecord
         else
           recs = real.find_with_associations
         end
-        MiqPreloader.preload(recs, preload_values + includes_values) if includes_values
+
+        if includes_values
+          ActiveRecord::Associations::Preloader.new.preload(recs, preload_values + includes_values)
+        end
 
         # when 5.0 support is dropped, assume a block given
         if block_given?
           yield recs, join_dep
+        else
+          recs
         end
-        recs
       end
 
       # From ActiveRecord::QueryMethods

data/lib/active_record/virtual_attributes.rb

@@ -141,3 +141,12 @@ end
 
 require "active_record/virtual_attributes/virtual_total"
 require "active_record/virtual_attributes/arel_groups"
+
+# legacy support for sql types
+module VirtualAttributes
+  module Type
+    Symbol      = ActiveRecord::VirtualAttributes::Type::Symbol
+    StringSet   = ActiveRecord::VirtualAttributes::Type::StringSet
+    NumericSet  = ActiveRecord::VirtualAttributes::Type::NumericSet
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  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: Define attributes in arel
 email:
 - keenan@thebrocks.net
@@ -73,8 +87,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_cc.yml"
+- ".rubocop_local.yml"
 - ".travis.yml"
 - Appraisals
 - CHANGELOG.md