Merge pull request #544 from appwrite/fix-ruby-services

Fix ruby services

Author: christyjacob4

templates/ruby/base/params.twig

@@ -1,3 +1,16 @@
+            path = '{{ method.path }}'
+{% for parameter in method.parameters.path %}
+                .gsub('{{ '{' }}{{ parameter.name }}{{ '}' }}', {{ parameter.name | caseSnake | escapeKeyword }})
+{% endfor %}
+
+{% for parameter in method.parameters.all %}
+{% if parameter.required %}
+            if {{ parameter.name | caseSnake | escapeKeyword }}.nil?
+              raise {{spec.title | caseUcfirst}}::Exception.new('Missing required parameter: "{{ parameter.name | caseCamel | escapeKeyword }}"')
+            end
+
+{% endif %}
+{% endfor %}
             params = {
 {% for parameter in method.parameters.query | merge(method.parameters.body)  %}
                 {{ parameter.name }}: {{ parameter.name | caseSnake | escapeKeyword }},
@@ -12,16 +25,3 @@
                 "{{ key }}": '{{ header }}',
 {% endfor %}
             }
-{% if method.parameters.all | length %}
-{% for parameter in method.parameters.all %}
-{% if parameter.required %}
-            if {{ parameter.name | caseSnake | escapeKeyword }}.nil?
-                raise {{spec.title | caseUcfirst}}::Exception.new('Missing required parameter: "{{ parameter.name | caseCamel | escapeKeyword }}"')
-            end
-
-{% endif %}
-{% endfor %}
-{% for parameter in method.parameters.path %}
-                .gsub('{{ '{' }}{{ parameter.name }}{{ '}' }}', {{ parameter.name | caseSnake | escapeKeyword }})
-{% endfor %}
-{% endif %}

templates/ruby/docs/example.md.twig

@@ -1,20 +1,17 @@
-require 'appwrite'
+require '{{ spec.title }}'
 
-client = Appwrite::Client.new
-{% if method.type == "upload" %}
-InputFile = Appwrite::InputFile
-{% endif %}
+include {{ spec.title | caseUcfirst }}
 
-client
+client = Client.new
     .set_endpoint('https://[HOSTNAME_OR_IP]/v1') # Your API Endpoint
 {% for node in method.security %}
 {% for key,header in node|keys %}
     .set_{{header|caseSnake}}('{{node[header]['x-appwrite']['demo']}}') # {{node[header].description}}
 {% endfor %}
 {% endfor %}
 
-{{ service.name | caseSnake }} = {{spec.title | caseUcfirst}}::{{ service.name | caseUcfirst }}.new(client{% if service.globalParams | length %}{% for parameter in service.globalParams %}, {{parameter.name | caseSnake}}:{{ parameter | paramExample }}{% endfor %}{% endif %})
+{{ service.name | caseSnake }} = {{ service.name | caseUcfirst }}.new(client{% if service.globalParams | length %}{% for parameter in service.globalParams %}, {{parameter.name | caseSnake}}:{{ parameter | paramExample }}{% endfor %}{% endif %})
 
-response = {{ service.name | caseSnake }}.{{ method.name | caseSnake }}({% for parameter in method.parameters.all %}{% if parameter.required %}{% if not loop.first %}, {% endif %}{{parameter.name|caseSnake}}: {% if parameter.type == 'file' %}{{spec.title | caseUcfirst}}::{{ parameter | paramExample }}{% else %}{{ parameter | paramExample }}{% endif %}{% endif %}{% endfor %})
+response = {{ service.name | caseSnake }}.{{ method.name | caseSnake }}({% for parameter in method.parameters.all %}{% if parameter.required %}{% if not loop.first %}, {% endif %}{{parameter.name|caseSnake}}: {% if parameter.type == 'file' %}{{ parameter | paramExample }}{% else %}{{ parameter | paramExample }}{% endif %}{% endif %}{% endfor %})
 
 puts response.inspect

templates/ruby/lib/container/services/service.rb.twig

@@ -16,9 +16,6 @@ module {{spec.title | caseUcfirst}}
         #
         # @return [{{ method.responseModel | caseUcfirst }}]
         def {{ method.name | caseSnake }}({% for parameter in method.parameters.all %}{{ parameter.name | caseSnake | escapeKeyword }}:{% if not parameter.required %} nil{% endif %}{% if not loop.last %}, {% endif %}{% endfor %}{% if 'multipart/form-data' in method.consumes %}, on_progress: nil{% endif %})
-
-            path = '{{ method.path }}'
-
 {{ include('ruby/base/params.twig')}}
 {% if 'multipart/form-data' in method.consumes %}
 {{ include('ruby/base/requests/file.twig')}}