webspicy 0.3.0.pre.rc2 → 0.3.0.pre.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d31b169f136144209e61a59ac7c7c848562e5646
-  data.tar.gz: 2e971cd2cf87bd7215039349257dbe6fe05d0a5c
+  metadata.gz: b25073c6397b2720a2c7fd0024cb7a0fa5762f57
+  data.tar.gz: 2012c7403444a88649a212d22691e8260d4471c2
 SHA512:
-  metadata.gz: 0ac4e3b403070e46f7d85b88289cb81abc375422acf42164eab8ed70145201087bd5affb9fd94d54231f5ac388ee430ce9441f5959c9b372ebcfac2ce06a8bf4
-  data.tar.gz: f84f29c4023ef02e568b2c8b861a095f8ce118964ffb6cada0a3c3e1c9c6458d0ff5b4ed308e2a77edba6d64695bdb2492073c14977b3d871f72d38fbbfd7fae
+  metadata.gz: 5bd05c8199e926768b3bd197a30df9e0b6da4de007e1abcea0661583ebbfea9b5636a89f65c4e65c1f397adb9c2e1d1142b0e04a9d2ee8f2f4a1f6c9d404e2a0
+  data.tar.gz: 8a7fee06f727727945247b22a508b5d9566e6a2acc3e8fefba2d6b0b1cc8aca3238ad89f874294801e069dc4d82254e6970d1580968515046761cb5cbeb04faf

data/examples/restful/Gemfile.lock

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

data/lib/webspicy/checker.rb

@@ -8,18 +8,17 @@ module Webspicy
 
     def call
       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
 
             it 'meets the formal doc data schema' do
-              Webspicy.resource(file.load, file)
+              Webspicy.resource(file.load, file, scope)
             end
 
           end
         end
-        RSpec::Core::Runner.run config.rspec_options
       end
+      RSpec::Core::Runner.run config.rspec_options
     end
 
   end

data/lib/webspicy/configuration.rb

@@ -26,7 +26,7 @@ module Webspicy
           config.each_scope(&bl)
         end
       else
-        Webspicy.with_scope_for(self, &bl)
+        yield Scope.new(self)
       end
     end
 
@@ -228,7 +228,7 @@ module Webspicy
     # original.
     def dup(&bl)
       super.tap do |d|
-        d.children = self.children.dup
+        d.children = []
         d.rspec_options = self.rspec_options.dup
         d.before_listeners = self.before_listeners.dup
         yield d if block_given?

data/lib/webspicy/scope.rb

@@ -30,7 +30,7 @@ module Webspicy
     def each_resource(&bl)
       return enum_for(:each_resource) unless block_given?
       each_resource_file do |file, folder|
-        yield Webspicy.resource(file.load, file)
+        yield Webspicy.resource(file.load, file, self)
       end
     end
 

data/lib/webspicy/tester.rb

@@ -90,8 +90,8 @@ module Webspicy
             end
           end
         end
-        RSpec::Core::Runner.run config.rspec_options
       end
+      RSpec::Core::Runner.run config.rspec_options
     end
 
   end # class Tester

data/lib/webspicy/version.rb

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

data/lib/webspicy.rb

@@ -38,40 +38,57 @@ module Webspicy
 
   FORMALDOC = Finitio::DEFAULT_SYSTEM.parse (Path.dir/"webspicy/formaldoc.fio").read
 
-  def resource(raw, file = nil)
-    FORMALDOC["Resource"].dress(raw)
+  # Returns a default scope instance.
+  def default_scope
+    Scope.new(Configuration.new)
+  end
+  module_function :default_scope
+
+  def resource(raw, file = nil, scope = default_scope)
+    with_scope(scope) do
+      FORMALDOC["Resource"].dress(raw)
+    end
   end
   module_function :resource
 
-  def service(raw)
-    FORMALDOC["Service"].dress(raw)
+  def service(raw, scope = default_scope)
+    with_scope(scope) do
+      FORMALDOC["Service"].dress(raw)
+    end
   end
   module_function :service
 
-  def test_case(raw)
-    FORMALDOC["TestCase"].dress(raw)
+  def test_case(raw, scope = default_scope)
+    with_scope(scope) do
+      FORMALDOC["TestCase"].dress(raw)
+    end
   end
   module_function :test_case
 
   #
-  # Yields a Scope instance for the configuration passed as parameter.
+  # Yields the block after having installed `scope` globally.
   #
   # This method makes sure that the scope will also be accessible for
   # Finitio world schema parsing/dressing. Given that some global state
   # is required (see "Schema" ADT, the dresser in particular, which calls
   # `schema` later), the scope is put as a thread-local variable...
   #
-  def with_scope_for(config)
-    scope = set_current_scope(Scope.new(config))
-    yield scope
+  # This method is considered private and should not be used outside of
+  # Webspicy itself.
+  #
+  def with_scope(scope)
+    scope = set_current_scope(scope)
+    result = yield scope
     set_current_scope(nil)
+    result
   end
-  module_function :with_scope_for
+  module_function :with_scope
 
   #
   # Sets the current scope.
   #
-  # See `with_scope_for`
+  # This method is considered private and should not be used outside of
+  # Webspicy itself.
   #
   def set_current_scope(scope)
     Thread.current[:webspicy_scope] = scope
@@ -80,7 +97,7 @@ module Webspicy
 
   #
   # Parses a webservice schema (typically input or output) in the context
-  # of the current scope previously installed using `with_scope_for`.
+  # of the current scope previously installed using `with_scope`.
   #
   # If no scope has previously been installed, Finitio's default system
   # is used instead of another schema.

data/spec/unit/scope/test_each_resource.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 module Webspicy
   describe Scope, 'each_resource' do
 
-    with_scope_management
-
     let(:scope) {
       Scope.new(configuration)
     }

data/spec/unit/scope/test_each_service.rb

@@ -2,8 +2,6 @@ require 'spec_helper'
 module Webspicy
   describe Scope, 'each_service' do
 
-    with_scope_management
-
     let(:scope) {
       Scope.new(configuration)
     }

data/spec/unit/spec_helper.rb

@@ -13,20 +13,6 @@ module SpecHelper
 
 end
 
-module ScopeManagement
-
-  def with_scope_management
-    before(:each) {
-      Webspicy.set_current_scope(scope)
-    }
-    after(:each) {
-      Webspicy.set_current_scope(nil)
-    }
-  end
-
-end
-
 RSpec.configure do |c|
   c.include SpecHelper
-  c.extend  ScopeManagement
 end

data/spec/unit/test_configuration.rb

@@ -112,6 +112,7 @@ module Webspicy
       let(:original) do
         Configuration.new(Path.dir/'resource') do |c|
           c.host = "http://127.0.0.1"
+          c.folder 'service'
         end
       end
 
@@ -135,6 +136,11 @@ module Webspicy
         expect(duped.before_listeners.size).to eq(1)
         expect(original.before_listeners.size).to eq(0)
       end
+
+      it 'empties the children' do
+        duped = original.dup
+        expect(duped.children).to be_empty
+      end
     end
 
   end

metadata

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