Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor RemoteResponse class into a plain-old Struct with some custom methods added. #11

Open
wants to merge 1 commit into
base: gems-upgrade
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions angus-remote.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
spec.add_dependency('angus-sdoc', '~> 0.0', '>= 0.0.6')
spec.add_dependency('multipart-post', '>= 2.2')
spec.add_dependency('persistent_http', '~> 2.0.3')
spec.add_dependency('activesupport')

spec.add_development_dependency('ci_reporter', '~> 2.0.0')
spec.add_development_dependency('fakefs')
Expand Down
35 changes: 0 additions & 35 deletions lib/angus/remote/remote_response.rb

This file was deleted.

18 changes: 0 additions & 18 deletions lib/angus/remote/representation.rb

This file was deleted.

83 changes: 56 additions & 27 deletions lib/angus/remote/response/builder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,11 @@
require 'date'
require 'json'

require_relative '../message'
require_relative '../remote_response'

require_relative 'hash'
require 'active_support/core_ext/string/inflections'

require_relative '../message'
require_relative '../service_directory'


# TODO: move to another gem and possibly change its name
require_relative '../../unmarshalling'

Expand Down Expand Up @@ -57,16 +54,6 @@ def self.build_from_definition(status_code, body, service_code_name, service_ver
json_response = JSON(body)

fields = {}

fields[:status] = json_response['status']
fields[:status_code] = status_code
fields[:messages] = self.build_messages(json_response['messages'])
fields[:body] = body
fields[:service_code_name] = service_code_name
fields[:service_version] = service_version
fields[:operation_namespace] = operation_namespace
fields[:operation_code_name] = operation_code_name

representations_hash = self.representations_hash(representations)
glossary_terms_hash = glossary.terms_hash

Expand All @@ -76,15 +63,49 @@ def self.build_from_definition(status_code, body, service_code_name, service_ver
fields[element.name.to_sym] = element_value
end

response_class = Angus::Remote::RemoteResponse.new(*fields.keys, :elements)
response = response_class.new(*fields.values, fields.transform_keys(&:to_s))
# Esto tira un warning cada vez que el nombre de la clase se repite:
# warning: redefining constant Struct::SomethingResponse
# Evaluar si conviene hacer "repsonse_class = " o bien "ResponseClass = "
response_class = Struct.new("#{operation_code_name.camelcase}Response", *fields.keys) do
attr_reader :status, :status_code, :messages, :http_response_info

def initialize(status, status_code, messages, http_response_info, *args)
@status = status
@status_code = status_code
@messages = messages
@http_response_info = http_response_info

response.http_response_info[:status_code] = status_code
response.http_response_info[:body] = body
response.http_response_info[:service_code_name] = service_code_name
response.http_response_info[:service_version] = service_version
response.http_response_info[:operation_namespace] = operation_namespace
response.http_response_info[:operation_code_name] = operation_code_name
super(*args)
end

def to_hash
{
http_status_code: @http_response_info[:status_code],
body: @http_response_info[:body],
service_name: @http_response_info[:service_name],
operation_name: @http_response_info[:operation_name]
}
end

def elements
to_h.transform_keys(&:to_s)
end
end

response = response_class.new(
json_response['status'],
status_code,
build_messages(json_response['messages']),
{
status_code: status_code,
body: body,
service_name: service_code_name,
service_version: service_version,
operation_namespace: operation_namespace,
operation_name: operation_code_name
},
*fields.values
)

fields = nil
response_class = nil
Expand Down Expand Up @@ -216,8 +237,12 @@ def self.build_from_representation(hash_value, type, representations, glossary_t
fields[field.name.to_sym] = field_value
end

representation_class = Struct.new(*fields.keys, :elements)
representation_object = representation_class.new(*fields.values, fields.transform_keys(&:to_s))
representation_class = Struct.new("#{type.to_s.camelcase}", *fields.keys) do
def elements
to_h.transform_keys(&:to_s)
end
end
representation_object = representation_class.new(*fields.values)

fields = nil
representation_class = nil
Expand Down Expand Up @@ -263,8 +288,12 @@ def self.build_from_variable_fields(variable_fields_hash)
fields[key_name.to_sym] = field_value
end

representation_class = Struct.new(*fields.keys, :elements)
representation_object = representation_class.new(*fields.values, fields.transform_keys(&:to_s))
representation_class = Struct.new(*fields.keys) do
def elements
to_h.transform_keys(&:to_s)
end
end
representation_object = representation_class.new(*fields.values)

fields = nil
representation_class = nil
Expand Down
49 changes: 0 additions & 49 deletions lib/angus/remote/response/hash.rb

This file was deleted.

2 changes: 0 additions & 2 deletions spec/angus/remote/response/builder_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

require 'angus/remote/response/builder'

require 'angus/remote/remote_response'

describe Angus::Remote::Response::Builder do

subject(:builder) { Angus::Remote::Response::Builder }
Expand Down
56 changes: 0 additions & 56 deletions spec/angus/remote/response/hash_spec.rb

This file was deleted.