croods 0.2.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da70e6c23805cc55c8a4d7db9e97adc567a4bcd436fb0296600238e9826955c7
-  data.tar.gz: 43415c1a16fdefeaa51fc4dd5cf4b7c93121c8f16fbefefee5966af4ac714766
+  metadata.gz: abd8dafdfb10c2b936a894dcb6da1057c6bfe3646f6e6d5af0f58d59d0be7bab
+  data.tar.gz: 8da5a9b8c82bacefae7d736610d7ba4e0e3305ecf832a602dd61cff0edc1b53c
 SHA512:
-  metadata.gz: 3ea56e2741d2559944657daeeb73ef18cee25a381da09e50fe5f430cc4ae008015ec241e60cf96b7c931cc998fce5333fdd7f13e9e978d6f4ca890ece42554b7
-  data.tar.gz: da63eb7581f72c974162b6c905d438ba7afa2b8f18b1c5d319d675e8821c7a3aae4fbb3a420f46f4c09b8548911a53fd2d1b3915b7609859fdac6be82c6ac2b2
+  metadata.gz: deac1ff6c8763d738b8ccd20149632df9be2425690a1550d57172e3a922a1b685f484d848f39fa5f3a8a29b3bd596c4c8c27e6f7356dbd4d56d40ff0abf879a2
+  data.tar.gz: 7a7342dba26327dc7e1422b26adf56b08747a20a3062d1c1090b941c6d3cf4030f2953975fceb770fb1127cc15097e7398ee35ec0ca017c1a4a6b18ba3a78a4a

data/README.md

@@ -130,15 +130,13 @@ use_for_authentication!(
 ## Contributing
 
 You can manually check your changes in the dummy Rails app under `/todos`.
+Use it to run integration tests since it doesn't have an UI.
 
-To set it up:
+- Clone the repository
+- Install bundler `gem install bundler`
+- Install gems `bin/bundle`
 
-```
-cd todos/
-bin/setup
-```
-
-To run specs use:
+To run both Croods-rails' and the example's specs use:
 `bin/rspec`
 
 ## License

data/lib/croods.rb

@@ -4,6 +4,8 @@ require 'rack/cors'
 require 'committee'
 require 'devise'
 require 'devise_token_auth'
+require 'kaminari'
+require 'api-pagination'
 require 'pundit'
 require 'schema_associations'
 require 'schema_auto_foreign_keys'

data/lib/croods/controller/collection.rb

@@ -5,10 +5,22 @@ module Croods
     module Collection
       protected
 
+      def page_param
+        params[resource.page_attribute_name]
+      end
+
+      def paginate_collection(list)
+        paginate(list.send(resource.page_method_name, page_param))
+      end
+
       def collection
-        resource
+        list = resource
           .apply_filters(policy_scope(model), params)
           .order(resource.sort_by)
+
+        list = paginate_collection(list) if page_param.present?
+
+        list
       end
     end
   end

data/lib/croods/controller/member.rb

@@ -29,7 +29,7 @@ module Croods
           .merge(
             params
               .require(resource.resource_name)
-              .permit(resource.request_attributes.keys)
+              .permit!
           )
       end
 

data/lib/croods/policy/scope.rb

@@ -38,6 +38,8 @@ module Croods
         associations = scope.reflect_on_all_associations(:belongs_to)
 
         associations.each do |association|
+          next if association.options[:optional]
+
           model = association.class_name.constantize
           expanded_path = path + [association]
           association_path = reflection_path(model, target, expanded_path)

data/lib/croods/resource.rb

@@ -12,6 +12,7 @@ require_relative 'resource/json_schema'
 require_relative 'resource/authentication'
 require_relative 'resource/authorization'
 require_relative 'resource/filters'
+require_relative 'resource/pagination'
 require_relative 'resource/sorting'
 require_relative 'resource/services'
 
@@ -32,6 +33,7 @@ module Croods
       include Authentication
       include Authorization
       include Filters
+      include Pagination
       include Sorting
       include Services
     end

data/lib/croods/resource/authorization.rb

@@ -8,10 +8,23 @@ module Croods
 
         on = [on] if on&.is_a?(Symbol)
 
-        actions.each do |action|
-          next if on && !on.include?(action.name)
+        authorization_roles << { roles: roles, on: on }
+      end
+
+      def authorization_roles
+        @authorization_roles ||= []
+      end
+
+      def apply_authorization_roles!
+        authorization_roles.each do |authorization|
+          (actions + additional_actions).each do |action|
+            on = authorization[:on]
+            roles = authorization[:roles]
+
+            next if on && !on.include?(action.name)
 
-          action.roles = roles
+            action.roles = roles
+          end
         end
       end
 

data/lib/croods/resource/json_schema/definition.rb

@@ -5,16 +5,25 @@ module Croods
     module JsonSchema
       module Definition
         TYPES = {
-          datetime: 'string',
-          date: 'string',
-          text: 'string',
-          json: 'object',
-          float: 'number'
+          datetime: ['string'],
+          date: ['string'],
+          text: ['string'],
+          json: %w[object array],
+          jsonb: %w[object array],
+          float: ['number']
         }.freeze
 
         class << self
           def schema(attribute)
-            { type: types(attribute) }.merge(format(attribute))
+            { type: types(attribute) }
+              .merge(format(attribute))
+              .merge(items(attribute))
+          end
+
+          def items(attribute)
+            return {} unless %i[json jsonb].include?(attribute.type)
+
+            { items: { type: %w[string number object] } }
           end
 
           def format(attribute)
@@ -30,13 +39,18 @@ module Croods
 
           def types(attribute)
             types = []
-            types << type(attribute.type)
-            types << 'null' if attribute.null
+            converted_types(attribute.type).each do |converted_type|
+              types << converted_type
+            end
+            null = (
+              attribute.null || attribute.default || attribute.default_function
+            )
+            types << 'null' if null
             types
           end
 
-          def type(type)
-            TYPES[type] || type.to_s
+          def converted_types(type)
+            TYPES[type] || [type.to_s]
           end
         end
       end

data/lib/croods/resource/json_schema/links/collection.rb

@@ -33,6 +33,16 @@ module Croods
               filters
             end
 
+            def properties(resource)
+              properties = {}
+
+              resource.pagination_params.each do |attribute|
+                properties[attribute.name] = definition(attribute)
+              end
+
+              properties.merge(filters(resource))
+            end
+
             def definition(attribute)
               definition = Definition.schema(attribute)
 
@@ -42,13 +52,16 @@ module Croods
             end
 
             def required(resource)
-              resource.filters.reject(&:null).map(&:name)
+              collection_properties = resource.filters +
+                                      resource.pagination_params
+
+              collection_properties.reject(&:null).map(&:name)
             end
 
             def schema(resource)
               {
                 additionalProperties: false,
-                properties: filters(resource),
+                properties: properties(resource),
                 required: required(resource),
                 type: ['object']
               }

data/lib/croods/resource/pagination.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Croods
+  module Resource
+    module Pagination
+      def page_attribute
+        @page_attribute ||= Croods::Attribute.new(
+          Kaminari.config.param_name, :string, null: true
+        )
+      end
+
+      def per_page_attribute
+        @per_page_attribute ||= Croods::Attribute.new(
+          'per_page', :string, null: true
+        )
+      end
+
+      def pagination_params
+        @pagination_params ||= [page_attribute, per_page_attribute]
+      end
+
+      def page_attribute_name
+        @page_attribute.name
+      end
+
+      def page_method_name
+        @page_method_name ||= Kaminari.config.page_method_name
+      end
+    end
+  end
+end

data/lib/croods/resource/policy.rb

@@ -26,7 +26,7 @@ module Croods
       end
 
       def policy_scope_name(action)
-        "#{model_name}#{action.to_s.camelize}Scope"
+        "#{model_name}#{action.to_s.titleize.gsub(/\ /, '')}Scope"
       end
 
       def create_policy!

data/lib/croods/routes.rb

@@ -10,6 +10,7 @@ module ActionDispatch
           resource.create_model!
           resource.create_policy!
           resource.create_controller!
+          resource.apply_authorization_roles!
           create_resource_routes!(resource)
         end
 

data/lib/croods/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Croods
-  VERSION = '0.2.6'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: croods
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Daniel Weinmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-13 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: api-pagination
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: committee
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -296,6 +324,7 @@ files:
 - lib/croods/resource/json_schema/required.rb
 - lib/croods/resource/model.rb
 - lib/croods/resource/names.rb
+- lib/croods/resource/pagination.rb
 - lib/croods/resource/paths.rb
 - lib/croods/resource/policy.rb
 - lib/croods/resource/services.rb