habarico 7.3.0.pre.beta.4 → 7.3.0.pre.beta.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a056cdaeb146337defb5bedd3926ee8d82b90480523ccb0f3b4d8555c9677869
-  data.tar.gz: 15edda4d7164407fbb56b8637d627dd3b966268281338cd2be871d4b7270ce6d
+  metadata.gz: eda89e03950b126daf32cd28fc71e2304ad8f0ea952a40a7cbbe4f22bb214074
+  data.tar.gz: e3d1f3ba8d50cc95d9a06ac90aef33a2a79a3cc988a69c099e259d6ee00ff4bc
 SHA512:
-  metadata.gz: 532da0b4889e1c30d26f05c83bde244edebfc8202c58ddfe955aead87279b5a3748cd64eca4feabe332958186c6b8aa0fc62a5c1788a1da4aa9a21ec13814644
-  data.tar.gz: 7d77a42cbe998a8306ed73f1943cc907b7fc53543a382c54a5ff34d86da30b8f371d2b44d3459c059272199549a778e9ad813a8de68768b51f8dc93995ff275c
+  metadata.gz: 7543c39d73bd2e0036111fdfccb10d43527c93efea40486a5cf57f112b1566e7a032c8e6224838cd9ae3b56cdb27072eea7858a58e631c63d99e9c16e2b8fff3
+  data.tar.gz: e1791678ea0908958c68090f9545b1870c37096f65e94a37ba502f35905c5260d60d3480351b48cc5516560c101780cff72ce8618d12edeac7927542637a1664

data/VERSION

@@ -1 +1 @@
-7.3.0-beta.4
+7.3.0-beta.6

data/app/controllers/habarico/action_schema_controller.rb

@@ -13,9 +13,7 @@ module Habarico
         current_user: current_user,
         target: (JSON.parse(params['_target']) rescue {}).symbolize_keys
       )
-      render json: Habarico::SchemaService.instance.get_action_schema(resource_name, action_name, context)
-                                          .as_json
-                                          .deep_compact(compactable: [nil, {}].freeze)
+      render_schema(Habarico::SchemaService.instance.get_action_schema(resource_name, action_name, context))
     end
 
     def show
@@ -32,9 +30,7 @@ module Habarico
         record_pk: params[:id],
         target: (JSON.parse(params['_target']) rescue {}).symbolize_keys
       )
-      render json: Habarico::SchemaService.instance.get_action_schema(resource_name, action_name, context)
-                                          .as_json
-                                          .deep_compact(compactable: [nil, {}].freeze)
+      render_schema(Habarico::SchemaService.instance.get_action_schema(resource_name, action_name, context))
     end
 
   end

data/app/controllers/habarico/application_controller.rb

@@ -11,5 +11,14 @@ module Habarico
       request.format = :json if %w[text/html */*].include?(request.format.to_s)
     end
 
+    private
+
+    # Renders a generated schema; `SchemaService` answers nil for a resource it does not know.
+    def render_schema(schema)
+      raise Eluvia::Errors::NotFound.new('Resource not found.') if schema.nil?
+
+      render json: Habarico::Serializers.compact_json(schema)
+    end
+
   end
 end

data/app/controllers/habarico/global_schema_controller.rb

@@ -4,7 +4,7 @@ module Habarico
     def index
       # Prepare context and generate schema
       context = Habarico::Context.new(current_user: current_user)
-      render json: Habarico::SchemaService.instance.get_global_schema(context).as_json.deep_compact(compactable: [nil, {}].freeze)
+      render_schema(Habarico::SchemaService.instance.get_global_schema(context))
     end
 
   end

data/app/controllers/habarico/local_schema_controller.rb

@@ -12,7 +12,7 @@ module Habarico
         target: (JSON.parse(params['_target']) rescue {}).symbolize_keys,
         source: (JSON.parse(params['_source']) rescue {}).symbolize_keys
       )
-      render json: Habarico::SchemaService.instance.get_local_schema(resource_name, context).as_json.deep_compact(compactable: [nil, {}].freeze)
+      render_schema(Habarico::SchemaService.instance.get_local_schema(resource_name, context))
     end
 
     def show
@@ -28,7 +28,7 @@ module Habarico
         target: (JSON.parse(params['_target']) rescue {}).symbolize_keys,
         source: (JSON.parse(params['_source']) rescue {}).symbolize_keys
       )
-      render json: Habarico::SchemaService.instance.get_local_schema(resource_name, context).as_json.deep_compact(compactable: [nil, {}].freeze)
+      render_schema(Habarico::SchemaService.instance.get_local_schema(resource_name, context))
     end
 
   end

data/lib/habarico/active_model/extensible_enum.rb

@@ -0,0 +1,43 @@
+module Habarico
+  module ActiveModel
+    # Declarations built from a list of choices that may grow after the class is defined.
+    #
+    # `enum_attr` and `intended_for_types` copy the choices into the class when they are called, so
+    # appending to the list alone would change nothing. This module records every declaration made
+    # from a list and repeats it when `add_values` extends the list.
+    module ExtensibleEnum
+      extend ::ActiveSupport::Concern
+
+      # Declarations made from a list, as `{ list => [declaration, ...] }`, keyed by the list itself
+      # since its contents change.
+      def self.declarations
+        @declarations ||= Hash.new { |hash, list| hash[list] = [] }.compare_by_identity
+      end
+
+      # Runs `declaration` now and again whenever `add_values` extends `list`.
+      def self.declare(list, &declaration)
+        declarations[list] << declaration
+        declaration.call
+      end
+
+      # Appends `values` to `list` and repeats every declaration made from it.
+      def self.add_values(list, values)
+        list.concat(values)
+        declarations[list].each(&:call)
+        list
+      end
+
+      class_methods do
+        # `enum_attr attr_name, list`, kept in step with `list`.
+        def extensible_enum_attr(attr_name, list)
+          ExtensibleEnum.declare(list) { enum_attr attr_name, list }
+        end
+
+        # `intended_for_types(*list)`, kept in step with `list`.
+        def extensible_intended_for_types(list)
+          ExtensibleEnum.declare(list) { intended_for_types(*list) }
+        end
+      end
+    end
+  end
+end