webspicy 0.2.3 → 0.3.0.pre.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 664e519735fcd77f635cd462563320baba79481e
-  data.tar.gz: c1f0002111073477a9503a2df78901f4f6f5cb5a
+  metadata.gz: 397c21900711f78462183be1dab9cba93caf6cdf
+  data.tar.gz: 12b2b0e27ee8171922e1d032fae95b0980d21ff2
 SHA512:
-  metadata.gz: 707569be3cf76e783c82610c791f560bde7a849b742342e42f37e867f669966b05fbc44c52de49444a5cfac777480e98cf37d05620768e52e6d8edab6b3df4ac
-  data.tar.gz: ba6f158b152a33d79ab220c08c66d0b1dd2b71fa11d288876d8c53f40cc20f67a74a7428e7eb02433048aee8dfed924281532c50424fed2a3c66ab6e65802497
+  metadata.gz: 2e68c059d88816ecdabf5737784aae341cd65f7891ce1db3264ac4dfbdaf6c75744b49645e94eb84597159ce241273808481d58d80e17bc0f41d42101ec838e8
+  data.tar.gz: 36477950cfb806330fff4ee261485960e87f696d575a2d55945a10b685090832be6b452eea0b25186a23d55288197c9837c18be20816ba19b8b75b346d3ed4fc

data/examples/restful/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.2.1)
+    webspicy (0.2.3)
       finitio (~> 0.5.2)
       http (~> 2)
       path (~> 1.3)
@@ -19,7 +19,7 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     finitio (0.5.2)
       citrus (>= 2.4, < 4.0)
-    http (2.2.2)
+    http (2.2.1)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 1.0.1)

data/examples/restful/Rakefile

@@ -4,17 +4,14 @@ require 'webspicy'
 
 desc "Checks all .yml definition files"
 task :check do
-  config = Webspicy::Configuration.new do |c|
-    c.add_folder Path.dir/"webspicy"
-  end
+  config = Webspicy::Configuration.new(Path.dir/"webspicy")
   Webspicy::Checker.new(config).call
 end
 
 namespace :test do
   desc "Run all tests directly on Sinatra application using rack/test"
   task :rack do
-    config = Webspicy::Configuration.new do |c|
-      c.add_folder Path.dir/"webspicy"
+    config = Webspicy::Configuration.new(Path.dir/"webspicy") do |c|
       c.client = Webspicy::RackTestClient.for(::Sinatra::Application)
       c.before_each do |_,_,_,client|
         client.api.post "/reset"
@@ -25,9 +22,8 @@ namespace :test do
 
   desc "Runs all tests on the real web server (must be launched previously)"
   task :real do
-    config = Webspicy::Configuration.new do |c|
+    config = Webspicy::Configuration.new(Path.dir/"webspicy") do |c|
       c.host = "http://127.0.0.1:4567"
-      c.add_folder Path.dir/"webspicy"
       c.client = Webspicy::HttpClient
       c.before_each do |_,_,_,client|
         client.api.post "http://127.0.0.1:4567/reset"

data/lib/webspicy/configuration.rb

@@ -1,8 +1,9 @@
 module Webspicy
   class Configuration
 
-    def initialize
-      @folders = []
+    def initialize(folder = Path.pwd)
+      @folder = folder
+      @children = []
       @before_listeners = []
       @rspec_options = default_rspec_options
       @run_counterexamples = default_run_counterexamples
@@ -11,16 +12,33 @@ module Webspicy
       @client = HttpClient
       yield(self) if block_given?
     end
+    attr_accessor :folder
+    protected :folder=
 
     # Adds a folder to the list of folders where test case definitions are
     # to be found.
-    def add_folder(folder)
-      folder = Path(folder)
-      raise "Folder `#{folder}` does not exists" unless folder.exists? && folder.directory?
-      @folders << folder
+    def folder(folder = nil, &bl)
+      if folder.nil?
+        @folder
+      else
+        folder = folder.is_a?(String) ? @folder/folder : Path(folder)
+        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.folder = folder
+        end
+        yield(child) if block_given?
+        @children << child
+        child
+      end
+    end
+    attr_accessor :children
+    protected :children=
+
+    # Returns whether this configuration has children configurations or not
+    def has_children?
+      !children.empty?
     end
-    attr_accessor :folders
-    protected :folders=
 
     # Sets whether counter examples have to be ran or not.
     def run_counterexamples=(run_counterexamples)
@@ -35,7 +53,7 @@ module Webspicy
 
     # Returns the defaut value for run_counterexamples
     def default_run_counterexamples
-      ENV['ROBUST'].nil? || ENV['ROBUST'] != 'no'
+      ENV['ROBUST'].nil? || (ENV['ROBUST'] != 'no')
     end
     private :default_run_counterexamples
 
@@ -176,7 +194,7 @@ module Webspicy
     # original.
     def dup(&bl)
       super.tap do |d|
-        d.folders = self.folders.dup
+        d.children = self.children.dup
         d.rspec_options = self.rspec_options.dup
         d.before_listeners = self.before_listeners.dup
         yield d if block_given?

data/lib/webspicy/scope.rb

@@ -13,14 +13,19 @@ module Webspicy
     # Yields each resource file in the current scope
     def each_resource_file(&bl)
       return enum_for(:each_resource_file) unless block_given?
-      config.folders.each do |folder|
-        _each_resource_file(folder, &bl)
+      if config.has_children?
+        config.children.each do |child|
+          _each_resource_file(child, &bl)
+        end
+      else
+        _each_resource_file(config, &bl)
       end
     end
 
     # Recursive implementation of `each_resource_file` for each
     # folder in the configuration.
-    def _each_resource_file(folder)
+    def _each_resource_file(config)
+      folder = config.folder
       folder.glob("**/*.yml").select(&to_filter_proc(config.file_filter)).each do |file|
         yield file, folder
       end
@@ -61,8 +66,8 @@ module Webspicy
     # Returns the Data system to use for parsing schemas
     def data_system
       @data_system ||= begin
-        root = config.folders.find{|f| (f/"schema.fio").file? }
-        root ? Finitio::DEFAULT_SYSTEM.parse((root/"schema.fio").read) : Finitio::DEFAULT_SYSTEM
+        schema = config.folder/"schema.fio"
+        schema.file? ? Finitio::DEFAULT_SYSTEM.parse(schema.read) : Finitio::DEFAULT_SYSTEM
       end
     end
 

data/lib/webspicy/version.rb

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

data/spec/unit/scope/test_each_resource.rb

@@ -15,9 +15,7 @@ module Webspicy
     context 'without any filter' do
 
       let(:configuration) {
-        Configuration.new{|c|
-          c.add_folder restful_folder
-        }
+        Configuration.new(restful_folder)
       }
 
       it 'returns all files' do
@@ -28,8 +26,7 @@ module Webspicy
     context 'with a file filter as a proc' do
 
       let(:configuration) {
-        Configuration.new{|c|
-          c.add_folder restful_folder
+        Configuration.new(restful_folder){|c|
           c.file_filter = ->(f) {
             f.basename.to_s == "getTodo.yml"
           }
@@ -44,8 +41,7 @@ module Webspicy
     context 'with a file filter as a Regex' do
 
       let(:configuration) {
-        Configuration.new{|c|
-          c.add_folder restful_folder
+        Configuration.new(restful_folder){|c|
           c.file_filter = /getTodo.yml/
         }
       }
@@ -55,5 +51,18 @@ module Webspicy
       end
     end
 
+    context 'when having children folders' do
+
+      let(:configuration) {
+        Configuration.new(restful_folder) do |c|
+          c.folder 'todo'
+        end
+      }
+
+      it 'returns all files' do
+        expect(subject.size).to eql(restful_folder.glob('**/*.yml').size)
+      end
+    end
+
   end
 end

data/spec/unit/scope/test_each_service.rb

@@ -19,8 +19,7 @@ module Webspicy
     context 'without any filter' do
 
       let(:configuration) {
-        Configuration.new{|c|
-          c.add_folder restful_folder
+        Configuration.new(restful_folder){|c|
           c.file_filter = /getTodo.yml/
         }
       }
@@ -33,8 +32,7 @@ module Webspicy
     context 'with a service filter as a proc' do
 
       let(:configuration) {
-        Configuration.new{|c|
-          c.add_folder restful_folder
+        Configuration.new(restful_folder){|c|
           c.file_filter = /getTodo.yml/
           c.service_filter = ->(s) {
             s.method == "POST"

data/spec/unit/spec_helper.rb

@@ -3,8 +3,12 @@ require 'webspicy'
 
 module SpecHelper
 
+  def examples_folder
+    Webspicy::EXAMPLES_FOLDER
+  end
+
   def restful_folder
-    Webspicy::EXAMPLES_FOLDER/'restful/webspicy'
+    examples_folder/'restful/webspicy'
   end
 
 end

data/spec/unit/test_configuration.rb

@@ -10,6 +10,33 @@ module Webspicy
       expect(seen).to be_a(Configuration)
     end
 
+    describe 'folder' do
+
+      it 'returns the main folder without arg' do
+        config = Configuration.new(Path.dir)
+        expect(config.folder).to eql(Path.dir)
+      end
+
+      it 'creates a child when adding a folder' do
+        Configuration.new(Path.dir) do |c|
+          child = c.folder 'resource'
+          expect(child).to be_a(Configuration)
+          expect(child.folder).to eql(Path.dir/'resource')
+        end
+      end
+
+      it 'yield the child to the block if any given' do
+        Configuration.new(Path.dir) do |c|
+          seen = nil
+          c.folder 'resource' do |child|
+            seen = child
+          end
+          expect(seen).to be_a(Configuration)
+          expect(seen.folder).to eql(Path.dir/'resource')
+        end
+      end
+    end
+
     describe 'run_counterexamples' do
 
       it 'is true by default' do
@@ -83,8 +110,7 @@ module Webspicy
     describe 'dup' do
 
       let(:original) do
-        Configuration.new do |c|
-          c.add_folder Path.dir/'resource'
+        Configuration.new(Path.dir/'resource') do |c|
           c.host = "http://127.0.0.1"
         end
       end
@@ -93,19 +119,16 @@ module Webspicy
         duped = original.dup do |d|
           d.host = "http://127.0.0.1:4567"
         end
+        expect(duped.folder).to eql(Path.dir/'resource')
         expect(duped.host).to eql("http://127.0.0.1:4567")
         expect(original.host).to eql("http://127.0.0.1")
       end
 
       it 'duplicates the internal arrays to' do
         duped = original.dup do |d|
-          d.add_folder Path.dir/'scope'
           d.rspec_options << "--hello"
           d.before_each do end
         end
-        expect(duped.folders.size).to eql(2)
-        expect(original.folders.size).to eql(1)
-
         expect(duped.rspec_options.last).to eq("--hello")
         expect(original.rspec_options.last).not_to eq("--hello")
 

data/tasks/test.rake

@@ -16,7 +16,7 @@ namespace :test do
     desc "Runs the integration tests on the #{file.basename} example"
     task(test_name) do
       Bundler.with_original_env do
-        system("cd #{file} && rake")
+        system("cd #{file} && bundle exec rake")
       end
     end
     tests << test_name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0.pre.rc1
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -169,9 +169,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1