plain_model 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbfb75e773e360168629f706d2180999618cb6bd9e1021be975beafa22e5106c
-  data.tar.gz: fd281798e57e733940630ed0c930ed83a8b6d66562f04d7aaf541d2100a8b095
+  metadata.gz: e7edc77ecf12c7fe60433f63f23d795b49d99159c3565d848e49cc48b17ebb26
+  data.tar.gz: a565e4f7f13b9d8a3974d56a2da1f8ed8956bb8af9f5b57d841d43c1be7c0940
 SHA512:
-  metadata.gz: a65be93c437fd1e95933448aac1b74ea859c2db7e573ce4ff56689ea8c603d6f8b34d93a03673183ccdb63c2055b6661cd2e0742b946b66d53a56b3c6fc8b8b2
-  data.tar.gz: 126876f5467e55745540232a77e566cf99366a13be74c015298da16cb48b07503920f80869e1ed45775eef5f45c8553c250ca6440c94e83f0abe8a21664905ae
+  metadata.gz: 799deefe0bc47e69a0a2ac89c01f4e2e4c1950b4f06f4edf4248d7aac47c79bef07a3a18ce96bb16cbf17a8798d55a5568a62f3ee02e36d1b1b71e69e7c15f51
+  data.tar.gz: 2ece3a004d52ab5dc6af1bc7b4b03c8b5e8549926cd9f6a1498550e23241d118ba7edae3904489efcd707754119476d0b59efec1104e0839328f25c494c7b9bd

data/lib/plain_model/query_builder.rb

@@ -9,9 +9,9 @@ require_relative 'querying/includes'
 module PlainModel
   class QueryBuilder
     include PlainModel::Querying::Base
-    include PlainModel::Querying::WithModel
-    include PlainModel::Querying::Except
     include PlainModel::Querying::Where
     include PlainModel::Querying::Includes
+    include PlainModel::Querying::Except
+    include PlainModel::Querying::WithModel
   end
 end

data/lib/plain_model/querying/base.rb

@@ -10,25 +10,19 @@ module PlainModel
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :chainable_methods, instance_accessor: false, default: []
-
-        class_attribute :result_methods,
-                        instance_accessor: false,
-                        default: [:to_a, :first, :last, :each, :collect, :map, :select, :detect]
-
         extend Forwardable
-        attr_reader :values
-        instance_delegate [:first, :last, :each, :collect, :map, :select, :detect] => :all
-        private :_within_new_instance, :_records
-
-        def initialize(*args)
-          @values = {}
-          super(*args)
-        end
+        attr_accessor :values
+        instance_delegate [:first, :last, :each, :collect, :map, :filter, :detect] => :to_a
+        private :_records
+      end
 
-        protected
+      def initialize(*args)
+        @values = initial_values
+        super(*args)
+      end
 
-        attr_writer :values
+      def initial_values
+        {}
       end
 
       def to_a
@@ -47,12 +41,6 @@ module PlainModel
         []
       end
 
-      def _within_new_instance(&block)
-        new_instance = dup
-        new_instance.instance_exec(&block)
-        new_instance
-      end
-
       def _records
         raise NotImplementedError, "implement #_records private method in #{self.class}"
       end

data/lib/plain_model/querying/except.rb

@@ -11,14 +11,17 @@ module PlainModel
       # @param keys [Array<Symbol>] values keys that you want to exclude from query
       # @return new instance with applied changes
       def except(*keys)
-        _within_new_instance do
-          self.values = values.except(*keys)
-        end
+        dup.except!(*keys)
       end
 
-      included do
-        self.chainable_methods += [:except]
+      # Chain method
+      # @param keys [Array<Symbol>] values keys that you want to exclude from query
+      # @return new instance with applied changes
+      def except!(*keys)
+        self.values = values.except(*keys)
+        self
       end
+
     end
   end
 end

data/lib/plain_model/querying/includes.rb

@@ -9,23 +9,24 @@ module PlainModel
     module Includes
       extend ActiveSupport::Concern
 
-      def initialize(*args)
-        super(*args)
-        values[:includes] = {}
-      end
-
-      included do
-        self.chainable_methods += [:includes]
+      def initial_values
+        super.merge includes: {}
       end
 
       # Chain method
       # @param names [Array<Symbol,Hash>] - names of includes with optional tail hash for nested includes
       # @return new instance with applied changes
       def includes(*names)
-        _within_new_instance do
-          new_includes = ::PlainModel::MergeIncludes.new(values[:includes]).merge(names)
-          values[:includes] = new_includes
-        end
+        dup.includes!(*names)
+      end
+
+      # Chain method
+      # @param names [Array<Symbol,Hash>] - names of includes with optional tail hash for nested includes
+      # @return current instance with applied changes
+      def includes!(*names)
+        new_includes = ::PlainModel::MergeIncludes.new(values[:includes]).merge(names)
+        values[:includes] = new_includes
+        self
       end
     end
   end

data/lib/plain_model/querying/where.rb

@@ -7,22 +7,23 @@ module PlainModel
     module Where
       extend ActiveSupport::Concern
 
-      def initialize(*args)
-        super(*args)
-        values[:where] = {}
+      def initial_values
+        super.merge where: []
       end
 
-      included do
-        self.chainable_methods += [:except]
+      # Chain method
+      # @param conditions [Array]
+      # @return new instance with applied changes
+      def where(*conditions)
+        dup.where!(*conditions)
       end
 
       # Chain method
-      # @param conditions [Hash]
-      # @return new instance with applied changes
-      def where(conditions)
-        _within_new_instance do
-          values[:where].merge!(conditions)
-        end
+      # @param conditions [Array]
+      # @return current instance with applied changes
+      def where!(*conditions)
+        values[:where] = (values[:where] + conditions).uniq
+        self
       end
     end
   end

data/lib/plain_model/querying/with_model.rb

@@ -7,24 +7,24 @@ module PlainModel
     module WithModel
       extend ActiveSupport::Concern
 
+      included do
+        attr_reader :model_class
+        private :_records
+      end
+
       def initialize(model_class, *args)
         @model_class = model_class
         super(*args)
       end
 
-      included do
-        attr_reader :model_class
-
-        def dup_args
-          [model_class]
-        end
-
-        private
+      def dup_args
+        super + [model_class]
+      end
 
-        def _records
-          model_class._records(values)
-        end
+      def _records
+        model_class._records(values)
       end
+
     end
   end
 end

data/lib/plain_model/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PlainModel
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plain_model
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Denis Talakevich
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -132,8 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Plan Old Ruby Object with ORM and query support.