standardapi 6.0.0 → 6.0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81dc01aaad4d3d573a00b241af7c7d4134bc0f9e0c5aae9474cec5b854e000a0
-  data.tar.gz: fd49e0bfdb1f9c264616dfe64ef84d5f1ae1cd2bab6f7be267d8c1c449085a67
+  metadata.gz: c628d369e270f41efcedd26602fee435cd4d7b58b80522e982b842fdac0e2f4c
+  data.tar.gz: 34ecda61518319d65c0b0a88eb257212dd29f828db15acfd35e39c9af49eff71
 SHA512:
-  metadata.gz: 294677d3823d9adbe74f1f91ee7da3b17590dceab4c1c7ef2279f95d377dfd65e7d73a4be8a6950f205f1f4f3f7b755f948c85938d39220fcdff286fabf4a714
-  data.tar.gz: bde0392349330cf02767e0233b1e878960bdcc5402e503306035e1e8b966d2d604c3afe1fa3cc863aaf214f4b4bdf1b817881438694b21a423b843a633b7292c
+  metadata.gz: 4f1739fa09be7bcc2b339d1714fa2f327861e39aa04228a287a16ad94e7aab0b3625173ec012b2f0653c6c0cfcf9c92f7ceaaeaadc5477afc0c7444570a84d3a
+  data.tar.gz: 8214eeb03cff6d51051e40da9438392b92d1a08a0b09f022f35b9e2028c9c384afbeba7c1975a48ac6e6537d6d3e33aac0c19725ded76c96e18aae85a66ffa8a

data/lib/standard_api/controller.rb

@@ -72,7 +72,7 @@ module StandardAPI
       record = resources.find(params[:id])
       instance_variable_set("@#{model.model_name.singular}", record)
 
-      if record.update_attributes(model_params)
+      if record.update(model_params)
         if request.format == :html
           redirect_to url_for(
             controller: record.class.base_class.model_name.collection,
@@ -155,7 +155,7 @@ module StandardAPI
     end
 
     def resources
-      query = model.filter(params[:where]).filter(current_mask[model.table_name])
+      query = model.filter(params['where']).filter(current_mask[model.table_name])
       
       if params[:distinct_on]
         query = query.distinct_on(params[:distinct_on])
@@ -187,8 +187,10 @@ module StandardAPI
           when true
             preloads[key] = value
           when Hash, ActiveSupport::HashWithIndifferentAccess
-            if !value.keys.any? { |x| ['where', 'limit', 'offset', 'order', 'distinct'].include?(x) }
-              preloads[key] = preloadables_hash(reflection.klass, value)
+            if !value.keys.any? { |x| ['when', 'where', 'limit', 'offset', 'order', 'distinct'].include?(x) }
+              if !reflection.polymorphic?
+                preloads[key] = preloadables_hash(reflection.klass, value)
+              end
             end
           end
         end
@@ -206,8 +208,10 @@ module StandardAPI
           when true
             preloads[key] = value
           when Hash, ActiveSupport::HashWithIndifferentAccess
-            if !value.keys.any? { |x| ['where', 'limit', 'offset', 'order', 'distinct'].include?(x) }
-              preloads[key] = preloadables_hash(reflection.klass, value)
+            if !value.keys.any? { |x| ['when', 'where', 'limit', 'offset', 'order', 'distinct'].include?(x) }
+              if !reflection.polymorphic?
+                preloads[key] = preloadables_hash(reflection.klass, value)
+              end
             end
           end
         end
@@ -303,7 +307,7 @@ module StandardAPI
           
           column = column == '*' ? Arel.star : column.to_sym
           if functions.include?(func.to_s.downcase)
-            @selects << ((@model || model).arel_table[column].send(func))
+            @selects << ((defined?(@model) ? @model : model).arel_table[column].send(func))
           end
         end
       end

data/lib/standard_api/helpers.rb

@@ -23,7 +23,7 @@ module StandardAPI
       if includes.empty?
         record.cache_key(*timestamp_keys)
       else
-        timestamp = record.send(:max_updated_column_timestamp, timestamp_keys)
+        timestamp = timestamp_keys.map { |attr| record[attr]&.to_time }.compact.max
         "#{record.model_name.cache_key}/#{record.id}-#{digest_hash(sort_hash(includes))}-#{timestamp.utc.to_s(record.cache_timestamp_format)}"
       end
     end
@@ -58,7 +58,7 @@ module StandardAPI
     end
     
     def cached_at_columns_for_includes(includes)
-      includes.select { |k,v| ![:where, :limit, :order, :distinct].include?(k.to_sym) }.map do |k, v|
+      includes.select { |k,v| !['when', 'where', 'limit', 'order', 'distinct'].include?(k) }.map do |k, v|
         ["#{k}_cached_at"] + cached_at_columns_for_includes(v).map { |v2| "#{k}_#{v2}" }
       end.flatten
     end

data/lib/standard_api/includes.rb

@@ -17,7 +17,7 @@ module StandardAPI
         includes.flatten.compact.each { |v| normalized.merge!(normalize(v)) }
       when Hash, ActionController::Parameters
         includes.each_pair do |k, v|
-          if ['where', 'order'].include?(k.to_s) # Where and order are not normalized (sanitation happens in activerecord-filter)
+          if ['limit', 'when', 'where', 'order'].include?(k.to_s) # Where and order are not normalized (sanitation happens in activerecord-filter)
             normalized[k] = case v
             when Hash then v.to_h
             when ActionController::Parameters then v.to_unsafe_h
@@ -58,7 +58,7 @@ module StandardAPI
 
       permit = normalize(permit.with_indifferent_access)
       includes.each do |k, v|
-        if permit.has_key?(k) || ['where', 'order', 'distinct'].include?(k.to_s)
+        if permit.has_key?(k) || ['limit', 'when', 'where', 'order', 'distinct'].include?(k.to_s)
           permitted[k] = sanitize(v, permit[k] || {}, true)
         else
           if [:raise, nil].include?(Rails.configuration.try(:action_on_unpermitted_includes))

data/lib/standard_api/orders.rb

@@ -15,7 +15,14 @@ module StandardAPI
             key2, key3 = *key.to_s.split('.')
             permitted << sanitize({key2.to_sym => { key3.to_sym => value } }, permit)
           elsif permit.include?(key.to_s)
-            value = value.to_unsafe_hash.symbolize_keys if value.is_a?(Hash) || value.is_a?(ActionController::Parameters)
+            case value
+            when Hash
+              value
+            when ActionController::Parameters
+              value.to_unsafe_hash
+            else
+              value
+            end
             permitted << { key.to_sym => value }
           elsif permit.find { |x| (x.is_a?(Hash) || x.is_a?(ActionController::Parameters)) && x.has_key?(key.to_s) }
             subpermit = permit.find { |x| (x.is_a?(Hash) || x.is_a?(ActionController::Parameters)) && x.has_key?(key.to_s) }[key.to_s]

data/lib/standard_api/test_case/index_tests.rb

@@ -90,7 +90,7 @@ module StandardAPI
                 assert_equal json[included.to_s][key.to_s], normalize_to_json(m, key, value), message
               end
             else
-              m = models.first.send(included).first.try(:reload)
+              m = models.find { |x| json['id'] == normalize_to_json(x, 'id', x.id) }.send(included).first.try(:reload)
 
               m_json = if m && m.has_attribute?(:id)
                 json[included.to_s].find { |x| x['id'] == normalize_to_json(m, :id, m.id) }

data/lib/standard_api/version.rb

@@ -1,3 +1,3 @@
 module StandardAPI
-  VERSION = '6.0.0'
+  VERSION = '6.0.0.9'
 end

data/lib/standard_api/views/application/_record.json.jbuilder

@@ -5,7 +5,7 @@ record.attributes.each do |name, value|
 end
 
 includes.each do |inc, subinc|
-  next if [:where, :order, :limit].include?(inc.to_sym)
+  next if ["limit", "offset", "order", "when", "where"].include?(inc)
   
   case association = record.class.reflect_on_association(inc)
   when ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection, ActiveRecord::Reflection::ThroughReflection
@@ -14,18 +14,17 @@ includes.each do |inc, subinc|
       partial = model_partial(association.klass)
       json.set! inc do
         # TODO limit causes preloaded assocations to reload
-        if subinc.keys.any? { |x| ['where', 'limit', 'offset', 'order'].include?(x) }
-          if subinc[:distinct]
-            json.array! record.send(inc).filter(subinc[:where]).limit(subinc[:limit]).sort(subinc[:order]).distinct_on(subinc[:distinct]), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
+        if subinc.keys.any? { |x| ["limit", "offset", "order", "when", "where"].include?(x) }
+          if subinc['distinct']
+            json.array! record.send(inc).filter(subinc['where']).limit(subinc['limit']).sort(subinc['order']).distinct_on(subinc['distinct']), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
           else
-            json.array! record.send(inc).filter(subinc[:where]).limit(subinc[:limit]).sort(subinc[:order]).distinct, partial: partial, as: partial.split('/').last, locals: { includes: subinc }
+            json.array! record.send(inc).filter(subinc['where']).limit(subinc['limit']).sort(subinc['order']).distinct, partial: partial, as: partial.split('/').last, locals: { includes: subinc }
           end
         else
           json.array! record.send(inc), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
         end
       end
     end
-  
   when ActiveRecord::Reflection::BelongsToReflection, ActiveRecord::Reflection::HasOneReflection
     can_cache = can_cache_relation?(record.class, inc, subinc)
     if association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
@@ -42,7 +41,6 @@ includes.each do |inc, subinc|
         end
       end
     end
-    
   else
     if record.respond_to?(inc)
       value = record.send(inc)
@@ -65,4 +63,4 @@ if !record.errors.blank?
   errs = record.errors.to_hash
   errs.default_proc = nil
   json.set! 'errors', errs
-end
+end

data/lib/standard_api/views/application/_record.streamer

@@ -7,8 +7,8 @@ json.object! do
   end
 
   includes.each do |inc, subinc|
-    next if [:where, :order, :limit].include?(inc.to_sym)
-  
+    next if ["limit", "offset", "order", "when", "where"].include?(inc)
+    
     case association = record.class.reflect_on_association(inc)
     when ActiveRecord::Reflection::HasManyReflection, ActiveRecord::Reflection::HasAndBelongsToManyReflection, ActiveRecord::Reflection::ThroughReflection
       can_cache = can_cache_relation?(record.class, inc, subinc)
@@ -16,18 +16,17 @@ json.object! do
         partial = model_partial(association.klass)
         json.set! inc do
           # TODO limit causes preloaded assocations to reload
-          if subinc.keys.any? { |x| ['where', 'limit', 'offset', 'order'].include?(x) }
-            if subinc[:distinct]
-              json.array! record.send(inc).filter(subinc[:where]).limit(subinc[:limit]).sort(subinc[:order]).distinct_on(subinc[:distinct]), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
+          if subinc.keys.any? { |x| ["limit", "offset", "order", "when", "where"].include?(x) }
+            if subinc['distinct']
+              json.array! record.send(inc).filter(subinc['where']).limit(subinc['limit']).sort(subinc['order']).distinct_on(subinc['distinct']), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
             else
-              json.array! record.send(inc).filter(subinc[:where]).limit(subinc[:limit]).sort(subinc[:order]).distinct, partial: partial, as: partial.split('/').last, locals: { includes: subinc }
+              json.array! record.send(inc).filter(subinc['where']).limit(subinc['limit']).sort(subinc['order']).distinct, partial: partial, as: partial.split('/').last, locals: { includes: subinc }
             end
           else
             json.array! record.send(inc), partial: partial, as: partial.split('/').last, locals: { includes: subinc }
           end
         end
       end
-  
     when ActiveRecord::Reflection::BelongsToReflection, ActiveRecord::Reflection::HasOneReflection
       can_cache = can_cache_relation?(record.class, inc, subinc)
       if association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
@@ -44,7 +43,6 @@ json.object! do
           end
         end
       end
-    
     else
       if record.respond_to?(inc)
         value = record.send(inc)
@@ -60,13 +58,13 @@ json.object! do
         end
       end
     end
-  
+    
   end
-
+  
   if !record.errors.blank?
     errs = record.errors.to_hash
     errs.default_proc = nil
     json.set! 'errors', errs
   end
   
-end
+end

data/lib/standard_api/views/application/index.json.jbuilder

@@ -5,12 +5,32 @@ end
 if !includes.empty? && can_cache?(model, includes)
   partial = model_partial(model)
   record_name = partial.split('/').last.to_sym
-  locals = { record_name => nil, :includes => includes }
 
   json.cache_collection! instance_variable_get("@#{model.model_name.plural}"), key: proc { |record| cache_key(record, includes) } do |record|
-    locals[record_name] = record
+    locals = { record: record, record_name => record, :includes => includes }
     json.partial! partial, locals
   end
 else
-  json.array! instance_variable_get("@#{model.model_name.plural}"), partial: model_partial(model), as: model_partial(model).split('/').last, includes: includes
+  partial = model_partial(model)
+  record_name = partial.split('/').last.to_sym
+  json.array!(instance_variable_get("@#{model.model_name.plural}")) do |record|
+    sub_includes = includes.select do |key, value|
+      case value
+      when Hash, ActionController::Parameters
+        if value.has_key?('when')
+          value['when'].all? { |k, v| record.send(k).as_json == v }
+        else
+          true
+        end
+      else
+        true
+      end
+    end
+
+    json.partial! partial, {
+      record: record,
+      record_name => record,
+      includes: sub_includes
+    }
+  end
 end

data/lib/standard_api/views/application/index.streamer

@@ -5,12 +5,34 @@ end
 if !includes.empty? && can_cache?(model, includes)
   partial = model_partial(model)
   record_name = partial.split('/').last.to_sym
-  locals = { record_name => nil, :includes => includes }
   
   json.cache_collection! instance_variable_get("@#{model.model_name.plural}"), key: proc {|record| cache_key(record, includes) } do |record|
-    locals[record_name] = record
+    locals = { record: record, record_name => record, :includes => includes }
     json.partial! partial, locals
   end
 else
-  json.array! instance_variable_get("@#{model.model_name.plural}"), partial: model_partial(model), as: model_partial(model).split('/').last, includes: includes
+  partial = model_partial(model)
+  record_name = partial.split('/').last.to_sym
+  json.array! do
+    instance_variable_get("@#{model.model_name.plural}").each do |record|
+      sub_includes = includes.select do |key, value|
+        case value
+        when Hash, ActionController::Parameters
+          if value.has_key?('when')
+            value['when'].all? { |k, v| record.send(k).as_json == v }
+          else
+            true
+          end
+        else
+          true
+        end
+      end
+
+      json.partial! partial, {
+        record: record,
+        record_name => record,
+        includes: sub_includes
+      }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.0.9
 platform: ruby
 authors:
 - James Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-30 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord-sort
   requirement: !ruby/object:Gem::Requirement