Use updated JR branch which merges records on joins

lgebhardt · lgebhardt · commit 762718244b80 · 2020-02-08T12:14:25.000-05:00
diff --git a/Appraisals b/Appraisals
@@ -1,7 +1,7 @@
 appraise 'rails-4-2 pundit-1' do
   gem 'rails', '4.2.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 1.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -11,7 +11,7 @@ end
 appraise 'rails-5-0 pundit-1' do
   gem 'rails', '5.0.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 1.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -21,7 +21,7 @@ end
 appraise 'rails-5-1 pundit-1' do
   gem "rails", "5.1.0"
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 1.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -31,7 +31,7 @@ end
 appraise 'rails-5-2 pundit-1' do
   gem 'rails', '5.2.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 1.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -40,7 +40,7 @@ end
 
 appraise 'rails-6-0 pundit-1' do
   gem 'rails', '~> 6.0.0'
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 1.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.4.1'
@@ -50,7 +50,7 @@ end
 appraise 'rails-4-2 pundit-2' do
   gem 'rails', '4.2.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 2.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -60,7 +60,7 @@ end
 appraise 'rails-5-0 pundit-2' do
   gem 'rails', '5.0.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 2.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -70,7 +70,7 @@ end
 appraise 'rails-5-1 pundit-2' do
   gem 'rails', '5.1.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 2.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -80,7 +80,7 @@ end
 appraise 'rails-5-2 pundit-2' do
   gem 'rails', '5.2.0'
   # ToDo: This is only for testing purposes
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 2.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.3.13'
@@ -89,7 +89,7 @@ end
 
 appraise 'rails-6-0 pundit-2' do
   gem 'rails', '~> 6.0.0'
-  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'track_join_options'
+  gem 'jsonapi-resources', :git => 'https://github.com/cerebris/jsonapi-resources.git', :branch => 'use_records_for_joined_resources'
   gem 'pundit', '~> 2.0'
   group :development, :test do
     gem 'sqlite3', '~> 1.4.1'
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gem(
   'jsonapi-resources',
   git: 'https://github.com/cerebris/jsonapi-resources.git',
-  branch: 'track_join_options'
+  branch: 'use_records_for_joined_resources'
 )
 
 gemspec
diff --git a/gemfiles/rails_4_2_pundit_1.gemfile b/gemfiles/rails_4_2_pundit_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "4.2.0"
 gem "pundit", "~> 1.0"
 
diff --git a/gemfiles/rails_4_2_pundit_2.gemfile b/gemfiles/rails_4_2_pundit_2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "4.2.0"
 gem "pundit", "~> 2.0"
 
diff --git a/gemfiles/rails_5_0_pundit_1.gemfile b/gemfiles/rails_5_0_pundit_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "5.0.0"
 gem "pundit", "~> 1.0"
 
diff --git a/gemfiles/rails_5_0_pundit_2.gemfile b/gemfiles/rails_5_0_pundit_2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "5.0.0"
 gem "pundit", "~> 2.0"
 
diff --git a/gemfiles/rails_5_1_pundit_1.gemfile b/gemfiles/rails_5_1_pundit_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "5.1.0"
 gem "pundit", "~> 1.0"
 
diff --git a/gemfiles/rails_5_1_pundit_2.gemfile b/gemfiles/rails_5_1_pundit_2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "5.1.0"
 gem "pundit", "~> 2.0"
 
diff --git a/gemfiles/rails_5_2_pundit_1.gemfile b/gemfiles/rails_5_2_pundit_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "5.2.0"
 gem "pundit", "~> 1.0"
 
diff --git a/gemfiles/rails_5_2_pundit_2.gemfile b/gemfiles/rails_5_2_pundit_2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "5.2.0"
 gem "pundit", "~> 2.0"
 
diff --git a/gemfiles/rails_6_0_pundit_1.gemfile b/gemfiles/rails_6_0_pundit_1.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "~> 6.0.0"
 gem "pundit", "~> 1.0"
 
diff --git a/gemfiles/rails_6_0_pundit_2.gemfile b/gemfiles/rails_6_0_pundit_2.gemfile
@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "track_join_options"
+gem "jsonapi-resources", git: "https://github.com/cerebris/jsonapi-resources.git", branch: "use_records_for_joined_resources"
 gem "rails", "~> 6.0.0"
 gem "pundit", "~> 2.0"
 
diff --git a/lib/jsonapi/authorization/pundit_scoped_resource.rb b/lib/jsonapi/authorization/pundit_scoped_resource.rb
@@ -10,18 +10,6 @@ def records(options = {})
           user_context = JSONAPI::Authorization.configuration.user_context(options[:context])
           ::Pundit.policy_scope!(user_context, super)
         end
-
-        def apply_joins(records, join_manager, options)
-          records = super
-          join_manager.join_details.each do |k, v|
-            next if k == '' || v[:join_type] == :root
-            v[:join_options][:relationship_details][:resource_klasses].each_key do |klass|
-              next unless klass.included_modules.include?(PunditScopedResource)
-              records = records.where(v[:alias] => { klass._primary_key => klass.records(options)})
-            end
-          end
-          records
-        end
       end
     end
   end

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ source 'https://rubygems.org'`
`4`	`4`	`gem(`
`5`	`5`	`'jsonapi-resources',`
`6`	`6`	`git: 'https://github.com/cerebris/jsonapi-resources.git',`
`7`		`- branch: 'track_join_options'`
	`7`	`+ branch: 'use_records_for_joined_resources'`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`gemspec`