fetcha 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd41a3e51c6bd2115cfc3d735bf19b7b8fe9de93
-  data.tar.gz: cfcb0e8c69f2b2ddf3063af7cb8801d3d16d28d0
+  metadata.gz: 278adb65683904f06b7ce27682cce5eee7e8006f
+  data.tar.gz: d3013fe779d79bc72b1be02a950eed93aa9168d3
 SHA512:
-  metadata.gz: f122a1601bce2fcab21b6a5ac8f74ecde0e1acd050027326321b8510ce3a15707783848d0801e112c9b8af5a2c79e08c4d9b79456158bc1e9892f573a4c64aea
-  data.tar.gz: 7a3b439163238c4104fb8a0081c7b83d6c85cf0fd813692006f6399e17abf31f5ab075b8be94bc722bbfbd722fe2d4010b0b295e0048262b3095f17a9882faf3
+  metadata.gz: 49ed2595431fd9a74fda15969ee899bbca2a69eaf1b79b6d12884f41a675effc8ace6b7634c49467f1d781f8fbeb0a0f16b207e5d46bebcd87a73ebc395bd86d
+  data.tar.gz: 6f1d6b5cbe5d68178d9c1ee820a931cf9d62b43c7d127bf31b9a226777e00b0cbf378d9f1ec198ec0427b7553e0ddf9e1688e6b6bcd7cd50f4a37e74a227ee18

data/lib/fetcha.rb

@@ -12,10 +12,12 @@ module Fetcha
       filters = params['filter']
       sorting = params['sort']
       pages = params['page']
+      search = params['search']
       results = process_scope(results, query_scope) if query_scope
       results = process_filtering(results, filters) if filters
       results = process_sorting(results, sorting) if sorting
       results = process_pagination!(results, pages) if pages
+      results = process_search(results, search) if search
       results
     end
 
@@ -64,19 +66,11 @@ module Fetcha
       datasource.send(query_scope) if (fetchable_opts[:scopes].include? query_scope.to_sym)
     end
 
-    def process_filtering(datasource, filters)
-      if filters.is_a?(String)
-        full_text_filtering(datasource, filters)
-      else
-        hash_filtering(datasource, filters)
-      end
-    end
-
-    def full_text_filtering(datasource, filter)
-      datasource.search_full_text(filter)
+    def process_search(datasource, search)
+      datasource.search_full_text(search)
     end
 
-    def hash_filtering(datasource, filters = {})
+    def process_filtering(datasource, filters = {})
       filter_opts = fetchable_opts[:filtering]
       includes = Set.new()
       

data/lib/fetcha/version.rb

@@ -1,3 +1,3 @@
 module Fetcha
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fetcha
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Vincenzo Ferrara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -97,7 +97,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- fetcha-0.1.2.gem
 - fetcha.gemspec
 - lib/fetcha.rb
 - lib/fetcha/version.rb