fetcha 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61d61933364bc8cb1c81431a9c5ba0fc4224c670
-  data.tar.gz: 422b38441617e39ed53166ff55f87578539dbacd
+  metadata.gz: 6bc945f6738e144d783205329479a73b7bcce92d
+  data.tar.gz: 2c5406ce136580118a7591b8d59bc08711b5bd92
 SHA512:
-  metadata.gz: f931681d3c2bab0b4609c07f6f1abdee6ef15c62f4e31ca2a0afe8dd4aa4192eca694fa087fe68761c37916a4ce058465bcf2c6a3cae77428db01c2cbb3ad58c
-  data.tar.gz: 47f49b64deb5b1c414c5673151a199df55ae2f69371ef885a099ab58d71aa3893bf7480efc019216f5262d145abaa8ac5b7e93e444414e5c437977a148ce8092
+  metadata.gz: 776cf811b5aeb285f3944dead807561e053424f04e1b35e2b3a55d26aca5337b72b155d961206184d3a641961ada7fea3ea7fe0d90cc893e5528cb2165c4c63f
+  data.tar.gz: 758489f31f0a8acb6b2fbb123fd148b1f758ccc1a9c7f067acd8ce8cb20d3da2fa20651d691026ec6f23afd6be94a57b6c8aba624dff621ad87b4afac74148c4

data/lib/fetcha.rb

@@ -1,13 +1,12 @@
-require "fetcha/version"
-require "active_support/concern"
+require 'fetcha/version'
+require 'active_support/concern'
 
 module Fetcha
   extend ActiveSupport::Concern
 
   module ClassMethods
-
     def fetch(params = {})
-      results = self.all
+      results = all
       query_scope = params['scope']
       filters = params['filter']
       sorting = params['sort']
@@ -28,7 +27,7 @@ module Fetcha
       end
 
       def total_count(column_name = :all, _options = nil)
-        @total_count ||= 
+        @total_count ||=
           begin
             c = except(:offset, :limit, :order)
             c = c.count(column_name)
@@ -49,7 +48,7 @@ module Fetcha
         {
           filtering: {},
           sorting: {},
-          scopes: Set.new(),
+          scopes: Set.new,
           pagination: {
             default_size: 10,
             max_size: 50
@@ -59,7 +58,7 @@ module Fetcha
 
     def fulltext_search_on(*fields)
       include PgSearch
-      self.pg_search_scope :search_full_text, against: fields, using: { trigram: { threshold: 0.1 }, tsearch: { prefix: true } }
+      pg_search_scope :search_full_text, against: fields, using: { trigram: { threshold: 0.1 }, tsearch: { prefix: true } }
     end
 
     def filterable_on(*fields)
@@ -84,7 +83,7 @@ module Fetcha
     end
 
     def process_scope(datasource, query_scope)
-      datasource.send(query_scope) if (fetchable_opts[:scopes].include? query_scope.to_sym)
+      datasource.send(query_scope) if fetchable_opts[:scopes].include? query_scope.to_sym
     end
 
     def process_search(datasource, search)
@@ -93,9 +92,9 @@ module Fetcha
 
     def process_filtering(datasource, filters = {})
       filter_opts = fetchable_opts[:filtering]
-      includes = Set.new()
-      
-      real_filters = filters.select do |k| 
+      includes = Set.new
+
+      real_filters = filters.select do |k|
         next unless filter_opts.keys.include? k
         values = k.split('.')
         includes << values.first if values.second.present?
@@ -104,7 +103,12 @@ module Fetcha
       results = includes.empty? ? datasource : datasource.includes(includes.to_a)
 
       real_filters.each do |key, value|
-        results = process_operation(results, key, value)
+        v = if value =~ /,/
+              value.split(',')
+            else
+              value
+            end
+        results = process_operation(results, key, v)
       end
       results
     end
@@ -122,7 +126,7 @@ module Fetcha
           results = send("#{operation}_filter", results, field, value)
         end
       else
-        results = results.where({field => value})
+        results = results.where(field => value)
       end
       results
     end
@@ -158,7 +162,7 @@ module Fetcha
     end
 
     def method_missing(name, *args, block)
-      raise ForbiddenError if name.match /.*_filter$/
+      raise ForbiddenError if name =~ /.*_filter$/
       super
     end
   end
@@ -185,6 +189,5 @@ module Fetcha
     end
   end
 
-
   class ForbiddenError < StandardError; end
 end

data/lib/fetcha/version.rb

@@ -1,3 +1,3 @@
 module Fetcha
-  VERSION = "0.2.2"
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcha
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport