standardapi 6.0.0.32 → 7.1.0

data/lib/standard_api/middleware/query_encoding.rb

@@ -13,8 +13,8 @@ require 'msgpack'
 module StandardAPI
   module Middleware
     class QueryEncoding
-      MSGPACK_MIME_TYPE = "application/msgpack".freeze
-      HTTP_METHOD_OVERRIDE_HEADER = "HTTP_QUERY_ENCODING".freeze
+      MSGPACK_MIME_TYPE = "application/msgpack"
+      HTTP_METHOD_OVERRIDE_HEADER = "HTTP_QUERY_ENCODING"
 
       def initialize(app)
         @app = app
@@ -31,4 +31,4 @@ module StandardAPI
 
     end
   end
-end
+end

data/lib/standard_api/middleware.rb

@@ -0,0 +1,5 @@
+module StandardAPI
+  module Middleware
+    autoload :QueryEncoding, 'standard_api/middleware/query_encoding'
+  end
+end

data/lib/standard_api/railtie.rb

@@ -1,12 +1,40 @@
 module StandardAPI
   class Railtie < ::Rails::Railtie
 
-    initializer 'standardapi' do
+    initializer 'standardapi', :before => :set_autoload_paths do |app|
+      if app.root.join('app', 'controllers', 'acl').exist?
+        ActiveSupport::Inflector.inflections(:en) do |inflect|
+          inflect.acronym 'ACL'
+        end
+
+        app.config.autoload_paths << app.root.join('app', 'controllers', 'acl').to_s
+      end
+
+      ActiveSupport.on_load(:before_configuration) do
+        ::ActionDispatch::Routing::Mapper.send :include, StandardAPI::RouteHelpers
+      end
+
       ActiveSupport.on_load(:action_view) do
         ::ActionView::Base.send :include, StandardAPI::Helpers
-        ::ActionDispatch::Routing::Mapper.send :include, StandardAPI::RouteHelpers
       end
     end
 
   end
+  
+  module AutosaveByDefault
+    def self.included base
+      base.class_eval do
+        class <<self  
+          alias_method :standard_build, :build
+        end
+      
+        def self.build(model, name, scope, options, &block)
+          options[:autosave] = true
+          standard_build(model, name, scope, options, &block)
+        end
+      end
+    end
+  end
+
+  ::ActiveRecord::Associations::Builder::Association.include(AutosaveByDefault)
 end

data/lib/standard_api/route_helpers.rb

@@ -1,10 +1,10 @@
 module StandardAPI
   module RouteHelpers
-    
+
     # StandardAPI wrapper for ActionDispatch::Routing::Mapper::Resources#resources
     #
     # Includes the following routes
-    #   
+    #
     #   GET /schema
     #   GET /calculate
     #
@@ -20,20 +20,47 @@ module StandardAPI
     #   end
     def standard_resources(*resources, &block)
       options = resources.extract_options!.dup
-      
+
       resources(*resources, options) do
-        get :schema, on: :collection
-        get :calculate, on: :collection
-        delete ':relationship/:resource_id' => :remove_resource, on: :member
-        post ':relationship/:resource_id' => :add_resource, on: :member
-        block.call if block
+        block.call if block # custom routes take precedence over standardapi routes
+
+        available_actions = if only = parent_resource.instance_variable_get(:@only)
+          Array(only).map(&:to_sym)
+        else
+          if parent_resource.instance_variable_get(:@api_only)
+            [:index, :create, :show, :update, :destroy]
+          else
+            [:index, :create, :new, :show, :update, :destroy, :edit]
+          end + [ :schema, :calculate, :add_resource, :remove_resource, :create_resource ]
+        end
+
+        actions = if except = parent_resource.instance_variable_get(:@except)
+          available_actions - Array(except).map(&:to_sym)
+        else
+          available_actions
+        end
+
+        get :schema, on: :collection if actions.include?(:schema)
+        get :calculate, on: :collection if actions.include?(:calculate)
+
+        if actions.include?(:add_resource)
+          post ':relationship/:resource_id' => :add_resource, on: :member
+        end
+        
+        if actions.include?(:create_resource)
+          post ':relationship' => :create_resource, on: :member
+        end
+
+        if actions.include?(:remove_resource)
+          delete ':relationship/:resource_id' => :remove_resource, on: :member
+        end
       end
     end
 
     # StandardAPI wrapper for ActionDispatch::Routing::Mapper::Resources#resource
     #
     # Includes the following routes
-    #   
+    #
     #   GET /schema
     #   GET /calculate
     #
@@ -49,12 +76,35 @@ module StandardAPI
     #   end
     def standard_resource(*resource, &block)
       options = resource.extract_options!.dup
-      
+
       resource(*resource, options) do
-        get :schema, on: :collection
-        get :calculate, on: :collection
-        delete ':relationship/:resource_id' => :remove_resource, on: :member
-        post ':relationship/:resource_id' => :add_resource, on: :member
+        available_actions = if only = parent_resource.instance_variable_get(:@only)
+          Array(only).map(&:to_sym)
+        else
+          if parent_resource.instance_variable_get(:@api_only)
+            [:index, :create, :show, :update, :destroy]
+          else
+            [:index, :create, :new, :show, :update, :destroy, :edit]
+          end + [ :schema, :calculate, :add_resource, :remove_resource ]
+        end
+
+        actions = if except = parent_resource.instance_variable_get(:@except)
+          available_actions - Array(except).map(&:to_sym)
+        else
+          available_actions
+        end
+
+        get :schema, on: :collection if actions.include?(:schema)
+        get :calculate, on: :collection if actions.include?(:calculate)
+
+        if actions.include?(:add_resource)
+          post ':relationship/:resource_id' => :add_resource, on: :member
+        end
+
+        if actions.include?(:remove_resource)
+          delete ':relationship/:resource_id' => :remove_resource, on: :member
+        end
+
         block.call if block
       end
     end

data/lib/standard_api/test_case/calculate_tests.rb

@@ -26,8 +26,14 @@ module StandardAPI
         calculations = @controller.instance_variable_get('@calculations')
         expectations = selects.map { |s| model.send(s.keys.first, column.name) }
         expectations = [expectations] if expectations.length > 1
-        assert_equal expectations,
-          calculations
+
+        if math_column
+          assert_equal expectations.map { |a| a.map { |b| b.round(9) } },
+            calculations.map { |a| a.map { |b| b.round(9) } }
+        else
+          assert_equal expectations.map { |b| b.round(9) },
+            calculations.map { |b| b.round(9) }
+        end
       end
 
       test '#calculate.json params[:where]' do
@@ -53,22 +59,23 @@ module StandardAPI
         #   calculations
       end
 
-      test '#calculate.json mask' do
+      test '#calculate.json mask_for' do
         # This is just to instance @controller
         get resource_path(:calculate)
 
-        # If #current_mask isn't defined by StandardAPI we don't know how to
-        # test other's implementation of #current_mask. Return and don't test.
-        return if @controller.method(:current_mask).owner != StandardAPI
+        # If #mask isn't defined by StandardAPI we don't know how to
+        # test other's implementation of #mask_for. Return and don't test.
+        return if @controller.method(:mask_for).owner != StandardAPI
 
         m = create_model
 
-        @controller.current_mask[plural_name] = { id: m.id + 100 }
+        @controller.define_singleton_method(:mask_for) do |table_name|
+          { id: m.id + 100 }
+        end
         selects = [{ count: :id}, { maximum: :id }, { minimum: :id }, { average: :id }]
         get :calculate, select: selects, format: 'json'
         assert_response :ok
         assert_equal [[0, nil, nil, nil]], @controller.instance_variable_get('@calculations')
-        @controller.current_mask.delete(plural_name)
       end
 
     end

data/lib/standard_api/test_case/create_tests.rb

@@ -22,7 +22,7 @@ module StandardAPI
           json = JSON.parse(response.body)
           assert json.is_a?(Hash)
 
-          view_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
+          create_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
             message = "Model / Attribute: #{m.class.name}##{key}"
             if value.is_a?(BigDecimal)
               assert_equal_or_nil normalize_to_json(m, key, attrs[key.to_sym]).to_s.to_f, json[key.to_s].to_s.to_f, message
@@ -53,9 +53,9 @@ module StandardAPI
           json = JSON.parse(response.body)
           assert json.is_a?(Hash)
           m.reload
-          view_attributes(m).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
+          create_attributes(m).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
             message = "Model / Attribute: #{m.class.name}##{key}"
-            assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), value, message
+            assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), normalize_attribute(m, key, value), message
           end
         end
       end
@@ -64,8 +64,7 @@ module StandardAPI
         trait = FactoryBot.factories[singular_name].definition.defined_traits.any? { |x| x.name.to_s == 'invalid' }
 
         if !trait
-          Rails.logger.try(:warn, "No invalid trait for #{model.name}. Skipping invalid tests")
-          warn("No invalid trait for #{model.name}. Skipping invalid tests")
+          skip("No invalid trait for #{model.name}. Skipping invalid tests")
           return
         end
 
@@ -106,8 +105,7 @@ module StandardAPI
         trait = FactoryBot.factories[singular_name].definition.defined_traits.any? { |x| x.name.to_s == 'invalid' }
 
         if !trait
-          Rails.logger.try(:warn, "No invalid trait for #{model.name}. Skipping invalid tests")
-          warn("No invalid trait for #{model.name}. Skipping invalid tests")
+          skip("No invalid trait for #{model.name}. Skipping invalid tests")
           return
         end
 
@@ -146,7 +144,7 @@ module StandardAPI
               next if !association
 
               if ['belongs_to', 'has_one'].include?(association.macro.to_s)
-                view_attributes(m.send(included)) do |key, value|
+                create_attributes(m.send(included)) do |key, value|
                   assert_equal json[included.to_s][key.to_s], normalize_to_json(m, key, value)
                 end
               else
@@ -160,7 +158,7 @@ module StandardAPI
                   nil
                 end
 
-                view_attributes(m2).each do |key, value|
+                create_attributes(m2).each do |key, value|
                   message = "Model / Attribute: #{m2.class.name}##{key}"
                   if m_json[key.to_s].nil?
                     assert_nil normalize_to_json(m2, key, value), message

data/lib/standard_api/test_case/destroy_tests.rb

@@ -13,23 +13,35 @@ module StandardAPI
         end
       end
 
-      test '#destroy.json mask' do
+      test '#destroy.json mask_for' do
         m = create_model
 
         # This is just to instance @controller
         get resource_path(:show, id: m.id, format: 'json')
 
-        # If #current_mask isn't defined by StandardAPI we don't know how to
-        # test other's implementation of #current_mask. Return and don't test.
-        return if @controller.method(:current_mask).owner != StandardAPI
+        # If #mask_for isn't defined by StandardAPI we don't know how to
+        # test other's implementation of #mask_for. Return and don't test.
+        return if @controller.method(:mask_for).owner != StandardAPI
 
-        @controller.current_mask[plural_name] = { id: m.id + 1 }
+        @controller.define_singleton_method(:mask_for) do |table_name|
+          { id: m.id + 1 }
+        end
         assert_raises(ActiveRecord::RecordNotFound) do
           delete resource_path(:destroy, id: m.id, format: :json)
         end
-        @controller.current_mask.delete(plural_name)
       end
 
+      test '#destroy.json with comma separated ids' do
+        m1 = create_model
+        m2 = create_model
+        m3 = create_model
+
+        assert_difference("#{model.name}.count", -3) do
+          delete resource_path(:destroy, id: "#{m1.id},#{m2.id},#{m3.id}", format: :json)
+          assert_response :no_content
+          assert_equal '', response.body
+        end
+      end
     end
   end
-end
+end

data/lib/standard_api/test_case/index_tests.rb

@@ -69,9 +69,12 @@ module StandardAPI
       end
 
       test '#index.json params[:include]' do
+        next if includes.empty?
+
         travel_to Time.now do
           create_model
           get resource_path(:index, format: :json), params: { limit: 100, include: includes }
+          assert_response :ok
 
           json = JSON.parse(response.body)[0]
           assert json.is_a?(Hash)
@@ -114,20 +117,21 @@ module StandardAPI
         end
       end
 
-      test '#index.json mask' do
+      test '#index.json mask_for' do
         # This is just to instance @controller
         get resource_path(:index, format: :json), params: { limit: 1 }
 
-        # If #current_mask isn't defined by StandardAPI we don't know how to
-        # test other's implementation of #current_mask. Return and don't test.
-        return if @controller.method(:current_mask).owner != StandardAPI
+        # If #mask_for isn't defined by StandardAPI we don't know how to
+        # test other's implementation of #mask_for. Return and don't test.
+        return if @controller.method(:mask_for).owner != StandardAPI
 
         m = create_model
-        @controller.current_mask[plural_name] = { id: m.id }
+        @controller.define_singleton_method(:mask_for) do |table_name|
+          { id: m.id }
+        end
         get :index, format: :json
         models = @controller.instance_variable_get("@#{plural_name}")
         assert_equal model.where(id: m.id).sort(required_orders).to_sql, models.to_sql
-        @controller.current_mask.delete(plural_name)
       end
     end
   end

data/lib/standard_api/test_case/schema_tests.rb

@@ -18,7 +18,13 @@ module StandardAPI
           assert_equal_or_nil column.null, actual_column['null']
           assert_equal_or_nil column.array, actual_column['array']
           assert_equal_or_nil column.comment, actual_column['comment']
-          assert_equal_or_nil (column.default || column.default_function), actual_column['default']
+
+          if column.default
+            default = model.connection.lookup_cast_type_from_column(column).deserialize(column.default)
+            assert_equal default, actual_column['default']
+          else
+            assert_nil column.default
+          end
         end
 
         assert json['limit']

data/lib/standard_api/test_case/show_tests.rb

@@ -15,6 +15,7 @@ module StandardAPI
       test '#show.json params[:include]' do
         m = create_model
         get resource_path(:show, id: m.id, include: includes, format: :json)
+        assert_response :ok
 
         json = JSON.parse(response.body)
         includes.each do |included|
@@ -51,22 +52,22 @@ module StandardAPI
         end
       end
 
-      test '#show.json mask' do
+      test '#show.json mask_for' do
         m = create_model
 
         # This is just to instance @controller
         get resource_path(:show, id: m.id, format: :json)
 
-        # If #current_mask isn't defined by StandardAPI we don't know how to
-        # test other's implementation of #current_mask. Return and don't test.
-        return if @controller.method(:current_mask).owner != StandardAPI
-
+        # If #mask_for isn't defined by StandardAPI we don't know how to
+        # test other's implementation of #mask_for. Return and don't test.
+        return if @controller.method(:mask_for).owner != StandardAPI
 
-        @controller.current_mask[plural_name] = { id: m.id + 1 }
+        @controller.define_singleton_method(:mask_for) do |table_name|
+          { id: m.id + 1 }
+        end
         assert_raises(ActiveRecord::RecordNotFound) do
           get resource_path(:show, id: m.id, format: :json)
         end
-        @controller.current_mask.delete(plural_name)
       end
 
     end

data/lib/standard_api/test_case/update_tests.rb

@@ -16,7 +16,7 @@ module StandardAPI
         put resource_path(:update, :id => m.id, format: format), params: { singular_name => attrs }, as: as
         assert_response :ok, "Updating #{m.class.name} with #{attrs.inspect}"
 
-        view_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
+        update_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
           message = "Model / Attribute: #{m.class.name}##{key}"
           if value.is_a?(BigDecimal)
             assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]).to_s.to_f, value.to_s.to_f, message
@@ -34,7 +34,7 @@ module StandardAPI
         get resource_path(:show, id: m.id), as: :json
 
         return if @controller.method(:update).owner != StandardAPI
-        
+
         attrs = attributes_for(singular_name).select{|k,v| !model.readonly_attributes.include?(k.to_s) }
         create_webmocks(attrs)
 
@@ -57,9 +57,9 @@ module StandardAPI
         assert_response :ok, "Updating #{m.class.name} with #{attrs.inspect}"
 
         # (m.attribute_names & attrs.keys.map(&:to_s)).each do |test_key|
-        view_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
+        update_attributes(m.reload).select { |x| attrs.keys.map(&:to_s).include?(x) }.each do |key, value|
           message = "Model / Attribute: #{m.class.name}##{key}"
-          assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), value, message
+          assert_equal_or_nil normalize_attribute(m, key, attrs[key.to_sym]), normalize_attribute(m, key, value), message
         end
         assert JSON.parse(@response.body).is_a?(Hash)
       end
@@ -68,8 +68,7 @@ module StandardAPI
         trait = FactoryBot.factories[singular_name].definition.defined_traits.any? { |x| x.name.to_s == 'invalid' }
 
         if !trait
-          Rails.logger.try(:warn, "No invalid trait for #{model.name}. Skipping invalid tests")
-          warn("No invalid trait for #{model.name}. Skipping invalid tests")
+          skip("No invalid trait for #{model.name}. Skipping invalid tests")
           return
         end
 
@@ -94,7 +93,7 @@ module StandardAPI
 
           put resource_path(:update, :id => m.id, format: format), params: { include: includes, singular_name => attrs }, as: as
           assert_response :ok, "Updating #{m.class.name} with #{attrs.inspect}"
-        
+
           controller_model = @controller.instance_variable_get("@#{singular_name}")
           json = JSON.parse(response.body)
           includes.each do |included|
@@ -104,7 +103,7 @@ module StandardAPI
             next if !association
 
             if ['belongs_to', 'has_one'].include?(association.macro.to_s)
-              view_attributes(controller_model.send(included)) do |key, value|
+              update_attributes(controller_model.send(included)) do |key, value|
                 message = "Model / Attribute: #{controller_model.send(included).class.name}##{key}"
                 assert_equal json[included.to_s][key.to_s], value, message
               end
@@ -118,7 +117,7 @@ module StandardAPI
                 nil
               end
 
-              view_attributes(m).each do |key, value|
+              update_attributes(m).each do |key, value|
                 message = "Model / Attribute: #{m.class.name}##{key}"
                 if m_json[key.to_s].nil?
                   assert_nil normalize_to_json(m, key, value), message
@@ -132,21 +131,22 @@ module StandardAPI
         end
       end
 
-      test '#update.json mask' do
+      test '#update.json mask_for' do
         m = create_model
 
         # This is just to instance @controller
         get resource_path(:index, format: :json), params: { limit: 1 }
 
-        # If #current_mask isn't defined by StandardAPI we don't know how to
-        # test other's implementation of #current_mask. Return and don't test.
-        return if @controller.method(:current_mask).owner != StandardAPI
+        # If #mask_for isn't defined by StandardAPI we don't know how to
+        # test other's implementation of #mask_for. Return and don't test.
+        return if @controller.method(:mask_for).owner != StandardAPI
 
-        @controller.current_mask[plural_name] = { id: m.id + 1 }
+        @controller.define_singleton_method(:mask_for) do |table_name|
+          { id: m.id + 1 }
+        end
         assert_raises(ActiveRecord::RecordNotFound) do
           put resource_path(:update, :id => m.id), as: :json
         end
-        @controller.current_mask.delete(plural_name)
       end
 
     end

data/lib/standard_api/test_case.rb

@@ -25,8 +25,7 @@ module StandardAPI::TestCase
     end
 
     begin
-      model_class_name = klass.name.gsub(/ControllerTest$/, '').singularize
-      model_class = model_class_name.constantize
+      model_class = klass.name.gsub(/Test$/, '').constantize.model
 
       klass.send(:filters=, model_class.attribute_names)
       klass.send(:orders=, model_class.attribute_names)
@@ -138,8 +137,19 @@ module StandardAPI::TestCase
 
   def view_attributes(record)
     return [] if record.nil?
-    record.attributes.select { |x| !@controller.send(:excludes_for, record.class).include?(x.to_sym) }
+    record.attributes.select do |x|
+      !@controller.send(:excludes_for, record.class).include?(x.to_sym)
+    end
+  end
+
+  def update_attributes(record)
+    return [] if record.nil?
+    record.attributes.select do |x|
+      !record.class.readonly_attributes.include?(x.to_s) &&
+      !@controller.send(:excludes_for, record.class).include?(x.to_sym)
+    end
   end
+  alias_method :create_attributes, :update_attributes
 
   module ClassMethods
 

data/lib/standard_api/version.rb

@@ -1,3 +1,3 @@
 module StandardAPI
-  VERSION = '6.0.0.32'
+  VERSION = '7.1.0'
 end

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

@@ -1,26 +1,27 @@
-record.attributes.each do |name, value|
+record.attribute_names.each do |name|
   # Skip if attribute is included in excludes
-  next if defined?(excludes) && excludes[record.model_name.singular.to_sym].try(:find) { |x| x.to_s == name.to_s }
-  json.set! name, value
+  next if defined?(excludes) && excludes[record.model_name.singular.to_sym].try(:find) { |x| x.to_s == name }
+
+  serialize_attribute(json, record, name, record.type_for_attribute(name).type)
 end
 
 includes.each do |inc, subinc|
   next if ["limit", "offset", "order", "when", "where", "distinct", "distinct_on"].include?(inc)
 
-
   case association = record.class.reflect_on_association(inc)
   when ActiveRecord::Reflection::AbstractReflection
     if association.collection?
-      can_cache = can_cache_relation?(record.class, inc, subinc)
-      json.cache_if!(can_cache, can_cache ? association_cache_key(record, inc, subinc) : nil) do
-        partial = model_partial(association.klass)
-        json.set! inc do
+      can_cache = can_cache_relation?(record, inc, subinc)
+      json.set! inc do
+        json.cache_if!(can_cache, can_cache ? association_cache_key(record, inc, subinc) : nil) do
+          partial = model_partial(association.klass)
+
           # TODO limit causes preloaded assocations to reload
           sub_records = record.send(inc)
 
           sub_records = sub_records.limit(subinc['limit']) if subinc['limit']
           sub_records = sub_records.offset(subinc['offset']) if subinc['offset']
-          sub_records = sub_records.order(subinc['order']) if subinc['order']
+          sub_records = sub_records.reorder(subinc['order']) if subinc['order']
           sub_records = sub_records.filter(subinc['where']) if subinc['where']
           sub_records = sub_records.distinct if subinc['distinct']
           sub_records = sub_records.distinct_on(subinc['distinct_on']) if subinc['distinct_on']
@@ -29,17 +30,17 @@ includes.each do |inc, subinc|
         end
       end
     else
-      can_cache = can_cache_relation?(record.class, inc, subinc)
+      can_cache = can_cache_relation?(record, inc, subinc)
       if association.is_a?(ActiveRecord::Reflection::BelongsToReflection)
         can_cache = can_cache && !record.send(association.foreign_key).nil?
       end
-      json.cache_if!(can_cache, can_cache ? association_cache_key(record, inc, subinc) : nil) do
-        value = record.send(inc)
-        if value.nil?
-          json.set! inc, nil
-        else
-          partial = model_partial(value)
-          json.set! inc do
+      json.set! inc do
+        json.cache_if!(can_cache, can_cache ? association_cache_key(record, inc, subinc) : nil) do
+          value = record.send(inc)
+          if value.nil?
+            json.null!
+          else
+            partial = model_partial(value)
             json.partial! partial, partial.split('/').last.to_sym => value, includes: subinc
           end
         end