jsonapi_compliable 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff9f3051203426cebee5e62694cf097f0aba942d
-  data.tar.gz: f427616b68314981ec7dd9d46a5941042e234637
+  metadata.gz: 6db73195ae7cc73877b7d3bf32fa81bb89f0e747
+  data.tar.gz: 186d279c3221ab57bf08ab86145bac235c621c17
 SHA512:
-  metadata.gz: 2ec6bf442ea94a3213137860adf61e12aff5a29897a1eebee53850c1f69a927ba636c8ad98bf4523adcc976182777abdc314ff75af165e80d7e3d65110b2cca3
-  data.tar.gz: 0ade2b736330f5267b58d97c10ad669ec285d25fffc705436d3398b5869ea2e7d07eabcb81b0767109a8898fdc24a6e23ccf6d2ea7a4280963d02e8a246a2b09
+  metadata.gz: df42aaa0b32e2fdb0aa6c1dd288fb93765e8d52bc48ba676751c280c96b1a6ee81348ec75bad9a2b08cd9e02e73e6905c10057ba8c69634cc2e39d788d68a0d4
+  data.tar.gz: d60190e16b515697be4b6167034815d1f265c753cb7e2bf57c9345f2a1d592b83f1a1b2cc9289750a6008f01be6daed66d8147047caaed09c4bf99894aa03b30

data/lib/jsonapi_compliable/resource.rb

@@ -487,7 +487,7 @@ module JsonapiCompliable
     # @see .model
     # @see Adapters::ActiveRecord#update
     # @param [Hash] update_params The relevant attributes, including id and foreign keys
-    # @return [Object] an instance of the just-created model
+    # @return [Object] an instance of the just-updated model
     def update(update_params)
       adapter.update(model, update_params)
     end
@@ -507,7 +507,7 @@ module JsonapiCompliable
     # @see .model
     # @see Adapters::ActiveRecord#destroy
     # @param [String] id The +id+ of the relevant Model
-    # @return [Object] an instance of the just-created model
+    # @return [Object] an instance of the just-destroyed model
     def destroy(id)
       adapter.destroy(model, id)
     end

data/lib/jsonapi_compliable/scoping/default_filter.rb

@@ -38,7 +38,7 @@ module JsonapiCompliable
     def apply
       resource.default_filters.each_pair do |name, opts|
         next if overridden?(name)
-        @scope = opts[:filter].call(@scope)
+        @scope = opts[:filter].call(@scope, resource.context)
       end
 
       @scope

data/lib/jsonapi_compliable/scoping/extra_fields.rb

@@ -35,7 +35,7 @@ module JsonapiCompliable
     # @return the scope object we are chaining/modofying
     def apply
       each_extra_field do |callable|
-        @scope = callable.call(@scope)
+        @scope = callable.call(@scope, resource.context)
       end
 
       @scope

data/lib/jsonapi_compliable/scoping/filter.rb

@@ -41,7 +41,7 @@ module JsonapiCompliable
     # specified in the adapter.
     def filter_scope(filter, value)
       if custom_scope = filter.values.first[:filter]
-        custom_scope.call(@scope, value)
+        custom_scope.call(@scope, value, resource.context)
       else
         resource.adapter.filter(@scope, filter.keys.first, value)
       end
@@ -52,8 +52,31 @@ module JsonapiCompliable
         filter = find_filter!(param_name.to_sym)
         value  = param_value
         value  = value.split(',') if value.is_a?(String) && value.include?(',')
+        value  = normalize_string_values(value)
         yield filter, value
       end
     end
+
+    # Convert a string of "true" to true, etc
+    #
+    # NB - avoid Array(value) here since we might want to
+    # return a single element instead of array
+    def normalize_string_values(value)
+      if value.is_a?(Array)
+        value.map { |v| normalize_string_value(v) }
+      else
+        normalize_string_value(value)
+      end
+    end
+
+    def normalize_string_value(value)
+      case value
+      when 'true' then true
+      when 'false' then false
+      when 'nil', 'null' then nil
+      else
+        value
+      end
+    end
   end
 end

data/lib/jsonapi_compliable/scoping/paginate.rb

@@ -61,7 +61,7 @@ module JsonapiCompliable
 
     # Apply the custom pagination proc
     def apply_custom_scope
-      custom_scope.call(@scope, number, size)
+      custom_scope.call(@scope, number, size, resource.context)
     end
 
     private

data/lib/jsonapi_compliable/scoping/sort.rb

@@ -31,7 +31,8 @@ module JsonapiCompliable
     # @return the scope we are chaining/modifying
     def apply_custom_scope
       each_sort do |attribute, direction|
-        @scope = custom_scope.call(@scope, attribute, direction)
+        @scope = custom_scope
+          .call(@scope, attribute, direction, resource.context)
       end
       @scope
     end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.1"
+  VERSION = "0.11.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-13 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -202,6 +202,7 @@ files:
 - gemfiles/rails_4.gemfile
 - gemfiles/rails_5.gemfile
 - jsonapi_compliable.gemspec
+- lib/generators/jsonapi/field_generator.rb
 - lib/generators/jsonapi/resource_generator.rb
 - lib/generators/jsonapi/templates/application_resource.rb.erb
 - lib/generators/jsonapi/templates/controller.rb.erb