magick_columns 0.0.1 → 0.0.2

data/test/{query_builder_test.rb → magick_columns_test.rb}

@@ -5,20 +5,6 @@ class MagickColumnsTest < ActiveSupport::TestCase
     assert_kind_of Module, MagickColumns
   end
   
-  test 'extract magick query terms' do
-    terms = Person.send(:_extract_magick_query_terms, 'a b')
-    assert_equal [['a', 'b']], terms
-    
-    terms = Person.send(:_extract_magick_query_terms, 'a or b')
-    assert_equal [['a'], ['b']], terms
-    
-    terms = Person.send(:_extract_magick_query_terms, 'long_abc')
-    assert_equal [['long_abc']], terms
-    
-    terms = Person.send(:_extract_magick_query_terms, '  ')
-    assert_equal [], terms
-  end
-  
   test 'map magick column operator' do
     operator = Person.send(:_map_magick_column_operator, '=', 'PostgreSQL')
     assert_equal '=', operator

data/test/tokenizer_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class TokenizerTest < ActiveSupport::TestCase
+  test 'extract terms' do
+    terms = MagickColumns::Tokenizer.new('a b').extract_terms
+    assert_equal [[{term: 'a'}, {term: 'b'}]], terms
+    
+    terms = MagickColumns::Tokenizer.new('a or b').extract_terms
+    assert_equal [[{term: 'a'}], [{term: 'b'}]], terms
+    
+    terms = MagickColumns::Tokenizer.new('long_abc').extract_terms
+    assert_equal [[{term: 'long_abc'}]], terms
+    
+    terms = MagickColumns::Tokenizer.new('  ').extract_terms
+    assert_equal [], terms
+  end
+  
+  test 'clean query' do
+    query = MagickColumns::Tokenizer.new('a b').clean_query
+    assert_equal 'a b', query
+    
+    query = MagickColumns::Tokenizer.new('and a b').clean_query
+    assert_equal 'a b', query
+    
+    query = MagickColumns::Tokenizer.new('  and  and a b or or  ').clean_query
+    assert_equal 'a b', query
+  end
+  
+  test 'split in terms' do
+    terms = MagickColumns::Tokenizer.new.split_term_in_terms('a')
+    assert_equal [{term: 'a'}], terms
+    
+    terms = MagickColumns::Tokenizer.new.split_term_in_terms('from a')
+    assert_equal [{term: 'a', operator: '>='}], terms
+    
+    terms = MagickColumns::Tokenizer.new.split_term_in_terms('until a')
+    assert_equal [{term: 'a', operator: '<='}], terms
+    
+    terms = MagickColumns::Tokenizer.new.split_term_in_terms('until today')
+    assert_equal [{term: Date.today.to_s(:db), operator: '<='}], terms
+    
+    terms = MagickColumns::Tokenizer.new.split_term_in_terms('from a to b')
+    assert_equal(
+      [{term: 'a', operator: '>='}, {term: 'b', operator: '<='}], terms
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: magick_columns
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-13 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,13 +67,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/tasks/magick_columns_tasks.rake
-- lib/magick_columns/magick_columns.rb
+- lib/magick_columns/railtie.rb
+- lib/magick_columns/rules.rb
+- lib/magick_columns/locale/es.yml
+- lib/magick_columns/locale/en.yml
+- lib/magick_columns/active_record.rb
 - lib/magick_columns/defaults.rb
+- lib/magick_columns/tokenizer.rb
 - lib/magick_columns/version.rb
 - lib/magick_columns.rb
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
+- README.md
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/public/500.html
@@ -113,8 +118,9 @@ files:
 - test/dummy/test/unit/article_test.rb
 - test/dummy/test/fixtures/articles.yml
 - test/dummy/test/fixtures/people.yml
+- test/magick_columns_test.rb
 - test/test_helper.rb
-- test/query_builder_test.rb
+- test/tokenizer_test.rb
 homepage: http://github.com/francocatena/magick_columns
 licenses: []
 post_install_message: 
@@ -129,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3819401529936594819
+      hash: 165541859099290878
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,10 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3819401529936594819
+      hash: 165541859099290878
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Build query conditions from simple strings
@@ -185,5 +191,6 @@ test_files:
 - test/dummy/test/unit/article_test.rb
 - test/dummy/test/fixtures/articles.yml
 - test/dummy/test/fixtures/people.yml
+- test/magick_columns_test.rb
 - test/test_helper.rb
-- test/query_builder_test.rb
+- test/tokenizer_test.rb

data/README.rdoc

@@ -1,45 +0,0 @@
-= MagickColumns
-
-This gem extends ActiveRecord to provide queries built from *simple* strings
-
-== Instalation
-
-Add to your Gemfile:
-
-  gem 'magick_columns'
-
-== Usage
-
-When must declare `has_magick_columns` in your model:
-
-  class Person < ActiveRecord::Base
-    has_magick_columns name: :string, email: :email, birth: :date
-  end
-
-And now you can do something like this:
-  
-  people = Person.magick_search('anakin or luke')
-
-The method returns a Relation, so you can apply any aditional method you want:
-
-  people.order('name').limit(5)
-
-And of course you can "spy" the query with:
-
-  people.to_sql
-
-== How to contribute
-
-If you find what you might think is a bug:
-
-1. Check the GitHub issue tracker to see if anyone else has had the same issue.
-   https://github.com/francocatena/magick_columns/issues/
-2. If you do not see anything, create an issue with information on how to reproduce it.
-
-If you want to contribute an enhancement or a fix:
-
-1. Fork the project on GitHub.
-   https://github.com/francocatena/magick_columns/
-2. Make your changes with tests.
-3. Commit the changes without making changes to the Rakefile, VERSION, or any other files that are not related to your enhancement or fix
-4. Send a pull request.

data/lib/magick_columns/magick_columns.rb

@@ -1,80 +0,0 @@
-module MagickColumns
-  module Base
-    extend ActiveSupport::Concern
- 
-    included do
-    end
- 
-    module ClassMethods
-      def has_magick_columns(options = {})
-        @@_magick_columns ||= {}
-        @@_magick_columns[name] ||= []
-      
-        options.each do |field, type|
-          column_options = _magick_column_options(type)
-    
-          @@_magick_columns[name] << { field: field }.merge(column_options)
-        end
-      end
-      
-      def magick_search(query)
-        or_queries = []
-        terms = {}
-
-        _extract_magick_query_terms(query).each_with_index do |or_term, i|
-          and_queries = []
-          
-          or_term.each_with_index do |and_term, j|
-            mini_query = []
-
-            @@_magick_columns[name].each_with_index do |column, k|
-              if column[:condition].call(and_term)
-                operator = _map_magick_column_operator(column[:operator])
-                terms[:"t_#{i}_#{j}_#{k}"] = column[:mask] % { t: and_term }
-
-                mini_query << "#{column[:field]} #{operator} :t_#{i}_#{j}_#{k}"
-              end
-            end
-
-            and_queries << mini_query.join(' OR ')
-          end
-
-          or_queries << and_queries.map { |a_q| "(#{a_q})" }.join(' AND ')
-        end
-
-        where(or_queries.map { |o_q| "(#{o_q})" }.join(' OR '), terms)
-      end
-
-      private
-      
-      def _magick_column_options(type)
-        type.kind_of?(Hash) ? type : MagicColumns::DEFAULTS[type.to_sym]
-      end
-
-      def _extract_magick_query_terms(query)
-        ands = Regexp.quote("#{I18n.t('magick_columns.and', default: 'and')}")
-        ors = Regexp.quote("#{I18n.t('magick_columns.or', default: 'or')}")
-        clean_query = query.strip
-          .gsub(%r{\A\s*(#{ands})\s+}, '')
-          .gsub(%r{\s+(#{ands})\s*\z}, '')
-          .gsub(%r{\A\s*(#{ors})\s+}, '')
-          .gsub(%r{\s+(#{ors})\s*\z}, '')
-        or_terms = []
-
-        clean_query.split(%r{\s+(#{ors})\s+}).each do |or_term|
-          or_terms << or_term.split(%r{\s+(#{ands})\s+|\s+}).reject do |t|
-            t =~ %r{\A(#{ands})\z} || t =~ %r{\A(#{ors})\z}
-          end
-        end
-
-        or_terms.reject(&:empty?)
-      end
-
-      def _map_magick_column_operator(operator, db = nil)
-        db ||= ActiveRecord::Base.connection.adapter_name
-        
-        operator == :like ? (db == 'PostgreSQL' ? 'ILIKE' : 'LIKE') : operator
-      end
-    end
-  end
-end