praxis 2.0.pre.18 → 2.0.pre.19

data/spec/spec_app/app/controllers/base_class.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 class BaseClass
   # Do NOT use a controller inherited base class to add concerns!
   # If you do that, you'd be sharing state (i.e. overriding/adding) from  concerns across controllers
   # which will probably lead to sharing issues you didn't expect.
   # For example: any controller adding after/before/around filters will be visible
   # to any other controllers sharing the concern.
-  # Include a concern to all of them instead 
-  
+  # Include a concern to all of them instead
+
   # Inheritance of classes should be independent from the concerns.
   # I.e., you can use class inheritance in cases where it makes sense from an OO point of view
   # but for the most part, you can probably share code through modules/concerns too.
-  def this_is_shared
-  end
-end
+  def this_is_shared; end
+end

data/spec/spec_app/app/controllers/instances.rb

@@ -1,59 +1,57 @@
+# frozen_string_literal: true
+
 class Instances < BaseClass
   include Praxis::Controller
 
   implements ApiResources::Instances
   include Concerns::BasicApi
 
-  before :validate, actions: [:index]  do |controller|
-    #p [:before, :validate, :params_and_headers, controller.request.action.name]
+  before :validate, actions: [:index] do |controller|
+    # p [:before, :validate, :params_and_headers, controller.request.action.name]
   end
 
   before actions: [:show] do |controller|
-    #puts "before action"
-    if controller.request.params.fail_filter
-      Praxis::Responses::Unauthorized.new
-    end
+    # puts "before action"
+    Praxis::Responses::Unauthorized.new if controller.request.params.fail_filter
   end
 
-  around :validate, actions: [:show] do |controller, blk|
-    #puts "Before validate decorator (for show)"
+  around :validate, actions: [:show] do |_controller, blk|
+    # puts "Before validate decorator (for show)"
     blk.call
-    #puts "After validate decorator"
+    # puts "After validate decorator"
   end
 
-  around :action do |controller, blk|
-    #puts "Decorator one (all actions) start"
+  around :action do |_controller, blk|
+    # puts "Decorator one (all actions) start"
     blk.call
-    #puts "Decorator one end"
+    # puts "Decorator one end"
   end
 
-  around :action, actions: [:show] do |controller, blk|
-    #puts "Decorator two (show action) start"
+  around :action, actions: [:show] do |_controller, blk|
+    # puts "Decorator two (show action) start"
     blk.call
-    #puts "Decorator two end"
+    # puts "Decorator two end"
   end
 
-  around :action, actions: [:index] do |controller, blk|
-    #puts "Decorator three (index action) start"
+  around :action, actions: [:index] do |_controller, blk|
+    # puts "Decorator three (index action) start"
     blk.call
-    #puts "Decorator three end"
+    # puts "Decorator three end"
   end
 
-  def index(cloud_id:, response_content_type: 'application/vnd.acme.instance;type=collection', **params)
+  def index(response_content_type: 'application/vnd.acme.instance;type=collection', **_params)
     instances = Instance::Collection.example
-    response.body = JSON.pretty_generate(instances.collect { |i| i.render })
-    response.headers['Content-Type'] = response_content_type #'application/vnd.acme.instance;type=collection'
+    response.body = JSON.pretty_generate(instances.collect(&:render))
+    response.headers['Content-Type'] = response_content_type # 'application/vnd.acme.instance;type=collection'
     response
   end
 
   def show(cloud_id:, id:, junk:, create_identity_map:, **other_params)
-    if create_identity_map
-      request.identity_map
-    end
+    request.identity_map if create_identity_map
 
     payload = request.payload
 
-    response.body = {cloud_id: cloud_id, id: id, junk: junk, other_params: other_params, payload: payload && payload.dump}
+    response.body = { cloud_id: cloud_id, id: id, junk: junk, other_params: other_params, payload: payload && payload.dump }
     response.headers['Content-Type'] = 'application/json'
     response
   end
@@ -68,12 +66,12 @@ class Instances < BaseClass
 
       part_body = {
         key: instance_id,
-        value: instance.render(fields: {id: true, name: true})
+        value: instance.render(fields: { id: true, name: true })
       }
 
       headers = {
         'Status' => '201',
-        'Content-Type' => (Instance.identifier + '+json').to_s,
+        'Content-Type' => "#{Instance.identifier}+json".to_s,
         'Location' => definition.to_href(cloud_id: cloud_id, id: instance.id)
       }
 
@@ -84,14 +82,13 @@ class Instances < BaseClass
     response
   end
 
-
-  def attach_file(id:, cloud_id:)
+  def attach_file(*)
     response.headers['Content-Type'] = 'application/json'
 
     destination_path = request.payload.part('destination_path').payload
     file = request.payload.part('file')
     file.payload.rewind # Ensure contents is at the beggining.
-    extra_part_names = request.payload.map(&:name) - ['destination_path', 'file']
+    extra_part_names = request.payload.map(&:name) - %w[destination_path file]
     extra_parts = extra_part_names.each_with_object({}) do |pname, hash|
       hash[pname] = request.payload.part(pname).body
     end
@@ -109,23 +106,23 @@ class Instances < BaseClass
     response
   end
 
-  def terminate(id:, cloud_id:)
+  def terminate(*)
     response.headers['Content-Type'] = 'application/json'
     response
   end
 
-  def stop(id:, cloud_id:)
+  def stop(*)
     response.headers['Content-Type'] = 'application/json'
     response
   end
 
-  def update(id:, cloud_id:)
+  def update(*)
     response.body = JSON.pretty_generate(request.payload.dump)
     response.headers['Content-Type'] = 'application/vnd.acme.instance'
     response
   end
 
-  def exceptional(cloud_id:, splat:)
+  def exceptional(*)
     response.headers['Content-Type'] = 'application/json'
     response
   end

data/spec/spec_app/app/controllers/volumes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Volumes < BaseClass
   include Praxis::Controller
 
@@ -5,22 +7,20 @@ class Volumes < BaseClass
   include Concerns::BasicApi
 
   before actions: [:show] do |controller|
-    #puts "before action for volumes"
+    # puts "before action for volumes"
   end
 
   def index
     volumes = Volume::Collection.example
-    
-    response.body = volumes.collect { |v| v.render }
+
+    response.body = volumes.collect(&:render)
     response.headers['Content-Type'] = 'application/vnd.acme.volumes'
     response
   end
 
-  def show(id:, **other_params)
+  def show(*)
     response.body = JSON.pretty_generate(Volume.example.render)
     response.headers['Content-Type'] = 'application/vnd.acme.volume'
     response
   end
-
-
 end

data/spec/spec_app/app/responses/multipart.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 class MultipartResponse < Praxis::Response
   self.response_name = :multipart
@@ -5,6 +6,4 @@ class MultipartResponse < Praxis::Response
   def handle
     @status = 200
   end
-
 end
-

data/spec/spec_app/app/responses/other_response.rb

@@ -1,6 +1,6 @@
+# frozen_string_literal: true
+
 class OtherResponse < Praxis::Response
   self.response_name = :other_response
   self.status = 200
-
 end
-

data/spec/spec_app/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SetHeader
   def initialize(app, header, value)
     @app = app
@@ -8,12 +10,25 @@ class SetHeader
   def call(env)
     status, headers, body = @app.call(env)
     headers[@header] = @value
-    [status, headers,body]
+    [status, headers, body]
   end
 end
 
-Praxis::Application.configure do |application|
+class LowBudgetMutex
+  include Singleton
+
+  attr_reader :after_app_controllers
 
+  def initialize
+    @after_app_controllers = nil
+  end
+
+  def after_app_controllers_called
+    @after_app_controllers = :worked
+  end
+end
+
+Praxis::Application.configure do |application|
   application.middleware SetHeader, 'Spec-Middleware', 'used'
 
   application.bootloader.use SimpleAuthenticationPlugin, config_file: 'config/authentication.yml'
@@ -26,13 +41,12 @@ Praxis::Application.configure do |application|
 
   # Silly callback code pieces to test that the deferred callbacks work even for sub-stages
   application.bootloader.after :app, :controllers do
-    $after_app_controllers = :worked
+    LowBudgetMutex.instance.after_app_controllers_called
   end
   application.bootloader.after :app do
-    raise "After sub-stage hooks not working!" unless $after_app_controllers == :worked
+    raise 'After sub-stage hooks not working!' unless LowBudgetMutex.instance.after_app_controllers == :worked
   end
 
-
   application.layout do
     layout do
       map :initializers, 'config/initializers/**/*'
@@ -49,5 +63,4 @@ Praxis::Application.configure do |application|
       end
     end
   end
-
 end

data/spec/spec_app/config.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pp'
 require 'json'
 
@@ -5,13 +7,12 @@ require 'bundler/setup'
 
 require 'pry'
 
-$:.unshift File.expand_path('lib', __dir__)
+$LOAD_PATH.unshift File.expand_path('lib', __dir__)
 
 require 'praxis'
 
-
 application = Praxis::Application.instance
 
 application.setup
 
-run application
+run application

data/spec/spec_app/design/api.rb

@@ -1,5 +1,6 @@
-Praxis::ApiDefinition.define do
+# frozen_string_literal: true
 
+Praxis::ApiDefinition.define do
   response_template :other_response do |media_type:|
     status 200
     media_type media_type
@@ -10,33 +11,30 @@ Praxis::ApiDefinition.define do
     media_type 'multipart/form-data'
   end
 
-
-
   trait :authenticated do
     headers do
-      key "Authorization", String, required: false
+      key 'Authorization', String, required: false
     end
   end
 
   info do # applies to all API infos
-    name "Spec App"
-    title "A simple App to do some simple integration testing"
-    description "This example API should really be replaced by a set of more full-fledged example apps in the future"
+    name 'Spec App'
+    title 'A simple App to do some simple integration testing'
+    description 'This example API should really be replaced by a set of more full-fledged example apps in the future'
 
-    base_path "/api"
+    base_path '/api'
     produces 'json'
-    #version_with :path
-    #base_path "/v:api_version"
+    # version_with :path
+    # base_path "/v:api_version"
 
     # Custom attributes (for OpenApi, for example)
-    termsOfService "http://example.com/tos"
+    termsOfService 'http://example.com/tos'
     contact name: 'Joe', email: 'joe@email.com'
-    license name: "Apache 2.0",
-            url: "https://www.apache.org/licenses/LICENSE-2.0.html"
+    license name: 'Apache 2.0',
+            url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
   end
 
   info '1.0' do # Applies to 1.0 version (and inherits everything else form the global one)
-    description "A simple 1.0 App"
+    description 'A simple 1.0 App'
   end
-
 end

data/spec/spec_app/design/media_types/instance.rb

@@ -1,19 +1,19 @@
-class Instance < Praxis::MediaType
+# frozen_string_literal: true
 
+class Instance < Praxis::MediaType
   identifier 'application/vnd.acme.instance'
 
   attributes do
     attribute :id, Integer
-    attribute :name, String, 
-      example: /[:first_name:]/,
-      regexp: /^\w+$/
+    attribute :name, String,
+              example: /[:first_name:]/,
+              regexp: /^\w+$/
 
     attribute :href, String
 
     attribute :root_volume, Volume, null: true
 
     attribute :volumes, Volume::Collection
-    
   end
 
   default_fieldset do

data/spec/spec_app/design/media_types/volume.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Volume < Praxis::MediaType
   identifier 'application/vnd.acme.volume'
 
@@ -23,5 +25,4 @@ class Volume < Praxis::MediaType
 
     identifier 'application/vnd.acme.volumes'
   end
-
 end

data/spec/spec_app/design/media_types/volume_snapshot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class VolumeSnapshot < Praxis::MediaType
   identifier 'application/json'
 
@@ -26,5 +28,4 @@ class VolumeSnapshot < Praxis::MediaType
       attribute :href
     end
   end
-
 end

data/spec/spec_app/design/resources/instances.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApiResources
   class Instances
     include Praxis::EndpointDefinition
@@ -28,8 +30,8 @@ module ApiResources
 
       headers do
         # BOTH ARE EQUIVALENT
-        #key "FOO", String, required: true
-        header "FOO", /bar/
+        # key "FOO", String, required: true
+        header 'FOO', /bar/
         key 'Account-Id', Integer, required: false, min: 0
       end
 
@@ -37,7 +39,6 @@ module ApiResources
         attribute :response_content_type, String, default: 'application/vnd.acme.instance;type=collection'
       end
 
-
       response :ok, Praxis::Collection.of(Instance)
     end
 
@@ -59,11 +60,10 @@ module ApiResources
 
       payload required: false, null: true do
         attribute :something, String
-        attribute :optional, String, default: "not given"
+        attribute :optional, String, default: 'not given'
       end
     end
 
-
     action :bulk_create do
       routing do
         post ''
@@ -77,11 +77,11 @@ module ApiResources
       response :multipart_ok, Praxis::Types::MultipartArray do
         name_type Integer
 
-        part /\d+/ do
+        part(/\d+/) do
           header 'Status', '201'
           header 'Content-Type', /^#{Instance.identifier}/
           header 'Location', Attributor::URI,
-            example: proc { |part| ApiResources::Instances.to_href(cloud_id: part[:value].cloud_id, id: part[:value].id) }
+                 example: proc { |part| ApiResources::Instances.to_href(cloud_id: part[:value].cloud_id, id: part[:value].id) }
 
           payload Hash do
             attribute :key, Integer, required: true
@@ -90,16 +90,14 @@ module ApiResources
               attribute :name
             end
           end
-
         end
       end
 
-
       # Using a hash param for parts
-      #response :multipart_ok, parts: {
+      # response :multipart_ok, parts: {
       #  like: :created,
       #  location: /\/instances\//
-      #}
+      # }
 
       # Using a block for parts to defin a sub-request
       #     sub_request = proc do
@@ -157,7 +155,6 @@ module ApiResources
         attribute :id
       end
 
-
       response :ok, media_type: 'application/json'
     end
 
@@ -178,7 +175,6 @@ module ApiResources
       response :ok
     end
 
-
     action :exceptional do
       routing do
         prefix '//clouds/:cloud_id/otherinstances'
@@ -229,7 +225,5 @@ module ApiResources
     #     key 'destination', String, required: true
     #     match /file-.+/, FileUpload
     #   end
-
   end
-
 end

data/spec/spec_app/design/resources/volume_snapshots.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'volumes'
 
 module ApiResources
@@ -7,8 +9,8 @@ module ApiResources
     media_type VolumeSnapshot
 
     version '1.0'
-    
-    parent Volumes, :id => :volume_id
+
+    parent Volumes, id: :volume_id
     prefix '/snapshots'
 
     action :index do
@@ -21,7 +23,6 @@ module ApiResources
       params do
         attribute :volume_id, Integer, description: 'id of parent volume'
       end
-
     end
 
     action :show do
@@ -32,8 +33,6 @@ module ApiResources
       params do
         attribute :id
       end
-      
     end
-
   end
 end

data/spec/spec_app/design/resources/volumes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ApiResources
   class Volumes
     include Praxis::EndpointDefinition
@@ -7,10 +9,10 @@ module ApiResources
     prefix '/clouds/:cloud_id/volumes'
 
     trait :authenticated
-  
+
     action_defaults do
       params do
-        attribute :cloud_id, Integer, description: "id of the cloud"
+        attribute :cloud_id, Integer, description: 'id of the cloud'
       end
     end
 
@@ -35,9 +37,6 @@ module ApiResources
         attribute :junk, String, default: ''
         attribute :some_date, DateTime, default: DateTime.parse('2012-12-21')
       end
-      
     end
-
   end
-
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'coveralls'
 Coveralls.wear!
 
-$:.unshift File.expand_path(__dir__)
-$:.unshift File.expand_path('../lib',__dir__)
-$:.unshift File.expand_path('support',__dir__)
+$LOAD_PATH.unshift File.expand_path(__dir__)
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+$LOAD_PATH.unshift File.expand_path('support', __dir__)
 
 require 'bundler'
 Bundler.setup :default, :test
@@ -13,9 +15,6 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
 end
 
-require 'simplecov'
-SimpleCov.start 'praxis'
-
 require 'pry'
 require 'pry-byebug'
 
@@ -26,17 +25,17 @@ require 'rack/test'
 require 'rspec/its'
 require 'rspec/collection_matchers'
 
-Dir["#{File.dirname(__FILE__)}/../lib/praxis/plugins/*.rb"].each do |file|
+Dir["#{File.dirname(__FILE__)}/../lib/praxis/plugins/*.rb"].sort.each do |file|
   require file
 end
 
-
-Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
+Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each do |file|
   require file
 end
 
 def suppress_output
-  original_stdout, original_stderr = $stdout.clone, $stderr.clone
+  original_stdout = $stdout.clone
+  original_stderr = $stderr.clone
   $stderr.reopen File.new('/dev/null', 'w')
   $stdout.reopen File.new('/dev/null', 'w')
   yield
@@ -51,12 +50,12 @@ RSpec.configure do |config|
   config.before(:suite) do
     Praxis::Mapper::Resource.finalize!
     Praxis::Blueprint.caching_enabled = true
-    Praxis::Application.instance.setup(root:'spec/spec_app')
+    Praxis::Application.instance.setup(root: 'spec/spec_app')
   end
 
   config.before(:each) do
     Praxis::Blueprint.cache = Hash.new do |hash, key|
-      hash[key] = Hash.new
+      hash[key] = {}
     end
   end
 
@@ -65,4 +64,3 @@ RSpec.configure do |config|
     Praxis::Application.instance.logger.level = 2 # warn
   end
 end
-

data/spec/support/be_deep_equal_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copied verbatim from: https://github.com/amogil/rspec-deep-ignore-order-matcher
 
 RSpec::Matchers.define :be_deep_equal do |expected|
@@ -18,6 +20,7 @@ RSpec::Matchers.define :be_deep_equal do |expected|
   def match?(actual, expected)
     return arrays_match?(actual, expected) if expected.is_a?(Array) && actual.is_a?(Array)
     return hashes_match?(actual, expected) if expected.is_a?(Hash) && actual.is_a?(Hash)
+
     expected == actual
   end
 
@@ -26,6 +29,7 @@ RSpec::Matchers.define :be_deep_equal do |expected|
     actual.each do |a|
       index = exp.find_index { |e| match? a, e }
       return false if index.nil?
+
       exp.delete_at(index)
     end
     exp.empty?
@@ -33,6 +37,7 @@ RSpec::Matchers.define :be_deep_equal do |expected|
 
   def hashes_match?(actual, expected)
     return false unless actual.keys.sort == expected.keys.sort
+
     actual.each { |key, value| return false unless match? value, expected[key] }
     true
   end