standardapi 6.0.0.26 → 6.1.0

data/test/standard_api/test_app.rb

@@ -37,6 +37,7 @@ require 'standard_api/test_app/controllers'
 # Test Application Routes
 Rails.application.routes.draw do
   get :tables, to: 'application#tables', as: :tables
+  get :schema, to: 'application#schema', as: :schema
 
   [:properties, :photos, :documents, :references, :sessions, :unlimited, :default_limit].each do |r|
     standard_resources r

data/test/standard_api/test_app/app/controllers/acl/account_acl.rb

@@ -0,0 +1,15 @@
+module AccountACL
+
+  def attributes
+    [ "property_id", "name" ]
+  end
+
+  def orders
+    [ "id" ]
+  end
+
+  def includes
+    [ "photos", "subject", "property" ]
+  end
+
+end

data/test/standard_api/test_app/app/controllers/acl/property_acl.rb

@@ -0,0 +1,27 @@
+module PropertyACL
+
+  def attributes
+    [ :name,
+      :aliases,
+      :description,
+      :constructed,
+      :size,
+      :active
+      # :photos_attributes,
+      # { photos_attributes: [ :id, :account_id, :property_id, :format] }
+    ]
+  end
+
+  def orders
+    ["id", "name", "aliases", "description", "constructed", "size", "created_at", "active"]
+  end
+
+  def includes
+    [ :photos, :landlord, :english_name, :document ]
+  end
+
+  def nested
+    [ :photos ]
+  end
+
+end

data/test/standard_api/test_app/app/controllers/acl/reference_acl.rb

@@ -0,0 +1,7 @@
+module ReferenceACL
+
+  def includes
+    { subject: [ :landlord, :photos ] }
+  end
+
+end

data/test/standard_api/test_app/controllers.rb

@@ -1,77 +1,45 @@
 class ApplicationController < ActionController::Base
   include StandardAPI::Controller
+  include StandardAPI::AccessControlList
   prepend_view_path File.join(File.dirname(__FILE__), 'views')
 
-  private
-
-  def account_params
-    [ "property_id", "name" ]
-  end
-
-  def account_orders
-    [ "id" ]
-  end
-
-  def account_includes
-    [ "photos" ]
-  end
-
-  def property_params
-    [ :name,
-      :aliases,
-      :description,
-      :constructed,
-      :size,
-      :active,
-      :photos_attributes,
-      { photos_attributes: [ :id, :account_id, :property_id, :format] }
-    ]
-  end
-
-  def property_orders
-    ["id", "name", "aliases", "description", "constructed", "size", "created_at", "active"]
-  end
-
-  def property_includes
-    [:photos, :landlord, :english_name]
-  end
-
-  def reference_includes
-    { subject: [ :landlord, :photos ] }
-  end
-
 end
 
 class PropertiesController < ApplicationController
 end
 
 class AccountsController < ApplicationController
+
+  def show
+    @account = Account.last
+  end
+
 end
 
 class DocumentsController < ApplicationController
 
-  def document_params
+  def document_attributes
     [ :file, :type ]
   end
-  
+
   def document_orders
-    [:id]
+    [ :id ]
   end
 
 end
 
 class PhotosController < ApplicationController
 
-  def photo_params
+  def photo_attributes
     [ :id, :account_id, :property_id, :format ]
   end
 
   def photo_orders
-    [:id]
+    [ :id ]
   end
 
   def photo_includes
-    [:account]
+    [ :account ]
   end
 
 end
@@ -104,4 +72,4 @@ class DefaultLimitController < ApplicationController
     100
   end
 
-end
+end

data/test/standard_api/test_app/models.rb

@@ -1,8 +1,9 @@
 # = Models
 
 class Account < ActiveRecord::Base
-  has_many :photos
+  has_many :photos, -> { order(:created_at) }
   belongs_to :property
+  belongs_to :subject, polymorphic: true
 end
 
 class Photo < ActiveRecord::Base
@@ -21,6 +22,9 @@ class Property < ActiveRecord::Base
   has_and_belongs_to_many :photos
   has_many :accounts
   has_one :landlord, class_name: 'Account'
+  has_one :document_attachments, class_name: "Attachment", as: :record, inverse_of: :record
+  has_one :document, through: "document_attachments"
+
 
   validates :name, presence: true
   accepts_nested_attributes_for :photos
@@ -34,22 +38,46 @@ class Reference < ActiveRecord::Base
   belongs_to :subject, polymorphic: true
 end
 
+class Document < ActiveRecord::Base
+  attr_accessor :file
+end
+
+class Attachment < ActiveRecord::Base
+  belongs_to :record, polymorphic: true
+  belongs_to :document
+end
+
 # = Migration
 
-class CreateModelTables < ActiveRecord::Migration[5.2]
+class CreateModelTables < ActiveRecord::Migration[6.0]
 
   def self.up
 
+    comment = "test comment"
+    exec_query(<<-SQL, "SQL")
+      COMMENT ON DATABASE #{quote_column_name(current_database)} IS #{quote(comment)};
+    SQL
+
     create_table "accounts", force: :cascade do |t|
       t.string   'name',                 limit: 255
       t.integer  'property_id'
+      t.integer  "subject_id"
+      t.string   "subject_type"
+      t.datetime "property_cached_at"
+      t.datetime "subject_cached_at"
       t.integer  'photos_count', null: false, default: 0
+      t.datetime "created_at",                         null: false
+    end
+
+    create_table "landlords", force: :cascade do |t|
+      t.string  "name"
     end
 
     create_table "photos", force: :cascade do |t|
       t.integer  "account_id"
       t.integer  "property_id"
       t.string   "format",                 limit: 255
+      t.datetime "created_at",                         null: false
     end
 
     create_table "properties", force: :cascade do |t|
@@ -68,12 +96,12 @@ class CreateModelTables < ActiveRecord::Migration[5.2]
       t.string   "key"
       t.string   "value"
     end
-    
+
     create_table "photos_properties", force: :cascade do |t|
       t.integer  "photo_id"
       t.integer  "property_id"
     end
-    
+
     create_table "landlords_properties", force: :cascade do |t|
       t.integer  "landlord_id"
       t.integer  "property_id"
@@ -82,6 +110,12 @@ class CreateModelTables < ActiveRecord::Migration[5.2]
     create_table "documents", force: :cascade do |t|
       t.string   'type'
     end
+
+    create_table "attachments", force: :cascade do |t|
+      t.string  'record_type'
+      t.integer  'record_id'
+      t.integer  'document_id'
+    end
   end
 
 end

data/test/standard_api/test_app/test/factories.rb

@@ -1,4 +1,5 @@
 FactoryBot.define do
+
   factory :account do
     name            { Faker::Name.name }
 
@@ -7,7 +8,7 @@ FactoryBot.define do
       name { nil }
     end
   end
-  
+
   factory :landlord do
     name            { Faker::Name.name }
   end
@@ -17,12 +18,12 @@ FactoryBot.define do
   end
 
   factory :document do
-    file            { fixture_file_upload(Rails.root + 'test/fixtures/photo.png', 'image/png') }
+    file            { Rack::Test::UploadedFile.new(File.join(Rails.root, 'test/fixtures/photo.png'), 'image/png') }
   end
 
   factory :pdf do
     type            { 'Pdf' }
-    file            { fixture_file_upload(Rails.root + 'test/fixtures/photo.png', 'image/png') }
+    file            { Rack::Test::UploadedFile.new(File.join(Rails.root, 'test/fixtures/photo.png'), 'image/png') }
   end
 
   factory :reference do

data/test/standard_api/test_app/views/photos/_photo.json.jbuilder

@@ -2,6 +2,7 @@ json.set! :id,          photo.id
 json.set! :account_id,  photo.account_id
 json.set! :property_id, photo.property_id
 json.set! :format,      photo.format
+json.set! :created_at,  photo.created_at
 json.set! :template,    'photos/_photo'
 
 if includes[:account]

data/test/standard_api/test_app/views/photos/_photo.streamer

@@ -0,0 +1,18 @@
+json.object! do
+    json.set! :id,          photo.id
+    json.set! :account_id,  photo.account_id
+    json.set! :property_id, photo.property_id
+    json.set! :format,      photo.format
+    json.set! :created_at,  photo.created_at
+    json.set! :template,    'photos/_photo'
+
+    if includes[:account]
+        json.set! :account do
+            if photo.account
+                json.partial! 'application/record', record: photo.account, includes: includes[:account]
+            else
+                json.value! nil
+            end
+        end
+    end
+end

data/test/standard_api/test_app/views/photos/_schema.json.jbuilder

@@ -0,0 +1 @@
+json.set! 'template', 'photos/schema'

data/test/standard_api/test_app/views/photos/_schema.streamer

@@ -0,0 +1,3 @@
+json.object! do
+  json.set! 'template', 'photos/schema'
+end

data/test/standard_api/test_app/views/photos/schema.json.jbuilder

@@ -1 +1 @@
-json.set! 'template', 'photos/schema'
+json.partial! 'schema'

data/test/standard_api/test_app/views/photos/schema.streamer

@@ -0,0 +1 @@
+json.partial! 'schema'

data/test/standard_api/test_helper.rb

@@ -0,0 +1,238 @@
+require File.expand_path('../test_app', __FILE__)
+
+require "minitest/autorun"
+require 'minitest/unit'
+require 'factory_bot'
+require 'faker'
+require 'standard_api/test_case'
+require 'byebug'
+require 'mocha/minitest'
+
+# Setup the test db
+ActiveSupport.test_order = :random
+
+include ActionDispatch::TestProcess
+
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+  include FactoryBot::Syntax::Methods
+
+  def setup
+    @routes ||= TestApplication.routes
+    @subscribers, @layouts, @partials = [], {}, {}
+
+    Rails.cache.clear
+
+    @subscribers << ActiveSupport::Notifications.subscribe("!render_template.action_view") do |_name, _start, _finish, _id, payload|
+      path = payload[:identifier]
+      virtual_path = payload[:virtual_path]
+      format, handler = *path.split("/").last.split('.').last(2)
+
+      partial = virtual_path =~ /^.*\/_[^\/]*$/
+
+      if partial
+        if @partials[virtual_path]
+          @partials[virtual_path][:count] += 1
+        else
+          @partials[virtual_path] = {
+            count: 1,
+            path: virtual_path,
+            format: format,
+            handler: handler
+          }
+        end
+      else
+        if @layouts[virtual_path]
+          @layouts[virtual_path][:count] += 1
+        else
+          @layouts[virtual_path] = {
+            count: 1,
+            path: virtual_path,
+            format: format,
+            handler: handler
+          }
+        end
+      end
+    end
+  end
+
+  def teardown
+    @subscribers.each do |subscriber|
+      ActiveSupport::Notifications.unsubscribe(subscriber)
+    end
+  end
+
+  # = Helper Methods
+
+  def controller_path
+    if defined?(@controller)
+      @controller.controller_path
+    else
+      controller_class.new.controller_path
+    end
+  end
+
+  def path_with_action(action, options={})
+    { :controller => controller_path, :action => action }.merge(options)
+  end
+
+  def assert_sql(sql, &block)
+    queries = []
+    callback = -> (*, payload) do
+      queries << payload[:sql]
+    end
+
+    ActiveSupport::Notifications.subscribed(callback, "sql.active_record", &block)
+
+    assert_not_nil queries.map { |x| x.strip.gsub(/\s+/, ' ') }.
+      find { |x| x == sql.strip.gsub(/\s+/, ' ') }
+  end
+
+  def assert_rendered(options = {}, message = nil)
+    options = case options
+    when NilClass, Regexp, String, Symbol
+      { layout: options }
+    when Hash
+      options
+    else
+      raise ArgumentError, "assert_template only accepts a String, Symbol, Hash, Regexp, or nil"
+    end
+
+    options.assert_valid_keys(:layout, :partial, :count, :format, :handler)
+
+    if expected_layout = options[:layout]
+      case expected_layout
+      when String, Symbol
+        msg = message || sprintf("expecting layout <%s> but action rendered <%s>",
+          expected_layout, @layouts.keys)
+        assert_includes @layouts.keys, expected_layout.to_s, msg
+
+        key = expected_layout.to_s
+        value = @layouts[key]
+
+        if expected_count = options[:count]
+          actual_count = value[:count]
+          msg = message || sprintf("expecting %s to be rendered %s time(s) but rendered %s time(s)",
+                 expected_partial, expected_count, actual_count)
+          assert_equal expected_count, actual_count, msg
+        end
+
+        if expected_format = options[:format]
+          actual_format = value[:format]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_format, actual_format)
+          assert_equal expected_format, actual_format, msg
+        end
+
+        if expected_handler = options[:handler]
+          actual_handler = value[:handler]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_handler, actual_handler)
+          assert_equal expected_handler, actual_handler, msg
+        end
+      when Regexp
+        msg = message || sprintf("expecting layout <%s> but action rendered <%s>",
+          expected_layout, @layouts.keys)
+        assert(@layouts.keys.any? {|l| l =~ expected_layout }, msg)
+
+        key = @layouts.keys.find {|l| l =~ expected_layout }
+        value = @layouts[key]
+
+        if expected_count = options[:count]
+          actual_count = value[:count]
+          msg = message || sprintf("expecting %s to be rendered %s time(s) but rendered %s time(s)",
+                 expected_partial, expected_count, actual_count)
+          assert_equal expected_count, actual_count, msg
+        end
+
+        if expected_format = options[:format]
+          actual_format = value[:format]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_format, actual_format)
+          assert_equal expected_format, actual_format, msg
+        end
+
+        if expected_handler = options[:handler]
+          actual_handler = value[:handler]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_handler, actual_handler)
+          assert_equal expected_handler, actual_handler, msg
+        end
+      when nil, false
+        assert(@layouts.empty?, msg)
+      end
+    elsif expected_partial = options[:partial]
+      case expected_partial
+      when String, Symbol
+        msg = message || sprintf("expecting partial <%s> but action rendered <%s>",
+          expected_partial, @partials.keys)
+        assert_includes @partials.keys, expected_partial.to_s, msg
+
+        key = expected_partial.to_s
+        value = @partials[key]
+
+        if expected_count = options[:count]
+          actual_count = value[:count]
+          msg = message || sprintf("expecting %s to be rendered %s time(s) but rendered %s time(s)",
+                 expected_partial, expected_count, actual_count)
+          assert_equal expected_count, actual_count, msg
+        end
+
+        if expected_format = options[:format]
+          actual_format = value[:format]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_format, actual_format)
+          assert_equal expected_format, actual_format, msg
+        end
+
+        if expected_handler = options[:handler]
+          actual_handler = value[:handler]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_handler, actual_handler)
+          assert_equal expected_handler, actual_handler, msg
+        end
+      when Regexp
+        msg = message || sprintf("expecting partial <%s> but action rendered <%s>",
+          expected_partial, @partials.keys)
+        assert(@partials.keys.any? {|l| l =~ expected_partial }, msg)
+
+        key = @partials.keys.find {|l| l =~ expected_partial }
+        value = @partials[key]
+
+        if expected_count = options[:count]
+          actual_count = value[:count]
+          msg = message || sprintf("expecting %s to be rendered %s time(s) but rendered %s time(s)",
+                 expected_partial, expected_count, actual_count)
+          assert_equal expected_count, actual_count, msg
+        end
+
+        if expected_format = options[:format]
+          actual_format = value[:format]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_format, actual_format)
+          assert_equal expected_format, actual_format, msg
+        end
+
+        if expected_handler = options[:handler]
+          actual_handler = value[:handler]
+          msg = message || sprintf("expecting %s to be rendered as %s but rendered as %s",
+                 expected_partial, expected_handler, actual_handler)
+          assert_equal expected_handler, actual_handler, msg
+        end
+      when nil, false
+        assert(@partials.empty?, msg)
+      end
+    end
+  end
+
+end
+
+class ActionController::TestCase
+
+  def assigns(key = nil)
+    assigns = {}.with_indifferent_access
+    @controller.view_assigns.each { |k, v| assigns.regular_writer(k, v) }
+    key.nil? ? assigns : assigns[key]
+  end
+
+end