praxis 2.0.pre.7 → 2.0.pre.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1854f289afef574a8f46cc2e98ab1426a39cf908f1a761b3b294b044b3ea1093
-  data.tar.gz: 70dfe074269ea807771f891958096b66ea4d2a2a5fa399722527a7114867ac79
+  metadata.gz: fa1ee705af72674f99b3b697fe5199636d6268a55696e1bcdf4a892b11b7acf3
+  data.tar.gz: e3cc19834e9640b0ee252240013367b7e444623d19e3acb9cb3eff8c83d71223
 SHA512:
-  metadata.gz: 6d135d076923a6564b1c7b956a9ad069951d9033b6450eb135772dc7f03a9e1cf36edc0e650a9970694dcb707164326d646c638f917bd5bd55cff51f3a5b0c0c
-  data.tar.gz: e6c6f36d894f2ff67d85d56073bc54f68d4450a757870c04aecae7d8f33daddd1bdadf2142e36407d12be85e718675624d1229776759277f196f462e574f14b7
+  metadata.gz: 958b4bf7d5684477bfb371e970f8f05871c1699a4980dc508367d5d659dc013ce049b3336d55ca1b4ca1cf617ec5b10924e92e41f18102680087ebf015fe6ce7
+  data.tar.gz: 2bbde613a765af9769b9dba0a13860b4dc520148e4263c5b4b52acf55960f8ba0aa63870f3f31c1ef73a047c33b7ffce30477d789380617f336c0893dedf31a6

data/lib/praxis/docs/openapi/parameter_object.rb

@@ -48,11 +48,11 @@ module Praxis
   
           if action.params
             route_params = \
-              if action.primary_route.nil?
+              unless action.route
                 warn "Warning: No routes defined for action #{action.name}"
                 []
               else
-                action.primary_route.path.named_captures.keys.collect(&:to_sym)
+                action.route.path.named_captures.keys.collect(&:to_sym)
               end
             (action.params.attributes||{}).each_with_object(output) do |(name, info), out|
               in_type = route_params.include?(name) ? :path : :query

data/lib/praxis/docs/openapi/paths_object.rb

@@ -31,21 +31,18 @@ module Praxis
           # fill in the paths hash with a key for each path for each action/route
           resource.actions.each do |action_name, action|
             params_example =  action.params ? action.params.example(nil) : nil
-            urls = action.route.collect do |route|
-              ActionDefinition.url_description(route: route, params: action.params, params_example: params_example)
-            end.compact
-            urls.each do |url|
-              verb = url[:verb].downcase
-              templetized_path = OpenApiGenerator.templatize_url(url[:path])
-              path_entry = paths[templetized_path]
-              # Let's fill in verb stuff within the working hash
-              raise "VERB #{_verb} already defined for #{id}!?!?!" if path_entry[verb]
-              
-              action_uid = "action-#{action_name}-#{id}"
-              # Add a tag matching the resource name (hoping all actions of a resource are grouped)
-              action_tags = [resource.display_name]
-              path_entry[verb] = OperationObject.new( id: action_uid, url: url, action: action, tags: action_tags).dump
-            end
+            url = ActionDefinition.url_description(route: action.route, params: action.params, params_example: params_example)
+
+            verb = url[:verb].downcase
+            templetized_path = OpenApiGenerator.templatize_url(url[:path])
+            path_entry = paths[templetized_path]
+            # Let's fill in verb stuff within the working hash
+            raise "VERB #{_verb} already defined for #{id}!?!?!" if path_entry[verb]
+            
+            action_uid = "action-#{action_name}-#{id}"
+            # Add a tag matching the resource name (hoping all actions of a resource are grouped)
+            action_tags = [resource.display_name]
+            path_entry[verb] = OperationObject.new( id: action_uid, url: url, action: action, tags: action_tags).dump
           end
           # For each path, we can further annotate with 
           # servers

data/lib/praxis/extensions/pagination/ordering_params.rb

@@ -88,6 +88,10 @@ module Praxis
 
         attr_reader :items
 
+        def self.json_schema_type
+          :string
+        end
+
         def self.native_type
           self
         end

data/lib/praxis/extensions/pagination/pagination_params.rb

@@ -175,6 +175,10 @@ module Praxis
           end
         end
 
+        def self.json_schema_type
+          :string
+        end
+
         def self.native_type
           self
         end

data/lib/praxis/version.rb

@@ -1,3 +1,3 @@
 module Praxis
-  VERSION = '2.0.pre.7'
+  VERSION = '2.0.pre.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: praxis
 version: !ruby/object:Gem::Version
-  version: 2.0.pre.7
+  version: 2.0.pre.8
 platform: ruby
 authors:
 - Josep M. Blanquer