surus 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca553e879baa56ea3b059072ecb5cdfbdfc148f4
-  data.tar.gz: 9284d9fc51b2d3b50c013e19e77b13a8ce1f8cbe
+  metadata.gz: 0ba3e32fb91f29014a44a70df352f6863ee8f341
+  data.tar.gz: a7dd13115acd96b38f3369750a05596912a2a90b
 SHA512:
-  metadata.gz: 818f420d11fd94a7e90d67855cdb5e79db3aac8c5d73c08608012e46ee8c73f1067a1555730c369c3817d2ba6dcc36d34a4b79121334cc78fc2c97dcedf82b0e
-  data.tar.gz: 4131b91df11f7186e7260b0aed8d87079ed124f7f03fe253bcd80dd35d1068e96f188fd0914251df8c1a8443132cfd1d5a99bfdde3e30f9e59e9d20450aa7cf4
+  metadata.gz: fef906f19243ce07000434326b9be81742a4de4ae8f969a526d624ed19b69f36a23834e47d78aad02c296b3f3428411ff20359f998bc6d5d72cef93c2e1a08be
+  data.tar.gz: 886eabfb959223927da81e2ad0dc11977f6b8081861ec1c20211f5955abeb35e74331119b15b745d879c612a8dacf00154f85d04f998a7479e8e5da9854e5e34

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.7.0 (October 2, 2017)
+
+* Support JSON has_many :though relationships (Peter Schilling)
+
 # 0.6.5 (May 5, 2017)
 
 * Qualify column references with table names (Zach Schneider)

data/lib/surus/json.rb

@@ -5,4 +5,5 @@ require 'surus/json/model'
 require 'surus/json/association_scope_builder'
 require 'surus/json/belongs_to_scope_builder'
 require 'surus/json/has_many_scope_builder'
+require 'surus/json/has_many_through_scope_builder'
 require 'surus/json/has_and_belongs_to_many_scope_builder'

data/lib/surus/json/has_many_through_scope_builder.rb

@@ -0,0 +1,69 @@
+module Surus
+  module JSON
+    class HasManyThroughScopeBuilder < AssociationScopeBuilder
+      def scope
+        s = association
+          .klass
+          .joins(through_table_join)
+          .where("#{through_table}.#{through_foreign_key}=#{outside_table}.#{outside_primary_key}")
+
+        s = s.instance_eval(&association.scope) if association.scope
+        s
+      end
+
+      delegate :through_reflection, to: :association
+
+      def through_table_join
+        if foreign_key == through_association_foreign_key
+          join_through_table_foreign_key_on_association
+        else
+          join_through_table_foreign_key_on_through
+        end
+      end
+
+      def join_through_table_foreign_key_on_association
+        "JOIN #{through_table} ON #{through_table}.#{through_primary_key}=#{association_table}.#{foreign_key}"
+      end
+
+      def join_through_table_foreign_key_on_through
+        "JOIN #{through_table} ON #{through_table}.#{foreign_key}=#{association_table}.#{association_primary_key}"
+      end
+
+      def outside_table
+        outside_class.quoted_table_name
+      end
+
+      def outside_primary_key
+        quote_column_name outside_class.primary_key
+      end
+
+      def foreign_key
+        quote_column_name association.foreign_key
+      end
+
+      def through_table
+        through_reflection.quoted_table_name
+      end
+
+      def through_primary_key
+        quote_column_name through_reflection.active_record_primary_key
+      end
+
+      def through_foreign_key
+        quote_column_name through_reflection.foreign_key
+      end
+
+      def through_association_foreign_key
+        quote_column_name through_reflection.association_foreign_key
+      end
+
+      def association_table
+        quote_table_name association.klass.table_name
+      end
+
+      def association_primary_key
+        quote_column_name association.association_primary_key
+      end
+    end
+  end
+end

data/lib/surus/json/query.rb

@@ -55,6 +55,8 @@ module Surus
               :belongs_to
             when ActiveRecord::Reflection::HasManyReflection
               :has_many
+            when ActiveRecord::Reflection::ThroughReflection
+              :has_many_through
             when ActiveRecord::Reflection::HasAndBelongsToManyReflection
               :has_and_belongs_to_many
             end
@@ -73,6 +75,9 @@ module Surus
           when :has_many
             association_scope = HasManyScopeBuilder.new(original_scope, association).scope
             ArrayAggQuery.new(association_scope, association_options).to_sql
+          when :has_many_through
+            association_scope = HasManyThroughScopeBuilder.new(original_scope, association).scope
+            ArrayAggQuery.new(association_scope, association_options).to_sql
           when :has_and_belongs_to_many
             association_scope = HasAndBelongsToManyScopeBuilder.new(original_scope, association).scope
             ArrayAggQuery.new(association_scope, association_options).to_sql

data/lib/surus/version.rb

@@ -1,3 +1,3 @@
 module Surus
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

data/spec/database_structure.sql

@@ -120,3 +120,33 @@ CREATE TABLE posts_tags(
   tag_id integer NOT NULL REFERENCES tags,
   PRIMARY KEY (post_id, tag_id)
 );
+
+
+
+DROP TABLE IF EXISTS comments CASCADE;
+
+CREATE TABLE comments(
+  id serial PRIMARY KEY,
+  post_id integer NOT NULL REFERENCES posts,
+  name varchar NOT NULL,
+  body varchar NOT NULL
+);
+
+
+
+DROP TABLE IF EXISTS medias CASCADE;
+
+CREATE TABLE medias(
+  id serial PRIMARY KEY,
+  url varchar NOT NULL
+);
+
+
+
+DROP TABLE IF EXISTS post_medias CASCADE;
+
+CREATE TABLE post_medias(
+  id serial PRIMARY KEY,
+  post_id integer NOT NULL REFERENCES posts,
+  media_id integer NOT NULL REFERENCES medias
+);

data/spec/factories.rb

@@ -33,4 +33,19 @@ FactoryGirl.define do
     author
     url { Faker::Avatar.image }
   end
+
+  factory :comment do
+    post
+    name { Faker::Name.name }
+    body { Faker::Lorem.paragraph }
+  end
+
+  factory :media do
+    url { Faker::Internet.url }
+  end
+
+  factory :post_media do
+    post
+    media
+  end
 end

data/spec/json/json_spec.rb

@@ -194,6 +194,60 @@ describe 'json' do
         find_json = Oj.load User.find_json(user.id, include: {posts: {columns: [:id], include: :forum}})
         expect(find_json).to eq(to_json)
       end
+
+      context 'assocation table has the belongs_to' do
+        it 'includes entire has_many through association' do
+          user = FactoryGirl.create :user
+          post = FactoryGirl.create :post, author: user
+          FactoryGirl.create :comment, post: post
+          FactoryGirl.create :comment, post: post
+
+          to_json = Oj.load user.to_json(include: :comments)
+          find_json = Oj.load User.find_json(user.id, include: :comments)
+          expect(find_json).to eq(to_json)
+        end
+
+        it 'excludes other has_many through association records' do
+          user = FactoryGirl.create :user
+          post = FactoryGirl.create :post, author: user
+          FactoryGirl.create :comment, post: post
+          FactoryGirl.create :comment, post: post
+
+          other_post = FactoryGirl.create :post, author: user
+          FactoryGirl.create :comment, post: other_post
+          FactoryGirl.create :comment, post: other_post
+
+          to_json = Oj.load user.to_json(include: :comments)
+          find_json = Oj.load User.find_json(user.id, include: :comments)
+          expect(find_json).to eq(to_json)
+        end
+      end
+
+      context 'through table has the belongs_to' do
+        it 'includes entire has_many through association when ' do
+          post = FactoryGirl.create :post
+          media = FactoryGirl.create :media
+          post.medias << media
+
+          to_json = Oj.load post.to_json(include: :medias)
+          find_json = Oj.load Post.find_json(post.id, include: :medias)
+          expect(find_json).to eq(to_json)
+        end
+
+        it 'excludes other has_many through association records' do
+          post = FactoryGirl.create :post
+          media = FactoryGirl.create :media
+          post.medias << media
+
+          other_post = FactoryGirl.create :post
+          other_media = FactoryGirl.create :media
+          other_post.medias << other_media
+
+          to_json = Oj.load post.to_json(include: :medias)
+          find_json = Oj.load Post.find_json(post.id, include: :medias)
+          expect(find_json).to eq(to_json)
+        end
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -27,6 +27,7 @@ class User < ActiveRecord::Base
     -> { where subject: 'foo' },
     foreign_key: :author_id,
     class_name: 'Post'
+  has_many :comments, through: :posts
 
   # association name is reserved word in PostgreSQL
   has_many :rows, foreign_key: :author_id, class_name: 'Post', table_name: 'posts'
@@ -59,12 +60,30 @@ class Post < ActiveRecord::Base
     foreign_key: :forum_id,
     class_name: 'Forum'
   has_and_belongs_to_many :tags
+  has_many :comments
+
+  has_many :post_medias
+  has_many :medias, through: :post_medias
 end
 
 class Tag < ActiveRecord::Base
   has_and_belongs_to_many :posts
 end
 
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end
+
+class Media < ActiveRecord::Base
+  self.table_name = "medias"
+end
+
+class PostMedia < ActiveRecord::Base
+  self.table_name = "post_medias"
+  belongs_to :post
+  belongs_to :media
+end
+
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: surus
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Jack Christensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -193,6 +193,7 @@ files:
 - lib/surus/json/belongs_to_scope_builder.rb
 - lib/surus/json/has_and_belongs_to_many_scope_builder.rb
 - lib/surus/json/has_many_scope_builder.rb
+- lib/surus/json/has_many_through_scope_builder.rb
 - lib/surus/json/model.rb
 - lib/surus/json/query.rb
 - lib/surus/json/row_query.rb
@@ -232,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ''
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: PostgreSQL Acceleration for ActiveRecord