webspicy 0.3.0.pre.rc1 → 0.3.0.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397c21900711f78462183be1dab9cba93caf6cdf
-  data.tar.gz: 12b2b0e27ee8171922e1d032fae95b0980d21ff2
+  metadata.gz: d31b169f136144209e61a59ac7c7c848562e5646
+  data.tar.gz: 2e971cd2cf87bd7215039349257dbe6fe05d0a5c
 SHA512:
-  metadata.gz: 2e68c059d88816ecdabf5737784aae341cd65f7891ce1db3264ac4dfbdaf6c75744b49645e94eb84597159ce241273808481d58d80e17bc0f41d42101ec838e8
-  data.tar.gz: 36477950cfb806330fff4ee261485960e87f696d575a2d55945a10b685090832be6b452eea0b25186a23d55288197c9837c18be20816ba19b8b75b346d3ed4fc
+  metadata.gz: 0ac4e3b403070e46f7d85b88289cb81abc375422acf42164eab8ed70145201087bd5affb9fd94d54231f5ac388ee430ce9441f5959c9b372ebcfac2ce06a8bf4
+  data.tar.gz: f84f29c4023ef02e568b2c8b861a095f8ce118964ffb6cada0a3c3e1c9c6458d0ff5b4ed308e2a77edba6d64695bdb2492073c14977b3d871f72d38fbbfd7fae

data/examples/restful/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.2.3)
+    webspicy (0.3.0.pre.rc1)
       finitio (~> 0.5.2)
       http (~> 2)
       path (~> 1.3)

data/lib/webspicy/checker.rb

@@ -7,7 +7,7 @@ module Webspicy
     attr_reader :config
 
     def call
-      Webspicy.with_scope_for(config) do |scope|
+      config.each_scope do |scope|
         client = scope.get_client
         scope.each_resource_file do |file, folder|
           RSpec.describe file.relative_to(folder).to_s do

data/lib/webspicy/configuration.rb

@@ -1,8 +1,9 @@
 module Webspicy
   class Configuration
 
-    def initialize(folder = Path.pwd)
+    def initialize(folder = Path.pwd, parent = nil)
       @folder = folder
+      @parent = parent
       @children = []
       @before_listeners = []
       @rspec_options = default_rspec_options
@@ -15,6 +16,20 @@ module Webspicy
     attr_accessor :folder
     protected :folder=
 
+    attr_accessor :parent
+    protected :parent=
+
+    def each_scope(&bl)
+      return enum_for(:each_scope) unless block_given?
+      if has_children?
+        children.each do |config|
+          config.each_scope(&bl)
+        end
+      else
+        Webspicy.with_scope_for(self, &bl)
+      end
+    end
+
     # Adds a folder to the list of folders where test case definitions are
     # to be found.
     def folder(folder = nil, &bl)
@@ -25,6 +40,7 @@ module Webspicy
         raise "Folder `#{folder}` does not exists" unless folder.exists? && folder.directory?
         raise "Folder must be a descendant" unless folder.inside?(@folder)
         child = dup do |c|
+          c.parent = self
           c.folder = folder
         end
         yield(child) if block_given?
@@ -186,6 +202,24 @@ module Webspicy
     end
     private :default_rspec_options
 
+    # Returns the Data system to use for parsing schemas
+    #
+    # The data system associated with a configuration is build when the
+    # configuration folder contains a `schema.fio` finitio file. When no
+    # such file can be found, the parent config is checked (if any). When
+    # no `schema.fio` file can be found, the method ends up returning the
+    # default Finition system.
+    def data_system
+      schema = self.folder/"schema.fio"
+      if schema.file?
+        Finitio::DEFAULT_SYSTEM.parse(schema.read)
+      elsif not(self.parent.nil?)
+        self.parent.data_system
+      else
+        Finitio::DEFAULT_SYSTEM
+      end
+    end
+
     # Duplicates this configuration and yields the block with the new one,
     # if a block is given.
     #

data/lib/webspicy/scope.rb

@@ -13,13 +13,7 @@ module Webspicy
     # Yields each resource file in the current scope
     def each_resource_file(&bl)
       return enum_for(:each_resource_file) unless block_given?
-      if config.has_children?
-        config.children.each do |child|
-          _each_resource_file(child, &bl)
-        end
-      else
-        _each_resource_file(config, &bl)
-      end
+      _each_resource_file(config, &bl)
     end
 
     # Recursive implementation of `each_resource_file` for each
@@ -65,10 +59,7 @@ module Webspicy
 
     # Returns the Data system to use for parsing schemas
     def data_system
-      @data_system ||= begin
-        schema = config.folder/"schema.fio"
-        schema.file? ? Finitio::DEFAULT_SYSTEM.parse(schema.read) : Finitio::DEFAULT_SYSTEM
-      end
+      @data_system ||= config.data_system
     end
 
 

data/lib/webspicy/tester.rb

@@ -7,7 +7,7 @@ module Webspicy
     attr_reader :config
 
     def call
-      Webspicy.with_scope_for(config) do |scope|
+      config.each_scope do |scope|
         client = scope.get_client
         scope.each_resource do |resource|
           scope.each_service(resource) do |service|

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 3
-    TINY  = "0-rc1"
+    TINY  = "0-rc2"
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.rc1
+  version: 0.3.0.pre.rc2
 platform: ruby
 authors:
 - Bernard Lambeau