querifier 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d9ece5eebe56e40fa8fffa8684dc2f41ee28a52
-  data.tar.gz: 13a382c786e6d0c2a90512d58412549d5d099242
+  metadata.gz: '0384ae9c72a559364bfcc1ff5a8727e23e333083'
+  data.tar.gz: 92eb1c2528a31373da3bbce219299fe9b5bc6542
 SHA512:
-  metadata.gz: 0cd9c66e1f9f552a2f632a6cb0286b0da4ad68a4a2c4c89cb0ba60195346e6c5aa939d6d8ce3bc7acd6a5b38ab0a656da9b231a60c091cf94f75982600762688
-  data.tar.gz: '0077599ee23261b4930473d42bb9ea9e1eaca1ae20168c3304e753e84413ff35e1e712d677086e65c6affc964877056acf232b663f58b1e274c522609424f1b2'
+  metadata.gz: fa625d8291d0fafb3c89f8b8926cdfdf4367c392efb76bc5cb9778407b082928ad9d7bb0672dda1b5a27b19cb4d491e38498185706154937652b39fee2572ff2
+  data.tar.gz: 9b882bc922be3d74f548b425e2b66db08354f7a398cbde06e11d5fd9fb3118de458d25ad87ee21dfddfa551b323d859dc3833645fa2833b7799dca5f07c0c286

data/README.md

@@ -69,6 +69,39 @@ class BookController < ApiController
 end
 ```
 
+## Custom model class
+
+Querifier will try to assume the class for your model removing the `Query` from your query classname, some examples are:
+  - BookQuery => Book
+  - BooksQuery => Books
+  - SomeModule::BookQuery => Book
+
+If your model isn't called like your query, you can configure it with the entity_class method, something like:
+
+```ruby
+class BookQuery
+  include Querifier::Queries::Default
+
+  # If no order param is provided, then this order will be used
+  # default_sort { id: :asc }
+  # Configure these constants to add attributes to the ordering a filtering
+  where_attributes :id, :author_name # Configure your attributes here
+  order_attributes :id # Configure your attributes here
+
+
+  # This will replace the assumption with the class you send via parameter
+  # The :: are optional, but I recommend you to be explicit about the modules of your class
+  def self.default_collection
+    ::SomeOtherClassName.all
+  end
+
+  def filter_by_author_name(value)
+    @collection = @collection.joins(:author).where(authors: { name: value })
+  end
+end
+
+```
+
 
 ## Custom methods
 

data/lib/querifier/queries/base.rb

@@ -7,7 +7,7 @@ module Querifier
       end
 
       def collection
-        @collection ||= self.class.entity_class.all
+        @collection ||= self.class.default_collection
       end
 
       def params
@@ -19,13 +19,8 @@ module Querifier
       end
 
       module ClassMethods
-        def entity_class(value = nil)
-          return entity_class = value unless value.nil?
-          @@entity_class ||= Object.const_get self.name.split('::').last.split('Query').first
-        end
-
-        def entity_class=(value)
-          @@entity_class = value
+        def default_collection
+          @@default_collection ||= Object.const_get(self.name.split('::').last.split('Query').first).all
         end
       end
 

data/lib/querifier/queries/order.rb

@@ -61,13 +61,23 @@ module Querifier
         @@default_sort = { id: :asc }
 
         def order_attributes(*value)
-          return @@order_attributes = [*value] if value.any?
-          @@order_attributes
+          return class_variable_set :@@order_attributes, [*value] if value.any?
+          begin
+            class_variable_get :@@order_attributes
+          rescue NameError
+            class_variable_set :@@order_attributes, []
+            class_variable_get :@@order_attributes
+          end
         end
 
         def default_sort(value = nil)
-          return @@default_sort = value if value
-          @@default_sort
+          return class_variable_set :@@default_sort, value if value
+          begin
+            class_variable_get :@@default_sort
+          rescue NameError
+            class_variable_set :@@default_sort, { id: :asc }
+            class_variable_get :@@default_sort
+          end
         end
       end
     end

data/lib/querifier/queries/where.rb

@@ -9,7 +9,7 @@ module Querifier
 
       def filter
         return self if @filtered
-        filter_params.each do |attribute|
+        filter_params.each do |(attribute, _)|
           value = filter_value(attribute)
           send("filter_by_#{attribute}", value) if value
         end
@@ -50,8 +50,13 @@ module Querifier
         @@where_attributes = []
 
         def where_attributes(*value)
-          return @@where_attributes = [*value] if value.any?
-          @@where_attributes
+          return class_variable_set :@@where_attributes, [*value] if value.any?
+          begin
+            class_variable_get :@@where_attributes
+          rescue NameError
+            class_variable_set :@@where_attributes, []
+            class_variable_get :@@where_attributes
+          end
         end
       end
     end

data/lib/querifier/version.rb

@@ -1,3 +1,3 @@
 module Querifier
-  VERSION = "0.1.1"
+  VERSION = "0.2.2"
 end

data/querifier.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'railties', '>= 4.1.0', '< 6'
   # TODO
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querifier
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Hugo Farji
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".byebug_history"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"

data/.byebug_history

@@ -1,53 +0,0 @@
-continue
-klass
-exit
-continue
-option
-exit
-!!!
-continue
-exit
-params.fetch(:order, {}).find_all { |(k, _)| self.class::ORDER_ATTRIBUTES.include? k }.to_h
-params.fetch(:order, {}).find_all { |(k, _)| self.class::ORDER_ATTRIBUTES.include? k }.flatten
-params.fetch(:order, {}).find_all { |(k, _)| self.class::ORDER_ATTRIBUTES.include? k }
-params.fetch(:order)
-)
-params.fetch(:order
-exit
-option && direction &&  self.class::ORDER_ATTRIBUTES.include?(option) && %w[asc desc].include?(direction.to_s.downcase)
-option && direction &&  self.class::ORDER_ATTRIBUTES.include?(option)
-option && direction
-direction
-option
-exit
-!!!
-continue
-%w[asc desc].include?(direction.to_s.downcase)
-%w[asc desc].include?(direction.downcase)
-self.class::ORDER_ATTRIBUTES.include?(option)
-valid_sort?(option, direction)
-order_params
-continue
-order_params
-direction
-option
-continue
-f
-continue
-self.class.entity_class.where
-self.class.entity_class
-self.class
-self
-continue
-@collection
-continue
-@collection
-collection
-continue
-@collection
-continue
-@collection
-continue
-value
-continue
-value