squeel 1.1.1 → 1.2.1

data/spec/support/models.rb

@@ -71,9 +71,13 @@ class Article < ActiveRecord::Base
   belongs_to              :person
   has_many                :comments
   has_and_belongs_to_many :tags
-  has_many   :notes, :as => :notable
+  has_many :notes, :as => :notable
   has_many :commenters, :through => :comments, :source => :person
-  has_many :uniq_commenters, :through => :comments, :source => :person, :uniq => true
+  if ActiveRecord::VERSION::MAJOR > 3 && ActiveRecord::VERSION::MINOR >= 1
+    has_many :uniq_commenters, lambda { uniq }, :through => :comments, :source => :person
+  else
+    has_many :uniq_commenters, :through => :comments, :source => :person, :uniq => true
+  end
 end
 
 class Comment < ActiveRecord::Base
@@ -89,34 +93,114 @@ class Note < ActiveRecord::Base
   belongs_to :notable, :polymorphic => true
 end
 
-Dir[File.expand_path('../../blueprints/*.rb', __FILE__)].each do |f|
-  require f
+class User < ActiveRecord::Base
+  has_many :memberships, as: :member
+  has_many :groups, through: :memberships
+  has_many :packages, through: :groups
+end
+
+class Package < ActiveRecord::Base
+  has_many :memberships, as: :member
+end
+
+class Membership < ActiveRecord::Base
+  belongs_to :group
+  belongs_to :member, polymorphic: true
+
+  if ActiveRecord::VERSION::MAJOR > 3
+    default_scope -> { where(active: true) }
+  else
+    default_scope where(active: true)
+  end
+
+  before_save :set_active
+
+  def set_active
+    self.active = true
+  end
+end
+
+class Group < ActiveRecord::Base
+  has_many :memberships
+  has_many :users, through: :memberships, source: :member, source_type: 'User'
+  has_many :packages, through: :memberships, source: :member, source_type: 'Package'
+end
+
+class Seat < ActiveRecord::Base
+  belongs_to :payment, dependent: :destroy
+  has_many(:order_items,
+    as: :orderable,
+    autosave: true,
+    dependent: :destroy
+  )
+end
+
+class OrderItem < ActiveRecord::Base
+  belongs_to :orderable, polymorphic: true
+end
+
+class Payment < ActiveRecord::Base
+  has_many :seats
 end
 
 class Models
   def self.make
-    10.times do
-      person = Person.make
+    10.times do |i|
+      # 10 people total, salary gt 30000
+      person = Person.create(name: Faker::Name.name, salary: 30000 + (i + 1) * 1000)
       2.times do
-        UnidentifiedObject.create(:person => person, :name => Sham.object_name)
+        # 20 unidentified object total, 2 per person
+        person.unidentified_objects.create(name: Faker::Lorem.words(1).first)
       end
-      Note.make(:notable => person)
+      # 10 notes based on people total
+      person.notes.create(note: Faker::Lorem.words(7).join(' '))
       3.times do
-        article = Article.make(:person => person)
+        # 30 articles total
+        article = person.articles.create(title: Faker::Lorem.sentence, body: Faker::Lorem.paragraph)
         3.times do
-          article.tags = [Tag.make, Tag.make, Tag.make]
+          # 30 * 3 tags total
+          article.tags << Tag.create(name: Faker::Lorem.words(3).join(' '))
         end
-        Note.make(:notable => article)
+        # 30 notes based on articles total
+        article.notes.create(note: Faker::Lorem.words(7).join(' '))
         10.times do
-          Comment.make(:article => article)
+          # 30 * 10 comments based on articles total
+          article.comments.create(body: Faker::Lorem.paragraph)
         end
       end
       2.times do
-        Comment.make(:person => person)
+        # 20 comments based on people total
+        person.comments.create(body: Faker::Lorem.paragraph)
       end
     end
 
-    Comment.make(:body => 'First post!', :article => Article.make(:title => 'Hello, world!'))
-    Comment.make(:body => 'Last post!', :article => Article.first, :person => Article.first.commenters.first)
+    # an article, a comment based on articles and people
+    Article.create(title: 'Hello, world!', body: Faker::Lorem.paragraph).
+      comments.create(body: 'First post!', person: Person.last)
+    # a comment based on articles and people
+    Article.first.comments.create(body: 'Last post!', person: Article.last.commenters.first)
+
+    # So, we created
+    # 10 people
+    # 31 articles
+    # 322 comments(22 p + 302 a, 2 overlaps)
+    # 40 notes(10 p + 30 a)
+    # 90 tags
+    # 20 unidentified objects
+
+    # has many through polymorphic model examples
+    users = User.create([{ name: 'batman' }, { name: 'robin' }])
+    groups = Group.create([{ name: 'justice league'}, { name: 'batcave stalagmite counting club'}])
+    users.first.groups << groups.first
+    users.first.groups << groups.last
+    users.last.groups << groups.last
+
+    10.times do |i|
+      seat = Seat.create(no: i+1)
+      seat.order_items.create(unit_price: 10, quantity: 1)
+
+      seat.create_payment if i%2 == 0
+    end
   end
 end
+

data/spec/support/schema.rb

@@ -1,10 +1,79 @@
 require 'active_record'
 require 'squeel'
+require 'pathname'
+require 'yaml'
 
-ActiveRecord::Base.establish_connection(
-  :adapter  => 'sqlite3',
-  :database => ':memory:'
-)
+ENV['SQ_DB'] ||= 'sqlite3'
+
+MYSQL_ENV = ENV['SQ_DB'] =~ /mysql/
+SQLITE_ENV = ENV['SQ_DB'] == 'sqlite3'
+PG_ENV = ENV['SQ_DB'] == 'postgresql'
+Q = MYSQL_ENV ? '`' : '"' #Quotes difference in MySQL
+
+module Squeel
+  module Test
+    extend self
+
+    def config
+      @config ||= read_config
+    end
+
+    def read_config
+      config_file = Pathname.new(ENV['SQ_CONFIG_FILE'] || File.expand_path('../../', __FILE__) + '/config.yml')
+      expand_config(YAML.parse(config_file.read).transform)
+    end
+
+    def expand_config(config)
+      config["databases"].each do |adapter, connection|
+        connection['adapter'] ||= adapter
+      end
+
+      config
+    end
+
+    def build_connection(adapter)
+      case adapter
+        when 'sqlite3'
+          ActiveRecord::Base.establish_connection(
+            :adapter  => 'sqlite3',
+            :database => ':memory:'
+          )
+        else
+          Squeel::Test.send "rebuild_#{ENV['SQ_DB']}_db"
+
+          ActiveRecord::Base.establish_connection(
+            Squeel::Test.config['databases'][ENV['SQ_DB']]
+          )
+        end
+    end
+
+    private
+      def rebuild_mysql_db
+        config = self.config['databases']['mysql']
+        %x( mysqladmin --user=#{config['username']} -f drop #{config['database']} )
+        %x( mysql --user=#{config['username']} -e "create DATABASE #{config['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci ")
+      end
+
+      def rebuild_mysql2_db
+        config = self.config['databases']['mysql2']
+        %x( mysqladmin --user=#{config['username']} -f drop #{config['database']} )
+        %x( mysql --user=#{config['username']} -e "create DATABASE #{config['database']} DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci ")
+      end
+
+      def rebuild_postgresql_db
+        config = self.config['databases']['postgresql']
+        %x( dropdb #{config['database']} )
+        %x( createdb -E UTF8 -T template0 #{config['database']} )
+    end
+  end
+end
+
+case ENV['SQ_DB']
+  when 'sqlite3', 'mysql', 'mysql2', 'postgresql'
+    Squeel::Test.build_connection(ENV['SQ_DB'])
+  else
+    raise RuntimeError, "Error SQ_DB setting, must be included in sqlite3, mysql, mysql2, postgresql."
+  end
 
 silence_stream(STDOUT) do
   ActiveRecord::Migration.verbose = false
@@ -53,6 +122,42 @@ silence_stream(STDOUT) do
       t.string  :note
     end
 
+    # Test for polymorphic with source_type
+    create_table :users do |t|
+      t.string :name
+    end
+
+    create_table :memberships do |t|
+      t.references :group
+      t.integer   :member_id
+      t.string    :member_type
+      t.boolean   :active
+    end
+
+    create_table :packages do |t|
+      t.string :name
+    end
+
+    create_table :groups do |t|
+      t.string :name
+    end
+
+    create_table :seats do |t|
+      t.string :no
+      t.integer :payment_id
+    end
+
+    create_table :order_items do |t|
+      t.string :orderable_type
+      t.integer :orderable_id
+      t.integer :quantity
+      t.integer :unit_price
+    end
+
+    create_table :payments do |t|
+
+    end
+
   end
 end
 

data/squeel.gemspec

@@ -8,23 +8,25 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ernie Miller"]
   s.email       = ["ernie@erniemiller.org"]
-  s.homepage    = "http://erniemiller.org/projects/squeel"
-  s.summary     = %q{Active Record 3, improved.}
+  s.homepage    = "https://github.com/ernie/squeel"
+  s.summary     = %q{Active Record, improved.}
   s.description = %q{
-      Squeel unlocks the power of Arel in your Rails 3 application with
+      Squeel unlocks the power of Arel in your Rails application with
       a handy block-based syntax. You can write subqueries, access named
       functions provided by your RDBMS, and more, all without writing
-      SQL strings.
+      SQL strings. Supporting Rails 3 and 4.
     }
   s.rubyforge_project = "squeel"
 
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'activesupport', '>= 3.0'
-  s.add_dependency 'polyamorous', '~> 0.6.0'
+  s.add_dependency 'polyamorous', '~> 1.1.0'
   s.add_development_dependency 'rspec', '~> 2.6.0'
-  s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'
+  s.add_development_dependency 'mysql', '~> 2.9.1'
+  s.add_development_dependency 'mysql2', '~> 0.3.16'
+  s.add_development_dependency 'pg', '~> 0.17.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -1,143 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: squeel
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Ernie Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: polyamorous
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.6.0
 - !ruby/object:Gem::Dependency
-  name: machinist
+  name: faker
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mysql
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
+        version: 2.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.3
-description: ! "\n      Squeel unlocks the power of Arel in your Rails 3 application
-  with\n      a handy block-based syntax. You can write subqueries, access named\n
-  \     functions provided by your RDBMS, and more, all without writing\n      SQL
-  strings.\n    "
+        version: 2.9.1
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.16
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.16
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.17.1
+description: "\n      Squeel unlocks the power of Arel in your Rails application with\n
+  \     a handy block-based syntax. You can write subqueries, access named\n      functions
+  provided by your RDBMS, and more, all without writing\n      SQL strings. Supporting
+  Rails 3 and 4.\n    "
 email:
 - ernie@erniemiller.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -150,19 +162,32 @@ files:
 - lib/squeel/adapters/active_record/3.0/association_preload_extensions.rb
 - lib/squeel/adapters/active_record/3.0/compat.rb
 - lib/squeel/adapters/active_record/3.0/context.rb
+- lib/squeel/adapters/active_record/3.0/join_dependency_extensions.rb
 - lib/squeel/adapters/active_record/3.0/relation_extensions.rb
 - lib/squeel/adapters/active_record/3.1/compat.rb
 - lib/squeel/adapters/active_record/3.1/context.rb
+- lib/squeel/adapters/active_record/3.1/join_dependency_extensions.rb
 - lib/squeel/adapters/active_record/3.1/preloader_extensions.rb
 - lib/squeel/adapters/active_record/3.1/relation_extensions.rb
 - lib/squeel/adapters/active_record/3.2/compat.rb
 - lib/squeel/adapters/active_record/3.2/context.rb
+- lib/squeel/adapters/active_record/3.2/join_dependency_extensions.rb
 - lib/squeel/adapters/active_record/3.2/preloader_extensions.rb
 - lib/squeel/adapters/active_record/3.2/relation_extensions.rb
 - lib/squeel/adapters/active_record/4.0/compat.rb
 - lib/squeel/adapters/active_record/4.0/context.rb
+- lib/squeel/adapters/active_record/4.0/join_dependency_extensions.rb
 - lib/squeel/adapters/active_record/4.0/preloader_extensions.rb
 - lib/squeel/adapters/active_record/4.0/relation_extensions.rb
+- lib/squeel/adapters/active_record/4.1/compat.rb
+- lib/squeel/adapters/active_record/4.1/context.rb
+- lib/squeel/adapters/active_record/4.1/preloader_extensions.rb
+- lib/squeel/adapters/active_record/4.1/reflection_extensions.rb
+- lib/squeel/adapters/active_record/4.1/relation_extensions.rb
+- lib/squeel/adapters/active_record/4.2/compat.rb
+- lib/squeel/adapters/active_record/4.2/context.rb
+- lib/squeel/adapters/active_record/4.2/preloader_extensions.rb
+- lib/squeel/adapters/active_record/4.2/relation_extensions.rb
 - lib/squeel/adapters/active_record/base_extensions.rb
 - lib/squeel/adapters/active_record/compat.rb
 - lib/squeel/adapters/active_record/context.rb
@@ -198,9 +223,11 @@ files:
 - lib/squeel/nodes/predicate_operators.rb
 - lib/squeel/nodes/sifter.rb
 - lib/squeel/nodes/stub.rb
+- lib/squeel/nodes/subquery_join.rb
 - lib/squeel/nodes/unary.rb
 - lib/squeel/version.rb
 - lib/squeel/visitors.rb
+- lib/squeel/visitors/enumeration_visitor.rb
 - lib/squeel/visitors/from_visitor.rb
 - lib/squeel/visitors/group_visitor.rb
 - lib/squeel/visitors/having_visitor.rb
@@ -211,11 +238,8 @@ files:
 - lib/squeel/visitors/select_visitor.rb
 - lib/squeel/visitors/visitor.rb
 - lib/squeel/visitors/where_visitor.rb
-- spec/blueprints/articles.rb
-- spec/blueprints/comments.rb
-- spec/blueprints/notes.rb
-- spec/blueprints/people.rb
-- spec/blueprints/tags.rb
+- spec/config.travis.yml
+- spec/config.yml
 - spec/console.rb
 - spec/core_ext/symbol_spec.rb
 - spec/helpers/squeel_helper.rb
@@ -239,6 +263,7 @@ files:
 - spec/squeel/nodes/predicate_spec.rb
 - spec/squeel/nodes/sifter_spec.rb
 - spec/squeel/nodes/stub_spec.rb
+- spec/squeel/nodes/subquery_join_spec.rb
 - spec/squeel/visitors/from_visitor_spec.rb
 - spec/squeel/visitors/order_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
@@ -248,70 +273,27 @@ files:
 - spec/support/models.rb
 - spec/support/schema.rb
 - squeel.gemspec
-homepage: http://erniemiller.org/projects/squeel
+homepage: https://github.com/ernie/squeel
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2299455513016806786
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2299455513016806786
 requirements: []
 rubyforge_project: squeel
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Active Record 3, improved.
-test_files:
-- spec/blueprints/articles.rb
-- spec/blueprints/comments.rb
-- spec/blueprints/notes.rb
-- spec/blueprints/people.rb
-- spec/blueprints/tags.rb
-- spec/console.rb
-- spec/core_ext/symbol_spec.rb
-- spec/helpers/squeel_helper.rb
-- spec/spec_helper.rb
-- spec/squeel/adapters/active_record/base_extensions_spec.rb
-- spec/squeel/adapters/active_record/context_spec.rb
-- spec/squeel/adapters/active_record/join_dependency_extensions_spec.rb
-- spec/squeel/adapters/active_record/relation_extensions_spec.rb
-- spec/squeel/core_ext/symbol_spec.rb
-- spec/squeel/dsl_spec.rb
-- spec/squeel/nodes/as_spec.rb
-- spec/squeel/nodes/function_spec.rb
-- spec/squeel/nodes/grouping_spec.rb
-- spec/squeel/nodes/join_spec.rb
-- spec/squeel/nodes/key_path_spec.rb
-- spec/squeel/nodes/literal_spec.rb
-- spec/squeel/nodes/operation_spec.rb
-- spec/squeel/nodes/operators_spec.rb
-- spec/squeel/nodes/order_spec.rb
-- spec/squeel/nodes/predicate_operators_spec.rb
-- spec/squeel/nodes/predicate_spec.rb
-- spec/squeel/nodes/sifter_spec.rb
-- spec/squeel/nodes/stub_spec.rb
-- spec/squeel/visitors/from_visitor_spec.rb
-- spec/squeel/visitors/order_visitor_spec.rb
-- spec/squeel/visitors/predicate_visitor_spec.rb
-- spec/squeel/visitors/preload_visitor_spec.rb
-- spec/squeel/visitors/select_visitor_spec.rb
-- spec/squeel/visitors/visitor_spec.rb
-- spec/support/models.rb
-- spec/support/schema.rb
+specification_version: 4
+summary: Active Record, improved.
+test_files: []