standardapi 6.0.0.32 → 7.1.0

data/test/standard_api/test_app/models.rb

@@ -1,17 +1,22 @@
 # = 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
-  belongs_to :account, :counter_cache => true
+  belongs_to :account, counter_cache: true
   has_and_belongs_to_many :properties
+  has_one :camera
 end
 
 class Document < ActiveRecord::Base
   attr_accessor :file
+  
+  enum level:   { public: 0, secret: 1 }, _suffix: true
+  enum rating:  { poor: 0, ok: 1, good: 2 }
 end
 
 class Pdf < Document
@@ -24,6 +29,7 @@ class Property < ActiveRecord::Base
   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
 
@@ -32,8 +38,36 @@ class Property < ActiveRecord::Base
   end
 end
 
+class LSNType < ActiveRecord::Type::Value
+
+  def type
+    :lsn
+  end
+
+  def cast_value(value)
+    case value
+    when Integer
+      [value].pack('N')
+    else
+      value&.to_s&.b
+    end
+  end
+
+  def serialize(value)
+    PG::TextEncoder::Bytea.new.encode(value)
+  end
+
+  def deserialize(value)
+    return nil if value.nil?
+    PG::TextDecoder::Bytea.new.decode(value).unpack1('N')
+  end
+
+end
+
 class Reference < ActiveRecord::Base
   belongs_to :subject, polymorphic: true
+
+  attribute :custom_binary, LSNType.new
 end
 
 class Document < ActiveRecord::Base
@@ -45,7 +79,16 @@ class Attachment < ActiveRecord::Base
   belongs_to :document
 end
 
-# = Migration
+class Camera < ActiveRecord::Base
+end
+
+class UuidModel < ActiveRecord::Base
+end
+
+# = Create/recreate database and migration
+task = ActiveRecord::Tasks::PostgreSQLDatabaseTasks.new(ActiveRecord::Base.connection_db_config)
+task.drop
+task.create
 
 class CreateModelTables < ActiveRecord::Migration[6.0]
 
@@ -59,13 +102,23 @@ class CreateModelTables < ActiveRecord::Migration[6.0]
     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|
@@ -81,29 +134,45 @@ class CreateModelTables < ActiveRecord::Migration[6.0]
     create_table "references", force: :cascade do |t|
       t.integer  "subject_id"
       t.string   "subject_type",         limit: 255
+      t.binary   "sha"
+      t.binary   "custom_binary"
       t.string   "key"
       t.string   "value"
     end
-    
+
     create_table "photos_properties", force: :cascade do |t|
       t.integer  "photo_id"
       t.integer  "property_id"
+      t.index ["photo_id", "property_id"], unique: true
     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.integer  'level', limit: 2, null: false, default: 0
+      t.integer  'rating', limit: 2
       t.string   'type'
     end
-    
-    create_table "attachments", force: :cascade do |t| 
+
+    create_table "cameras", force: :cascade do |t|
+      t.integer  'photo_id'
+      t.string   'make'
+    end
+
+    create_table "attachments", force: :cascade do |t|
       t.string  'record_type'
       t.integer  'record_id'
       t.integer  'document_id'
     end
+    
+    create_table "uuid_models", id: :uuid, force: :cascade do |t|
+      t.string 'title', default: 'recruit'
+      t.string 'name', default: -> { 'round(random() * 1000)' }
+    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
@@ -47,4 +48,7 @@ FactoryBot.define do
     end
   end
 
+  factory :camera do
+    make  { ['Sony', 'Nokia', 'Canon', 'Leica'].sample }
+  end
 end

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

@@ -3,6 +3,7 @@ json.object! do
     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]
@@ -10,7 +11,7 @@ json.object! do
             if photo.account
                 json.partial! 'application/record', record: photo.account, includes: includes[:account]
             else
-                json.null!
+                json.value! nil
             end
         end
     end

data/test/standard_api/test_app/views/sessions/create.json.jbuilder

@@ -0,0 +1 @@
+json.set! 'includes', includes

data/test/standard_api/test_app/views/sessions/create.streamer

@@ -0,0 +1,3 @@
+json.object! do
+  json.set! 'includes', includes
+end

data/test/standard_api/test_app.rb

@@ -18,7 +18,7 @@ class TestApplication < Rails::Application
   config.cache_classes = true
   config.action_controller.perform_caching = true
   config.cache_store = :memory_store, { size: 8.megabytes }
-  config.action_dispatch.show_exceptions = false
+  config.action_dispatch.show_exceptions = :none
 
   # if defined?(FactoryBotRails)
   #   config.factory_bot.definition_file_paths += [ '../factories' ]
@@ -28,6 +28,15 @@ end
 # Test Application initialization
 TestApplication.initialize!
 
+# Make sure to test the right view files
+ActionView::Template.unregister_template_handler :streamer, :jbuilder
+case ENV["TSENCODER"]
+when "turbostreamer"
+  ActionView::Template.register_template_handler :streamer, TurboStreamer::Handler
+else
+  ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+end
+
 # Test Application Models
 require 'standard_api/test_app/models'
 
@@ -44,6 +53,8 @@ Rails.application.routes.draw do
   end
 
   standard_resource :account
+  # standard_resources :photos, only: [ :index, :show ]
+
 end
 
 # Test Application Helpers

data/test/standard_api/test_helper.rb

@@ -64,6 +64,15 @@ class ActiveSupport::TestCase
 
   # = Helper Methods
 
+  def debug
+    ActiveRecord::Base.logger = Logger.new(STDOUT)
+    $debugging = true
+    yield
+  ensure
+    ActiveRecord::Base.logger = nil
+    $debugging = false
+  end
+
   def controller_path
     if defined?(@controller)
       @controller.controller_path
@@ -76,6 +85,18 @@ class ActiveSupport::TestCase
     { :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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: standardapi
 version: !ruby/object:Gem::Version
-  version: 6.0.0.32
+  version: 7.1.0
 platform: ruby
 authors:
 - James Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2024-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 7.1.3
 - !ruby/object:Gem::Dependency
   name: activerecord-sort
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: activerecord-filter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.2
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.2
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: turbostreamer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: jbuilder
   requirement: !ruby/object:Gem::Requirement
@@ -245,11 +273,13 @@ extra_rdoc_files:
 files:
 - README.md
 - lib/standard_api.rb
+- lib/standard_api/access_control_list.rb
 - lib/standard_api/active_record/connection_adapters/postgresql/schema_statements.rb
 - lib/standard_api/controller.rb
 - lib/standard_api/errors.rb
 - lib/standard_api/helpers.rb
 - lib/standard_api/includes.rb
+- lib/standard_api/middleware.rb
 - lib/standard_api/middleware/query_encoding.rb
 - lib/standard_api/orders.rb
 - lib/standard_api/railtie.rb
@@ -277,11 +307,22 @@ files:
 - lib/standard_api/views/application/show.json.jbuilder
 - lib/standard_api/views/application/show.streamer
 - test/standard_api/caching_test.rb
+- test/standard_api/controller/include_test.rb
+- test/standard_api/controller/subresource_test.rb
 - test/standard_api/helpers_test.rb
+- test/standard_api/nested_attributes/belongs_to_test.rb
+- test/standard_api/nested_attributes/has_and_belongs_to_many_test.rb
+- test/standard_api/nested_attributes/has_many_test.rb
+- test/standard_api/nested_attributes/has_one_test.rb
 - test/standard_api/performance.rb
 - test/standard_api/route_helpers_test.rb
 - test/standard_api/standard_api_test.rb
 - test/standard_api/test_app.rb
+- test/standard_api/test_app/app/controllers/acl/account_acl.rb
+- test/standard_api/test_app/app/controllers/acl/camera_acl.rb
+- test/standard_api/test_app/app/controllers/acl/photo_acl.rb
+- test/standard_api/test_app/app/controllers/acl/property_acl.rb
+- test/standard_api/test_app/app/controllers/acl/reference_acl.rb
 - test/standard_api/test_app/config/database.yml
 - test/standard_api/test_app/controllers.rb
 - test/standard_api/test_app/models.rb
@@ -294,13 +335,15 @@ files:
 - test/standard_api/test_app/views/photos/schema.json.jbuilder
 - test/standard_api/test_app/views/photos/schema.streamer
 - test/standard_api/test_app/views/properties/edit.html.erb
+- test/standard_api/test_app/views/sessions/create.json.jbuilder
+- test/standard_api/test_app/views/sessions/create.streamer
 - test/standard_api/test_app/views/sessions/new.html.erb
 - test/standard_api/test_helper.rb
 homepage: https://github.com/waratuman/standardapi
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -318,8 +361,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: StandardAPI makes it easy to expose a query interface for your Rails models
 test_files: []