webspicy 0.1.0.pre.rc3 → 0.1.0.pre.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6894d4163e21f8309c91e1befcf39ce59423e04
-  data.tar.gz: 61bc6deca7423852bea6daa1d5c2aacf7ec17c57
+  metadata.gz: db22eea722029a231a0b460ab4984c5c0b4fb04a
+  data.tar.gz: d4138fb451e46da2c76bb49009ec64a31f32f15a
 SHA512:
-  metadata.gz: c403e240151fd262ee1982e0dbc4d839bdfcbf33e6682f5c0384fbd034b900de76871d3b6360284ee7ee29a4ad4281f57a329bb67ee053fe9e88c364d5dfbe59
-  data.tar.gz: 815d5fed96020fc8cc1db42443f1eaee72357793408c05f304801a34f4b5cdd7d8e0dca5883602c92eda0c94aaee11d671e6cbc33092d6871a88072b4d5e12d7
+  metadata.gz: b464b7b066f6d8d07033261e16e579d3609e339b189328561eb58fe2d741ee110d878bfda870def3c7210723cca6d2b5fd1b53c57cd2140422cb2604ec7059f7
+  data.tar.gz: b529dea8cfe6b724b02b16fb414b675403e9def355795b6a5b904508626a66b924955e77b817db72c0d25928394f38f437c6f4d8d32486485c2545c454a09c62

data/examples/restful/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: ../..
   specs:
-    webspicy (0.1.0.pre.rc2)
+    webspicy (0.1.0.pre.rc3)
       finitio (~> 0.5.2)
       http (~> 0.5)
       path (~> 1.3)
+      rack-test (~> 0.7)
       rspec (~> 3.6)
 
 GEM
@@ -33,6 +34,8 @@ GEM
     rack (2.0.3)
     rack-protection (2.0.0)
       rack
+    rack-test (0.7.0)
+      rack (>= 1.0, < 3)
     rake (10.5.0)
     rspec (3.6.0)
       rspec-core (~> 3.6.0)

data/examples/restful/Rakefile

@@ -1,21 +1,40 @@
+$LOAD_PATH.unshift File.expand_path("..", __FILE__)
+require 'app'
 require 'webspicy'
 
 namespace :webspicy do
 
-  config = Webspicy::Configuration.new do |c|
-    c.host = "http://127.0.0.1:4567"
-    c.add_folder Path.dir/"webspicy"
-  end
-
   task :check do
+    config = Webspicy::Configuration.new do |c|
+      c.add_folder Path.dir/"webspicy"
+    end
     Webspicy::Checker.new(config).call
   end
 
-  task :test do
+  task :testrack do
+    config = Webspicy::Configuration.new do |c|
+      c.add_folder Path.dir/"webspicy"
+      c.client = Webspicy::RackTestClient.for(::Sinatra::Application)
+      c.before_each do |_,_,_,client|
+        client.api.post "/reset"
+      end
+    end
+    Webspicy::Tester.new(config).call
+  end
+
+  task :testreal do
+    config = Webspicy::Configuration.new 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"
+      end
+    end
     Webspicy::Tester.new(config).call
   end
 
 end
 
-task :test => :"webspicy:test"
+task :test => [:"webspicy:check", :"webspicy:testrack"]
 task :default => :test

data/examples/restful/app.rb

@@ -19,19 +19,27 @@ TODOLIST = [
 disable :show_exceptions
 enable :raise_errors
 
+set :todolist, TODOLIST.dup
+
+post '/reset' do
+  settings.todolist = TODOLIST.dup
+  status 200
+  ""
+end
+
 get '/todo/' do
   content_type :json
-  TODOLIST.to_json
+  settings.todolist.to_json
 end
 
 post '/todo/' do
   content_type :json
   todo = SCHEMA["Todo"].dress(JSON.load(request.body.read))
-  if TODOLIST.find{|t| t[:id] == todo[:id] }
+  if settings.todolist.find{|t| t[:id] == todo[:id] }
     status 409
     {error: "Identifier already in use"}.to_json
   else
-    TODOLIST << todo
+    settings.todolist << todo
     status 201
     todo.to_json
   end
@@ -39,7 +47,7 @@ end
 
 get '/todo/:id' do |id|
   content_type :json
-  todo = TODOLIST.find{|todo| todo[:id] == Integer(id) }
+  todo = settings.todolist.find{|todo| todo[:id] == Integer(id) }
   if todo.nil?
     status 404
     {error: "No such todo"}.to_json

data/lib/webspicy/client/http_client.rb

@@ -1,6 +1,12 @@
 module Webspicy
   class HttpClient < Client
 
+    def initialize(scope)
+      super(scope)
+      @api = Api.new
+    end
+    attr_reader :api
+
     def call(test_case, service, resource)
       # Instantiate the parameters
       headers = test_case.headers
@@ -13,7 +19,6 @@ module Webspicy
       url = scope.to_real_url(url)
 
       # Invoke the service now
-      api = Api.new
       api.public_send(service.method.to_s.downcase.to_sym, url, params, headers)
 
       # Return the result
@@ -24,46 +29,33 @@ module Webspicy
 
       attr_reader :last_response
 
-      def get(url, params, headers = nil)
-        headers, url = headers_and_url_for(url, params, headers)
-
+      def get(url, params = {}, headers = nil)
         Webspicy.info("GET #{url} -- #{params.inspect}")
 
-        @last_response = HTTP[headers].get(url, params: params)
+        @last_response = HTTP[headers || {}].get(url, params: params)
 
         Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
         Webspicy.debug("Response: #{@last_response.body}")
       end
 
-      def post(url, params, headers = nil)
-        headers, url = headers_and_url_for(url, params, headers)
-
+      def post(url, params = {}, headers = nil)
         Webspicy.info("POST #{url} -- #{params.inspect}")
 
-        @last_response = HTTP[headers].post(url, body: params.to_json)
+        @last_response = HTTP[headers || {}].post(url, body: params.to_json)
 
         Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
         Webspicy.debug("Response: #{@last_response.body}")
       end
 
-      def post_form(url, params, headers = nil)
-        headers, url = headers_and_url_for(url, params, headers)
-
+      def post_form(url, params = {}, headers = nil)
         Webspicy.info("POST #{url} -- #{params.inspect}")
 
-        @last_response = HTTP[headers].post(url, form: params)
+        @last_response = HTTP[headers || {}].post(url, form: params)
 
         Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
         Webspicy.debug("Response: #{@last_response.body}")
       end
 
-    private
-
-      def headers_and_url_for(url, params, headers)
-        headers = headers || {}
-        [ headers, url ]
-      end
-
     end
 
   end

data/lib/webspicy/client/rack_test_client.rb

@@ -0,0 +1,105 @@
+module Webspicy
+  class RackTestClient < Client
+
+    def self.for(app)
+      Factory.new(app)
+    end
+
+    def initialize(scope, app)
+      super(scope)
+      @api = Api.new(app)
+    end
+    attr_reader :api
+
+    def call(test_case, service, resource)
+      # Instantiate the parameters
+      headers = test_case.headers
+      params = test_case.dress_params? ? service.dress_params(test_case.params) : test_case.params
+
+      # Instantiate the url and strip parameters
+      url, params = resource.instantiate_url(params)
+
+      # Invoke the service now
+      api.public_send(service.method.to_s.downcase.to_sym, url, params, headers)
+
+      # Return the result
+      Resource::Service::Invocation.new(service, test_case, api.last_response)
+    end
+
+    class Factory
+
+      def initialize(app)
+        @app = app
+      end
+      attr_reader :app
+
+      def new(scope)
+        RackTestClient.new(scope, app)
+      end
+
+    end # class Factory
+
+    class RackHandler
+      include Rack::Test::Methods
+
+      def initialize(app)
+        @app = app
+      end
+      attr_reader :app
+
+    end # class RackHandler
+
+    class Api
+
+      attr_reader :last_response
+
+      def initialize(app)
+        @handler = RackHandler.new(app)
+      end
+      attr_reader :handler
+
+      def get(url, params = {}, headers = nil)
+        Webspicy.info("GET #{url} -- #{params.inspect}")
+
+        install_headers(headers) if headers
+        handler.get(url, params)
+        @last_response = handler.last_response
+
+        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
+        Webspicy.debug("Response: #{@last_response.body}")
+      end
+
+      def post(url, params = {}, headers = nil)
+        Webspicy.info("POST #{url} -- #{params.inspect}")
+
+        install_headers(headers) if headers
+        handler.post(url, params.to_json, {"CONTENT_TYPE" => "application/json"})
+        @last_response = handler.last_response
+
+        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
+        Webspicy.debug("Response: #{@last_response.body}")
+      end
+
+      def post_form(url, params = {}, headers = nil)
+        Webspicy.info("POST #{url} -- #{params.inspect}")
+
+        install_headers(headers) if headers
+        handler.post(url, params)
+        @last_response = handler.last_response
+
+        Webspicy.debug("Headers: #{@last_response.headers.to_hash}")
+        Webspicy.debug("Response: #{@last_response.body}")
+      end
+
+    private
+
+      def install_headers(hs)
+        hs.each_pair do |k,v|
+          handler.header(k,v)
+        end
+      end
+
+    end # class Api
+
+  end # class RackTestClient
+end # module Webspicy

data/lib/webspicy/client.rb

@@ -12,6 +12,7 @@ module Webspicy
 
     def before(*args, &bl)
       config.before_listeners.each do |beach|
+        args << self
         beach.call(*args, &bl)
       end
     end

data/lib/webspicy/configuration.rb

@@ -19,7 +19,8 @@ module Webspicy
       raise "Folder `#{folder}` does not exists" unless folder.exists? && folder.directory?
       @folders << folder
     end
-    attr_reader :folders
+    attr_accessor :folders
+    protected :folders=
 
     # Sets whether counter examples have to be ran or not.
     def run_counterexamples=(run_counterexamples)
@@ -137,6 +138,8 @@ module Webspicy
     def before_listeners
       @before_listeners
     end
+    attr_writer :before_listeners
+    protected :before_listeners=
 
     # Allows setting the options passed at RSpec, which is used by both the runner
     # and checker classes.
@@ -146,7 +149,8 @@ module Webspicy
     def rspec_options=(options)
       @rspec_options = options
     end
-    attr_reader :rspec_options
+    attr_accessor :rspec_options
+    protected :rspec_options=
 
     # Returns the default rspec options.
     #
@@ -164,5 +168,20 @@ module Webspicy
     end
     private :default_rspec_options
 
+    # Duplicates this configuration and yields the block with the new one,
+    # if a block is given.
+    #
+    # The cloned configuration has all same values as the original but shares
+    # nothing with it. Therefore, affecting the new one has no effect on the
+    # original.
+    def dup(&bl)
+      super.tap do |d|
+        d.folders = self.folders.dup
+        d.rspec_options = self.rspec_options.dup
+        d.before_listeners = self.before_listeners.dup
+        yield d if block_given?
+      end
+    end
+
   end
 end

data/lib/webspicy/resource/service/invocation.rb

@@ -11,6 +11,16 @@ module Webspicy
 
         attr_reader :service, :test_case, :response
 
+        ### Getters on response
+
+        def response_code
+          code = response.status
+          code = code.code unless code.is_a?(Integer)
+          code
+        end
+
+        ### Query methods
+
         def done?
           !response.nil?
         end
@@ -20,15 +30,15 @@ module Webspicy
         end
 
         def is_success?
-          response.status.code >= 200 && response.status.code < 300
+          response_code >= 200 && response_code < 300
         end
 
         def is_empty_response?
-          response.status.code == 204
+          response_code == 204
         end
 
         def is_redirect?
-          response.status.code >= 300 && response.status.code < 400
+          response_code >= 300 && response_code < 400
         end
 
         ### Check of HTTP status
@@ -47,7 +57,8 @@ module Webspicy
 
         def expected_content_type_unmet
           ect = test_case.expected_content_type
-          got = response.content_type.mime_type.to_s
+          got = response.content_type
+          got = got.mime_type.to_s if got.respond_to?(:mime_type)
           ect == got ? nil : "#{ect} != #{got}"
         end
 

data/lib/webspicy/version.rb

@@ -1,6 +1,6 @@
 module Webspicy
   module Version
-    TINY  = "0-rc3"
+    TINY  = "0-rc4"
     MINOR = 1
     MAJOR = 0
   end

data/lib/webspicy.rb

@@ -6,6 +6,7 @@ require 'logger'
 require 'ostruct'
 require 'yaml'
 require 'rspec'
+require 'rack/test'
 module Webspicy
 
   ###
@@ -16,6 +17,7 @@ module Webspicy
   require 'webspicy/scope'
   require 'webspicy/client'
   require 'webspicy/client/http_client'
+  require 'webspicy/client/rack_test_client'
   require 'webspicy/resource'
   require 'webspicy/checker'
   require 'webspicy/tester'

data/spec/unit/test_configuration.rb

@@ -80,5 +80,39 @@ module Webspicy
       end
     end
 
+    describe 'dup' do
+
+      let(:original) do
+        Configuration.new do |c|
+          c.add_folder Path.dir/'resource'
+          c.host = "http://127.0.0.1"
+        end
+      end
+
+      it 'lets duplicate a configuration' do
+        duped = original.dup do |d|
+          d.host = "http://127.0.0.1:4567"
+        end
+        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")
+
+        expect(duped.before_listeners.size).to eq(1)
+        expect(original.before_listeners.size).to eq(0)
+      end
+    end
+
   end
 end

data/tasks/test.rake

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.rc3
+  version: 0.1.0.pre.rc4
 platform: ruby
 authors:
 - Bernard Lambeau
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10'
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: finitio
   requirement: !ruby/object:Gem::Requirement
@@ -102,6 +130,7 @@ files:
 - lib/webspicy/checker.rb
 - lib/webspicy/client.rb
 - lib/webspicy/client/http_client.rb
+- lib/webspicy/client/rack_test_client.rb
 - lib/webspicy/configuration.rb
 - lib/webspicy/formaldoc.fio
 - lib/webspicy/resource.rb