jsonapi_compliable 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d8e742552f8d3c559e5717fd4e282846e4d904
-  data.tar.gz: f297e2bf808e4a22596ac9fdc54e0350f6a5e132
+  metadata.gz: a2ba641517d1b4433f52881fcf610733d49eabff
+  data.tar.gz: 55dd7a70e1da568c2263eb957764c4adc402f9e4
 SHA512:
-  metadata.gz: 42c2dff29d06844d41e3c1042065d33d627e41d4a84231e947d77ca416b63317c9dd5e97fa94da9327197c918c5675a53293257d4bbe53206ec7de35d98cf743
-  data.tar.gz: bd862e16092f6e89f6652fc1c0dd814f0f30095329678776c9eb3045336b164a87360467b7f53d92b4fc5142f1aee3475e4a8bd7bdc1547373ae1cfb62277116
+  metadata.gz: 21ab6475b3792bde16e04e63c40079408e8fac5dd1f1b3001c8b1412f1b85bae1c555ed3b022a9000df025952f008ddea305c2102248ef3ab2f1e30d83e298f4
+  data.tar.gz: 8182598c1b91062d2a9bc2cca2c1cbfe5a8567995b28d3599dfa1433880f756466a75ce427c5f77a77055473f718da88bc6de5afe10e78741a1e14ac7089c3f9

data/gemfiles/rails_4.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    jsonapi_compliable (0.4.0)
+    jsonapi_compliable (0.5.2)
       jsonapi-serializable (~> 0.1)
 
 GEM
@@ -196,7 +196,7 @@ DEPENDENCIES
   guard-rspec
   jsonapi-rails (~> 0.1)
   jsonapi_compliable!
-  kaminari
+  kaminari (~> 0.17)
   pry
   pry-byebug
   rails (~> 4.1)

data/gemfiles/rails_5.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    jsonapi_compliable (0.4.0)
+    jsonapi_compliable (0.5.2)
       jsonapi-serializable (~> 0.1)
 
 GEM
@@ -200,7 +200,7 @@ DEPENDENCIES
   guard-rspec
   jsonapi-rails (~> 0.1)
   jsonapi_compliable!
-  kaminari
+  kaminari (~> 0.17)
   pry
   pry-byebug
   rails (~> 5.0)

data/lib/jsonapi_compliable/query.rb

@@ -26,17 +26,24 @@ module JsonapiCompliable
     end
 
     def include_hash
-      @include_hash ||= include_directive.to_hash
+      @include_hash ||= begin
+        requested     = include_directive.to_hash
+        all_allowed   = resource.sideloading.to_hash[:base]
+        whitelist     = resource.sideload_whitelist.values.reduce(:merge)
+        allowed       = whitelist ? Util::IncludeParams.scrub(all_allowed, whitelist) : all_allowed
+
+        Util::IncludeParams.scrub(requested, allowed)
+      end
     end
 
-    def all_requested_association_names
-      @all_requested_association_names ||= Util::Hash.keys(include_hash)
+    def association_names
+      @association_names ||= Util::Hash.keys(include_hash)
     end
 
     def to_hash
       hash = { resource.type => self.class.default_hash }
 
-      all_requested_association_names.each do |name|
+      association_names.each do |name|
         hash[name] = self.class.default_hash
       end
 
@@ -50,7 +57,8 @@ module JsonapiCompliable
       parse_filter(hash)
       parse_sort(hash)
       parse_pagination(hash)
-      parse_include(hash, include_hash)
+
+      parse_include(hash, include_hash, resource.type)
       parse_stats(hash)
 
       hash
@@ -68,13 +76,14 @@ module JsonapiCompliable
       resource.association_names.include?(name)
     end
 
-    def parse_include(memo, incl_hash, namespace = nil)
-      namespace ||= resource.type
+    def parse_include(memo, incl_hash, namespace)
+      memo[namespace].merge!(include: incl_hash)
 
-      memo[namespace][:include] = incl_hash
       incl_hash.each_pair do |key, sub_hash|
-        memo[key][:include] = parse_include(memo, sub_hash, key)
+        memo.merge!(parse_include(memo, sub_hash, key))
       end
+
+      memo
     end
 
     def parse_stats(hash)

data/lib/jsonapi_compliable/resource.rb

@@ -1,41 +1,27 @@
 module JsonapiCompliable
   class Resource
-    attr_reader :filters,
-      :default_filters,
-      :default_sort,
-      :default_page_size,
-      :default_page_number,
-      :sorting,
-      :stats,
-      :sideload_whitelist,
-      :pagination,
-      :extra_fields,
-      :sideloading,
-      :adapter,
-      :type,
-      :context
+    attr_reader :context
 
     class << self
       attr_accessor :config
+
+      delegate :allow_sideload, to: :sideloading
+      delegate :has_many, to: :sideloading
+      delegate :has_one, to: :sideloading
+      delegate :belongs_to, to: :sideloading
+      delegate :has_and_belongs_to_many, to: :sideloading
+      delegate :polymorphic_belongs_to, to: :sideloading
+      delegate :polymorphic_has_many, to: :sideloading
     end
 
     delegate :sideload, to: :sideloading
 
-    # Incorporate custom adapter methods
-    def self.method_missing(meth, *args, &blk)
-      if sideloading.respond_to?(meth)
-        sideloading.send(meth, *args, &blk)
-      else
-        super
-      end
-    end
-
     def self.inherited(klass)
       klass.config = Util::Hash.deep_dup(self.config)
     end
 
     def self.sideloading
-      config[:sideloading] ||= Sideload.new(:base, resource: self)
+      @sideloading ||= Sideload.new(:base, resource: self)
     end
 
     def self.sideload_whitelist(whitelist)
@@ -111,23 +97,6 @@ module JsonapiCompliable
       end
     end
 
-    def copy
-      self.class.new(@config)
-    end
-
-    def initialize(config = nil)
-      config = config || self.class.config
-      config = Util::Hash.deep_dup(config)
-      set_config(config)
-    end
-
-    def set_config(config)
-      @config = config
-      config.each_pair do |key, value|
-        instance_variable_set(:"@#{key}", value)
-      end
-    end
-
     def with_context(object, namespace = nil)
       begin
         prior = context
@@ -173,20 +142,56 @@ module JsonapiCompliable
       stats_dsl.calculation(calculation)
     end
 
+    def sideloading
+      self.class.sideloading
+    end
+
     def default_sort
-      @default_sort || [{ id: :asc }]
+      self.class.config[:default_sort] || [{ id: :asc }]
     end
 
     def default_page_number
-      @default_page_number || 1
+      self.class.config[:default_page_number] || 1
     end
 
     def default_page_size
-      @default_page_size || 20
+      self.class.config[:default_page_size] || 20
     end
 
     def type
-      @type || :undefined_jsonapi_type
+      self.class.config[:type] || :undefined_jsonapi_type
+    end
+
+    def filters
+      self.class.config[:filters]
+    end
+
+    def sorting
+      self.class.config[:sorting]
+    end
+
+    def stats
+      self.class.config[:stats]
+    end
+
+    def pagination
+      self.class.config[:pagination]
+    end
+
+    def extra_fields
+      self.class.config[:extra_fields]
+    end
+
+    def sideload_whitelist
+      self.class.config[:sideload_whitelist]
+    end
+
+    def default_filters
+      self.class.config[:default_filters]
+    end
+
+    def adapter
+      self.class.config[:adapter]
     end
   end
 end

data/lib/jsonapi_compliable/sideload.rb

@@ -1,7 +1,7 @@
 module JsonapiCompliable
   class Sideload
     attr_reader :name,
-      :resource,
+      :resource_class,
       :polymorphic,
       :sideloads,
       :scope_proc,
@@ -10,12 +10,12 @@ module JsonapiCompliable
 
     def initialize(name, opts)
       @name               = name
-      @resource           = (opts[:resource] || Class.new(Resource)).new
+      @resource_class     = (opts[:resource] || Class.new(Resource))
       @sideloads          = {}
       @polymorphic        = !!opts[:polymorphic]
       @polymorphic_groups = {} if polymorphic?
 
-      extend @resource.adapter.sideloading_module
+      extend @resource_class.config[:adapter].sideloading_module
     end
 
     def polymorphic?
@@ -65,10 +65,8 @@ module JsonapiCompliable
         @sideloads.each_pair do |key, sideload|
           hash[name][key] = sideload.to_hash[key]
 
-          if sideloading = sideload.resource.sideloading
-            sideloading.sideloads.each_pair do |k, s|
-              hash[name][k] = s.to_hash[k]
-            end
+          if sideloading = sideload.resource_class.sideloading
+            hash[name][key].merge!(sideloading.to_hash[:base])
           end
         end
       end
@@ -87,7 +85,7 @@ module JsonapiCompliable
 
     def resolve_basic(parents, query, namespace)
       sideload_scope   = scope_proc.call(parents)
-      sideload_scope   = Scope.new(sideload_scope, resource, query, namespace: namespace)
+      sideload_scope   = Scope.new(sideload_scope, resource_class.new, query, namespace: namespace)
       sideload_results = sideload_scope.resolve
       assign_proc.call(parents, sideload_results)
     end

data/lib/jsonapi_compliable/stats/payload.rb

@@ -1,8 +1,8 @@
 module JsonapiCompliable
   module Stats
     class Payload
-      def initialize(dsl, query_hash, scope)
-        @dsl        = dsl
+      def initialize(resource, query_hash, scope)
+        @resource   = resource
         @query_hash = query_hash[:stats]
         @scope      = scope
       end
@@ -23,7 +23,7 @@ module JsonapiCompliable
 
       def each_calculation(name, calculations)
         calculations.each do |calc|
-          function = @dsl.stat(name, calc)
+          function = @resource.stat(name, calc)
           yield calc, function
         end
       end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable