lurker 0.6.1 → 0.6.2

data/features/atom_persistent_within_the_same_type.feature

@@ -54,7 +54,6 @@ Feature: atom persistent within test suite
         id: '100'
         controller: api/v2/users
         action: update
-      suffix: ''
     """
 
   Scenario: json schema tests response parameters and keep atom unchanged using "users/update"
@@ -133,6 +132,5 @@ Feature: atom persistent within test suite
         id: '100'
         controller: api/v2/users
         action: update
-      suffix: ''
 
     """

data/features/controller_nested_schema_scaffolding.feature

@@ -76,6 +76,5 @@ Feature: controller nested schema scaffolding
         action: index
       query_params:
         limit: 1
-      suffix: ''
 
     """

data/features/controller_schema_scaffolding.feature

@@ -66,6 +66,5 @@ Feature: controller schema scaffolding
         id: '1'
         controller: api/v1/users
         action: show
-      suffix: ''
 
   """

data/features/html_generation.feature

@@ -40,7 +40,6 @@ Feature: html generation
         path_params:
           action: create
           controller: api/v1/users
-        suffix: ''
       """
 
   When I successfully run `bin/lurker convert`

data/features/minitest.feature

@@ -61,7 +61,6 @@ Feature: minitest
         controller: api/v1/repos
         user_id: '1'
         id: '1'
-      suffix: ''
 
     """
 
@@ -100,7 +99,6 @@ Feature: minitest
       extensions:
         path_info: "/api/v1/users/1"
         method: PATCH
-        suffix: ''
         path_params:
           action: update
           controller: api/v1/users

data/features/multidomain_support.feature

@@ -50,7 +50,6 @@ Feature: mutidomain support
           action: destroy
           controller: api/v1/users
           id: 1
-        suffix: ''
       """
 
   When I successfully run `bin/lurker convert`

data/features/multitype_request_support.feature

@@ -55,7 +55,6 @@ Feature: multitype request support
         id: '1'
         controller: api/v2/users
         action: update
-      suffix: ''
     """
 
   Scenario: json schema tests response parameters and update request parameters using "users/update"
@@ -134,6 +133,5 @@ Feature: multitype request support
         id: '1'
         controller: api/v2/users
         action: update
-      suffix: ''
 
     """

data/features/partials.feature

@@ -61,7 +61,6 @@ Feature: partials
           action: create
           controller: api/v1/repos
           user_id: '1'
-        suffix: ''
       """
 
     Given a file named "spec/requests/repo_creation_spec.rb" with:

data/features/request_nested_schema_scaffolding.feature

@@ -66,6 +66,5 @@ Feature: request nested schema scaffolding
         controller: api/v1/repos
         user_id: '1'
         id: '1'
-      suffix: ''
 
     """

data/features/request_schema_scaffolding.feature

@@ -76,6 +76,5 @@ Feature: request schema scaffolding
         controller: api/v1/users
       query_params:
         limit: '1'
-      suffix: ''
 
     """

data/features/schema_suffixes.feature

@@ -48,7 +48,6 @@ Feature: schema suffixes
       extensions:
         path_info: "/api/v1/users/razum2um/repos/lurker.json"
         method: PATCH
-        suffix: ''
         path_params:
           action: update
           controller: api/v1/repos

data/features/schema_updating_within_test_suite.feature

@@ -26,6 +26,9 @@ Feature: schema updating within test suite
               type: string
               example: 'Bob'
     responseCodes:
+    - status: 400
+      successful: true
+      description: ''
     - status: 200
       successful: true
       description: ''
@@ -54,7 +57,37 @@ Feature: schema updating within test suite
         id: '1'
         controller: api/v2/users
         action: update
-      suffix: ''
+    """
+
+  Scenario: json schema tests response parameters and request parameters and show errors from both using "users/update"
+  Given a file named "spec/controllers/api/v2/users_controller_blank_spec.rb" with:
+    """ruby
+      require "spec_helper"
+
+      describe Api::V2::UsersController, :lurker do
+        render_views
+
+        let(:user) do
+          User.where(name: 'razum2um', surname: 'Unknown').first_or_create!
+        end
+
+        it "updates a user surname as string" do
+          patch :update, id: user.id, user: { name: '', surname: 'Marley' }
+          expect(response).not_to be_success
+        end
+      end
+    """
+
+  When I run `bin/rspec spec/controllers/api/v2/users_controller_blank_spec.rb`
+  Then the output should contain failures:
+    """
+    Lurker::ValidationError:
+      Request
+        The property '#/user' contains additional properties ["surname"]
+      Response
+        The property '#/' contains additional properties ["errors"]
+
+    1 example, 1 failure
     """
 
   Scenario: json schema tests response parameters and update request parameters using "users/update"
@@ -105,6 +138,9 @@ Feature: schema updating within test suite
               type: string
               example: Marley
     responseCodes:
+    - status: 400
+      successful: true
+      description: ''
     - status: 200
       successful: true
       description: ''
@@ -133,6 +169,5 @@ Feature: schema updating within test suite
         id: '1'
         controller: api/v2/users
         action: update
-      suffix: ''
 
     """

data/features/test_endpoint.feature

@@ -47,7 +47,6 @@ Feature: test endpoint
       extensions:
         path_info: "/api/v1/users/1"
         method: PATCH
-        suffix: ''
         path_params:
           action: update
           controller: api/v1/users

data/lib/lurker.rb

@@ -47,7 +47,9 @@ module Lurker
   class UndocumentedResponseCode < ValidationError; end
 end
 
+require 'lurker/jaml_descriptor'
 require 'lurker/schema'
+require 'lurker/json_schema_hash'
 require 'lurker/schema_modifier'
 require 'lurker/schema_modifier/hash'
 require 'lurker/schema_modifier/array'
@@ -55,10 +57,12 @@ require 'lurker/schema_modifier/atom'
 require 'lurker/ref_object'
 require 'lurker/erb_schema_context'
 require 'lurker/service'
-require 'lurker/jaml_descriptor'
 require 'lurker/validator'
 require 'lurker/validation_error'
+require 'lurker/utils'
 require 'lurker/endpoint'
+require 'lurker/endpoint/response_codes'
+require 'lurker/endpoint/http_parameters'
 require 'lurker/rendering_controller'
 require 'lurker/form_builder'
 require 'lurker/presenters/json_presenter'

data/lib/lurker/endpoint.rb

@@ -4,221 +4,166 @@ require 'json-schema'
 
 # Endpoints represent the schema for an API endpoint
 # The #consume_* methods will raise exceptions if input differs from the schema
-class Lurker::Endpoint
-
-  attr_reader :schema, :service, :endpoint_path, :current_scaffold, :extensions
-  attr_accessor :errors
-
-  def initialize(endpoint_path, extensions={}, service=Lurker::Service.default_service)
-    @endpoint_path = endpoint_path
-    @extensions = extensions
-    @service = service
-    @errors = []
-    @persisted = false
-    @schema = File.exist?(endpoint_path) ? load_schema : build_schema
-  end
-
-  def persist!
-    schema.ordered!.write_to(endpoint_path)
-    @persisted = true
-  end
-
-  def indexed?
-    prefix.present? && description.present?
-  end
-
-  def consume!(request_params, response_params, status_code, successful=true)
-    consume_request(request_params, successful)
-    consume_response(response_params, status_code, successful)
-    raise_errors!
-  end
-
-  def consume_request(params, successful=true)
-    if successful
-      Lurker::SchemaModifier.merge!(request_parameters, stringify_keys(params))
+module Lurker
+  class Endpoint
+    include Lurker::Utils
+
+    attr_reader :schema, :service, :endpoint_path, :extensions
+    attr_reader :request_parameters, :response_parameters, :response_codes
+    attr_accessor :errors
+
+    def initialize(endpoint_path, extensions = {}, service = Lurker::Service.default_service)
+      @endpoint_path = endpoint_path
+      @extensions = extensions
+      @service = service
+      @errors = []
+      @persisted = false
+      @schema = File.exist?(endpoint_path) ? load_schema : build_schema
+
+      initialize_schema_properties
     end
-  end
 
-  def consume_response(params, status_code, successful=true)
-    return validate_response(params, status_code, successful) if persisted?
+    def persist!
+      schema.ordered! unless persisted?
+      schema.write_to(endpoint_path)
 
-    if successful
-      Lurker::SchemaModifier.merge!(response_parameters, stringify_keys(params))
+      @persisted = true
     end
 
-    if !status_code_exists?(status_code, successful)
-      response_code = {
-        "status" => status_code,
-        "successful" => successful,
-        "description" => ""
-      }
-
-      Lurker::SchemaModifier.append!(response_codes, response_code)
+    def indexed?
+      prefix.present? && description.present?
     end
-  end
 
-  def verb
-    @verb ||= endpoint_path.match(/([A-Z]*)\.json(\.yml)?(\.erb)?$/)[1]
-  end
+    def consume!(request_params, response_params, status_code, successful = true)
+      consume_request(request_params, successful)
+      consume_response(response_params, status_code, successful)
 
-  def path
-    @path ||= endpoint_path.
-                gsub(service.service_dir, "").
-                match(/\/?(.*)[-\/][A-Z]+\.json(\.yml)?(\.erb)?$/)[1]
-  end
+      raise_errors!
+    end
 
-  # properties
+    def consume_request(params, successful = true)
+      request_parameters.validate(params) if persisted?
+      request_parameters.add(params) if successful
+    end
 
-  def deprecated?
-    @schema["deprecated"]
-  end
+    def consume_response(params, status_code, successful = true)
+      if persisted?
+        response_codes.validate!(status_code, successful)
+        response_parameters.validate(params) if successful
 
+        return
+      end
 
-  def prefix
-    @schema["prefix"]
-  end
+      response_parameters.add(params) if successful
+      response_codes.add(status_code, successful) unless response_codes.exists?(
+        status_code, successful)
+    end
 
-  def description
-    @schema["description"]
-  end
+    def verb
+      @verb ||= endpoint_path.match(/([A-Z]*)\.json(\.yml)?(\.erb)?$/)[1]
+    end
 
-  def url_params
-    (schema.extensions['path_params'] || {}).reject { |k, _| ['action', 'controller', 'format'].include? k }
-  end
+    def path
+      @path ||= endpoint_path.
+                  gsub(service.service_dir, "").
+                  match(/\/?(.*)[-\/][A-Z]+\.json(\.yml)?(\.erb)?$/)[1]
+    end
 
-  def query_params
-    (schema.extensions['query_params'] || {})
-  end
+    # properties
 
-  def request_parameters
-    @schema["requestParameters"] ||= {}
-  end
+    def deprecated?
+      @schema["deprecated"]
+    end
 
-  def response_parameters
-    @schema["responseParameters"] ||= {}
-  end
+    def prefix
+      @schema["prefix"]
+    end
 
-  def response_codes
-    @schema["responseCodes"] ||= []
-  end
+    def description
+      @schema["description"]
+    end
 
-  protected
+    def url_params
+      (schema.extensions['path_params'] || {}).reject { |k, _| %w(action controller format).include? k }
+    end
 
-  def persisted?
-    !!@persisted
-  end
+    def query_params
+      (schema.extensions['query_params'] || {})
+    end
 
-  def load_schema
-    @persisted = true
+    protected
 
-    Lurker::Schema.new(
-      load_file(endpoint_path),
-      stringify_keys(extensions)
-    )
-  end
+    def initialize_schema_properties
+      @response_codes = ResponseCodes.new(schema)
 
-  def build_schema
-    @persisted = false
-
-    Lurker::Schema.new(
-      {
-        "prefix" => "",
-        "description" => "",
-        "responseCodes" => []
-      },
-      stringify_keys(extensions)
-    )
-  end
+      @response_parameters = HttpParameters.new(schema,
+        schema_key: 'responseParameters', schema_id: endpoint_path, human_name: 'Response')
 
-  def load_file(fname)
-    if fname.match(/\.erb$/)
-      context = Lurker::ErbSchemaContext.new
-      erb = ERB.new(IO.read(fname)).result(context.get_binding)
-      YAML.load(erb)
-    else
-      YAML.load_file(fname)
+      @request_parameters = HttpParameters.new(schema,
+        schema_key: 'requestParameters', schema_id: endpoint_path, human_name: 'Request')
     end
-  end
 
-  def validate(expected_params, given_params, prefix=nil)
-    schema = set_additional_properties_false_on(expected_params.dup)
-    schema['id'] = "file://#{endpoint_path}"
-    unless (_errors = Lurker::Validator.new(schema, stringify_keys(given_params), record_errors: true).validate).empty?
-      self.errors << prefix
-      _errors.each { |e| self.errors << "- #{e}" }
-      return false
+    def persisted?
+      !!@persisted
     end
-    true
-  end
 
-  def validate_response(params, status_code, successful)
-    if !status_code_exists?(status_code, successful)
-      raise Lurker::UndocumentedResponseCode,
-        'Undocumented response: %s, successful: %s' % [
-          status_code, successful
-        ]
-    elsif successful
-      validate(response_parameters, params, 'Response')
-    else
-      true
+    def load_schema
+      @persisted = true
+
+      Lurker::Schema.new(
+        load_file(endpoint_path),
+        stringify_keys(extensions)
+      )
     end
-  end
 
-  def status_code_exists?(status_code, successful)
-    !!response_codes.detect do |code|
-      code["successful"] == successful &&
-        (code["status"] == status_code ||    # 200
-         code["status"].to_i == status_code) # "200 OK"
+    def build_schema
+      @persisted = false
+
+      Lurker::Schema.new(
+        {
+          "prefix" => "",
+          "description" => "",
+          "responseCodes" => []
+        },
+        stringify_keys(extensions)
+      )
     end
-  end
 
-  def raise_errors!
-    unless errors.empty?
-      raise Lurker::ValidationError.new(word_wrap((
-        # ['Schema', "- #{endpoint_path}"] +
-        errors
-        # + ['Diff', current_scaffold.schema.diff(schema)]
-      ).join("\n")))
+    def load_file(fname)
+      if fname.match(/\.erb$/)
+        context = Lurker::ErbSchemaContext.new
+        erb = ERB.new(IO.read(fname)).result(context.get_binding)
+        YAML.load(erb)
+      else
+        YAML.load_file(fname)
+      end
     end
-  end
 
-  def word_wrap(text)
-    text.gsub(/\s+in schema/m, "\n  in schema")
-  end
+    def raise_errors!
+      return if response_parameters.errors.empty?
 
-  # default additionalProperties on objects to false
-  # create a copy, so we don't mutate the input
-  def set_additional_properties_false_on(value)
-    if value.kind_of? Hash
-      copy = value.dup
-      if value["type"] == "object" || value.has_key?("properties")
-        copy["additionalProperties"] ||= false
-      end
-      value.each do |key, hash_val|
-        unless key == "additionalProperties"
-          copy[key] = set_additional_properties_false_on(hash_val)
-        end
+      errors = (request_parameters.errors | response_parameters.errors) * "\n"
+      exception = Lurker::ValidationError.new(word_wrap errors)
+      if (example = Lurker::Spy.current.block).respond_to?(:metadata) && (metadata = example.metadata).respond_to?(:location, true)
+        exception.set_backtrace [metadata.send(:location)]
       end
-      copy
-    elsif value.kind_of? Array
-      copy = value.map do |arr_val|
-        set_additional_properties_false_on(arr_val)
-      end
-    else
-      value
+      raise exception
     end
-  end
 
-  def stringify_keys(obj)
-    case obj
-    when Hash
-      result = {}
-      obj.each do |k, v|
-        result[k.to_s] = stringify_keys(v)
+    def word_wrap(text)
+      # strip .json# | .json.yml# | .json.yml.erb#
+      text = text.reverse
+      text.gsub!(/(\n|^)#bre\./, "\nbre.")
+      text.gsub!(/(\n|^)#lmy\./, "\nlmy.")
+      text.gsub!(/(\n|^)#nosj\./, "\nnosj.")
+      text.strip!
+      text = text.reverse
+
+      text.gsub!(/\s+in schema/m, "\n  in schema")
+      if defined?(Rails)
+        text.gsub!(/file:\/\/#{Rails.root}\//m, "")
       end
-      result
-    when Array then obj.map { |v| stringify_keys(v) }
-    else obj
+      text
     end
   end
 end