shaf 1.5.0 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (165) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data.tar.gz.sig +0 -0
  4. data/iana_link_relations.csv.gz +0 -0
  5. data/lib/shaf.rb +6 -0
  6. data/lib/shaf/alps/attribute_serializer.rb +41 -0
  7. data/lib/shaf/alps/json_serializer.rb +50 -0
  8. data/lib/shaf/alps/relation_serializer.rb +70 -0
  9. data/lib/shaf/api_doc/link_relations.rb +77 -0
  10. data/lib/shaf/app.rb +12 -5
  11. data/lib/shaf/authenticator.rb +56 -0
  12. data/lib/shaf/authenticator/base.rb +161 -0
  13. data/lib/shaf/authenticator/basic_auth.rb +25 -0
  14. data/lib/shaf/authenticator/challenge.rb +32 -0
  15. data/lib/shaf/authenticator/parameter.rb +31 -0
  16. data/lib/shaf/authenticator/request.rb +17 -0
  17. data/lib/shaf/command/console.rb +1 -1
  18. data/lib/shaf/command/generate.rb +5 -2
  19. data/lib/shaf/command/new.rb +20 -7
  20. data/lib/shaf/command/templates/Gemfile.erb +1 -0
  21. data/{templates/config/settings.yml → lib/shaf/command/templates/config/settings.yml.erb} +1 -5
  22. data/lib/shaf/errors.rb +11 -0
  23. data/lib/shaf/extensions.rb +3 -3
  24. data/lib/shaf/extensions/api_routes.rb +60 -0
  25. data/lib/shaf/extensions/authorize.rb +11 -9
  26. data/lib/shaf/extensions/log.rb +1 -1
  27. data/lib/shaf/extensions/resource_uris.rb +139 -63
  28. data/lib/shaf/extensions/symbolic_routes.rb +22 -19
  29. data/lib/shaf/formable.rb +1 -2
  30. data/lib/shaf/formable/form.rb +1 -1
  31. data/lib/shaf/generator.rb +2 -0
  32. data/lib/shaf/generator/base.rb +2 -3
  33. data/lib/shaf/generator/controller.rb +11 -7
  34. data/lib/shaf/generator/doc.rb +17 -0
  35. data/lib/shaf/generator/forms.rb +1 -0
  36. data/lib/shaf/generator/helper.rb +2 -1
  37. data/lib/shaf/generator/migration/base.rb +7 -3
  38. data/lib/shaf/generator/migration/type.rb +4 -26
  39. data/lib/shaf/generator/migration/types.rb +45 -16
  40. data/lib/shaf/generator/model.rb +1 -2
  41. data/lib/shaf/generator/profile.rb +52 -0
  42. data/lib/shaf/generator/serializer.rb +38 -73
  43. data/lib/shaf/generator/templates/api/policy.rb.erb +2 -2
  44. data/lib/shaf/generator/templates/api/profile.rb.erb +16 -0
  45. data/lib/shaf/generator/templates/api/serializer.rb.erb +2 -2
  46. data/lib/shaf/generator/templates/spec/integration_spec.rb.erb +1 -2
  47. data/lib/shaf/generator/templates/spec/serializer_spec.rb.erb +5 -5
  48. data/lib/shaf/helpers.rb +4 -0
  49. data/lib/shaf/helpers/authentication.rb +79 -0
  50. data/lib/shaf/helpers/cache_control.rb +1 -2
  51. data/lib/shaf/helpers/json_html.rb +58 -18
  52. data/lib/shaf/helpers/payload.rb +27 -41
  53. data/lib/shaf/helpers/vary.rb +8 -0
  54. data/lib/shaf/logger.rb +12 -0
  55. data/lib/shaf/parser.rb +65 -0
  56. data/lib/shaf/parser/base.rb +44 -0
  57. data/lib/shaf/parser/form_data.rb +15 -0
  58. data/lib/shaf/parser/json.rb +26 -0
  59. data/lib/shaf/profile.rb +110 -0
  60. data/lib/shaf/profile/attribute.rb +29 -0
  61. data/lib/shaf/profile/evaluator.rb +46 -0
  62. data/lib/shaf/profile/relation.rb +29 -0
  63. data/lib/shaf/profile/unique_id.rb +58 -0
  64. data/lib/shaf/profiles.rb +42 -0
  65. data/lib/shaf/profiles/shaf_basic.rb +20 -0
  66. data/lib/shaf/profiles/shaf_error.rb +48 -0
  67. data/lib/shaf/profiles/shaf_form.rb +109 -0
  68. data/lib/shaf/responder.rb +41 -2
  69. data/lib/shaf/responder/alps_json.rb +25 -0
  70. data/lib/shaf/responder/base.rb +20 -17
  71. data/lib/shaf/responder/hal.rb +62 -7
  72. data/lib/shaf/responder/html.rb +65 -9
  73. data/lib/shaf/responder/problem_json.rb +1 -1
  74. data/lib/shaf/serializer.rb +31 -0
  75. data/lib/shaf/settings.rb +25 -12
  76. data/lib/shaf/spec.rb +1 -0
  77. data/lib/shaf/spec/authenticator.rb +13 -0
  78. data/lib/shaf/spec/base.rb +1 -1
  79. data/lib/shaf/spec/http_method_utils.rb +1 -1
  80. data/lib/shaf/spec/integration_spec.rb +25 -13
  81. data/lib/shaf/spec/payload_utils.rb +2 -2
  82. data/lib/shaf/supported_http_methods.rb +15 -0
  83. data/lib/shaf/tasks/api_doc_task.rb +24 -3
  84. data/lib/shaf/tasks/routes_task.rb +14 -17
  85. data/lib/shaf/upgrade/manifest.rb +11 -2
  86. data/lib/shaf/upgrade/package.rb +78 -49
  87. data/lib/shaf/upgrade/version.rb +11 -10
  88. data/lib/shaf/utils.rb +19 -5
  89. data/lib/shaf/version.rb +3 -1
  90. data/lib/shaf/yard.rb +34 -0
  91. data/lib/shaf/yard/attribute_method_handler.rb +19 -0
  92. data/lib/shaf/yard/attribute_object.rb +30 -0
  93. data/lib/shaf/yard/base_method_handler.rb +30 -0
  94. data/lib/shaf/yard/link_method_handler.rb +39 -0
  95. data/lib/shaf/yard/link_object.rb +60 -0
  96. data/lib/shaf/yard/nested_attributes.rb +37 -0
  97. data/lib/shaf/yard/parser.rb +64 -0
  98. data/lib/shaf/yard/profile_method_handler.rb +51 -0
  99. data/lib/shaf/yard/profile_object.rb +21 -0
  100. data/lib/shaf/yard/resource_object.rb +55 -0
  101. data/lib/shaf/yard/serializer_handler.rb +27 -0
  102. data/templates/api/controllers/base_controller.rb +0 -10
  103. data/templates/api/controllers/docs_controller.rb +5 -3
  104. data/templates/api/controllers/root_controller.rb +7 -1
  105. data/templates/api/policies/base_policy.rb +2 -0
  106. data/templates/api/serializers/base_serializer.rb +1 -3
  107. data/templates/api/serializers/error_serializer.rb +1 -5
  108. data/templates/api/serializers/form_serializer.rb +1 -5
  109. data/templates/api/serializers/validation_error_serializer.rb +1 -5
  110. data/templates/config.ru +1 -1
  111. data/templates/config/bootstrap.rb +1 -2
  112. data/templates/config/directories.rb +52 -44
  113. data/templates/config/helpers.rb +1 -1
  114. data/templates/config/initializers.rb +52 -8
  115. data/templates/config/initializers/authentication.rb +18 -0
  116. data/templates/config/initializers/db_migrations.rb +2 -2
  117. data/templates/config/initializers/logging.rb +2 -2
  118. data/templates/frontend/assets/css/main.css +33 -1
  119. data/templates/frontend/views/headers.erb +20 -0
  120. data/templates/frontend/views/layout.erb +7 -1
  121. data/templates/frontend/views/payload.erb +1 -0
  122. data/templates/spec/spec_helper.rb +2 -0
  123. data/upgrades/0.5.0.tar.gz +0 -0
  124. data/upgrades/1.0.4.tar.gz +0 -0
  125. data/upgrades/1.1.0.tar.gz +0 -0
  126. data/upgrades/1.6.0.tar.gz +0 -0
  127. data/upgrades/1.6.1.tar.gz +0 -0
  128. data/upgrades/2.0.0.tar.gz +0 -0
  129. data/yard_templates/api_doc/doc_index/html/body.erb +3 -0
  130. data/yard_templates/api_doc/doc_index/setup.rb +8 -0
  131. data/yard_templates/api_doc/html/css/api-doc.css +222 -0
  132. data/yard_templates/api_doc/html/favicon.ico +0 -0
  133. data/yard_templates/api_doc/html/js/switch_tab.js +17 -0
  134. data/yard_templates/api_doc/html/setup.rb +59 -0
  135. data/yard_templates/api_doc/layout/html/footer.erb +3 -0
  136. data/yard_templates/api_doc/layout/html/header.erb +7 -0
  137. data/yard_templates/api_doc/layout/html/layout.erb +13 -0
  138. data/yard_templates/api_doc/layout/setup.rb +24 -0
  139. data/yard_templates/api_doc/profile/html/attributes.erb +10 -0
  140. data/yard_templates/api_doc/profile/html/profile.erb +6 -0
  141. data/yard_templates/api_doc/profile/html/relations.erb +10 -0
  142. data/yard_templates/api_doc/profile/setup.rb +38 -0
  143. data/yard_templates/api_doc/profile_attribute/html/attribute.erb +23 -0
  144. data/yard_templates/api_doc/profile_attribute/setup.rb +21 -0
  145. data/yard_templates/api_doc/profile_relation/html/relation.erb +37 -0
  146. data/yard_templates/api_doc/profile_relation/setup.rb +41 -0
  147. data/yard_templates/api_doc/resource/html/attributes.erb +10 -0
  148. data/yard_templates/api_doc/resource/html/profile.erb +14 -0
  149. data/yard_templates/api_doc/resource/html/relations.erb +10 -0
  150. data/yard_templates/api_doc/resource/html/resource.erb +5 -0
  151. data/yard_templates/api_doc/resource/setup.rb +56 -0
  152. data/yard_templates/api_doc/resource_attribute/html/attribute.erb +23 -0
  153. data/yard_templates/api_doc/resource_attribute/setup.rb +20 -0
  154. data/yard_templates/api_doc/resource_relation/html/relation.erb +47 -0
  155. data/yard_templates/api_doc/resource_relation/setup.rb +80 -0
  156. data/yard_templates/api_doc/setup.rb +31 -0
  157. data/yard_templates/api_doc/sidebar/html/profile_list.erb +8 -0
  158. data/yard_templates/api_doc/sidebar/html/search.erb +7 -0
  159. data/yard_templates/api_doc/sidebar/html/serializer_list.erb +8 -0
  160. data/yard_templates/api_doc/sidebar/html/sidebar.erb +13 -0
  161. data/yard_templates/api_doc/sidebar/setup.rb +56 -0
  162. metadata +140 -30
  163. metadata.gz.sig +1 -2
  164. data/lib/shaf/extensions/current_user.rb +0 -48
  165. data/lib/shaf/responder/hal_serializable.rb +0 -54
@@ -0,0 +1,39 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'shaf/yard/base_method_handler'
4
+
5
+ module Shaf
6
+ module Yard
7
+ # Handles call to Shaf::Serializer::link
8
+ class LinkMethodHandler < BaseMethodHandler
9
+ handles method_call(:link)
10
+
11
+ def object
12
+ LinkObject.new(serializer_namespace, name).tap do |link|
13
+ link.dynamic = true
14
+ link.rel = name
15
+ link.curie = curie
16
+ end
17
+ end
18
+
19
+ def name
20
+ super.sub(/[^:]+:/, '')
21
+ end
22
+
23
+ def curie
24
+ m = name.match(/([^:]+):/)
25
+ return m[1] if m
26
+
27
+ statement.parameters(false).each do |param|
28
+ next unless param&.respond_to? :source
29
+
30
+ str = String(param.source)
31
+ m = str.match(/curie:\s:?(\w+)/)
32
+ return m[1] if m
33
+ end
34
+
35
+ nil
36
+ end
37
+ end
38
+ end
39
+ end
@@ -0,0 +1,60 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'shaf/api_doc/link_relations'
4
+
5
+ module Shaf
6
+ module Yard
7
+ class LinkObject < ::YARD::CodeObjects::Base
8
+ attr_accessor :rel, :curie
9
+
10
+ def curie?
11
+ !!curie
12
+ end
13
+
14
+ def documentation
15
+ profile_doc || iana_doc || 'Undocumented'
16
+ end
17
+
18
+ def profile_object
19
+ return unless profile
20
+ return unless namespace.respond_to? :profile_objects
21
+
22
+ namespace.profile_objects.find do |po|
23
+ po.profile == profile
24
+ end
25
+ end
26
+
27
+ def profile
28
+ return @profile if defined? @profile
29
+ return unless namespace.respond_to? :profile
30
+ profile = namespace.profile
31
+ @profile = profile&.find_relation(name) && profile
32
+ end
33
+
34
+ def descriptor
35
+ profile&.find_relation(rel)
36
+ end
37
+
38
+ def profile_doc
39
+ descriptor&.doc
40
+ end
41
+
42
+ def http_methods
43
+ Array(descriptor&.http_methods)
44
+ end
45
+
46
+ def href
47
+ descriptor&.href
48
+ end
49
+
50
+ def content_type
51
+ descriptor&.content_type
52
+ end
53
+
54
+ def iana_doc
55
+ ApiDoc::LinkRelations.load_iana
56
+ ApiDoc::LinkRelations[name.to_sym]&.description
57
+ end
58
+ end
59
+ end
60
+ end
@@ -0,0 +1,37 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shaf
4
+ module Yard
5
+ module NestedAttributes
6
+ def nested_attributes_for(descriptor)
7
+ return {} unless descriptor
8
+
9
+ base_key = nested_key(descriptor)
10
+ nested_attributes(descriptor)
11
+ .yield_self { |nested| flatten(nested, base_key) }
12
+ end
13
+
14
+ def nested_attributes(descriptor)
15
+ attrs = Array(descriptor&.attributes)
16
+ attrs.each_with_object({}) do |attr, nested|
17
+ nested[attr] = nested_attributes(attr)
18
+ end.transform_values { |v| v.empty? ? nil : v }
19
+ end
20
+
21
+ def flatten(nested, base_key)
22
+ return {} if !nested || nested.empty?
23
+
24
+ nested.each_with_object({}) do |(desc, nested), all|
25
+ key = nested_key(base_key, desc)
26
+ all[key] = desc
27
+ next unless nested
28
+ all.merge!(flatten(nested, key))
29
+ end
30
+ end
31
+
32
+ def nested_key(base_key = nil, desc)
33
+ [base_key, desc.name].compact.join('.')
34
+ end
35
+ end
36
+ end
37
+ end
@@ -0,0 +1,64 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shaf
4
+ module Yard
5
+ class Parser
6
+ def self.call(name: '')
7
+ new(name).parse!
8
+ end
9
+
10
+ def initialize(name)
11
+ @name = name.downcase
12
+ end
13
+
14
+ def parse!
15
+ verify_exists! unless name.empty?
16
+ ::YARD.parse pattern
17
+ end
18
+
19
+ private
20
+
21
+ attr_reader :name
22
+
23
+ def pattern
24
+ return file_path if file_path
25
+
26
+ base = ['*', suffix].join
27
+ File.join(base_dir, '**', base)
28
+ end
29
+
30
+ def suffix
31
+ '_serializer.rb'
32
+ end
33
+
34
+ def verify_exists!
35
+ file_path or raise <<~ERR
36
+ Could not find a matching serializer for #{name}.
37
+ Looked in: #{base_dir}
38
+ Using suffix: #{suffix}
39
+ ERR
40
+ end
41
+
42
+ def file_path
43
+ @file_path ||= lookup_path
44
+ end
45
+
46
+ def base_dir
47
+ File.join(Shaf::Settings.app_dir || 'api', 'serializers')
48
+ end
49
+
50
+ def lookup_path
51
+ return if name.empty?
52
+
53
+ path = File.join(base_dir, name)
54
+ return path if File.exist? path
55
+
56
+ with_suffix = [path, suffix].join
57
+ return with_suffix if File.exist? with_suffix
58
+
59
+ with_extension = [path, '.rb'].join
60
+ with_extension if File.exist? with_extension
61
+ end
62
+ end
63
+ end
64
+ end
@@ -0,0 +1,51 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'shaf/yard/base_method_handler'
4
+ require 'shaf/profiles'
5
+ require 'shaf/utils'
6
+
7
+ module Shaf
8
+ module Yard
9
+ # Handles call to Shaf::Serializer::profile
10
+ class ProfileMethodHandler < BaseMethodHandler
11
+ include Shaf::Utils
12
+
13
+ handles method_call(:profile)
14
+
15
+ def process
16
+ serializer = serializer_namespace
17
+ profile = shaf_profile
18
+ return unless serializer
19
+
20
+ serializer.profile = profile
21
+
22
+ register object
23
+ serializer_namespace.profile_objects << object
24
+ end
25
+
26
+ def shaf_profile
27
+ return @shaf_profile if defined? @shaf_profile
28
+
29
+ bootstrap(env: ENV['RACK_ENV'])
30
+
31
+ @shaf_profile = Shaf::Profiles.find name
32
+ end
33
+
34
+ def object
35
+ # Put the Profile object on the the same namespace level as
36
+ # the serializer. Typically this it the root namespace
37
+ ns = namespace.namespace
38
+
39
+ name = shaf_profile&.to_s || self.name
40
+ name.gsub!(/(Shaf|Profiles)?::/, "")
41
+
42
+ name << "Profile" unless name.end_with? "Profile"
43
+
44
+ ProfileObject.new(ns, name).tap do |obj|
45
+ obj.dynamic = true
46
+ obj.profile = shaf_profile
47
+ end
48
+ end
49
+ end
50
+ end
51
+ end
@@ -0,0 +1,21 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shaf
4
+ module Yard
5
+ class ProfileObject < ::YARD::CodeObjects::ClassObject
6
+ attr_accessor :profile
7
+
8
+ def path
9
+ "Profiles::#{name}"
10
+ end
11
+
12
+ def description
13
+ profile&.doc || ""
14
+ end
15
+
16
+ def profile_name
17
+ name.to_s.sub(/Profile\z/, '')
18
+ end
19
+ end
20
+ end
21
+ end
@@ -0,0 +1,55 @@
1
+ # frozen_string_literal: true
2
+
3
+ module Shaf
4
+ module Yard
5
+ class ResourceObject < ::YARD::CodeObjects::ClassObject
6
+ attr_accessor :profile
7
+
8
+ def self.path(*args, sep: '::')
9
+ ['Serializers', *args].join(sep)
10
+ end
11
+
12
+ def path
13
+ self.class.path(super, sep: sep)
14
+ end
15
+
16
+ def attributes
17
+ children.select { |child| child.type == :attribute }
18
+ .sort_by(&:name)
19
+ end
20
+
21
+ def links
22
+ children.select { |child| child.type == :link }
23
+ .sort_by(&:name)
24
+ end
25
+
26
+ def resource_name
27
+ str = name.to_s.sub(/_?serializer$/i, '')
28
+ return str unless str.match? '_'
29
+
30
+ str.split('_')
31
+ .map(&:capitalize)
32
+ .join
33
+ end
34
+
35
+ def profile?
36
+ !!profile
37
+ end
38
+
39
+ def profile_name
40
+ return '' unless profile?
41
+
42
+ profile.name
43
+ end
44
+
45
+ def profile_objects
46
+ @profile_objects ||= []
47
+ end
48
+
49
+ def description
50
+ # TODO: How to add description? @description tag in serializer?
51
+ ''
52
+ end
53
+ end
54
+ end
55
+ end
@@ -0,0 +1,27 @@
1
+ module Shaf
2
+ module Yard
3
+ class SerializerHandler < ::YARD::Handlers::Ruby::Base
4
+ handles :class
5
+
6
+ process do
7
+ next unless serializer?
8
+
9
+ register object
10
+ end
11
+
12
+ def name
13
+ statement[0].source
14
+ end
15
+
16
+ def serializer?
17
+ name.match? %r{Serializer$}
18
+ end
19
+
20
+ def object
21
+ ResourceObject.new(namespace, name).tap do |obj|
22
+ obj.dynamic = true
23
+ end
24
+ end
25
+ end
26
+ end
27
+ end
@@ -11,8 +11,6 @@ class BaseController < Sinatra::Base
11
11
  set :public_folder, Shaf::Settings.public_folder
12
12
  disable :dump_errors
13
13
  set :show_exceptions, :after_handler
14
- enable :current_user
15
- set :auth_token_header, Shaf::Settings.auth_token_header
16
14
  end
17
15
 
18
16
  use Rack::Deflater
@@ -26,7 +24,6 @@ class BaseController < Sinatra::Base
26
24
  log.info "Processing: #{request.request_method} #{request.path_info}"
27
25
  log.debug "Headers: #{request_headers}"
28
26
  log.debug "Payload: #{payload || 'empty'}"
29
- set_vary_header
30
27
  end
31
28
 
32
29
  not_found do
@@ -47,13 +44,6 @@ class BaseController < Sinatra::Base
47
44
  Shaf::Router.mount controller
48
45
  end
49
46
 
50
- def set_vary_header
51
- return unless settings.auth_token_header
52
- return unless [:get, :head].include? request.request_method.downcase.to_sym
53
-
54
- headers('Vary' => Shaf::Settings.auth_token_header)
55
- end
56
-
57
47
  def api_error(err)
58
48
  case err
59
49
  when Shaf::Authorize::PolicyViolationError
@@ -1,14 +1,16 @@
1
1
  class DocsController < BaseController
2
2
 
3
- register_uri :doc_curie, '/doc/:resource/rels/{rel}'
3
+ register_uri :profile, '/doc/profiles/:name'
4
+ register_uri :doc_curie, '/doc/profiles/:name{#rel}'
4
5
  register_uri :documentation, '/doc/:resource'
5
6
 
6
7
  before_action do
7
8
  cache_control(:private, http_cache_max_age: :long)
8
9
  end
9
10
 
10
- get :doc_curie_path do
11
- respond_with doc, path: request.path_info, rel: params[:rel]
11
+ # Note: This route handles both :profile_path and :doc_curie_path
12
+ get :profile_path do
13
+ respond_with Shaf::Profiles.find!(params[:name])
12
14
  end
13
15
 
14
16
  get :documentation_path do
@@ -2,8 +2,14 @@ class RootController < BaseController
2
2
 
3
3
  register_uri :root, '/'
4
4
 
5
- get :root_uri do
5
+ get :root_path do
6
6
  cache_control(:private, http_cache_max_age: :long)
7
+ # Uncomment the line below (and change realm if you like) if your api has
8
+ # resources that requires authentication. See
9
+ # https://github.com/sammyhenningsson/shaf/blob/master/doc/AUTHENTICATION.md
10
+ # for more info.
11
+ # www_authenticate realm: 'MyApi'
12
+
7
13
  respond_with nil, serializer: RootSerializer
8
14
  end
9
15
  end
@@ -1,3 +1,5 @@
1
1
  class BasePolicy
2
2
  include HALPresenter::Policy::DSL
3
+
4
+ link :profile
3
5
  end
@@ -1,4 +1,2 @@
1
- class BaseSerializer
2
- extend HALPresenter
3
- extend Shaf::UriHelper
1
+ class BaseSerializer < Shaf::Serializer
4
2
  end