nql 0.0.3 → 0.1.2

data/spec/coordination_parser_spec.rb

@@ -1,43 +1,43 @@
-require 'spec_helper'
-
-describe NQL::SyntaxParser, '-> Coordination' do
-
-  let(:parser) { NQL::SyntaxParser.new }
-
-  it 'And' do
-    tree = parser.parse('var1 = value1 & var2 = value2')
-
-    tree.left.text_value.strip.should eq 'var1 = value1'
-    tree.coordinator.text_value.should eq '&'
-    tree.right.text_value.strip.should eq 'var2 = value2'
-  end
-
-  it 'Or' do
-    tree = parser.parse('var1 = value1 | var2 = value2')
-
-    tree.left.text_value.strip.should eq 'var1 = value1'
-    tree.coordinator.text_value.should eq '|'
-    tree.right.text_value.strip.should eq 'var2 = value2'
-  end
-
-  it 'And then Or' do
-    tree = parser.parse('var1 = value1 & var2 = value2 | var3 = value3')
-
-    tree.left.text_value.strip.should eq 'var1 = value1'
-    tree.coordinator.text_value.should eq '&'
-    tree.right.left.text_value.strip.should eq 'var2 = value2'
-    tree.right.coordinator.text_value.strip.should eq '|'
-    tree.right.right.text_value.strip.should eq 'var3 = value3'
-  end
-
-  it 'With parentheses' do
-    tree = parser.parse('(var1 = value1 & var2 = value2) | var3 = value3')
-
-    tree.left.expression.left.text_value.strip.should eq 'var1 = value1'
-    tree.left.expression.coordinator.text_value.should eq '&'
-    tree.left.expression.right.text_value.strip.should eq 'var2 = value2'
-    tree.coordinator.text_value.strip.should eq '|'
-    tree.right.text_value.strip.should eq 'var3 = value3'
-  end
-
+require 'spec_helper'
+
+describe NQL::SyntaxParser, '-> Coordination' do
+
+  let(:parser) { NQL::SyntaxParser.new }
+
+  it 'And' do
+    tree = parser.parse('var1 = value1 & var2 = value2')
+
+    tree.left.text_value.strip.should eq 'var1 = value1'
+    tree.coordinator.text_value.should eq '&'
+    tree.right.text_value.strip.should eq 'var2 = value2'
+  end
+
+  it 'Or' do
+    tree = parser.parse('var1 = value1 | var2 = value2')
+
+    tree.left.text_value.strip.should eq 'var1 = value1'
+    tree.coordinator.text_value.should eq '|'
+    tree.right.text_value.strip.should eq 'var2 = value2'
+  end
+
+  it 'And then Or' do
+    tree = parser.parse('var1 = value1 & var2 = value2 | var3 = value3')
+
+    tree.left.text_value.strip.should eq 'var1 = value1'
+    tree.coordinator.text_value.should eq '&'
+    tree.right.left.text_value.strip.should eq 'var2 = value2'
+    tree.right.coordinator.text_value.strip.should eq '|'
+    tree.right.right.text_value.strip.should eq 'var3 = value3'
+  end
+
+  it 'With parentheses' do
+    tree = parser.parse('(var1 = value1 & var2 = value2) | var3 = value3')
+
+    tree.left.expression.left.text_value.strip.should eq 'var1 = value1'
+    tree.left.expression.coordinator.text_value.should eq '&'
+    tree.left.expression.right.text_value.strip.should eq 'var2 = value2'
+    tree.coordinator.text_value.strip.should eq '|'
+    tree.right.text_value.strip.should eq 'var3 = value3'
+  end
+
 end

data/spec/coverage_helper.rb

@@ -0,0 +1,8 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start

data/spec/migrations/20121108154439_create_countries.rb

@@ -1,9 +1,9 @@
-class CreateCountries < ActiveRecord::Migration
-  def change
-    create_table :countries do |t|
-      t.string :name, null: false
-
-      t.timestamps
-    end
-  end
-end
+class CreateCountries < ActiveRecord::Migration
+  def change
+    create_table :countries do |t|
+      t.string :name, null: false
+      t.boolean :landlocked, null: true
+      t.timestamps
+    end
+  end
+end

data/spec/migrations/20121108154508_create_cities.rb

@@ -1,10 +1,10 @@
-class CreateCities < ActiveRecord::Migration
-  def change
-    create_table :cities do |t|
-      t.string :name, null: false
-      t.references :country
-
-      t.timestamps
-    end
-  end
-end
+class CreateCities < ActiveRecord::Migration
+  def change
+    create_table :cities do |t|
+      t.string :name, null: false
+      t.references :country
+
+      t.timestamps
+    end
+  end
+end

data/spec/models/city.rb

@@ -1,3 +1,3 @@
-class City < ActiveRecord::Base
-  belongs_to :country
+class City < ActiveRecord::Base
+  belongs_to :country
 end

data/spec/models/country.rb

@@ -1,3 +1,3 @@
-class Country < ActiveRecord::Base
-  has_many :cities, dependent: :destroy
+class Country < ActiveRecord::Base
+  has_many :cities, dependent: :destroy
 end

data/spec/query_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe NQL::Query do
+
+  before :all do
+    ActiveRecord::Base.establish_connection adapter: 'sqlite3', database: ":memory:"
+    ActiveRecord::Base.connection
+    ActiveRecord::Migrator.migrate ActiveRecord::Migrator.migrations_path
+  end
+
+  it 'Valid expression' do
+    query = NQL::Query.new Country, 'name: Argentina'
+
+    query.text.should eq 'name: Argentina'
+    query.expression.should be_a Treetop::Runtime::SyntaxNode
+  end
+
+  it 'Valid with empty expression' do
+    query = NQL::Query.new Country, ''
+
+    query.text.should eq ''
+    query.expression.should be_nil
+  end
+
+  it 'Valid with nil expression' do
+    query = NQL::Query.new Country, nil
+
+    query.text.should be_nil
+    query.expression.should be_nil
+  end
+
+  it 'Invalid model type' do
+    expect { NQL::Query.new Object, nil }.to raise_error NQL::InvalidModelError
+  end
+
+  it 'Invalid expression type' do
+    expect { NQL::Query.new Country, Object.new }.to raise_error NQL::DataTypeError
+  end
+
+  it 'Invalid expression syntax' do
+    expect { NQL::Query.new Country, 'xyz1234' }.to raise_error NQL::SyntaxError
+  end
+
+  it 'Invalid fields' do
+    expect { NQL::Query.new Country, 'name: Argentina | xyz: 1234 | abc: 0000'}.to raise_error NQL::AttributesNotFoundError
+  end
+
+end

data/spec/ransack_spec.rb

@@ -1,135 +1,164 @@
-require 'spec_helper'
-
-describe 'Ransack Query' do
-
-  let(:parser) { NQL::SyntaxParser.new }
-
-  context 'Single comparisons' do
-
-    it 'Equals' do
-      q = parser.parse('id = 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'eq'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Not equals' do
-      q = parser.parse('id != 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'not_eq'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Greater than' do
-      q = parser.parse('id > 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'gt'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Greater or equals than' do
-      q = parser.parse('id >= 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'gteq'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Less than' do
-      q = parser.parse('id < 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'lt'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Less or equals than' do
-      q = parser.parse('id <= 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'lteq'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Contains' do
-      q = parser.parse('id : 1234').to_ransack
-
-      q[:c][0].should have_attribute 'id'
-      q[:c][0].should have_predicate 'cont'
-      q[:c][0].should have_value '1234'
-    end
-
-    it 'Model references' do
-      q = parser.parse('models.id = 1234').to_ransack
-
-      q[:c][0].should have_attribute 'models_id'
-      q[:c][0].should have_predicate 'eq'
-      q[:c][0].should have_value '1234'
-    end
-
-  end
-
-  context 'Coordinated comparisons' do
-
-    it 'And' do
-      q = parser.parse('id > 1234 & name = abcd').to_ransack
-
-      q[:g][0][:m].should eq 'and'
-      q[:g][0][:c][0].should have_attribute 'id'
-      q[:g][0][:c][0].should have_predicate 'gt'
-      q[:g][0][:c][0].should have_value '1234'
-      q[:g][0][:c][1].should have_attribute 'name'
-      q[:g][0][:c][1].should have_predicate 'eq'
-      q[:g][0][:c][1].should have_value 'abcd'
-    end
-
-    it 'Or' do
-      q = parser.parse('id < 1234 | name : abcd').to_ransack
-
-      q[:g][0][:m].should eq 'or'
-      q[:g][0][:c][0].should have_attribute 'id'
-      q[:g][0][:c][0].should have_predicate 'lt'
-      q[:g][0][:c][0].should have_value '1234'
-      q[:g][0][:c][1].should have_attribute 'name'
-      q[:g][0][:c][1].should have_predicate 'cont'
-      q[:g][0][:c][1].should have_value 'abcd'
-    end
-
-    it 'And then Or' do
-      q = parser.parse('id > 1234 & name = abcd | name : efgh').to_ransack
-
-      q[:g][0][:m].should eq 'and'
-      q[:g][0][:c][0].should have_attribute 'id'
-      q[:g][0][:c][0].should have_predicate 'gt'
-      q[:g][0][:c][0].should have_value '1234'
-      q[:g][0][:g][0][:m].should eq 'or'
-      q[:g][0][:g][0][:c][0].should have_attribute 'name'
-      q[:g][0][:g][0][:c][0].should have_predicate 'eq'
-      q[:g][0][:g][0][:c][0].should have_value 'abcd'
-      q[:g][0][:g][0][:c][1].should have_attribute 'name'
-      q[:g][0][:g][0][:c][1].should have_predicate 'cont'
-      q[:g][0][:g][0][:c][1].should have_value 'efgh'
-    end
-
-    it 'With parentheses' do
-      q = parser.parse('(id > 1234 & name = abcd) | name : efgh').to_ransack
-
-      q[:g][0][:g][0][:m].should eq 'and'
-      q[:g][0][:g][0][:c][0].should have_attribute 'id'
-      q[:g][0][:g][0][:c][0].should have_predicate 'gt'
-      q[:g][0][:g][0][:c][0].should have_value '1234'
-      q[:g][0][:g][0][:c][1].should have_attribute 'name'
-      q[:g][0][:g][0][:c][1].should have_predicate 'eq'
-      q[:g][0][:g][0][:c][1].should have_value 'abcd'
-      q[:g][0][:m].should eq 'or'
-      q[:g][0][:c][0].should have_attribute 'name'
-      q[:g][0][:c][0].should have_predicate 'cont'
-      q[:g][0][:c][0].should have_value 'efgh'
-    end
-
-  end
-
+require 'spec_helper'
+
+describe 'Ransack Query' do
+
+  let(:parser) { NQL::SyntaxParser.new }
+
+  context 'Single comparisons' do
+
+    it 'Equals' do
+      q = parser.parse('id = 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'eq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Not equals' do
+      q = parser.parse('id != 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'not_eq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Greater than' do
+      q = parser.parse('id > 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'gt'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Greater or equals than' do
+      q = parser.parse('id >= 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'gteq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Less than' do
+      q = parser.parse('id < 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'lt'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Less or equals than' do
+      q = parser.parse('id <= 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'lteq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Contains' do
+      q = parser.parse('id : 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'cont'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Not contains' do
+      q = parser.parse('id !: 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'not_cont'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Matches' do
+      q = parser.parse('id ~ 1234').to_ransack
+
+      q[:c][0].should have_attribute 'id'
+      q[:c][0].should have_predicate 'matches'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Model references' do
+      q = parser.parse('models.id = 1234').to_ransack
+      q[:c][0].should have_attribute 'models_id'
+      q[:c][0].should have_predicate 'eq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Single comparison with parentheses and spaces' do
+      q = parser.parse('( models.id = 1234 )').to_ransack
+      q[:c][0].should have_attribute 'models_id'
+      q[:c][0].should have_predicate 'eq'
+      q[:c][0].should have_value '1234'
+    end
+
+    it 'Single comparison with parentheses' do
+      q = parser.parse('(models.id = 1234)').to_ransack
+      q[:c][0].should have_attribute 'models_id'
+      q[:c][0].should have_predicate 'eq'
+      q[:c][0].should have_value '1234'
+    end
+
+  end
+
+  context 'Coordinated comparisons' do
+
+    it 'And' do
+      q = parser.parse('id > 1234 & name = abcd').to_ransack
+
+      q[:g][0][:m].should eq 'and'
+      q[:g][0][:c][0].should have_attribute 'id'
+      q[:g][0][:c][0].should have_predicate 'gt'
+      q[:g][0][:c][0].should have_value '1234'
+      q[:g][0][:c][1].should have_attribute 'name'
+      q[:g][0][:c][1].should have_predicate 'eq'
+      q[:g][0][:c][1].should have_value 'abcd'
+    end
+
+    it 'Or' do
+      q = parser.parse('id < 1234 | name : abcd').to_ransack
+
+      q[:g][0][:m].should eq 'or'
+      q[:g][0][:c][0].should have_attribute 'id'
+      q[:g][0][:c][0].should have_predicate 'lt'
+      q[:g][0][:c][0].should have_value '1234'
+      q[:g][0][:c][1].should have_attribute 'name'
+      q[:g][0][:c][1].should have_predicate 'cont'
+      q[:g][0][:c][1].should have_value 'abcd'
+    end
+
+    it 'And then Or' do
+      q = parser.parse('id > 1234 & name = abcd | name : efgh').to_ransack
+
+      q[:g][0][:m].should eq 'and'
+      q[:g][0][:c][0].should have_attribute 'id'
+      q[:g][0][:c][0].should have_predicate 'gt'
+      q[:g][0][:c][0].should have_value '1234'
+      q[:g][0][:g][0][:m].should eq 'or'
+      q[:g][0][:g][0][:c][0].should have_attribute 'name'
+      q[:g][0][:g][0][:c][0].should have_predicate 'eq'
+      q[:g][0][:g][0][:c][0].should have_value 'abcd'
+      q[:g][0][:g][0][:c][1].should have_attribute 'name'
+      q[:g][0][:g][0][:c][1].should have_predicate 'cont'
+      q[:g][0][:g][0][:c][1].should have_value 'efgh'
+    end
+
+    it 'With parentheses' do
+      q = parser.parse('(id > 1234 & name = abcd) | name : efgh').to_ransack
+
+      q[:g][0][:g][0][:m].should eq 'and'
+      q[:g][0][:g][0][:c][0].should have_attribute 'id'
+      q[:g][0][:g][0][:c][0].should have_predicate 'gt'
+      q[:g][0][:g][0][:c][0].should have_value '1234'
+      q[:g][0][:g][0][:c][1].should have_attribute 'name'
+      q[:g][0][:g][0][:c][1].should have_predicate 'eq'
+      q[:g][0][:g][0][:c][1].should have_value 'abcd'
+      q[:g][0][:m].should eq 'or'
+      q[:g][0][:c][0].should have_attribute 'name'
+      q[:g][0][:c][0].should have_predicate 'cont'
+      q[:g][0][:c][0].should have_value 'efgh'
+    end
+
+  end
+
 end