lite-query 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6575d31196d0ee324fc60a8ebc6a1acb51515e1f3316f126eba4fa876c470d44
-  data.tar.gz: 9da2439d21e883e5ac4735db5f50612f7e1b1e17d4921c58094fc2628d1c3802
+  metadata.gz: d0f2835fd2e7eb71fe7e803340066fd45a583fa0f166ec076b191ee5995fe385
+  data.tar.gz: 96e47feaacb92baa6ea11aff0143b619a0b0a423e1df9cc84c20217312334e0f
 SHA512:
-  metadata.gz: bd7e99af963849568ae09db1525b61437980a49e9652db35a9617e7b67a96acd3fcddb18d153687f455110fdb33189686e0cd5e45162728f131cb4728059cb42
-  data.tar.gz: bfcb583e1b6c3eed4337acb19fb590aeb2506f22e09da1a73597cea7df3c2f718b286854900fd45df1fc3e8b11c05977920e46792a5073909183a620ff9899f9
+  metadata.gz: 2ba41ce1c43e94f248e6e171cc5b4d7cd3003f98bf1e439579570ac07e513a0c592b34fbc6995948a5c4a197cce2040e11c03dc1a4268bee1f7f9daae067185f
+  data.tar.gz: a603bb1729f80ef471f2063b738591cb6f8c63618e752efc15a00780e9a112161e0d91c07a649b66bcbc274f1db9a04076dcf6a11bfde819bed1310bbdc5440c

data/.rubocop.yml

@@ -1,12 +1,16 @@
 require:
   - rubocop-performance
+  - rubocop-rake
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
+  NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
-LineLength:
-  Max: 100
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+Layout/EmptyLinesAroundAttributeAccessor:
+  Enabled: true
 Layout/EmptyLinesAroundBlockBody:
   Exclude:
     - 'spec/**/**/*'
@@ -14,6 +18,14 @@ Layout/EmptyLinesAroundClassBody:
   EnforcedStyle: empty_lines_except_namespace
 Layout/EmptyLinesAroundModuleBody:
   EnforcedStyle: empty_lines_except_namespace
+Layout/LineLength:
+  Max: 100
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+Lint/RaiseException:
+  Enabled: true
+Lint/StructNewOverride:
+  Enabled: true
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/**/*'
@@ -22,10 +34,10 @@ Naming/MemoizedInstanceVariableName:
   Enabled: false
 RSpec/ExampleLength:
   Enabled: false
-RSpec/FilePath:
-  Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+Style/ArgumentsForwarding:
+  Enabled: false
 Style/Documentation:
   Enabled: false
 Style/ExpandPathArguments:

data/.travis.yml

@@ -4,6 +4,7 @@ cache: bundler
 rvm:
 - 2.5
 - 2.6
+- 2.7
 - ruby-head
 matrix:
   fast_finish: true

data/CHANGELOG.md

@@ -6,6 +6,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2021-07-19
+### Added
+- Added Ruby 3.0 support
+
+## [1.0.8] - 2020-07-03
+### Added
+- Added Ruby 2.7 support
+
+## [1.0.7] - 2019-12-21
+### Removed
+- Removed generator empty directory check
+
+## [1.0.6] - 2019-12-20
+### Removed
+- Removed lite-query generator
+- Removed spec from rails generator
+
 ## [1.0.5] - 2019-09-02
 ### Changed
 - Changed generator syntax

data/Gemfile.lock

@@ -1,114 +1,129 @@
 PATH
   remote: .
   specs:
-    lite-query (1.0.5)
+    lite-query (1.1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
+    actionpack (6.1.4)
+      actionview (= 6.1.4)
+      activesupport (= 6.1.4)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (6.1.4)
+      activesupport (= 6.1.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.1.4)
+      activesupport (= 6.1.4)
+    activerecord (6.1.4)
+      activemodel (= 6.1.4)
+      activesupport (= 6.1.4)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    ast (2.4.0)
-    builder (3.2.3)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    builder (3.2.4)
     colorize (0.8.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
-    database_cleaner (1.7.0)
-    diff-lcs (1.3)
-    erubi (1.8.0)
-    fasterer (0.6.0)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    fasterer (0.9.0)
       colorize (~> 0.7)
-      ruby_parser (>= 3.13.0)
+      ruby_parser (>= 3.14.1)
     generator_spec (0.9.4)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    i18n (1.6.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    loofah (2.2.3)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.4.0)
-      ast (~> 2.4.0)
-    rack (2.0.7)
+    method_source (1.0.0)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    parallel (1.20.1)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.4)
+      actionpack (= 6.1.4)
+      activesupport (= 6.1.4)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 0.13)
+      thor (~> 1.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.18.3)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
-      rubocop (>= 0.71.0)
-    rubocop-rspec (1.35.0)
-      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
-    ruby_parser (3.13.1)
-      sexp_processor (~> 4.9)
-    sexp_processor (4.12.1)
-    sqlite3 (1.4.1)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.6.0)
-    zeitwerk (2.1.9)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.8.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.4)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.6.0)
+      rubocop (~> 1.0)
+    rubocop-rspec (2.4.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    ruby-progressbar (1.11.0)
+    ruby_parser (3.16.0)
+      sexp_processor (~> 4.15, >= 4.15.1)
+    sexp_processor (4.15.3)
+    sqlite3 (1.4.2)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -124,8 +139,9 @@ DEPENDENCIES
   rspec
   rubocop
   rubocop-performance
+  rubocop-rake
   rubocop-rspec
   sqlite3
 
 BUNDLED WITH
-   2.0.1
+   2.2.24

data/README.md

@@ -29,22 +29,26 @@ Or install it yourself as:
 
 ## Setup
 
-`rails g lite:query:install` will generate the following file:
-`../app/queries/application_query.rb`
+### Generators
 
-```ruby
-class ApplicationQuery < Lite::Query::Base
-end
+Use `rails g query NAME` will generate the following files:
+
+```erb
+app/queries/[name]_query.rb
 ```
 
-Use `rails g query NAME` will generate the following file: `../app/queries/[name]_query.rb`
+If a `ApplicationQuery` file in the `app/queries` directory is available, the
+generator will create file that inherit from `ApplicationQuery` if not it will
+fallback to `Lite::Query::Base`.
+
+### Query
 
-You will then need to fill this class with the required `execute` method as shown below:
+You will need to fill this class with the required `execute` method as shown below:
 
 ```ruby
 class AgeQuery < ApplicationQuery
 
-  # NOTE: this method is required
+  # NOTE: This instance method is required
   def execute
     return relation unless args[:age]
 

data/lib/generators/rails/query_generator.rb

@@ -10,16 +10,9 @@ module Rails
 
     def copy_files
       path = File.join('app', 'queries', class_path, "#{file_name}_query.rb")
-      empty_directory('app/queries')
       template('query.rb.tt', path)
     end
 
-    def copy_specs
-      path = File.join('spec', 'queries', class_path, "#{file_name}_query_spec.rb")
-      empty_directory('spec/queries')
-      template('spec.rb.tt', path)
-    end
-
     private
 
     def file_name

data/lib/generators/rails/templates/query.rb.tt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 <% module_namespacing do -%>
-class <%= class_name %>Query < ApplicationQuery
+class <%= class_name %>Query < <%= ApplicationQuery.to_s rescue 'Lite::Query::Base' %>
 end
 <% end -%>

data/lib/lite/query.rb

@@ -4,5 +4,4 @@
   require "lite/query/#{name}"
 end
 
-require 'generators/lite/query/install_generator'
 require 'generators/rails/query_generator'

data/lib/lite/query/base.rb

@@ -9,14 +9,14 @@ module Lite
 
       class << self
 
-        def call(relation = nil, **args)
+        def call(relation = nil, args = {})
           klass = new(relation, args)
           klass.call
         end
 
       end
 
-      def initialize(relation = nil, **args)
+      def initialize(relation = nil, args = {})
         @relation = relation || default_relation
         @args = args
       end

data/lib/lite/query/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Query
 
-    VERSION ||= '1.0.5'
+    VERSION = '1.1.0'
 
   end
 end

data/lite-query.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
     )
   else
     raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
+          'public gem pushes.'
   end
 
   # Specify which files should be added to the gem when it is released.
@@ -46,6 +46,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rake'
   spec.add_development_dependency 'rubocop-rspec'
   spec.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-query
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Gomez
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-09-03 00:00:00.000000000 Z
+date: 2021-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  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: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +178,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - j.gomez@drexed.com
 executables: []
@@ -186,12 +200,9 @@ files:
 - _config.yml
 - bin/console
 - bin/setup
-- lib/generators/lite/query/install_generator.rb
-- lib/generators/lite/query/templates/install.rb
 - lib/generators/rails/USAGE
 - lib/generators/rails/query_generator.rb
 - lib/generators/rails/templates/query.rb.tt
-- lib/generators/rails/templates/spec.rb.tt
 - lib/lite/query.rb
 - lib/lite/query/base.rb
 - lib/lite/query/exceptions.rb
@@ -201,7 +212,7 @@ homepage: http://drexed.github.io/lite-query
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.24
+signing_key:
 specification_version: 4
 summary: Ruby Query based framework (aka query objects)
 test_files: []

data/lib/generators/lite/query/install_generator.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails/generators'
-
-module Lite
-  module Query
-    class InstallGenerator < Rails::Generators::Base
-
-      source_root File.expand_path('../templates', __FILE__)
-
-      def copy_application_query_file
-        copy_file('install.rb', 'app/queries/application_query.rb')
-      end
-
-    end
-  end
-end

data/lib/generators/lite/query/templates/install.rb

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-class ApplicationQuery < Lite::Query::Base
-end

data/lib/generators/rails/templates/spec.rb.tt

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-RSpec.describe <%= class_name %>Query, type: :query do
-  pending "add some examples to (or delete) #{__FILE__}"
-end