arel-helpers 2.9.1 → 2.12.1

data/spec/query_builder_spec.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 require 'spec_helper'
 
 class TestQueryBuilder < ArelHelpers::QueryBuilder
@@ -13,48 +11,63 @@ class TestQueryBuilder < ArelHelpers::QueryBuilder
   def noop
     reflect(query)
   end
+
+  not_nil def optional(skip:)
+    reflect(query.where(title: 'BarBar')) unless skip
+  end
 end
 
 describe ArelHelpers::QueryBuilder do
   let(:builder) { TestQueryBuilder.new }
 
-  it "returns (i.e. reflects) new instances of QueryBuilder" do
+  it 'returns (i.e. reflects) new instances of QueryBuilder' do
     builder.tap do |original_builder|
       original_builder.params = true
       new_builder = original_builder.noop
-      new_builder.object_id.should_not == original_builder.object_id
-      new_builder.params?.should == true
+      expect(new_builder.object_id).not_to eq original_builder.object_id
+      expect(new_builder.params?).to be true
     end
   end
 
-  it "forwards #to_a" do
-    Post.create(title: "Foobar")
+  it 'forwards #to_a' do
+    Post.create(title: 'Foobar')
     builder.to_a.tap do |posts|
-      posts.size.should == 1
-      posts.first.title.should == "Foobar"
+      expect(posts.size).to eq 1
+      expect(posts.first.title).to eq 'Foobar'
     end
   end
 
-  it "forwards #to_sql" do
-    builder.to_sql.strip.should == 'SELECT "posts".* FROM "posts"'
+  it 'forwards #to_sql' do
+    expect(builder.to_sql.strip).to eq 'SELECT "posts".* FROM "posts"'
   end
 
-  it "forwards #each" do
-    created_post = Post.create(title: "Foobar")
+  it 'forwards #each' do
+    created_post = Post.create(title: 'Foobar')
     builder.each do |post|
-      post.should == created_post
+      expect(post).to eq created_post
     end
   end
 
-  it "forwards other enumerable methods via #each" do
-    Post.create(title: "Foobar")
-    builder.map(&:title).should == ["Foobar"]
+  it 'forwards other enumerable methods via #each' do
+    Post.create(title: 'Foobar')
+    expect(builder.map(&:title)).to eq ['Foobar']
   end
 
   ArelHelpers::QueryBuilder::TERMINAL_METHODS.each do |method|
     it "does not enumerate records for #{method}" do
-      mock(builder).each.never
+      allow(builder).to receive :each
       builder.public_send(method)
+      expect(builder).not_to have_received :each
     end
   end
+
+  it 'returns reflect on existing query if method returns a falsy value' do
+    expect(builder.optional(skip: true).to_sql.strip).to eq 'SELECT "posts".* FROM "posts"'
+  end
+
+  it 'returns reflect on new query for default chainable method if value is truthy' do
+    expect(builder.optional(skip: false).to_sql.strip.gsub(/\s+/, ' ')).to eq <<-SQL.squish
+      SELECT "posts".* FROM "posts" WHERE "posts"."title" = 'BarBar'
+    SQL
+  end
 end

data/spec/spec_helper.rb

@@ -1,30 +1,20 @@
-# encoding: UTF-8
-
-$:.push(File.dirname(__FILE__))
+$LOAD_PATH.push(File.dirname(__FILE__))
 
 require 'rspec'
 require 'arel-helpers'
 require 'fileutils'
-require 'pry-byebug'
 
-require 'env'
+require 'combustion'
+Combustion.initialize! :active_record
 
-def silence(&block)
-  original_stdout = $stdout
-  $stdout = StringIO.new
-  begin
-    yield
-  ensure
-    $stdout = original_stdout
-  end
-end
+require 'database_cleaner'
+require 'env/models'
 
 RSpec.configure do |config|
-  config.mock_with :rr
+  DatabaseCleaner.strategy = :transaction
+
+  config.before(:suite) { DatabaseCleaner.clean_with :truncation }
 
-  config.before(:each) do
-    ArelHelpers::Env.establish_connection
-    ArelHelpers::Env.reset
-    silence { ArelHelpers::Env.migrate }
-  end
+  config.before { DatabaseCleaner.start }
+  config.after  { DatabaseCleaner.clean }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arel-helpers
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.12.1
 platform: ruby
 authors:
 - Cameron Dutro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2021-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,6 +30,90 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 description: Useful tools to help construct database queries with ActiveRecord and
   Arel.
 email:
@@ -51,9 +135,11 @@ files:
 - lib/arel-helpers/version.rb
 - spec/aliases_spec.rb
 - spec/arel_table_spec.rb
-- spec/env.rb
-- spec/env/migrations.rb
 - spec/env/models.rb
+- spec/internal/config/database.yml
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/test.log
 - spec/join_association_spec.rb
 - spec/query_builder_spec.rb
 - spec/spec_helper.rb
@@ -61,7 +147,7 @@ homepage: https://github.com/camertron/arel-helpers
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,9 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Useful tools to help construct database queries with ActiveRecord and Arel.
 test_files: []

data/spec/env/migrations.rb

@@ -1,75 +0,0 @@
-# encoding: UTF-8
-
-SuperClass = if ActiveRecord::VERSION::MAJOR >= 5
-  ActiveRecord::Migration["#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}".to_f]
-else
-  ActiveRecord::Migration
-end
-
-class CreatePostsTable < SuperClass
-  def change
-    create_table :posts do |t|
-      t.column :title, :string
-    end
-  end
-end
-
-class CreateCommentsTable < SuperClass
-  def change
-    create_table :comments do |t|
-      t.references :post
-    end
-  end
-end
-
-class CreateAuthorsTable < SuperClass
-  def change
-    create_table :authors do |t|
-      t.references :comment
-      t.references :collab_posts
-    end
-  end
-end
-
-class CreateFavoritesTable < SuperClass
-  def change
-    create_table :favorites do |t|
-      t.references :post
-    end
-  end
-end
-
-class CreateCollabPostsTable < SuperClass
-  def change
-    create_table :collab_posts do |t|
-      t.references :authors
-    end
-  end
-end
-
-class CreateCardsTable < SuperClass
-  def change
-    create_table :cards
-  end
-end
-
-class CreateCardLocationsTable < SuperClass
-  def change
-    create_table :card_locations do |t|
-      t.references :location
-      t.references :card, polymorphic: true
-    end
-  end
-end
-
-class CreateLocationsTable < SuperClass
-  def change
-    create_table :locations
-  end
-end
-
-class CreateCommunityTicketsTable < SuperClass
-  def change
-    create_table :community_tickets
-  end
-end

data/spec/env.rb

@@ -1,44 +0,0 @@
-# encoding: UTF-8
-
-require 'env/migrations'
-require 'env/models'
-
-module ArelHelpers
-  class Env
-    class << self
-
-      def db_dir
-        @db_dir ||= File.join(File.dirname(File.dirname(__FILE__)), "tmp")
-      end
-
-      def db_file
-        @db_file ||= File.join(db_dir, "test.sqlite3")
-      end
-
-      def establish_connection
-        ActiveRecord::Base.establish_connection(
-          :adapter  => "sqlite3",
-          :database => db_file
-        )
-      end
-
-      def migrate
-        CreatePostsTable.new.change
-        CreateCommentsTable.new.change
-        CreateAuthorsTable.new.change
-        CreateFavoritesTable.new.change
-        CreateCollabPostsTable.new.change
-        CreateCardsTable.new.change
-        CreateCardLocationsTable.new.change
-        CreateLocationsTable.new.change
-        CreateCommunityTicketsTable.new.change
-      end
-
-      def reset
-        File.unlink(db_file) if File.exist?(db_file)
-        FileUtils.mkdir_p(db_dir)
-      end
-
-    end
-  end
-end