usefull_scopes 0.2.1 → 1.0.0

data/test/test_helper.rb

@@ -1,18 +1,20 @@
 require 'bundler/setup'
+Bundler.require
 require 'active_record'
-require 'simplecov'
+
 require 'coveralls'
 Coveralls.wear!
 
 ENV["COVERAGE"] = "true"
 SimpleCov.start if ENV["COVERAGE"]
 
-Bundler.require
-
-MiniTest::Unit.autorun
+# reporters doesn't work with AS < 4 (see https://travis-ci.org/kaize/validates/jobs/28579079)
+if defined?(ActiveSupport::VERSION) && ActiveSupport::VERSION::MAJOR >= 4
+  require "minitest/reporters"
+  Minitest::Reporters.use! [Minitest::Reporters::DefaultReporter.new(:color => true)]
+end
 
 ActiveRecord::Base.establish_connection adapter: "sqlite3", database: ":memory:"
-
 ActiveRecord::Migration.create_table :models do |t|
   t.integer       :field_1
   t.string        :field_2
@@ -25,13 +27,10 @@ class Model < ActiveRecord::Base
   include UsefullScopes
 end
 
-class TestCase < MiniTest::Unit::TestCase
-  def load_fixture(filename)
-    File.read(File.dirname(__FILE__) + "/fixtures/#{filename}")
-  end
-
+class TestCase < MiniTest::Test
   require 'factory_girl'
   FactoryGirl.reload
-
   include FactoryGirl::Syntax::Methods
 end
+
+require 'minitest/autorun'

data/usefull_scopes.gemspec

@@ -18,4 +18,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.require_paths = ["lib"]
+
+  s.rdoc_options      = %w(--line-numbers --inline-source --title usefull_scopes --main README.md)
+  s.extra_rdoc_files  = %w(README.md LICENSE CONTRIBUTING.md)
+
+  s.add_dependency "activerecord", [">= 3.0.0"]
+  s.add_dependency "activesupport", [">= 3.0.0"]
 end

metadata

@@ -1,26 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: usefull_scopes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Kaize Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
-dependencies: []
+date: 2014-07-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 description: This gem provides additional scopes for your Active:Record models within
   Ruby on Rails framework.
 email:
 - info@kaize.ru
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
+- LICENSE
+- CONTRIBUTING.md
 files:
-- .coveralls.yml
-- .gitignore
+- ".coveralls.yml"
+- ".gitignore"
+- ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
@@ -29,35 +61,36 @@ files:
 - lib/usefull_scopes/version.rb
 - test/factories/models.rb
 - test/factories/sequences.rb
-- test/lib/usefull_scopes_test.rb
+- test/lib/scopes_test.rb
 - test/test_helper.rb
 - usefull_scopes.gemspec
 homepage: http://github.com/kaize/usefull_scopes
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- "--line-numbers"
+- "--inline-source"
+- "--title"
+- usefull_scopes
+- "--main"
+- README.md
 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: usefull_scopes
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Additional scopes for Active:Record models.
-test_files:
-- test/factories/models.rb
-- test/factories/sequences.rb
-- test/lib/usefull_scopes_test.rb
-- test/test_helper.rb
+test_files: []

data/test/lib/usefull_scopes_test.rb

@@ -1,652 +0,0 @@
-require 'test_helper'
-
-module UsefullScopes
-  class ScopesTest < TestCase
-    def setup
-      3.times { create :model }
-      @model = Model.first
-    end
-
-    def test_random_order_condition
-      random_request = Model.random
-
-      request_arel = random_request.arel
-      order = request_arel.order
-      order_conditions = order.orders
-
-      assert_includes order_conditions, "RANDOM()"
-    end
-
-    def test_random_sql
-      random_request = Model.random
-
-      assert_equal "SELECT \"models\".* FROM \"models\"  ORDER BY RANDOM()", random_request.to_sql
-    end
-
-    def test_exclude_result
-      @models = Model.exclude(@model)
-
-      models_count = Model.count - 1
-
-      assert_equal models_count, @models.count
-    end
-
-    def test_exclude_conditions
-      @models = Model.exclude(@model)
-
-      request_arel = @models.arel
-      condition = request_arel.where_clauses
-      assert_equal 1, condition.count
-      assert condition.first.match "NOT IN"
-    end
-
-    def test_with_result
-      @models = Model.with({field_1: @model.field_1})
-
-      assert @models
-
-      assert_includes @models, @model
-    end
-
-    def test_with_conditions
-      @models = Model.with({field_1: @model.field_1})
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        condition.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::Equality, condition_part
-        end
-      end
-    end
-
-    def test_with_incorrect_params
-      begin
-        @models = Model.with("field_1 = #{@model.field_1}")
-      rescue Exception => e
-        assert_equal "Hash is expected", e.message
-      end
-    end
-
-    def test_without_result
-      @models = Model.without({field_1: @model.field_1})
-
-      assert @models
-
-      refute @models.include?(@model)
-    end
-
-    def test_without_conditions
-      @models = Model.without({field_1: @model.field_1})
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::NotIn, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :field_1, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_without_incorrect_params
-      begin
-        @models = Model.without("field_1 = #{@model.field_1}")
-      rescue Exception => e
-        assert_equal "Hash is expected", e.message
-      end
-    end
-
-    def test_like_by_result
-
-      assert_respond_to Model, :like_by_field_2
-
-      @models = Model.like_by_field_2(@model.field_2[0..3])
-
-      assert @models.any?
-      assert_includes @models, @model
-    end
-
-    def test_like_by_condition
-
-      @models = Model.like_by_field_2(@model.field_2[0..3])
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        assert condition.expr.match "like"
-      end
-    end
-
-    def test_ilike_by_result
-      assert_respond_to Model, :ilike_by_field_2
-
-      # SQLite error %(
-      #@models = Model.ilike_by_field_2(@model.field_2[0..3])
-
-      #assert @models.any?
-      #assert_includes @models, @model
-    end
-
-    def test_ilike_by_condition
-      @models = Model.ilike_by_field_2(@model.field_2[0..3])
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        assert_kind_of Arel::Nodes::Matches, condition.expr
-
-        assert_kind_of Arel::Attributes::Attribute, condition.expr.left
-        assert_equal :field_2, condition.expr.left.name
-        assert_equal "stri%", condition.expr.right
-      end
-    end
-
-    def test_desc_by_result
-      assert_respond_to Model, :desc_by
-
-      @models = Model.desc_by(:field_1)
-
-      assert @models.any?
-    end
-
-    def test_desc_by_condition_array_attrs
-      attrs = [:field_1, :field_2]
-
-      @models = Model.desc_by(attrs)
-
-      arel = @models.arel
-      orders_conditions = arel.orders
-
-      assert orders_conditions.any?
-
-      orders_conditions.each_with_index do |condition, index|
-        assert_kind_of Arel::Nodes::Descending, condition
-        assert_kind_of Arel::Attributes::Attribute, condition.expr
-
-        assert_equal attrs[index], condition.expr.name
-      end
-    end
-
-    def test_desc_by_condition
-      @models = Model.desc_by(:field_1)
-
-      arel = @models.arel
-      orders_conditions = arel.orders
-
-      assert orders_conditions.any?
-
-      orders_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Descending, condition
-        assert_kind_of Arel::Attributes::Attribute, condition.expr
-
-        assert_equal :field_1, condition.expr.name
-      end
-    end
-
-    def test_desc_by_incorrect_params
-      begin
-        @models = Model.desc_by("field_1")
-      rescue Exception => e
-        assert_equal "Symbol or Array of symbols is expected", e.message
-      end
-    end
-
-    def test_asc_by_result
-      assert_respond_to Model, :asc_by
-
-      @models = Model.asc_by(:field_1)
-
-      assert @models.any?
-    end
-
-    def test_asc_by_condition_array_attrs
-      attrs = [:field_1, :field_2]
-
-      @models = Model.asc_by(attrs)
-
-      arel = @models.arel
-      orders_conditions = arel.orders
-
-      assert orders_conditions.any?
-
-      orders_conditions.each_with_index do |condition, index|
-        assert_kind_of Arel::Nodes::Ascending, condition
-        assert_kind_of Arel::Attributes::Attribute, condition.expr
-
-        assert_equal attrs[index], condition.expr.name
-      end
-    end
-
-    def test_asc_by_condition
-      @models = Model.asc_by(:field_1)
-
-      arel = @models.arel
-      orders_conditions = arel.orders
-
-      assert orders_conditions.any?
-
-      orders_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Ascending, condition
-        assert_kind_of Arel::Attributes::Attribute, condition.expr
-
-        assert_equal :field_1, condition.expr.name
-      end
-    end
-
-    def test_asc_by_incorrect_params
-      begin
-        @models = Model.asc_by("field_1")
-      rescue Exception => e
-        assert_equal "Symbol or Array of symbols is expected", e.message
-      end
-    end
-
-    def test_field_more_than_value_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_more(@model_less.field_1)
-
-      assert @models.any?
-      assert @models.include?(@model_more)
-      refute @models.include?(@model_less)
-    end
-
-    def test_field_more_than_object_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_more(@model_less)
-
-      assert @models.any?
-      assert @models.include?(@model_more)
-      refute @models.include?(@model_less)
-    end
-
-    def test_field_more_by_condition
-      @models = Model.field_1_more(@model.field_1)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        assert_kind_of Arel::Nodes::GreaterThan, condition.expr
-        assert_equal @model.field_1, condition.expr.right
-      end
-    end
-
-    def test_field_less_than_value_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_less(@model_more.field_1)
-
-      assert @models.any?
-      assert @models.include?(@model_less)
-      refute @models.include?(@model_more)
-    end
-
-    def test_field_less_than_object_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_less(@model_more)
-
-      assert @models.any?
-      assert @models.include?(@model_less)
-      refute @models.include?(@model_more)
-    end
-
-    def test_field_less_by_condition
-      @models = Model.field_1_less(@model.field_1)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        assert_kind_of Arel::Nodes::LessThan, condition.expr
-        assert_equal @model.field_1, condition.expr.right
-      end
-    end
-
-    def test_field_more_or_equal_than_value_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_more_or_equal(@model_more.field_1)
-
-      assert @models.any?
-      assert @models.include?(@model_more)
-      refute @models.include?(@model_less)
-    end
-
-    def test_field_more_or_equal_than_object_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_more_or_equal(@model_more)
-
-      assert @models.any?
-      assert @models.include?(@model_more)
-      refute @models.include?(@model_less)
-    end
-
-    def test_field_more_or_equal_by_condition
-      @models = Model.field_1_more_or_equal(@model.field_1)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        assert_kind_of Arel::Nodes::GreaterThanOrEqual, condition.expr
-        assert_equal @model.field_1, condition.expr.right
-      end
-    end
-
-    def test_field_less_or_equal_than_value_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_less_or_equal(@model_less.field_1)
-
-      assert @models.any?
-      assert @models.include?(@model_less)
-      refute @models.include?(@model_more)
-    end
-
-    def test_field_less_or_equal_than_object_by_result
-      @model_less = create :model
-      @model_more = create :model, field_1: @model_less.field_1 + 1
-
-      @models = Model.field_1_less_or_equal(@model_less)
-
-      assert @models.any?
-      assert @models.include?(@model_less)
-      refute @models.include?(@model_more)
-    end
-    def test_field_less_or_equal_by_condition
-      @models = Model.field_1_less_or_equal(@model.field_1)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        assert_kind_of Arel::Nodes::LessThanOrEqual, condition.expr
-        assert_equal @model.field_1, condition.expr.right
-      end
-    end
-
-    def test_more_than_result
-      @model = Model.last
-
-      @models = Model.more_than({field_1: 1})
-
-      assert @models.any?
-      assert @models.include?(@model)
-    end
-
-    def test_more_than_condition_value
-      @models = Model.more_than({field_1: 1})
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::GreaterThan, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :field_1, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_more_than_condition_ar_object
-      @models = Model.more_than(@model)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::GreaterThan, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :id, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_more_than_incorrect_params
-      begin
-        @models = Model.more_than("field_1")
-      rescue Exception => e
-        assert_equal "Hash or AR object is expected", e.message
-      end
-    end
-
-    def test_less_than_result
-      @model_first = Model.first
-      @model_last = Model.last
-
-      @models = Model.less_than({field_1: @model_last.field_1})
-
-      assert @models.any?
-      assert @models.include?(@model_first)
-    end
-
-    def test_less_than_condition_value
-      @models = Model.less_than({field_1: 1})
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::LessThan, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :field_1, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_less_than_condition_ar_object
-      @models = Model.less_than(@model)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::LessThan, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :id, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_less_than_incorrect_params
-      begin
-        @models = Model.less_than("field_1")
-      rescue Exception => e
-        assert_equal "Hash or AR object is expected", e.message
-      end
-    end
-
-    def test_more_or_equal_result
-      @model_first = Model.first
-      @model_last = Model.last
-
-      @models = Model.more_or_equal({field_1: @model_last.field_1})
-
-      assert @models.any?
-      assert @models.include?(@model_last)
-      assert_equal @models.count, 1
-    end
-
-    def test_more_or_equal_condition_value
-      @models = Model.more_or_equal({field_1: 1})
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::GreaterThanOrEqual, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :field_1, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_more_or_equal_condition_ar_object
-      @models = Model.more_or_equal(@model)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::GreaterThanOrEqual, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :id, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_more_or_equal_incorrect_params
-      begin
-        @models = Model.more_or_equal("field_1")
-      rescue Exception => e
-        assert_equal "Hash or AR object is expected", e.message
-      end
-    end
-
-    def test_less_or_equal_result
-      @model_first = Model.first
-      @model_last = Model.last
-
-      @models = Model.less_or_equal({field_1: @model_first.field_1})
-
-      assert @models.any?
-      assert @models.include?(@model_first)
-      assert_equal @models.count, 1
-    end
-
-    def test_less_or_equal_condition_value
-      @models = Model.less_or_equal({field_1: 1})
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::LessThanOrEqual, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :field_1, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_less_or_equal_condition_ar_object
-      @models = Model.less_or_equal(@model)
-
-      ctx = @models.arel.as_json["ctx"]
-      where_conditions = ctx.wheres
-
-      assert where_conditions.any?
-
-      where_conditions.each do |condition|
-        assert_kind_of Arel::Nodes::Grouping, condition
-        condition.expr.children.each do |condition_part|
-          assert_kind_of Arel::Nodes::LessThanOrEqual, condition_part
-
-          assert_kind_of Arel::Attributes::Attribute, condition_part.left
-
-          assert_equal :id, condition_part.left.name
-          assert_equal 1, condition_part.right
-        end
-      end
-    end
-
-    def test_less_or_equal_incorrect_params
-      begin
-        @models = Model.less_or_equal("field_1")
-      rescue Exception => e
-        assert_equal "Hash or AR object is expected", e.message
-      end
-    end
-  end
-end