jsonapi_compliable 0.11.8 → 0.11.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a845c1141c0c2a6bde9e63207a6937f5bda4f592
-  data.tar.gz: 6db8101f04fde4fad38fed98612a2e90facc4937
+  metadata.gz: c65b22ee08192e29950054add88f472e77132860
+  data.tar.gz: e675a96ad08246f8264df2ac265ffeab5e648af1
 SHA512:
-  metadata.gz: 06a6ba4c9abefc42659cdb8f1984517c7a7a30d41b83463b3dcd2cc3b996e935f3d1ccb0b267221fbeba692d3b86ba42ed73d6b5374d9da68a7441c69b613c0d
-  data.tar.gz: 87a7f332b4c57867d30cace428761a428179e23b921e9150997407a0f5723e31d93e603b2e0759692873ef72ebada4504ad3fbd8f9b78e8f248fadb9872713cd
+  metadata.gz: e912049b53c80808cb5cb54203e86c7594625b18adf8a5d5103663654374f1e2145c66d03d5b7ceb7572929285cdc15578a0b3dc5aaee8a22c7036a48d04c5a3
+  data.tar.gz: c9aa189b04542dbfa114f19d91741c2ecf986b87c1ffedc0865c127c2add5bd59942addbfe0e21a749a69a2bc2ebca7763fd8a5608bd4898a52ae4bca5d43340

data/Appraisals

@@ -5,7 +5,7 @@ appraise "rails-4" do
 end
 
 appraise "rails-5" do
-  gem "rails", "~> 5.0"
+  gem "rails", "~> 5.2"
   gem 'jsonapi-rails', '~> 0.3.1', require: 'jsonapi/rails'
   gem 'rspec-rails'
 end

data/gemfiles/rails_5.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0"
+gem "rails", "~> 5.2"
 gem "jsonapi-rails", "~> 0.3.1", :require => "jsonapi/rails"
 gem "rspec-rails"
 

data/lib/generators/jsonapi/templates/payload.rb.erb

@@ -33,6 +33,7 @@ JsonapiSpecHelpers::Payload.register(:<%= file_name %>) do
   <%- attributes.each do |a| -%>
   <%- type = a.type == :boolean ? [TrueClass, FalseClass] : a.type.to_s.classify -%>
   <%- type = String if a.type == :text -%>
+  <%- type = Float if a.type == :decimal -%>
   key(:<%= a.name %>, <%= type %>)
   <%- end -%>
 end

data/lib/jsonapi_compliable/base.rb

@@ -130,11 +130,31 @@ module JsonapiCompliable
     # @api private
     # @yieldreturn Code to run within the current context
     def wrap_context
-      jsonapi_resource.with_context(self, action_name.to_sym) do
+      jsonapi_resource.with_context(jsonapi_context, action_name.to_sym) do
         yield
       end
     end
 
+    # Override if you'd like the "context" to be something other than
+    # an instance of this class.
+    # In Rails, context is the controller instance.
+    #
+    # @example Overriding
+    #   # within your controller
+    #   def jsonapi_context
+    #     current_user
+    #   end
+    #
+    #   # within a resource
+    #   default_filter :by_user do |scope, context|
+    #     scope.where(user_id: context.id)
+    #   end
+    #
+    # @return the context object you'd like
+    def jsonapi_context
+      self
+    end
+
     # Use when direct, low-level access to the scope is required.
     #
     # @example Show Action

data/lib/jsonapi_compliable/util/render_options.rb

@@ -16,8 +16,8 @@ module JsonapiCompliable
         extra_fields = query_hash[:extra_fields]
 
         # Ensure fields doesnt clobber extra fields
-        if extra_fields.any? && fields.any?
-          extra_fields.each { |k,v| fields[k] = fields[k].to_a + v }
+        extra_fields.each do |k,v|
+          fields[k] = fields[k] + v if fields[k]
         end
 
         options            = {}

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.8"
+  VERSION = "0.11.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.8
+  version: 0.11.10
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable