nql 0.0.3 → 0.1.2

data/spec/spec_helper.rb

@@ -1,45 +1,46 @@
-require 'nql'
-
-Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each {|f| require f}
-
-ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
-
-RSpec::Matchers.define :have_attribute do |expected|
-  match do |actual|
-    actual[:a]['0'][:name] == expected
-  end
-
-  failure_message_for_should do |actual|
-    "expected: #{actual[:a]['0'][:name]}\n     got: #{expected}"
-  end
-end
-
-RSpec::Matchers.define :have_predicate do |expected|
-  match do |actual|
-    actual[:p] == expected
-  end
-
-  failure_message_for_should do |actual|
-    "expected: #{actual[:p]}\n     got: #{expected}"
-  end
-end
-
-RSpec::Matchers.define :have_value do |expected|
-  match do |actual|
-    actual[:v]['0'][:value] == expected
-  end
-
-  failure_message_for_should do |actual|
-    "expected: #{actual[:v]['0'][:value]}\n     got: #{expected}"
-  end
-end
-
-RSpec::Matchers.define :produce_sql do |expected|
-  match do |actual|
-    actual.to_sql.strip == expected
-  end
-
-  failure_message_for_should do |actual|
-    "expected: #{actual.to_sql}\n     got: #{expected}"
-  end
+require 'coverage_helper'
+require 'nql'
+
+Dir["#{File.dirname(__FILE__)}/models/**/*.rb"].each {|f| require f}
+
+ActiveRecord::Migrator.migrations_path = "#{File.dirname(__FILE__)}/migrations"
+
+RSpec::Matchers.define :have_attribute do |expected|
+  match do |actual|
+    actual[:a]['0'][:name] == expected
+  end
+
+  failure_message_for_should do |actual|
+    "expected: #{actual[:a]['0'][:name]}\n     got: #{expected}"
+  end
+end
+
+RSpec::Matchers.define :have_predicate do |expected|
+  match do |actual|
+    actual[:p] == expected
+  end
+
+  failure_message_for_should do |actual|
+    "expected: #{actual[:p]}\n     got: #{expected}"
+  end
+end
+
+RSpec::Matchers.define :have_value do |expected|
+  match do |actual|
+    actual[:v]['0'][:value] == expected
+  end
+
+  failure_message_for_should do |actual|
+    "expected: #{actual[:v]['0'][:value]}\n     got: #{expected}"
+  end
+end
+
+RSpec::Matchers.define :produce_sql do |expected|
+  match do |actual|
+    actual.to_sql.strip == expected
+  end
+
+  failure_message_for_should do |actual|
+    "expected: #{actual.to_sql}\n     got: #{expected}"
+  end
 end

data/spec/sql_spec.rb

@@ -1,117 +1,139 @@
-require 'spec_helper'
-
-describe 'SQL generation' do
-
-  before :all do
-    ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ":memory:"
-    ActiveRecord::Base.connection
-    ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path
-  end
-
-  context 'Single comparisons' do
-
-    it 'Equals' do
-      q = 'name = abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"name\" = 'abcd'"
-    end
-
-    it 'Not equals' do
-      q = 'name != abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" != 'abcd')"
-    end
-
-    it 'Greater than' do
-      q = 'name > abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" > 'abcd')"
-    end
-
-    it 'Greater or equals than' do
-      q = 'name >= abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" >= 'abcd')"
-    end
-
-    it 'Less than' do
-      q = 'name < abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" < 'abcd')"
-    end
-
-    it 'Less or equals than' do
-      q = 'name <= abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" <= 'abcd')"
-    end
-
-    it 'Contains' do
-      q = 'name : abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE '%abcd%')"
-    end
-
-  end
-
-  context 'Coordinated comparisons' do
-
-    it 'And' do
-      q = 'id > 1234 & name = abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"id\" > 1234 AND \"countries\".\"name\" = 'abcd'))"
-    end
-
-    it 'Or' do
-      q = 'id < 1234 | name : abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"id\" < 1234 OR \"countries\".\"name\" LIKE '%abcd%'))"
-    end
-
-    it 'And then Or' do
-      q = 'id > 1234 & name = abcd | name : efgh'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"id\" > 1234 AND (\"countries\".\"name\" = 'abcd' OR \"countries\".\"name\" LIKE '%efgh%')))"
-    end
-
-    it 'With parentheses' do
-      q = '(id > 1234 & name = abcd) | name : efgh'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"name\" LIKE '%efgh%' OR (\"countries\".\"id\" > 1234 AND \"countries\".\"name\" = 'abcd')))"
-    end
-
-  end
-
-  context 'Model joins' do
-
-    it 'Parent join' do
-      q = 'country.name : abcd'
-      City.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"cities\".* FROM \"cities\" LEFT OUTER JOIN \"countries\" ON \"countries\".\"id\" = \"cities\".\"country_id\" WHERE (\"countries\".\"name\" LIKE '%abcd%')"
-    end
-
-    it 'Children join' do
-      q = 'cities.name : abcd'
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\" LEFT OUTER JOIN \"cities\" ON \"cities\".\"country_id\" = \"countries\".\"id\" WHERE (\"cities\".\"name\" LIKE '%abcd%')"
-    end
-
-    it 'Children join distinct' do
-      q = 'cities.name : abcd'
-      Country.search(NQL.to_ransack(q)).result(distinct: true).should produce_sql "SELECT DISTINCT \"countries\".* FROM \"countries\" LEFT OUTER JOIN \"cities\" ON \"cities\".\"country_id\" = \"countries\".\"id\" WHERE (\"cities\".\"name\" LIKE '%abcd%')"
-    end
-
-  end
-
-  context 'Invalid queries' do
-
-    it 'Nil' do
-      q = nil
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\""
-    end
-
-    it 'Empty' do
-      q = ''
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\""
-    end
-
-    it 'Empty with spaces' do
-      q = '   '
-      Country.search(NQL.to_ransack(q)).result.should produce_sql "SELECT \"countries\".* FROM \"countries\""
-    end
-
-    it 'Partial expression' do
-      q = 'id ='
-      expect{Country.search(NQL.to_ransack(q)).result}.should raise_exception NQL::InvalidExpressionError
-    end
-
-  end
-
+require 'spec_helper'
+
+describe 'SQL generation' do
+
+  before :all do
+    ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ":memory:"
+    ActiveRecord::Base.connection
+    ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path
+  end
+
+  context 'Single comparisons' do
+
+    it 'Equals' do
+      q = 'name = abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"name\" = 'abcd'"
+    end
+
+    it 'With parentheses' do
+      q = '(name = abcd)'
+      a = Country.nql(q)
+      a.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"name\" = 'abcd'"
+    end
+
+    it 'With parentheses and boolean value' do
+      q = '(landlocked = true)'
+      a = Country.nql(q)
+      a.should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE \"countries\".\"landlocked\" = 't'"
+    end
+
+    it 'Not equals' do
+      q = 'name != abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" != 'abcd')"
+    end
+
+    it 'Greater than' do
+      q = 'name > abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" > 'abcd')"
+    end
+
+    it 'Greater or equals than' do
+      q = 'name >= abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" >= 'abcd')"
+    end
+
+    it 'Less than' do
+      q = 'name < abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" < 'abcd')"
+    end
+
+    it 'Less or equals than' do
+      q = 'name <= abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" <= 'abcd')"
+    end
+
+    it 'Contains' do
+      q = 'name : abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE '%abcd%')"
+    end
+
+    it 'Not contains' do
+      q = 'name !: abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" NOT LIKE '%abcd%')"
+    end
+
+    it 'Matches' do
+      q = 'name ~ abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (\"countries\".\"name\" LIKE 'abcd')"
+    end
+
+  end
+
+  context 'Coordinated comparisons' do
+
+    it 'And' do
+      q = 'id > 1234 & name = abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"id\" > 1234 AND \"countries\".\"name\" = 'abcd'))"
+    end
+
+    it 'Or' do
+      q = 'id < 1234 | name : abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"id\" < 1234 OR \"countries\".\"name\" LIKE '%abcd%'))"
+    end
+
+    it 'And then Or' do
+      q = 'id > 1234 & name = abcd | name : efgh'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"id\" > 1234 AND (\"countries\".\"name\" = 'abcd' OR \"countries\".\"name\" LIKE '%efgh%')))"
+    end
+
+    it 'With parentheses' do
+      q = '(id > 1234 & name = abcd) | name : efgh'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE ((\"countries\".\"name\" LIKE '%efgh%' OR (\"countries\".\"id\" > 1234 AND \"countries\".\"name\" = 'abcd')))"
+    end
+
+  end
+
+  context 'Model joins' do
+
+    it 'Parent join' do
+      q = 'country.name : abcd'
+      City.nql(q).should produce_sql "SELECT \"cities\".* FROM \"cities\" LEFT OUTER JOIN \"countries\" ON \"countries\".\"id\" = \"cities\".\"country_id\" WHERE (\"countries\".\"name\" LIKE '%abcd%')"
+    end
+
+    it 'Children join' do
+      q = 'cities.name : abcd'
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\" LEFT OUTER JOIN \"cities\" ON \"cities\".\"country_id\" = \"countries\".\"id\" WHERE (\"cities\".\"name\" LIKE '%abcd%')"
+    end
+
+    it 'Children join distinct' do
+      q = 'cities.name : abcd'
+      Country.nql(q, distinct: true).should produce_sql "SELECT DISTINCT \"countries\".* FROM \"countries\" LEFT OUTER JOIN \"cities\" ON \"cities\".\"country_id\" = \"countries\".\"id\" WHERE (\"cities\".\"name\" LIKE '%abcd%')"
+    end
+
+  end
+
+  context 'Invalid queries' do
+
+    it 'Nil' do
+      q = nil
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\""
+    end
+
+    it 'Empty' do
+      q = ''
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\""
+    end
+
+    it 'Empty with spaces' do
+      q = '   '
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\""
+    end
+
+    it 'Partial expression' do
+      q = 'id ='
+      Country.nql(q).should produce_sql "SELECT \"countries\".* FROM \"countries\"  WHERE (1=2)"
+    end
+
+  end
+
 end

metadata

@@ -1,82 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: nql
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
-  requirement: &28678476 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *28678476
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &28678152 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *28678152
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &28677828 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *28677828
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: ransack
-  requirement: &28677600 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *28677600
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &28677324 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *28677324
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &28677060 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28677060
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Natural Query Language built on top of ActiveRecord and Ransack
 email:
 - gabynaiman@gmail.com
@@ -84,57 +129,67 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".coveralls.yml"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - lib/nql.rb
+- lib/nql/error.rb
+- lib/nql/extension/active_record.rb
+- lib/nql/extension/arel.rb
+- lib/nql/extension/hash.rb
 - lib/nql/grammar.rb
 - lib/nql/grammar.treetop
-- lib/nql/invalid_expression_error.rb
+- lib/nql/query.rb
 - lib/nql/version.rb
 - nql.gemspec
 - spec/comparison_parser_spec.rb
 - spec/coordination_parser_spec.rb
+- spec/coverage_helper.rb
 - spec/migrations/20121108154439_create_countries.rb
 - spec/migrations/20121108154508_create_cities.rb
 - spec/models/city.rb
 - spec/models/country.rb
+- spec/query_spec.rb
 - spec/ransack_spec.rb
 - spec/spec_helper.rb
 - spec/sql_spec.rb
 homepage: https://github.com/gabynaiman/nql
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 3.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Natural Query Language built on top of ActiveRecord and Ransack
 test_files:
 - spec/comparison_parser_spec.rb
 - spec/coordination_parser_spec.rb
+- spec/coverage_helper.rb
 - spec/migrations/20121108154439_create_countries.rb
 - spec/migrations/20121108154508_create_cities.rb
 - spec/models/city.rb
 - spec/models/country.rb
+- spec/query_spec.rb
 - spec/ransack_spec.rb
 - spec/spec_helper.rb
 - spec/sql_spec.rb