jsonapi_compliable 0.3.10 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69c38215fcc942031f12c6c101120e4e2b045c4e
-  data.tar.gz: c696731f9c9098b6a1437acaa79831a89c5a85cf
+  metadata.gz: 06adc2e0a9833b1556d62814a1f88c81a4beac2e
+  data.tar.gz: 53d1f7f2d515a1c9dd18fe02f0ab7fe72069f5a9
 SHA512:
-  metadata.gz: 3c03156dbf5888c1ad8a13a79a7be1958ed54952f812126f25c5916279a32fc7474ebe19955c995ecd8ed5d1582ef4b7d10bed6aeb3cb393c4852b969d044931
-  data.tar.gz: 2f3658e3e8793911d19c7e894fcd8ccb106e7b4d68453744ae7570ce3d89e060fccd67cb2a055ecd944c4fd078e44a26d495a032172030e153b66fda783f7e3e
+  metadata.gz: 4b5e0517b385fe8fe14234570db9a07c27dc552454d3d7197740708828ad1a84faa496e593148f469ca609262f5047905d7a06f5942c30c60c03ac1b4f692455
+  data.tar.gz: d80f8f709221fd66c313409129bb7aac91c9c53bd8d1c8d7ad8affa646c84e7b3eb5eac511a97eb3067519a2f785f15c9ea2885fa3199507b87dbec8fdf64141

data/Gemfile

@@ -2,7 +2,6 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in jsonapi_compliable.gemspec
 gemspec
-gem 'active_model_serializers', git: 'https://github.com/richmolj/active_model_serializers.git'
 
 group :test do
   gem 'appraisal'

data/jsonapi_compliable.gemspec

@@ -18,9 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails", ['>= 4.1', '< 6']
-  spec.add_dependency "jsonapi", '~> 0.1.1.beta2'
-  spec.add_dependency "active_model_serializers", "~> 0.10"
-  spec.add_dependency "jsonapi_ams_extensions", "~> 0.1"
+
+  spec.add_dependency 'jsonapi-rails', '~> 0.1'
 
   spec.add_development_dependency "kaminari"
   spec.add_development_dependency "active_model_serializers"

data/lib/jsonapi_compliable.rb

@@ -1,6 +1,4 @@
-require 'active_model_serializers'
-require 'jsonapi'
-require 'jsonapi_ams_extensions'
+require 'jsonapi/rails'
 
 require "jsonapi_compliable/version"
 require "jsonapi_compliable/errors"
@@ -19,8 +17,8 @@ require "jsonapi_compliable/util/include_params"
 require "jsonapi_compliable/util/field_params"
 require "jsonapi_compliable/util/scoping"
 require "jsonapi_compliable/util/pagination"
-
-require 'jsonapi_compliable/railtie' if defined?(::Rails)
+require "jsonapi_compliable/extensions/extra_attribute"
+require "jsonapi_compliable/extensions/boolean_attribute"
 
 module JsonapiCompliable
   autoload :Base,           'jsonapi_compliable/base'

data/lib/jsonapi_compliable/base.rb

@@ -51,25 +51,26 @@ module JsonapiCompliable
       Util::FieldParams.parse!(params, :extra_fields)
     end
 
-    def render_ams(scope, opts = {})
+    def render_jsonapi(scope, opts = {})
       scoped = Util::Scoping.apply?(self, scope, opts.delete(:scope)) ? jsonapi_scope(scope) : scope
-      options = default_ams_options
+      options = default_jsonapi_render_options
       options[:include] = forced_includes || Util::IncludeParams.scrub(self)
       options[:jsonapi] = JsonapiCompliable::Util::Pagination.zero?(params) ? [] : scoped
       options[:fields] = Util::FieldParams.fieldset(params, :fields) if params[:fields]
-      options[:extra_fields] = Util::FieldParams.fieldset(params, :extra_fields) if params[:extra_fields]
       options[:meta] ||= {}
       options.merge!(opts)
       options[:meta][:stats] = Stats::Payload.new(self, scoped).generate if params[:stats]
+      options[:expose] ||= {}
+      options[:expose][:context] = self
+      options[:expose][:extra_fields] = Util::FieldParams.fieldset(params, :extra_fields) if params[:extra_fields]
 
       render(options)
     end
 
-    # render_ams(foo) equivalent to
-    # render json: foo, ams_default_options
-    def default_ams_options
+    # render_jsonapi(foo) equivalent to
+    # render jsonapi: foo, default_jsonapi_render_options
+    def default_jsonapi_render_options
       {}.tap do |options|
-        options[:adapter] = :json_api
       end
     end
 

data/lib/jsonapi_compliable/extensions/boolean_attribute.rb

@@ -0,0 +1,21 @@
+module JsonapiCompliable
+  module Extensions
+    module BooleanAttribute
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      module ClassMethods
+        def boolean_attribute(name, options = {}, &blk)
+          blk ||= proc { @object.public_send(name) }
+          field_name = :"is_#{name.to_s.gsub('?', '')}"
+          attribute field_name, options, &blk
+        end
+      end
+    end
+  end
+end
+
+JSONAPI::Serializable::Resource.class_eval do
+  include JsonapiCompliable::Extensions::BooleanAttribute
+end

data/lib/jsonapi_compliable/extensions/extra_attribute.rb

@@ -0,0 +1,34 @@
+require 'jsonapi/serializable/resource/conditional_fields'
+
+module JsonapiCompliable
+  module Extensions
+    module ExtraAttribute
+      def self.included(klass)
+        klass.extend ClassMethods
+      end
+
+      module ClassMethods
+        def extra_attribute(name, options = {}, &blk)
+          allow_field = proc {
+            if options[:if]
+              next false unless instance_eval(&options[:if])
+            end
+
+            if @extra_fields && @extra_fields[jsonapi_type]
+              @extra_fields[jsonapi_type].include?(name)
+            else
+              false
+            end
+          }
+
+          attribute name, if: allow_field, &blk
+        end
+      end
+    end
+  end
+end
+
+JSONAPI::Serializable::Resource.class_eval do
+  prepend JSONAPI::Serializable::Resource::ConditionalFields
+  include JsonapiCompliable::Extensions::ExtraAttribute
+end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.3.10"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.4.0
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-21 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -32,35 +32,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6'
 - !ruby/object:Gem::Dependency
-  name: jsonapi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1.beta2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.1.beta2
-- !ruby/object:Gem::Dependency
-  name: active_model_serializers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: jsonapi_ams_extensions
+  name: jsonapi-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -219,7 +191,8 @@ files:
 - lib/jsonapi_compliable/deserializable.rb
 - lib/jsonapi_compliable/dsl.rb
 - lib/jsonapi_compliable/errors.rb
-- lib/jsonapi_compliable/railtie.rb
+- lib/jsonapi_compliable/extensions/boolean_attribute.rb
+- lib/jsonapi_compliable/extensions/extra_attribute.rb
 - lib/jsonapi_compliable/scope/base.rb
 - lib/jsonapi_compliable/scope/default_filter.rb
 - lib/jsonapi_compliable/scope/extra_fields.rb

data/lib/jsonapi_compliable/railtie.rb

@@ -1,18 +0,0 @@
-require 'rails/railtie'
-require 'action_controller'
-require 'action_controller/railtie'
-require 'action_controller/serialization'
-
-module ActiveModelSerializers
-  class Railtie < Rails::Railtie
-    initializer 'jsonapi_compliable.register_renderer' do
-      require 'active_model_serializers/register_jsonapi_renderer'
-    end
-
-    initializer 'jsonapi_compliable.configure_ams' do
-      if ActiveModelSerializers.config.respond_to?(:include_data_default)
-        ActiveModelSerializers.config.include_data_default = :if_sideloaded
-      end
-    end
-  end
-end