jsonapi-resources 0.7.1.beta1 → 0.7.1.beta2

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.7.1.beta1'
+    VERSION = '0.7.1.beta2'
   end
 end

data/lib/jsonapi/response_document.rb

@@ -54,6 +54,10 @@ module JSONAPI
         if JSONAPI.configuration.top_level_meta_include_record_count && result.respond_to?(:record_count)
           meta[JSONAPI.configuration.top_level_meta_record_count_key] = result.record_count
         end
+
+        if JSONAPI.configuration.top_level_meta_include_page_count && result.respond_to?(:page_count)
+          meta[JSONAPI.configuration.top_level_meta_page_count_key] = result.page_count
+        end
       end
 
       meta.deep_transform_keys { |key| @key_formatter.format(key) }
@@ -90,10 +94,17 @@ module JSONAPI
       query_params[:page] = params
 
       request = @options[:request]
-      query_params[:fields] = request.params[:fields] if request.params[:fields]
+      if request.params[:fields]
+        query_params[:fields] = request.params[:fields].respond_to?(:to_unsafe_hash) ? request.params[:fields].to_unsafe_hash : request.params[:fields]
+      end
+
       query_params[:include] = request.params[:include] if request.params[:include]
       query_params[:sort] = request.params[:sort] if request.params[:sort]
-      query_params[:filter] = request.params[:filter] if request.params[:filter]
+
+      if request.params[:filter]
+        query_params[:filter] = request.params[:filter].respond_to?(:to_unsafe_hash) ? request.params[:filter].to_unsafe_hash : request.params[:filter]
+      end
+
       query_params
     end
 

data/lib/jsonapi/routing_ext.rb

@@ -33,13 +33,27 @@ module ActionDispatch
           end
 
           resource @resource_type, options do
-            @scope[:jsonapi_resource] = @resource_type
-
-            if block_given?
-              yield
+            # :nocov:
+            if @scope.respond_to? :[]=
+              # Rails 4
+              @scope[:jsonapi_resource] = @resource_type
+
+              if block_given?
+                yield
+              else
+                jsonapi_relationships
+              end
             else
-              jsonapi_relationships
+              # Rails 5
+              jsonapi_resource_scope(SingletonResource.new(@resource_type, api_only?, @scope[:shallow], options), @resource_type) do
+                if block_given?
+                  yield
+                else
+                  jsonapi_relationships
+                end
+              end
             end
+            # :nocov:
           end
         end
 
@@ -69,7 +83,8 @@ module ActionDispatch
           options[:path] = format_route(@resource_type)
 
           if res.resource_key_type == :uuid
-            options[:constraints] = {id: /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/}
+            options[:constraints] ||= {}
+            options[:constraints][:id] ||= /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
           end
 
           if options[:except]
@@ -87,13 +102,26 @@ module ActionDispatch
           end
 
           resources @resource_type, options do
-            @scope[:jsonapi_resource] = @resource_type
-
-            if block_given?
-              yield
+            # :nocov:
+            if @scope.respond_to? :[]=
+              # Rails 4
+              @scope[:jsonapi_resource] = @resource_type
+              if block_given?
+                yield
+              else
+                jsonapi_relationships
+              end
             else
-              jsonapi_relationships
+              # Rails 5
+              jsonapi_resource_scope(Resource.new(@resource_type, api_only?, @scope[:shallow], options), @resource_type) do
+                if block_given?
+                  yield
+                else
+                  jsonapi_relationships
+                end
+              end
             end
+            # :nocov:
           end
         end
 
@@ -206,6 +234,16 @@ module ActionDispatch
                                                   action: 'get_related_resources', via: [:get]
         end
 
+        protected
+        # :nocov:
+        def jsonapi_resource_scope(resource, resource_type) #:nodoc:
+          @scope = @scope.new(scope_level_resource: resource, jsonapi_resource: resource_type)
+
+          controller(resource.resource_scope) { yield }
+        ensure
+          @scope = @scope.parent
+        end
+        # :nocov:
         private
 
         def resource_type_with_module_prefix(resource = nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.7.1.beta1
+  version: 0.7.1.beta2
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  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: rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +123,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A resource-centric approach to implementing the controllers, routes,
   and serializers needed to support the JSON API spec.
 email:
@@ -118,20 +146,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
-- jsonapi-resources.gemspec
 - lib/generators/jsonapi/USAGE
 - lib/generators/jsonapi/controller_generator.rb
 - lib/generators/jsonapi/resource_generator.rb
 - lib/generators/jsonapi/templates/jsonapi_controller.rb
 - lib/generators/jsonapi/templates/jsonapi_resource.rb
 - lib/jsonapi-resources.rb
-- lib/jsonapi/active_record_operations_processor.rb
 - lib/jsonapi/acts_as_resource_controller.rb
 - lib/jsonapi/callbacks.rb
 - lib/jsonapi/configuration.rb
@@ -142,78 +164,22 @@ files:
 - lib/jsonapi/include_directives.rb
 - lib/jsonapi/link_builder.rb
 - lib/jsonapi/mime_types.rb
+- lib/jsonapi/naive_cache.rb
 - lib/jsonapi/operation.rb
+- lib/jsonapi/operation_dispatcher.rb
 - lib/jsonapi/operation_result.rb
 - lib/jsonapi/operation_results.rb
-- lib/jsonapi/operations_processor.rb
 - lib/jsonapi/paginator.rb
+- lib/jsonapi/processor.rb
 - lib/jsonapi/relationship.rb
-- lib/jsonapi/request.rb
+- lib/jsonapi/request_parser.rb
 - lib/jsonapi/resource.rb
 - lib/jsonapi/resource_controller.rb
+- lib/jsonapi/resource_controller_metal.rb
 - lib/jsonapi/resource_serializer.rb
 - lib/jsonapi/resources/version.rb
 - lib/jsonapi/response_document.rb
 - lib/jsonapi/routing_ext.rb
-- locales/en.yml
-- test/config/database.yml
-- test/controllers/controller_test.rb
-- test/fixtures/active_record.rb
-- test/fixtures/author_details.yml
-- test/fixtures/book_authors.yml
-- test/fixtures/book_comments.yml
-- test/fixtures/books.yml
-- test/fixtures/categories.yml
-- test/fixtures/comments.yml
-- test/fixtures/comments_tags.yml
-- test/fixtures/companies.yml
-- test/fixtures/craters.yml
-- test/fixtures/customers.yml
-- test/fixtures/documents.yml
-- test/fixtures/expense_entries.yml
-- test/fixtures/facts.yml
-- test/fixtures/hair_cuts.yml
-- test/fixtures/iso_currencies.yml
-- test/fixtures/line_items.yml
-- test/fixtures/makes.yml
-- test/fixtures/moons.yml
-- test/fixtures/numeros_telefone.yml
-- test/fixtures/order_flags.yml
-- test/fixtures/people.yml
-- test/fixtures/pictures.yml
-- test/fixtures/planet_types.yml
-- test/fixtures/planets.yml
-- test/fixtures/posts.yml
-- test/fixtures/posts_tags.yml
-- test/fixtures/preferences.yml
-- test/fixtures/products.yml
-- test/fixtures/purchase_orders.yml
-- test/fixtures/sections.yml
-- test/fixtures/tags.yml
-- test/fixtures/vehicles.yml
-- test/fixtures/web_pages.yml
-- test/helpers/assertions.rb
-- test/helpers/functional_helpers.rb
-- test/helpers/value_matchers.rb
-- test/helpers/value_matchers_test.rb
-- test/integration/requests/namespaced_model_test.rb
-- test/integration/requests/request_test.rb
-- test/integration/routes/routes_test.rb
-- test/integration/sti_fields_test.rb
-- test/lib/generators/jsonapi/controller_generator_test.rb
-- test/lib/generators/jsonapi/resource_generator_test.rb
-- test/test_helper.rb
-- test/unit/formatters/dasherized_key_formatter_test.rb
-- test/unit/jsonapi_request/jsonapi_request_test.rb
-- test/unit/operation/operations_processor_test.rb
-- test/unit/pagination/offset_paginator_test.rb
-- test/unit/pagination/paged_paginator_test.rb
-- test/unit/resource/resource_test.rb
-- test/unit/serializer/include_directives_test.rb
-- test/unit/serializer/link_builder_test.rb
-- test/unit/serializer/polymorphic_serializer_test.rb
-- test/unit/serializer/response_document_test.rb
-- test/unit/serializer/serializer_test.rb
 homepage: https://github.com/cerebris/jsonapi-resources
 licenses:
 - MIT
@@ -234,66 +200,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easily support JSON API in Rails.
-test_files:
-- test/config/database.yml
-- test/controllers/controller_test.rb
-- test/fixtures/active_record.rb
-- test/fixtures/author_details.yml
-- test/fixtures/book_authors.yml
-- test/fixtures/book_comments.yml
-- test/fixtures/books.yml
-- test/fixtures/categories.yml
-- test/fixtures/comments.yml
-- test/fixtures/comments_tags.yml
-- test/fixtures/companies.yml
-- test/fixtures/craters.yml
-- test/fixtures/customers.yml
-- test/fixtures/documents.yml
-- test/fixtures/expense_entries.yml
-- test/fixtures/facts.yml
-- test/fixtures/hair_cuts.yml
-- test/fixtures/iso_currencies.yml
-- test/fixtures/line_items.yml
-- test/fixtures/makes.yml
-- test/fixtures/moons.yml
-- test/fixtures/numeros_telefone.yml
-- test/fixtures/order_flags.yml
-- test/fixtures/people.yml
-- test/fixtures/pictures.yml
-- test/fixtures/planet_types.yml
-- test/fixtures/planets.yml
-- test/fixtures/posts.yml
-- test/fixtures/posts_tags.yml
-- test/fixtures/preferences.yml
-- test/fixtures/products.yml
-- test/fixtures/purchase_orders.yml
-- test/fixtures/sections.yml
-- test/fixtures/tags.yml
-- test/fixtures/vehicles.yml
-- test/fixtures/web_pages.yml
-- test/helpers/assertions.rb
-- test/helpers/functional_helpers.rb
-- test/helpers/value_matchers.rb
-- test/helpers/value_matchers_test.rb
-- test/integration/requests/namespaced_model_test.rb
-- test/integration/requests/request_test.rb
-- test/integration/routes/routes_test.rb
-- test/integration/sti_fields_test.rb
-- test/lib/generators/jsonapi/controller_generator_test.rb
-- test/lib/generators/jsonapi/resource_generator_test.rb
-- test/test_helper.rb
-- test/unit/formatters/dasherized_key_formatter_test.rb
-- test/unit/jsonapi_request/jsonapi_request_test.rb
-- test/unit/operation/operations_processor_test.rb
-- test/unit/pagination/offset_paginator_test.rb
-- test/unit/pagination/paged_paginator_test.rb
-- test/unit/resource/resource_test.rb
-- test/unit/serializer/include_directives_test.rb
-- test/unit/serializer/link_builder_test.rb
-- test/unit/serializer/polymorphic_serializer_test.rb
-- test/unit/serializer/response_document_test.rb
-- test/unit/serializer/serializer_test.rb
+test_files: []

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-.ruby-version
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-coverage
-test/log
-test_db
-test_db-journal

data/.travis.yml

@@ -1,9 +0,0 @@
-language: ruby
-sudo: false
-env:
-  - "RAILS_VERSION=4.1.0"
-  - "RAILS_VERSION=4.2.0"
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2

data/Gemfile

@@ -1,23 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec
-
-platforms :ruby do
-  gem 'sqlite3', '1.3.10'
-end
-
-platforms :jruby do
-  gem 'activerecord-jdbcsqlite3-adapter'
-end
-
-version = ENV['RAILS_VERSION'] || 'default'
-
-case version
-when 'master'
-  gem 'rails', { git: 'https://github.com/rails/rails.git' }
-  gem 'arel', { git: 'https://github.com/rails/arel.git' }
-when 'default'
-  gem 'rails', '>= 4.2'
-else
-  gem 'rails', "~> #{version}"
-end

data/Rakefile

@@ -1,20 +0,0 @@
-#!/usr/bin/env rake
-require 'bundler/gem_tasks'
-require 'rake/testtask'
-require './test/test_helper.rb'
-
-TestApp.load_tasks
-
-task default: :test
-
-desc 'Run tests in isolated processes'
-namespace :test do
-  task :isolated do
-    Dir[test_task.pattern].each do |file|
-      cmd = ['ruby']
-      test_task.libs.each { |l| cmd << '-I' << l }
-      cmd << file
-      sh cmd.join(' ')
-    end
-  end
-end

data/jsonapi-resources.gemspec

@@ -1,29 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'jsonapi/resources/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'jsonapi-resources'
-  spec.version       = JSONAPI::Resources::VERSION
-  spec.authors       = ['Dan Gebhardt', 'Larry Gebhardt']
-  spec.email         = ['dan@cerebris.com', 'larry@cerebris.com']
-  spec.summary       = 'Easily support JSON API in Rails.'
-  spec.description   = 'A resource-centric approach to implementing the controllers, routes, and serializers needed to support the JSON API spec.'
-  spec.homepage      = 'https://github.com/cerebris/jsonapi-resources'
-  spec.license       = 'MIT'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.0'
-
-  spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest'
-  spec.add_development_dependency 'minitest-spec-rails'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry'
-  spec.add_dependency 'rails', '>= 4.0'
-end