query_params 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e4760d86c9799b2c819f9122447add095fc4b55
-  data.tar.gz: 0f895652f78e9638d645fc22fbf233ec651d05f8
+  metadata.gz: 4e8bb9564113b072437e39a807cad77db2a80021
+  data.tar.gz: b8504a4728fddb28797cddb23467726b886e520d
 SHA512:
-  metadata.gz: cbb53f374616cda74e535c17ebd6443e484754d2825329a10a81a04f9ee456287a439bb44ccad8d5ce2c80d30a53db166f6a96a845ac888a8904c0c096103215
-  data.tar.gz: 80dc0c7f0f4ed7cd87fdbab76ae5b158c6dcf5d03319cbc68ff51226ca7e7f7e84a5e3c5ccc1164bc5670a83331af48082c2a1675f970a946c52fb3e7a193609
+  metadata.gz: 67337a313336cb63b9ffa83db118a1bebc0172979539255b510c38c4de43be176e779619655417fa2d4482eed5686958f9346a57e7b05131d7f0e303a68df6c8
+  data.tar.gz: 6c70590522a3198f742ecd016fb02359394490c78c1109d26e3a7dfb18ab97388d10f1dd58e863ccf37e9aa1d8c71d00729265e97d2a60c540ad9a21575e6d48

data/README.md

@@ -27,8 +27,13 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-QueryParams.build_uri(base_uri: "http://domain.com/search", q: "Mark", filters: ["age <= 18", "type = 1"])
+# Complete URI
+URI::QueryParams.build_uri(base_uri: "http://domain.com/search", q: "Mark", filters: ["age <= 18", "type = 1"])
 # => "http://domain.com/search?q=Mark&filters=age::le(18)|type::eq(1)"
+
+# Only query params
+URI::QueryParams.filters(filters: ["age <= 18", "type = 1"])
+# => "age::le(18)|type::eq(1)"
 ```
 
 ## Contributing

data/lib/query_params/condition.rb

@@ -1,21 +1,21 @@
 require "query_params"
 
-class Condition
+module Condition
 
   OPERATORS = { "=" => "eq", ">=" => "ge", "<=" => "le" }
 
-  def self.build_uri(queryParams, conditions)
+  def set_conditions(conditions)
     
     if conditions.kind_of?(Array)
       conditions.each do |condition|
-        set_query(queryParams, condition)
+        set_query(condition)
       end
     else
-      set_query(queryParams, conditions)
+      set_query(conditions)
     end
   end
 
-  def self.set_query(queryParams, condition)
+  def set_query(condition)
     tokens = condition.split(" ")
     
     raise(ArgumentError, "Invalid condition: #{condition}. Send operator separate for space.") if tokens.size < 3
@@ -26,7 +26,7 @@ class Condition
     
     raise(ArgumentError, "Invalid operator. Accepted tokens: #{OPERATORS.values}") if OPERATORS[operator].nil?
 
-    queryParams.send(OPERATORS[operator], field, value)
+    self.send(OPERATORS[operator], field, value)
   end
 
 end

data/lib/query_params/version.rb

@@ -1,3 +1,3 @@
 module QueryParams
-  VERSION = "1.1.1"
+  VERSION = "1.2.1"
 end

data/lib/query_params.rb

@@ -6,11 +6,17 @@ module URI
   class QueryParams
 
     include Filter
+    include Condition
 
     def initialize(base_uri = "")
       @base_uri = base_uri.nil? ? "" : base_uri
       @params = []
       @query = ""
+      @filter_param_name = "filters"
+    end
+
+    def set_filter_param_name(name = @filter_param_name)
+      @filter_param_name = name
     end
 
     def build_uri()
@@ -22,16 +28,30 @@ module URI
         uri += "#{@query}" 
         uri += "&" unless @params.empty?
       end
-      uri += "filters=#{ERB::Util.url_encode(@params.join("|"))}" unless @params.empty?
+      uri += "#{@filter_param_name}=#{build_filters()}" unless @params.empty?
       uri = "" if uri.length == 1
       "#{@base_uri}#{uri}"
     end
 
     def self.build_uri(options = {})
       queryParams = QueryParams.new(options[:base_uri])
-      Condition.build_uri(queryParams, options[:filters]) if options[:filters]
+      queryParams.set_conditions(options[:filters]) if options[:filters]
       queryParams.full_text_search(options[:q]) if options[:q]
+      queryParams.filter_param_name(options[:filter_param_name]) if options[:filter_param_name]
       queryParams.build_uri()
     end
+
+    def self.filters(filters)
+      if filters.nil? || filters.empty?
+        raise(ArgumentError, "Missing required parameter filters. Example: ['age >= 18']")
+      end
+      queryParams = QueryParams.new()
+      queryParams.set_conditions(filters)
+      queryParams.build_filters()
+    end
+
+    def build_filters()
+      ERB::Util.url_encode(@params.join("|"))
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_params
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - William Souza