active_house 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50733d5482718e12146c8c79d9c4d372df311268
-  data.tar.gz: e3d33e478537b2a0a04e9f02dd970d4c823432c4
+  metadata.gz: aba219aae4f2cb3ba08c8440b242058347c26df7
+  data.tar.gz: c591c24a4c0ec08dceab1ea5c70ffc6a77f768e1
 SHA512:
-  metadata.gz: c52e1158125f806bdd6f8547ba2cd64cc6b2426c9b5c1a3993fc00cf6802b890d3c8d490ccbb3968042778a4a6b1709ff95bb0f28d1572c07530dcb71d00bdc7
-  data.tar.gz: 77f1afc5c493e9ca5fd372763dedaf5036eb0bf22a59c10a5117c435b7abfdd45c04dc63fbb2029b6d0c7cea8210a51673b4bff3f9015e100a722e4e279ea46c
+  metadata.gz: 1ac453090a26362fece0925c7b86aebb9fb1211b8593547e104fcd06898b0e63e94747bd077582a0a8da79712fe88850ca2d11a7067bdf9041fda524e931e3e2
+  data.tar.gz: b1cc1836e95fb36af843cf390a87883fcb99b61279d39066a0590a2dd8ed33b1b2253da73343de1393e3a8e0f69d7af6b5243737dc2c9dd9de32b5956a2eb0ba

data/lib/active_house/query_builder.rb

@@ -1,5 +1,4 @@
 require 'plain_model/querying/base'
-require 'plain_model/querying/except'
 require 'plain_model/querying/with_model'
 require_relative 'querying/select'
 require_relative 'querying/from'
@@ -12,12 +11,12 @@ require_relative 'querying/union'
 require_relative 'querying/array_join'
 require_relative 'querying/page'
 require_relative 'querying/scope'
+require_relative 'querying/except'
 require_relative 'querying/collect'
 
 module ActiveHouse
   class QueryBuilder
     include PlainModel::Querying::Base
-    include PlainModel::Querying::Except
     include PlainModel::Querying::WithModel
 
     include ActiveHouse::Querying::Select
@@ -31,6 +30,7 @@ module ActiveHouse
     include ActiveHouse::Querying::ArrayJoin
     include ActiveHouse::Querying::Scope
     include ActiveHouse::Querying::Page
+    include ActiveHouse::Querying::Except
     include ActiveHouse::Querying::Collect
 
     # allows using query without model_class

data/lib/active_house/querying/except.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module ActiveHouse
+  module Querying
+    module Except
+      extend ActiveSupport::Concern
+
+      # Chain method
+      # @param keys [Array<Symbol>] values keys that you want to exclude from query
+      # @return new instance with applied changes
+      def except(*keys)
+        dup.except!(*keys)
+      end
+
+      # Chain method
+      # @param keys [Array<Symbol>] values keys that you want to exclude from query
+      # @return new instance with applied changes
+      def except!(*keys)
+        values.merge! initial_values.slice(*keys)
+        self
+      end
+
+    end
+  end
+end

data/lib/active_house/version.rb

@@ -1,3 +1,3 @@
 module ActiveHouse
-  VERSION = '0.6.4'.freeze
+  VERSION = '0.6.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_house
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Denis Talakevich
@@ -154,6 +154,7 @@ files:
 - lib/active_house/query_builder.rb
 - lib/active_house/querying/array_join.rb
 - lib/active_house/querying/collect.rb
+- lib/active_house/querying/except.rb
 - lib/active_house/querying/from.rb
 - lib/active_house/querying/group_by.rb
 - lib/active_house/querying/having.rb