standardapi 6.0.0.15 → 6.0.0.29

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

@@ -1,20 +1,17 @@
-if !includes.empty?
-  instance_variable_set("@#{model.model_name.plural}", preloadables(instance_variable_get("@#{model.model_name.plural}"), includes))
+if !defined?(records)
+  records = instance_variable_get("@#{model.model_name.plural}")
 end
 
+partial = model_partial(model)
+partial_record_name = partial.split('/').last.to_sym
+
 if !includes.empty? && can_cache?(model, includes)
-  partial = model_partial(model)
-  record_name = partial.split('/').last.to_sym
-  
-  json.cache_collection! instance_variable_get("@#{model.model_name.plural}"), key: proc {|record| cache_key(record, includes) } do |record|
-    locals = { record: record, record_name => record, :includes => includes }
-    json.partial! partial, locals
+  json.cache_collection! records, key: proc { |record| cache_key(record, includes) } do |record|
+    json.partial!(partial, includes: includes, partial_record_name => record)
   end
 else
-  partial = model_partial(model)
-  record_name = partial.split('/').last.to_sym
   json.array! do
-    instance_variable_get("@#{model.model_name.plural}").each do |record|
+    records.each do |record|
       sub_includes = includes.select do |key, value|
         case value
         when Hash, ActionController::Parameters
@@ -28,11 +25,7 @@ else
         end
       end
 
-      json.partial! partial, {
-        record: record,
-        record_name => record,
-        includes: sub_includes
-      }
+      json.partial!(partial, includes: sub_includes, partial_record_name => record)
     end
   end
 end

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

@@ -1,12 +1 @@
-json.set! 'columns' do
-  model.columns.each do |column|
-    json.set! column.name, {
-      type: json_column_type(column.sql_type),
-      primary_key: column.name == model.primary_key,
-      null: column.null,
-      array: column.array
-    }
-  end
-end
-
-json.set! 'limit', resource_limit
+json.partial!('schema', model: model)

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

@@ -1,16 +1 @@
-json.object! do
-  json.set! 'columns' do
-    json.object! do
-      model.columns.each do |column|
-        json.set! column.name, {
-          type: json_column_type(column.sql_type),
-          primary_key: column.name == model.primary_key,
-          null: column.null,
-          array: column.array
-        }
-      end
-    end
-  end
-
-  json.set! 'limit', resource_limit
-end
+json.partial!('schema', model: model)

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

@@ -1 +1,8 @@
-json.partial! model_partial(model), model_partial(model).split('/').last.to_sym => instance_variable_get("@#{model.model_name.singular}"), includes: includes
+if !defined?(record)
+  record = instance_variable_get("@#{model.model_name.singular}")
+end
+
+partial = model_partial(model)
+partial_record_name = partial.split('/').last.to_sym
+
+json.partial!(partial, partial_record_name => record, includes: includes)

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

@@ -1 +1,8 @@
-json.partial! model_partial(model), model_partial(model).split('/').last.to_sym => instance_variable_get("@#{model.model_name.singular}"), includes: includes
+if !defined?(record)
+  record = instance_variable_get("@#{model.model_name.singular}")
+end
+
+partial = model_partial(model)
+partial_record_name = partial.split('/').last.to_sym
+
+json.partial!(partial, partial_record_name => record, includes: includes)

data/test/standard_api/test_app.rb

@@ -0,0 +1,55 @@
+require "rails"
+require "active_model/railtie"
+require "active_record/railtie"
+require "action_controller/railtie"
+require "action_view/railtie"
+require "rails/test_unit/railtie"
+Bundler.require(*Rails.groups)
+
+require 'standard_api'
+
+# Test Application Config
+Rails.env = 'test'
+
+class TestApplication < Rails::Application
+  config.root = File.join(File.dirname(__FILE__), 'test_app')
+  config.secret_key_base = 'test key base'
+  config.eager_load = true
+  config.cache_classes = true
+  config.action_controller.perform_caching = true
+  config.cache_store = :memory_store, { size: 8.megabytes }
+  config.action_dispatch.show_exceptions = false
+
+  # if defined?(FactoryBotRails)
+  #   config.factory_bot.definition_file_paths += [ '../factories' ]
+  # end
+end
+
+# Test Application initialization
+TestApplication.initialize!
+
+# Test Application Models
+require 'standard_api/test_app/models'
+
+# Test Application Controllers
+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
+  end
+
+  standard_resource :account
+end
+
+# Test Application Helpers
+Object.const_set(:ApplicationHelper, Module.new)
+
+# require 'turbostreamer'
+# require 'wankel'
+# ActionView::Template.unregister_template_handler :jbuilder
+# ActionView::Template.register_template_handler :streamer, TurboStreamer::Handler

data/test/standard_api/test_app/config/database.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: postgresql
+  database: standardapi-test
+  encoding: utf8

data/test/standard_api/test_app/controllers.rb

@@ -0,0 +1,107 @@
+class ApplicationController < ActionController::Base
+  include StandardAPI::Controller
+  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
+end
+
+class DocumentsController < ApplicationController
+
+  def document_params
+    [ :file, :type ]
+  end
+  
+  def document_orders
+    [:id]
+  end
+
+end
+
+class PhotosController < ApplicationController
+
+  def photo_params
+    [ :id, :account_id, :property_id, :format ]
+  end
+
+  def photo_orders
+    [:id]
+  end
+
+  def photo_includes
+    [:account]
+  end
+
+end
+
+class ReferencesController < ApplicationController
+end
+
+class SessionsController < ApplicationController
+end
+
+class UnlimitedController < ApplicationController
+
+  def self.model
+    Account
+  end
+
+  def resource_limit
+    nil
+  end
+
+end
+
+class DefaultLimitController < ApplicationController
+
+  def self.model
+    Account
+  end
+
+  def default_limit
+    100
+  end
+
+end

data/test/standard_api/test_app/models.rb

@@ -0,0 +1,94 @@
+# = Models
+
+class Account < ActiveRecord::Base
+  has_many :photos
+  belongs_to :property
+end
+
+class Photo < ActiveRecord::Base
+  belongs_to :account, :counter_cache => true
+  has_and_belongs_to_many :properties
+end
+
+class Document < ActiveRecord::Base
+  attr_accessor :file
+end
+
+class Pdf < Document
+end
+
+class Property < ActiveRecord::Base
+  has_and_belongs_to_many :photos
+  has_many :accounts
+  has_one :landlord, class_name: 'Account'
+
+  validates :name, presence: true
+  accepts_nested_attributes_for :photos
+
+  def english_name
+    'A Name'
+  end
+end
+
+class Reference < ActiveRecord::Base
+  belongs_to :subject, polymorphic: true
+end
+
+# = Migration
+
+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  'photos_count', null: false, default: 0
+    end
+
+    create_table "photos", force: :cascade do |t|
+      t.integer  "account_id"
+      t.integer  "property_id"
+      t.string   "format",                 limit: 255
+    end
+
+    create_table "properties", force: :cascade do |t|
+      t.string   "name",                 limit: 255
+      t.string   "aliases",              default: [],   array: true
+      t.text     "description"
+      t.integer  "constructed"
+      t.decimal  "size"
+      t.datetime "created_at",                         null: false
+      t.boolean  "active",             default: false
+    end
+
+    create_table "references", force: :cascade do |t|
+      t.integer  "subject_id"
+      t.string   "subject_type",         limit: 255
+      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"
+    end
+
+    create_table "documents", force: :cascade do |t|
+      t.string   'type'
+    end
+  end
+
+end
+ActiveRecord::Migration.verbose = false
+CreateModelTables.up

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

@@ -0,0 +1,50 @@
+FactoryBot.define do
+  factory :account do
+    name            { Faker::Name.name }
+
+    trait(:nested)  { }
+    trait(:invalid) do
+      name { nil }
+    end
+  end
+  
+  factory :landlord do
+    name            { Faker::Name.name }
+  end
+
+  factory :photo do
+    format          { ['jpg', 'png', 'tiff'].sample }
+  end
+
+  factory :document do
+    file            { fixture_file_upload(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') }
+  end
+
+  factory :reference do
+    subject_type  { 'Photo' }
+    subject_id    { create(:photo).id }
+  end
+
+  factory :property do
+    name            { Faker::Lorem.words(number: Kernel.rand(1..4)).join(' ') }
+    description     { Faker::Lorem.paragraphs.join("\n\n") }
+    constructed     { Kernel.rand(1800..(Time.now.year - 2)) }
+    size            { Kernel.rand(1000..10000000).to_f / 100 }
+    active          { [true, false].sample }
+    photos          { [create(:photo)] }
+
+    trait(:nested)  do
+      photos_attributes { [attributes_for(:photo)] }
+    end
+
+    trait(:invalid) do
+      name { nil }
+    end
+  end
+
+end

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

@@ -0,0 +1,15 @@
+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! :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.null!
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+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! :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.null!
+            end
+        end
+    end
+end