vigia 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzQzNmJmYjk4OTkzYjZmZDc0ZGQ3N2I4MTZiYjUyYmZhOTNkODExZQ==
+    ZjQ5YmJhYmRiNjc0MDI2NzFjZThlOGJhN2E0MjIwNTVmOTFlMjA5MA==
   data.tar.gz: !binary |-
-    ZDI3MTQ4ZWYxNDY5MjIzMjA2MGM3OWVkN2EwNzA0NDU0NDhjODY5MQ==
+    MDJiZDJlNDNiZDJlYjg2YjRmYjJhNTNlNzJlNWZhM2E2ODA2ZTRmZg==
 SHA512:
   metadata.gz: !binary |-
-    ZGI4ZWY0MjAxZGM5YzRmYjdhYTE0MTc0NTg0NmRjZTI1ZTE3NDBjMWQ0YmE2
-    YmZmY2FhMWJhZTkzMDQ5NDU5N2U5MmE0ODAwNjhhYzk5MWRjODVmNjI0NmM0
-    NmY3ZDliMjRlNDMyOGJiZGJiMmU0NDhlNzRkNDJkMWFjMmQwYmY=
+    MThhNTJkMDU1NGNmMGYxOTU0Nzk2Yjg5NTdmMzU2NWE1NmU5NzE2YzQyYjY0
+    NGNlNDg2NTdlYTcwYjM4NDliNzU1YWJhODJkZGVhZTE2YjMxMGY4ZGE4YjFh
+    NDBhMGUxZjNiYzEyOTkxZDRjYzkwNTY2YzkwZDRmOTIwOTc0OTI=
   data.tar.gz: !binary |-
-    MzdkMDE5NjMzYmI5MGJmODY3MWQ1YWQwMDRjZDhhOWIwNzAxMWUxODVmMzQ5
-    M2ExMmVkMDI3Y2MwYzg2MWRiYWI3YTAyZDY2ZTFjMjliZTgyYmEyNmNlMmIy
-    MTlhM2I2NTc4NzM5OTY2Yzc0ZGY5ZDUyNjk1YTQ4NjVmZGY2NTU=
+    Y2Y5ODNhYmI0MzBiNDRmNTFlNTg5MjlkNTQxNmNkZDcyYzg2ZTAzYzZmMzJi
+    ZDEzZmQ4N2RjNzUzOTlmM2E2NTU4YzI3ZDQwYmZhZjI4ZDZlMDkxNDhmNDY1
+    MTI0MGE3MmM5YmMwMTFjODJiNWRiYTIyYTA2NGZmN2ZlNzNhNTk=

data/README.md

@@ -269,7 +269,7 @@ Then, create your Rspec shared example and name the examples accordingly
 ```ruby
 # /my_project/shared_examples/apib_examples.rb
 
-shared_examples 'my custom examples' do |vigia_example, response|
+shared_examples 'my custom examples' do
   it 'is a valid json response' do
     expect { JSON.parse(result.body) }.not_to raise_error
   end

data/lib/vigia/adapter.rb

@@ -43,8 +43,8 @@ module Vigia
       def preload
         instance_exec(&template)
 
-        Vigia::Sail::Group.collection   = groups
-        Vigia::Sail::Context.collection = contexts
+        groups.each   { |name, options| Vigia::Sail::Group.register(name, options) }
+        contexts.each { |name, options| Vigia::Sail::Context.register(name, options) }
       end
 
       def after_initialize(&block)

data/lib/vigia/adapters/blueprint.rb

@@ -39,7 +39,7 @@ module Vigia
 
         context :default,
           http_client_options: {
-            headers:      -> { adapter.headers_for(resource, action, transactional_example, response) },
+            headers:      -> { adapter.headers_for(action, transactional_example, response) },
             method:       -> { action.method },
             uri_template: -> { resource.uri_template },
             parameters:   -> { adapter.parameters_for(resource, action) },
@@ -47,13 +47,13 @@ module Vigia
           },
           expectations: {
             code:    -> { response.name.to_i },
-            headers: -> { adapter.headers_for(resource, action, transactional_example, response, include_payload = false) },
+            headers: -> { adapter.headers_for(action, transactional_example, response, include_payload = false) },
             body:    -> { response.body }
           }
       end
 
-      def headers_for(resource, action, transactional_example, response, include_payload = true)
-        headers  = headers_for_response(resource, response)
+      def headers_for(action, transactional_example, response, include_payload = true)
+        headers  = headers_for_response(response)
         headers += headers_for_payload(transactional_example, response) if with_payload?(action) && include_payload
         compile_headers(headers)
       end
@@ -82,13 +82,17 @@ module Vigia
         end
       end
 
-      def headers_for_response(resource, response)
+      def headers_for_response(response)
         collection = []
-        collection << [*resource.model.headers.collection]
         collection << [*response.headers.collection]
         collection.flatten
       end
 
+#       def resources
+#         apib.resource_groups.map(&:resources).flatten
+#       end
+
+
       def headers_for_payload(transactional_example, response)
         payload = get_payload(transactional_example, response)
         [ *payload.headers.collection ].flatten

data/lib/vigia/config.rb

@@ -1,12 +1,13 @@
 module Vigia
   class Config
     attr_accessor :source_file, :host, :custom_examples_paths, :custom_examples, :headers, :http_client_class
-    attr_accessor :adapter, :hooks, :rspec_config_block, :stderr, :stdout
+    attr_accessor :adapter, :hooks, :rspec_config_block, :stderr, :stdout, :internal_hosts
 
     def initialize
       @host                  = nil
       @source_file           = nil
       @rspec_config_block    = nil
+      @internal_hosts        = []
       @headers               = {}
       @custom_examples_paths = []
       @custom_examples       = []
@@ -42,6 +43,10 @@ module Vigia
       store_hook(Vigia::Sail::GroupInstance, :after, block)
     end
 
+    def extend_group(&block)
+      store_hook(Vigia::Sail::GroupInstance, :extend, block)
+    end
+
     def before_context(&block)
       store_hook(Vigia::Sail::Context, :before, block)
     end
@@ -50,6 +55,10 @@ module Vigia
       store_hook(Vigia::Sail::Context, :after, block)
     end
 
+    def extend_context(&block)
+      store_hook(Vigia::Sail::Context, :extend, block)
+    end
+
     def store_hook(rspec_class, filter, block)
       @hooks << { rspec_class: rspec_class, filter: filter,  block: block }
     end

data/lib/vigia/hooks.rb

@@ -0,0 +1,46 @@
+module Vigia
+  module Hooks
+
+    def execute_hook(filter_name, rspec_context)
+      hooks_for_object(filter_name).each do |hook|
+        rspec_context.instance_exec(&hook)
+      end
+    end
+
+    def hooks_for_object(filter_name)
+      config_hooks(filter_name) + object_hooks(filter_name)
+    end
+
+    def with_hooks(rspec_context)
+      instance = self
+
+      rspec_context.before(:context) do
+        instance.execute_hook(:before, self)
+      end
+
+      rspec_context.after(:context) do
+        instance.execute_hook(:after, self)
+      end
+
+      instance.execute_hook(:extend, rspec_context)
+
+      yield
+    end
+
+    private
+
+    def object_hooks(filter_name)
+      return [] unless respond_to?(:options)
+      option_name = "#{ filter_name }_#{ self.class.name.split('::').last.downcase }".to_sym
+      [ *options[option_name] ].compact
+
+    end
+
+    def config_hooks(filter_name)
+      Vigia.config.hooks.each_with_object([]) do |hook, collection|
+        next unless self.is_a?(hook[:rspec_class]) and filter_name == hook[:filter]
+        collection << hook[:block]
+      end
+    end
+  end
+end

data/lib/vigia/sail/example.rb

@@ -22,9 +22,10 @@ module Vigia
         instance = self
         rspec.it instance do
           skip              if instance.skip?(self)     || (respond_to?(:skip?)     and send(:skip?))
-          skip('__vigia__') if instance.disabled?(self) || (respond_to?(:disabled?) and send(:disabled?))
 
-          instance_exec(&instance.expectation)
+          unless instance.disabled?(self) || (respond_to?(:disabled?) and send(:disabled?))
+            instance_exec(&instance.expectation)
+          end
         end
       end
 
@@ -50,16 +51,3 @@ module Vigia
     end
   end
 end
-
-
-Vigia::Sail::Example.register(
-  :code_match,
-  description: 'has the expected HTTP code',
-  expectation: -> { expect(result.code).to be(expectations.code) }
-)
-
-Vigia::Sail::Example.register(
-  :include_headers,
-  description: 'includes the expected headers',
-  expectation: -> { expect(result[:headers]).to include(expectations[:headers]) }
-)

data/lib/vigia/sail/examples/default.rb

@@ -0,0 +1,11 @@
+Vigia::Sail::Example.register(
+  :code_match,
+  description: 'has the expected HTTP code',
+  expectation: -> { expect(result.code).to be(expectations.code) }
+)
+
+Vigia::Sail::Example.register(
+  :include_headers,
+  description: 'includes the expected headers',
+  expectation: -> { expect(result[:headers]).to include(expectations[:headers]) }
+)

data/lib/vigia/sail/rspec_object.rb

@@ -2,7 +2,12 @@ module Vigia
   module Sail
     class RSpecObject
       class << self
-        attr_accessor :collection
+        attr_reader :collection
+
+        def register(name, options)
+          @collection = {} if collection.nil?
+          @collection.merge!(name => options)
+        end
 
         def setup_and_run(name, rspec)
           name, options  = collection.select{ |k,v| k == name }.first
@@ -11,6 +16,8 @@ module Vigia
         end
       end
 
+      include Vigia::Hooks
+
       attr_reader :name, :options, :rspec
 
       def initialize(name, options, rspec)
@@ -20,22 +27,6 @@ module Vigia
 
       end
 
-      def execute_hook(filter_name, rspec_context)
-        hooks_for_object(filter_name).each do |hook|
-          rspec_context.instance_exec(&hook)
-        end
-      end
-
-      def hooks_for_object(filter_name)
-        config_hooks(filter_name) + object_hooks(filter_name)
-      end
-
-      def with_hooks(rspec_context)
-        execute_hook(:before, rspec_context)
-        yield
-        execute_hook(:after, rspec_context)
-      end
-
       def contextual_object(option_name: nil, object: nil, context: nil)
         context ||= rspec.described_class
         object  ||= options[option_name]
@@ -55,19 +46,6 @@ module Vigia
         return block if block.respond_to?(:call)
         raise error_message
       end
-
-      def object_hooks(filter_name)
-        option_name = "#{ filter_name }_#{ self.class.name.split('::').last.downcase }".to_sym
-        [ *options[option_name] ].compact
-
-      end
-
-      def config_hooks(filter_name)
-        Vigia.config.hooks.each_with_object([]) do |hook, collection|
-          next unless self.is_a?(hook[:rspec_class]) and filter_name == hook[:filter]
-          collection << hook[:block]
-        end
-      end
     end
   end
 end

data/lib/vigia/url.rb

@@ -1,7 +1,19 @@
 require 'uri'
+require 'addressable/template'
+require 'addressable/uri'
+
 
 module Vigia
   class Url
+    class << self
+      def template_defines_url?(template, url)
+        url_object      = Addressable::URI.parse(url)
+        template_object = Addressable::Template.new(template)
+        url_parameters  = template_object.extract(url_object) || {}
+        # recreate url and see if matches
+        template_object.expand(url_parameters) == url_object
+      end
+    end
 
     attr_reader :uri_template
 

data/lib/vigia/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Vigia
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/vigia.rb

@@ -8,6 +8,7 @@ require 'addressable/template'
 require_relative 'vigia/adapter'
 require_relative 'vigia/adapters/blueprint'
 require_relative 'vigia/config'
+require_relative 'vigia/hooks'
 require_relative 'vigia/http_client/options'
 require_relative 'vigia/http_client/rest_client'
 require_relative 'vigia/http_client/requests'
@@ -39,3 +40,5 @@ module Vigia
     end
   end
 end
+
+require_relative 'vigia/sail/examples/default'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vigia
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - David Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -190,22 +190,24 @@ files:
 - Rakefile
 - Gemfile
 - lib/vigia/http_client/requests.rb
-- lib/vigia/http_client/options.rb
 - lib/vigia/http_client/rest_client.rb
+- lib/vigia/http_client/options.rb
 - lib/vigia/spec/support/utils.rb
 - lib/vigia/spec/api_spec.rb
-- lib/vigia/version.rb
+- lib/vigia/rspec.rb
 - lib/vigia/adapters/blueprint.rb
 - lib/vigia/parameters.rb
 - lib/vigia/sail/group.rb
 - lib/vigia/sail/group_instance.rb
+- lib/vigia/sail/context.rb
 - lib/vigia/sail/example.rb
+- lib/vigia/sail/examples/default.rb
 - lib/vigia/sail/rspec_object.rb
-- lib/vigia/sail/context.rb
-- lib/vigia/url.rb
 - lib/vigia/adapter.rb
 - lib/vigia/config.rb
-- lib/vigia/rspec.rb
+- lib/vigia/hooks.rb
+- lib/vigia/url.rb
+- lib/vigia/version.rb
 - lib/vigia.rb
 - README.md
 homepage: https://github.com/nogates/vigia