searchkon 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d1a85dcbc2fa987d795fc2cd5b70268215edec815153f6e7faba8b087756e7e
-  data.tar.gz: 94ab0e106400d8b08d9f4a6cd3eaeba30361e7450a469d3975e7225b01b33327
+  metadata.gz: eb893a4d3dc86aa19c3da94c49e4fcb2746931308710ba6a165b5a39290a8cb4
+  data.tar.gz: 18eec74102de5b1ae4d5f07a965f682871f7bdfbff793f1ddf7ced1ea35a7c43
 SHA512:
-  metadata.gz: aa72df68a529c67c96221351087865476c337d46462d32c3298eb305621e4c845d4f1e9bb88e1e04032077cbf976364950c0c6c0ff0044be9a70a67aa652393c
-  data.tar.gz: c8ba2cf75c2160a480e515f5c5abd8db9a53d05498dd2d87e8835a01d12262d49d4c0d18cb68f771cc2872176e14fb85112a96e04a5eabb14900eaa8ec01c41b
+  metadata.gz: d11d1b0d6c13e55e4239f641c8fa65fa2378a2d856ca43d8f2ea09321dac83876258206ca5ee5791ce147a7be8e87acfba768c003116705bc1248b43f941d044
+  data.tar.gz: f09f8209e58b8be30119cc4da86b0e9e9c785e4c2a03f4df3626d5847e341bef6a8aad772133a00337386f415838d04a3c23b1dedd51388252f7c3b59862e274

data/lib/searchkon/query_builder.rb

@@ -7,7 +7,7 @@ module Searchkon
       def filter model, params = {}
         @model = model.constantize
         @res = @model.all
-        valid_params = validate_params(params, @model.searchable_columns)
+        valid_params = validate_params(params[:filters], @model.searchable_columns)
         create_filters valid_params
         @res
       end

data/lib/searchkon/regex_formatter.rb

@@ -1,6 +1,6 @@
 module Searchkon
   module RegexFormatter
-    SIMPLE_RANGE_FORMAT_REGEX = /\((.*)\.\.(.*)\)/
+  SIMPLE_RANGE_FORMAT_REGEX = /\((.*)\.\.(.*)\)/
   RELATIONAL_FORMAT_REGEX = /(.*)\.(.*)/
   DIGIT_RANGE_FORMAT_REGEX = /\((\d*)\.\.(\d*)\)/
   DATE_RANGE_FORMAT_REGEX = /\((\d{4}-\d{1,2}-\d{1,2})\.\.(\d{4}-\d{1,2}-\d{1,2})\)/

data/searchkon.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = 'searchkon'
-  s.version     = '0.1.2'
+  s.version     = '1.0.0'
   s.date        = '2020-05-24'
   s.summary     = "Search Command"
   s.description = "make search easy"
-  s.authors     = ["Majid Imanzade"]
+  s.authors     = ["Majid Imanzade", 'Amin Samadzade']
   s.email       = 'majidimanzade1@gmail.com'
   s.homepage    = 'https://rubygems.org/gems/searchkon'
   s.homepage    = "http://github.com/majidimanzade/searchkon"
@@ -16,4 +16,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec")
   s.add_development_dependency "sqlite3"
+
+  s.add_dependency "activesupport"
+  s.add_dependency "activerecord"
 end

data/spec/models/coupon.rb

@@ -0,0 +1,3 @@
+class Coupon < ActiveRecord::Base
+
+end

data/spec/models/payment.rb

@@ -0,0 +1,3 @@
+class Payment < ActiveRecord::Base
+
+end

data/spec/{product.rb → models/product.rb}

@@ -1,5 +1,7 @@
 class Product < ActiveRecord::Base
-  self.abstract_class = true
+
+  has_many :coupons
+  has_many :payments
 
   def self.searchable_columns
     {
@@ -7,6 +9,7 @@ class Product < ActiveRecord::Base
       exact: [
         'created_at',
         'coupons.id',
+        'payments.id',
         'id'
       ]
     }

data/spec/query_builder_spec.rb

@@ -1,5 +1,5 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/product')
+
 RSpec.describe Searchkon::QueryBuilder do
   describe 'query builder for filter' do
     let (:simple_where_params) do
@@ -31,7 +31,6 @@ RSpec.describe Searchkon::QueryBuilder do
 
     it 'should return simple where query' do
       query = "SELECT \"products\".* FROM \"products\" WHERE (products.title like '%foobar%') AND \"products\".\"id\" = 1"
-
       expect(Searchkon::QueryBuilder.filter('Product', simple_where_params).to_sql).to eq query
     end
 
@@ -57,8 +56,7 @@ RSpec.describe Searchkon::QueryBuilder do
 
     it 'should return simple where relational query with two relations' do
       relational_params = { filters: { 'coupons.id': 1, 'payments.id': 1 } }
-      query = "SELECT \"products\".* FROM \"products\" INNER JOIN \"payments\" ON \"payments\".\"product_id\" = \"products\".\"id\" INNER JOIN \"coupons\" ON \"coupons\".\"product_id\" = \"products\".\"id\" WHERE \"payments\".\"id\" = 1 AND \"coupons\".\"id\" = 1"
-
+      query = "SELECT \"products\".* FROM \"products\" INNER JOIN \"coupons\" ON \"coupons\".\"product_id\" = \"products\".\"id\" INNER JOIN \"payments\" ON \"payments\".\"product_id\" = \"products\".\"id\" WHERE \"coupons\".\"id\" = 1 AND \"payments\".\"id\" = 1"
       expect(Searchkon::QueryBuilder.filter('Product', relational_params).to_sql).to eq query
     end
 

data/spec/schema.rb

@@ -3,8 +3,17 @@ ActiveRecord::Schema.define do
 
   create_table :products, :force => true do |t|
     t.string :key
-    t.string :name
+    t.string :title
+    t.timestamps
+  end
+
+  create_table :coupons, :force => true do |t|
+    t.string :title
+    t.timestamps
+  end
 
+  create_table :payments, :force => true do |t|
+    t.string :title
     t.timestamps
   end
 

data/spec/spec_helper.rb

@@ -10,4 +10,6 @@ require 'rspec'
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
 
 load File.dirname(__FILE__) + '/schema.rb'
-require File.dirname(__FILE__) + '/product.rb'
+require File.dirname(__FILE__) + '/models/coupon.rb'
+require File.dirname(__FILE__) + '/models/payment.rb'
+require File.dirname(__FILE__) + '/models/product.rb'

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: searchkon
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Majid Imanzade
+- Amin Samadzade
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -66,6 +67,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: make search easy
 email: majidimanzade1@gmail.com
 executables: []
@@ -83,7 +112,9 @@ files:
 - lib/searchkon/searchables.rb
 - searchkon.gemspec
 - spec/filterable_spec.rb
-- spec/product.rb
+- spec/models/coupon.rb
+- spec/models/payment.rb
+- spec/models/product.rb
 - spec/query_builder_spec.rb
 - spec/schema.rb
 - spec/spec_helper.rb