model_driven_api 2.5.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8698a1f65e7b3cae8a9d27c3c610435b11d23102f86e90719b45b1a480628279
-  data.tar.gz: bddef848a94fd0a23b555f44e7596606fc1ed630afcd3d91179bc8d6ac0fe601
+  metadata.gz: 67995baff4158d601e25d872aaa500a7aa2481898da5dc3b11efa2ec34d57664
+  data.tar.gz: 6a7da3c92f698689ac9c1c6262400acf65d84d5cd2ea3db0577d7e8e7bba4443
 SHA512:
-  metadata.gz: 483e239527128317d747a7f2621379b35d7ed0fe24947c135d5e13154364e530baf9bf63a022e56dd0ca70196cc3f21a13acdeeaf4496408e698afab075fee15
-  data.tar.gz: 7396686c68fbfd721ed82728e3d6d2de9c6e2170362a9432b24da98b1cff3c8667d822a187f6b9d2cdc1f0509fc6437cceb65e795a444f161d93d320572a57d5
+  metadata.gz: bd49743f7008d52c27b8f283f12913df13fe091ac5222f71ce4ad05cba246132cd3488d32f7509097dc88baec47bab7ba3425074c4b58e009d0a357754c52640
+  data.tar.gz: b8bff5b3af92837c21109f3918b8c278219c73c05258623796824a3f2e2bfc299b6de5af634bdf9a6f2cc96cd8217f29e37318aa88c12c0e8bb630eb304db6ac

data/Rakefile

@@ -1,32 +1,14 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'ModelDrivenApi'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+# frozen_string_literal: true
 
-APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
-
-load 'rails/tasks/statistics.rake'
-
-require 'bundler/gem_tasks'
-
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.libs << "test"
+  t.libs << "lib"
+  t.test_files = FileList["test/**/test_*.rb"]
 end
 
-task default: :test
+# require "standard/rake"
+
+task default: %i[test standard]

data/app/controllers/api/v2/application_controller.rb

@@ -27,22 +27,26 @@ class Api::V2::ApplicationController < ActionController::API
         @records_all = @q.result # (distinct: true) Removing, but I'm not sure, with it I cannot sort in postgres for associated records (throws an exception on misuse of sort with distinct)
         page = (@page.presence || params[:page])
         per = (@per.presence || params[:per])
-        pages_info = (@pages_info.presence || params[:pages_info])
+        # pages_info = (@pages_info.presence || params[:pages_info])
         count = (@count.presence || params[:count])
-        # Paging
+        # Pagination
         @records = @records_all.page(page).per(per)
+        # Content-Range: posts 0-4/27
+        range_start = [(page.to_i - 1) * per.to_i, 0].max;
+        range_end = [0, page.to_i * per.to_i - 1].max;
+        response.set_header('Content-Range', "#{@model.table_name} #{range_start}-#{range_end}/#{@records.total_count}")
         
         # If there's the keyword pagination_info, then return a pagination info object
-        return render json: MultiJson.dump({count: @records_all.count,current_page_count: @records.count,next_page: @records.next_page,prev_page: @records.prev_page,is_first_page: @records.first_page?,is_last_page: @records.last_page?,is_out_of_range: @records.out_of_range?,pages_count: @records.total_pages,current_page_number: @records.current_page }) if !pages_info.blank?
+        # return render json: {count: @records_all.count,current_page_count: @records.count,next_page: @records.next_page,prev_page: @records.prev_page,is_first_page: @records.first_page?,is_last_page: @records.last_page?,is_out_of_range: @records.out_of_range?,pages_count: @records.total_pages,current_page_number: @records.current_page } if !pages_info.blank?
         
         # puts "ALL RECORDS FOUND: #{@records_all.inspect}"
         status = @records_all.blank? ? 404 : 200
         # puts "If it's asked for page number, then paginate"
-        return render json: MultiJson.dump(@records, json_attrs), status: status if !page.blank? # (@json_attrs || {})
+        return render json: @records.as_json(json_attrs), status: status if !page.blank? # (@json_attrs || {})
         #puts "if you ask for count, then return a json object with just the number of objects"
-        return render json: MultiJson.dump({count: @records_all.count}) if !count.blank?
+        return render json: {count: @records_all.count}if !count.blank?
         #puts "Default"
-        json_out = MultiJson.dump(@records_all, json_attrs)
+        json_out = @records_all.as_json(json_attrs)
         #puts "JSON ATTRS: #{json_attrs}"
         #puts "JSON OUT: #{json_out}"
         render json: json_out, status: status #(@json_attrs || {})
@@ -82,10 +86,17 @@ class Api::V2::ApplicationController < ActionController::API
         return render json: result, status: (status_number.presence || 200) if status == true
 
         # Normal Update Action
-        # Raisl 6 vs Rails 6.1
+        # Rails 6 vs Rails 6.1
         @record.respond_to?('update_attributes!') ? @record.update_attributes!(@body) : @record.update!(@body)
         render json: @record.to_json(json_attrs), status: 200
     end
+
+    def update_multi
+        authorize! :update, @model
+        ids = params[:ids].split(",")
+        @model.where(id: ids).update!(@body)
+        render json: ids.to_json, status: 200
+    end
     
     def destroy
         authorize! :destroy, @record
@@ -98,6 +109,15 @@ class Api::V2::ApplicationController < ActionController::API
         return api_error(status: 500) unless @record.destroy
         head :ok
     end
+
+    def destroy_multi
+        authorize! :destroy, @model
+
+        # Normal Destroy Action
+        ids = params[:ids].split(",")
+        @model.where(id: ids).destroy!(@body)
+        render json: ids.to_json, status: 200
+    end
     
     private
 
@@ -111,7 +131,6 @@ class Api::V2::ApplicationController < ActionController::API
             # call an unwanted method in the AR Model.
             resource = "custom_action_#{params[:do]}"
             raise NoMethodError unless @model.respond_to?(resource)
-            # return true, MultiJson.dump(params[:id].blank? ? @model.send(resource, params) : @model.send(resource, params[:id].to_i, params))
             # puts json_attrs
             body, status = @model.send(resource, params)
             return true, body.to_json(json_attrs), status
@@ -141,7 +160,7 @@ class Api::V2::ApplicationController < ActionController::API
         params[:current_user_id] = @current_user.id
         # Now every time the user fires off a successful GET request, 
         # a new token is generated and passed to them, and the clock resets.
-        response.headers['Token'] = JsonWebToken.encode(user_id: current_user.id)
+        response.set_header('Token', JsonWebToken.encode(user_id: current_user.id))
     end
     
     def find_record

data/config/initializers/cors_api_thecore.rb

@@ -1,11 +1,21 @@
 # config/initializers/cors.rb
+# Rails.application.config.middleware.insert_before 0, Rack::Cors do
+#   allow do
+#     origins '*'
+#     resource '*',
+#       headers: %w(Token),
+#       methods: :any,
+#       expose: %w(Token),
+#       max_age: 600
+#   end
+# end
+
+puts "Loading CORS"
 Rails.application.config.middleware.insert_before 0, Rack::Cors do
+  # Allow Everything
+  # Please override to your specific security needs in the actual application
   allow do
     origins '*'
-    resource '*',
-      headers: %w(Token),
-      methods: :any,
-      expose: %w(Token),
-      max_age: 600
+    resource '*', headers: :any, methods: [:get, :post, :put, :patch, :delete, :options, :head]
   end
-end
+end

data/config/routes.rb

@@ -27,8 +27,10 @@ Rails.application.routes.draw do
             # # CRUD Create
             post '*path', to: 'application#create'
             # # CRUD Update
+            put '*path/:id/multi', to: 'application#update_multi'
             put '*path/:id', to: 'application#update'
-            # # CRUD DElete
+            # # CRUD Delete
+            delete '*path/:id/multi', to: 'application#destroy_multi'
             delete '*path/:id', to: 'application#destroy'
         end
     end

data/lib/concerns/model_driven_api_role.rb

@@ -3,7 +3,7 @@ module ModelDrivenApiRole
     
     included do
         ## DSL (AKA what to show in the returned JSON)
-        # Use @@json_attrs to drive json rendering for 
+        # Use self.json_attrs to drive json rendering for 
         # API model responses (index, show and update ones).
         # For reference:
         # https://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html
@@ -17,7 +17,7 @@ module ModelDrivenApiRole
         # - include: include associated models, it's a list [] of hashes {} which also 
         #       accepts the [:only, :except, :methods, :include] keys.
         cattr_accessor :json_attrs
-        @@json_attrs = ModelDrivenApi.smart_merge((json_attrs || {}), {
+        self.json_attrs = ModelDrivenApi.smart_merge((json_attrs || {}), {
             except: [
                 :lock_version,
                 :created_at,

data/lib/concerns/model_driven_api_user.rb

@@ -4,7 +4,7 @@ module ModelDrivenApiUser
     included do
         has_many :used_tokens, inverse_of: :user, dependent: :destroy
         ## DSL (AKA what to show in the returned JSON)
-        # Use @@json_attrs to drive json rendering for 
+        # Use self.json_attrs to drive json rendering for 
         # API model responses (index, show and update ones).
         # For reference:
         # https://api.rubyonrails.org/classes/ActiveModel/Serializers/JSON.html
@@ -18,10 +18,9 @@ module ModelDrivenApiUser
         # - include: include associated models, it's a list [] of hashes {} which also 
         #       accepts the [:only, :except, :methods, :include] keys.
         cattr_accessor :json_attrs
-        @@json_attrs = ModelDrivenApi.smart_merge((json_attrs || {}), {
+        self.json_attrs = ModelDrivenApi.smart_merge((json_attrs || {}), {
             except: [
                 :lock_version,
-                :created_at,
                 :updated_at
             ],
             include: [:roles]

data/lib/model_driven_api/version.rb

@@ -1,3 +1,4 @@
 module ModelDrivenApi
-  VERSION = "#{`git describe --tags $(git rev-list --tags --max-count=1)`.chomp}"
+  # VERSION = "#{`git describe --tags $(git rev-list --tags --max-count=1)`.chomp}"
+  VERSION = "3.0.0"
 end

data/lib/model_driven_api.rb

@@ -4,7 +4,7 @@ require 'ransack'
 require 'jwt'
 require 'json_web_token'
 require "kaminari"
-require "multi_json"
+# require "multi_json"
 require "simple_command"
 
 require 'concerns/api_exception_management'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_driven_api
 version: !ruby/object:Gem::Version
-  version: 2.5.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_backend_commons
@@ -16,70 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: simple_command
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rack-cors
   requirement: !ruby/object:Gem::Requirement
@@ -95,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: deep_merge
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 description: Ruby on Rails REST APIs built by convention using the DB schema as the
   foundation, please see README for mode of use.
 email:
@@ -177,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Convention based RoR engine which uses DB schema introspection to create