mock_server 0.1.5 → 0.2

data/lib/mock_server/playback.rb

@@ -1,45 +1,52 @@
-require 'mock_server/utils'
 require 'erb'
 require 'hashie'
 
+require_relative 'utils'
+require_relative 'state'
+
+unless defined? MockServer::Store
+  require_relative 'store/global'
+end
+
 module MockServer
   class Playback
     include MockServer::Utils
+    include MockServer::Store
 
-    def initialize(app, options = {})
-      @options = options
+    def initialize(app, opt = {})
       @app = app
-      $mock_server_options ||= options
+      @options = mock_server_options_merge(opt)
     end
 
     def call(env)
-      @options.merge!($mock_server_options)
+      @options = self.mock_server_options_read
 
-      verbose(env, $mock_server_options) if @options[:verbose]
+      verbose(env) if @options[:verbose]
       return @app.call(env) unless @options[:routes] and
                                    lazy_match @options[:routes], env["PATH_INFO"]
 
       @request = Rack::Request.new(env)
 
-      $mock_server_options[:requests_stack] ||= []
-      $mock_server_options[:requests_stack] << @request.path
+      @options[:requests_stack] << @request.path
 
       @data = load_data
 
       record = match_request
 
-      if record
-        $mock_server_options[:success_stack] ||= []
-        $mock_server_options[:success_stack] << @request.path
+      response = if record
+        @options[:success_stack] << @request.path
+        @options[:matcher_exceptions].clear
 
         response = record[:response]
         [response[:status], response[:headers], [response[:body]]]
       else
-        $mock_server_options[:errors_stack] ||= []
         error = { @request.path => "Couldn't match #{@request.request_method} #{@request.path}" }
-        $mock_server_options[:errors_stack] << error
+        @options[:errors_stack] << error
         [404, {}, ['RECORD NOT FOUND!']]
       end
+
+      self.mock_server_options_write(@options)
+      response
     end
 
     private
@@ -80,8 +87,7 @@ module MockServer
     end
 
     def store_matcher_exception(exception)
-      $mock_server_options[:matcher_exceptions] ||= []
-      $mock_server_options[:matcher_exceptions] << exception
+      @options[:matcher_exceptions] << exception
     end
 
     def load_data

data/lib/mock_server/record.rb

@@ -1,29 +1,33 @@
-require 'mock_server/utils'
+require_relative 'utils'
+require_relative 'state'
+
+unless defined? MockServer::Store
+  require_relative 'store/global'
+end
 
 module MockServer
   class Record
     include MockServer::Utils
+    include MockServer::Store
 
-    def initialize(app, options = {})
-      @options = options
+    def initialize(app, opt = {})
       @app = app
-      $mock_server_options ||= options
+      @options = mock_server_options_merge(opt)
     end
 
     def call(env)
-      @options.merge!($mock_server_options)
+      @options = self.mock_server_options_read
 
-      verbose(env, $mock_server_options) if @options[:verbose]
+      verbose(env) if @options[:verbose]
       return @app.call(env) unless @options[:routes] and
                                    lazy_match @options[:routes], env["PATH_INFO"]
 
-      @options.merge!($mock_server_options)
-
       @request = Rack::Request.new(env)
       @data = load_data
 
       @app.call(env).tap do |status, header, response|
         record_response(status, header, response)
+        self.mock_server_options_write(@options)
         response
       end
     end

data/lib/mock_server/spec/helpers.rb

@@ -1,99 +1,44 @@
-# The purpose of the helper is to manpulate MockServer global var
-# in an rspec way. $mock_server_options
-#
-#
-# The basic:
-#
-#   $mock_server_options = { :path => 'fixtures/records', :filename => 'uploads' }
-#
-#
-# $mock_server_options tell you application which URL to do its magic for both, 
-# record and playback mode.
-#
-# Example:
-#
-#   $mock_server_options[:routes] = [ '**/uploads.json', '**/uploads/*',
-#                                     '**/folders.json', '**/folders', '**/folders' ]
-#
-# $mock_server_options[:matchers] is an array of path, url, and matchers proc
-#
-# Example:
-#
-# $mock_server_options[:matchers] = [
-#   { :method => :get, :path => '/api/2/projects/1/uploads.json',
-#     :matcher => Proc.new { |request, recorded_request|
-#       request.query == recorded_request.query and
-#       request.query == 'count=0'
-#     }
-#   },
-#   { :method => :put, :path => '/api/2/uploads/20',
-#     :matcher => Proc.new { |request, recorded_request|
-#       request.query == recorded_request.query and
-#       request.query == 'count=0'
-#     }
-#   },
-#   { :method => :delete, :path => '/api/2/uploads/20' },
-#   { :method => :get, :path => '/api/2/projects/1/folders.json' },
-#   { :method => :post, :path => '/api/2/folders',
-#     :matcher => Proc.new { |request, recorded_request|
-#       request.body.project_id == recorded_request.body.project_id and
-#       request.body.project_id == 1 and
-#       recorded_request.body.name == recorded_request.body.name and
-#       recorded_request.body.name == 'Mockup'
-#     }
-#   },
-#   { :method => :put, :path => '/api/2/uploads/20', 
-#     :matcher => Proc.new { |request, recorded_request|
-#       request.body.name == recorded_request.body.name
-#     }
-#   },
-#   { :method => :delete, :path => '/api/2/folders/3' }
-# ]
-
-
+unless defined? MockServer::Store
+  require_relative 'Store/global'
+end
 
 module MockServer
   module Spec
     module Helpers
+      include MockServer::Store
 
       # Inspect
       def mock_server_inspect
-        $mock_server_options.inspect
+        mock_server_options.inspect
       end
 
       # Configuration
       def mock_server_use_record(*arguments)
-        mock_server_config_set(:record_filenames, arguments)
+        mock_server_options_set(:record_filenames, arguments)
       end
 
       def mock_server_add_record(*arguments)
-        config = (mock_server_config_get(:record_filenames) || []) + arguments
-        mock_server_config_set(:record_filenames, config)
+        config = (mock_server_options_fetch(:record_filenames, []) + arguments)
+        mock_server_options_set(:record_filenames, config)
       end
 
       def mock_server_set_fixture_path(path)
-        mock_server_config_set(:path, path)
+        mock_server_options_set(:path, path)
       end
 
       # Active path config
       def mock_server_enable_routes(*arguments)
-        $mock_server_options ||= {}
-        $mock_server_options[:routes] ||= []
-        $mock_server_options[:routes] << arguments
-        $mock_server_options[:routes].flatten!
+        routes = mock_server_options_fetch(:routes, []) + arguments
+        mock_server_options_set(:routes, routes)
       end
 
       def mock_server_disable_path(path)
-        return unless $mock_server_options and $mock_server_options[:routes]
-        $mock_server_options[:routes] = if path.is_an? Array
-          path unless path.empty?
-        else
-          $mock_server_options[:routes] - [path]
-        end
+        routes = mock_server_options_fetch(:routes, []) - [path]
+        mock_server_options_set(:routes, routes.flatten!)
       end
 
       def mock_server_disable_all_routes!
-        $mock_server_options[:routes] = nil
+        mock_server_options_set(:routes, [])
       end
 
       # Matchers helpers
@@ -114,32 +59,32 @@ module MockServer
       end
 
       def mock_server_clear_matchers!
-        mock_server_config_set(:matchers, [])
+        mock_server_options_set(:matchers, [])
       end
 
       # Errors / Success stack
       def mock_server_requests_stack
-        $mock_server_options[:requests_stack] || []
+        mock_server_options_fetch(:requests_stack, [])
       end
 
       def mock_server_requests_stack_clear!
-        $mock_server_options[:requests_stack] = []
+         mock_server_options_set(:requests_stack, [])
       end
 
       def mock_server_errors_stack
-        $mock_server_options[:errors_stack] || []
+        mock_server_options_fetch(:errors_stack, [])
       end
 
       def mock_server_errors_stack_clear!
-        $mock_server_options[:errors_stack] = []
+        mock_server_options_set(:errors_stack, [])
       end
 
       def mock_server_success_stack
-        $mock_server_options[:success_stack] || []
+        mock_server_options_fetch(:success_stack, [])
       end
 
       def mock_server_success_stack_clear!
-        $mock_server_options[:success_stack] = []
+        mock_server_options_set(:success_stack, [])
       end
 
       def mock_server_response_stack_clear!
@@ -157,34 +102,41 @@ module MockServer
       end
 
       def mock_server_reraise_matcher_exceptions
-        $mock_server_options[:matcher_exceptions] ||= []
-        $mock_server_options[:matcher_exceptions].each do |exception|
+        mock_server_options_fetch(:matcher_exceptions, []).each do |exception|
           raise exception
         end
       end
 
       protected
 
-      # Configuration
-      def mock_server_config_set(key, value)
-        $mock_server_options ||= {}
-        $mock_server_options[key] = value
-      end
-
-      def mock_server_config_get(key)
-        $mock_server_options ||= {}
-        $mock_server_options[key]
-      end
-
       # Matchers helpers
       def mock_server_request(method, path, matcher)
         add_mock_server_matcher({ :method => method, :path => path, :matcher => matcher })
       end
 
       def add_mock_server_matcher(matcher)
-        $mock_server_options ||= {}
-        $mock_server_options[:matchers] ||= []
-        $mock_server_options[:matchers] << matcher
+        options = self.mock_server_options_read
+        options[:matchers] << matcher
+        mock_server_options_write(options)
+      end
+
+      def mock_server_options_fetch(key, value)
+        if self.mock_server_options_read[key]
+          mock_server_options_get(key)
+        else
+          mock_server_options_set(key, value)
+        end
+      end
+
+      def mock_server_options_set(key, value)
+        hash = self.mock_server_options_read
+        hash[key] = value
+        self.mock_server_options_write(hash)
+      end
+
+      def mock_server_options_get(key)
+        hash = self.mock_server_options_read
+        hash[key]
       end
 
     end

data/lib/mock_server/state.rb

@@ -0,0 +1,31 @@
+module MockServer
+  class State < Hashie::Dash
+    property :path, :default => 'fixtures/records'
+    property :filename, :default => 'record'
+    property :routes, :default => []
+    property :record_filenames, :default => []
+    property :matchers, :default => []
+    property :verbose, :default => false
+    property :requests_stack, :default => []
+    property :success_stack, :default => []
+    property :errors_stack, :default => []
+    property :requests_stack, :default => []
+    property :matcher_exceptions, :default => []
+
+    def merge(hash)
+      new_hash = self
+      hash.each do |k,v|
+        new_hash[k] = v
+      end
+      new_hash
+    end
+
+    def merge!(hash)
+      hash.each do |k,v|
+        self[k] = v
+      end
+      self
+    end
+
+  end
+end

data/lib/mock_server/store/global.rb

@@ -0,0 +1,22 @@
+require 'hashie'
+
+module MockServer
+  module Store
+
+      def mock_server_options_merge(opt = {})
+        $mock_server_options ||= MockServer::State.new(opt)
+        $mock_server_options.merge!(opt)
+      end
+
+      def mock_server_options_read
+        $mock_server_options ||= MockServer::State.new
+        $mock_server_options
+      end
+
+      def mock_server_options_write(value)
+        $mock_server_options ||= MockServer::State.new
+        $mock_server_options = value
+      end
+
+  end
+end

data/lib/mock_server/utils.rb

@@ -6,11 +6,9 @@ module MockServer
 
     private
 
-    def verbose(env, options)
-      if options
-        interception = lazy_match(options[:routes], env["PATH_INFO"]) ? "intercepted!" : "NOT intercepted."
-        puts %([MockServer] #{env["PATH_INFO"]} was #{interception}"\n)
-      end
+    def verbose(env)
+      interception = lazy_match(@options[:routes], env["PATH_INFO"]) ? "intercepted!" : "NOT intercepted."
+      puts %([MockServer] #{env["PATH_INFO"]} was #{interception}"\n)
     end
 
     def lazy_match(strings, path)

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: mock_server
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
 - Charles Barbier
+- Saimon Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-14 00:00:00.000000000 Z
+date: 2011-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70339623889120 !ruby/object:Gem::Requirement
+  requirement: &70185898662840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339623889120
+  version_requirements: *70185898662840
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70339623902520 !ruby/object:Gem::Requirement
+  requirement: &70185898662400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +33,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339623902520
+  version_requirements: *70185898662400
 description: 
 email: unixcharles@gmail.com
 executables: []
@@ -45,6 +46,8 @@ files:
 - lib/mock_server/record.rb
 - lib/mock_server/playback.rb
 - lib/mock_server/utils.rb
+- lib/mock_server/state.rb
+- lib/mock_server/store/global.rb
 - lib/mock_server/spec/helpers.rb
 homepage: http://www.github.com/unixcharles/mock_server
 licenses: []