eel 0.0.1 → 0.0.2

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p327

data/Gemfile

@@ -2,3 +2,8 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in eel.gemspec
 gemspec
+
+gem 'rspec'
+gem 'sqlite3'
+gem 'rspec-rails'
+gem 'factory_girl'

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')

data/eel.gemspec

@@ -6,8 +6,8 @@ require 'eel/version'
 Gem::Specification.new do |gem|
   gem.name          = 'eel'
   gem.version       = Eel::VERSION
-  gem.authors       = ['Ivan Efremov']
-  gem.email         = ['st8998@gmail.com']
+  gem.authors       = ['Ivan Efremov', 'Anatoly Lapshin']
+  gem.email         = ['st8998@gmail.com', 'holywarez@gmail.com']
   gem.description   = %q{It is more like Squeel but without Squ}
   gem.summary       = %q{It is more like Squeel but without Squ}
   gem.homepage      = 'https://github.com/StrangeMood/eel'

data/lib/eel/active_record/query_extensions.rb

@@ -4,8 +4,12 @@ module Eel
 
       def order *args
         return self if args.blank?
+        super *args.flatten.map { |a| a.respond_to?(:expr) ? assign_context(a.expr) : a }
+      end
 
-        super *args.flatten.map { |a| assign_context(a) }
+      def reorder *args
+        return self if args.blank?
+        super *args.flatten.map { |a| a.respond_to?(:expr) ? assign_context(a.expr) : a }
       end
 
       def build_where(opts, other = [])
@@ -25,8 +29,13 @@ module Eel
       private
 
       def assign_context attr
-        if attr.is_a?(Arel::Attributes::Attribute) && attr.relation.blank?
-          attr.relation = table
+        if attr.is_a?(Arel::Attributes::Attribute)
+          case attr.relation
+            when Symbol
+              attr.relation = Arel::Table.new(attr.relation, table.engine)
+            when NilClass
+              attr.relation = table
+          end
         end
         attr
       end

data/lib/eel/core_ext/symbol.rb

@@ -1,10 +1,15 @@
 class Symbol
 
   delegate :gt, :gteq, :lt, :lteq,
-           :eq, :in,
+           :eq, :not_eq, :in, :not_in,
            :desc, :asc,
            to: :attr
 
+  def between *other
+    other = other.flatten
+    Arel::Nodes::Between.new(attr, Arel::Nodes::And.new(other))
+  end
+
   def attr
     attr = Arel::Attributes::Attribute.new
     attr.name = self
@@ -16,7 +21,7 @@ class Symbol
                  when Class
                    val.arel_table
                  when Symbol
-                   val.to_s.classify.constantize
+                   val
                  when String
                    val.classify.constantize
                  else

data/lib/eel/version.rb

@@ -1,3 +1,3 @@
 module Eel
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

data/spec/dsl/dsl_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+
+describe 'Eel query dsl' do
+  context 'Simple filtering' do
+    before do
+      3.times do |index|
+        create(:todo_item, score_points: index + 1, due_date: Date.current + index.days)
+      end
+    end
+
+    context 'greater than' do
+      subject { TodoItem.where(:score_points.gt 2) }
+      it { should have(1).item }
+    end
+
+    context 'less than' do
+      subject { TodoItem.where(:score_points.lt 3) }
+      it { should have(2).items }
+    end
+
+    context 'combine comparsions' do
+      subject { TodoItem.where(:score_points.gt(1), :due_date.lt(2.days.since.to_date)) }
+
+      it { should have(1).item }
+      its('first.score_points') { should be(2) }
+    end
+
+  end
+
+  #context 'Filtering with joins' do
+  #  before do
+  #    head = create(:todo_item, score_points: 10, due_date: Date.current)
+  #    3.times do |index|
+  #      create(:todo_item, parent: head, score_points: index + 1, due_date: Date.current + index.days)
+  #    end
+  #  end
+  #
+  #  context 'greater than' do
+  #    subject { TodoItem.joins(:sub_tasks).where(:sub_tasks => {:id => 12}) }
+  #    it { should have(1).item }
+  #    its('first.parent') { should_not be(nil) }
+  #  end
+  #end
+end

data/spec/factories/todo_item.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  sequence(:name_of_todo) { |n| "Task numba #{n}" }
+
+  factory :todo_item do
+    name { generate :name_of_todo }
+    score_points 0
+    due_date { Date.current }
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'bundler/setup'
+
+#require 'support/active_record'
+require 'active_model'
+require 'active_record'
+require 'factory_girl'
+require 'rspec/rails/extensions/active_record/base'
+
+require 'eel'
+
+dirname = File.dirname(__FILE__)
+Dir["#{dirname}/support/**/*.rb"].each { |i| require i.gsub("#{dirname}/", '') }
+
+FactoryGirl.find_definitions
+
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+
+  config.around do |example|
+    ActiveRecord::Base.transaction do
+      example.run
+      raise ActiveRecord::Rollback
+    end
+  end
+end

data/spec/support/active_record.rb

@@ -0,0 +1,17 @@
+ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
+
+ActiveRecord::Migration.create_table :todo_items do |t|
+  t.string :name, null: false
+  t.integer :score_points, null: false, default: 0
+  t.integer :parent_id
+  t.date :due_date
+  t.timestamps
+end
+
+class TodoItem < ActiveRecord::Base
+  validates :name, presence: true
+  validates :score_points, presence: true
+
+  belongs_to :parent, class_name: 'TodoItem'
+  has_many :sub_tasks, class_name: 'TodoItem', foreign_key: :parent_id, inverse_of: :parent
+end

metadata

@@ -1,56 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: eel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
 - Ivan Efremov
+- Anatoly Lapshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-27 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-    none: false
-  name: activerecord
-  prerelease: false
 - !ruby/object:Gem::Dependency
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.2'
-    none: false
-  name: activesupport
-  prerelease: false
 description: It is more like Squeel but without Squ
 email:
 - st8998@gmail.com
+- holywarez@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rbenv-version
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -61,6 +64,10 @@ files:
 - lib/eel/active_record/query_extensions.rb
 - lib/eel/core_ext/symbol.rb
 - lib/eel/version.rb
+- spec/dsl/dsl_spec.rb
+- spec/factories/todo_item.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb
 homepage: https://github.com/StrangeMood/eel
 licenses: []
 post_install_message: 
@@ -68,21 +75,25 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: It is more like Squeel but without Squ
-test_files: []
+test_files:
+- spec/dsl/dsl_spec.rb
+- spec/factories/todo_item.rb
+- spec/spec_helper.rb
+- spec/support/active_record.rb