scenario_server 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 428e1ab2442b942ab63071ea8598148e79574df5
-  data.tar.gz: 469192547f52f20755ec2b64dec1e6c487572970
+  metadata.gz: ba5c753c602276fababe1e5ed34531f804a07ef1
+  data.tar.gz: ff6edf100eabe7a24b9cb0283d101f7962f5dcde
 SHA512:
-  metadata.gz: 34269dfd4153e5932e32ce393d58008e7ee9ff7143bec9cd09273e0ff49b28987a2a676010445e661d92ed805087bc387863a877c94bca7ed38f490c3566f80a
-  data.tar.gz: f87c3e8a0c778da0a4316f284845fe867c0e144dd7b3102e0f6cd340aa734fe82e99e01e259cf6e5092c7d088675cee4998d1188c8d49df69dd328b496f87f9b
+  metadata.gz: c33253655a852d7962bd8f074a20f3e486ad120bed2a76db3fa1ca92ab648ac038a75fa5350ff06905f6e2a5c1c2cd354e7bca8b40f5f61fb1e271fee1db4cd9
+  data.tar.gz: f5e6fc554effad0c652af2258f7b7e5da1501f3631fc1967eadb32dabe675c918ce4731829f78464cb9459ff535e9b3c763ff746c907020d96d8cb303131b9af

data/WIP.txt

@@ -0,0 +1,2 @@
+. scenario server should run with postgres too
+. add mechanism so the response fixture can be refreshed. 

data/lib/scenarios/application/app.rb

@@ -12,9 +12,7 @@ class ScenarioServer < Sinatra::Base
   register Sinatra::ConfigFile
   use Rack::MethodOverride
 
-  #config_file File.expand_path('~/.scenarios') + '/config.yml'
-
-  configure :production do
+	configure :production do
     puts 'Production Environment'
     config_file File.expand_path('~/.scenarios') + '/config.yml'
     set :db_file , File.dirname(File.expand_path(__FILE__)) + '/../data/scenario_db.sqlite3'
@@ -50,8 +48,6 @@ class ScenarioServer < Sinatra::Base
   end
 
   before do
-
-    # configure database
     if defined?(settings.localdbfile)
       puts "using db: "+settings.localdbfile
       options = {:db_file=>settings.localdbfile}
@@ -91,8 +87,8 @@ class ScenarioServer < Sinatra::Base
 
     selected_scenario = self.scenario_db.get_scenario_for_id(params[:scenario_id])
     routes = self.scenario_db.get_routes_for_scenario(params[:scenario_id])
-
-    if (request.env['HTTP_ACCEPT'] && request.env['HTTP_ACCEPT'].include?('text/html'))
+    
+		if (request.env['HTTP_ACCEPT'] && request.env['HTTP_ACCEPT'].include?('text/html'))
       if params.has_key?('error')
         erb :'scenario', :locals => {'scenario'=>selected_scenario, 'routes'=>routes, 'error'=>params['error']}
       else
@@ -135,7 +131,11 @@ class ScenarioServer < Sinatra::Base
 
       if valid_fixture
         self.scenario_db.add_route_for_scenario(params['route_type'],
-                                                params['path'], params['fixture'], params[:scenario_id])
+                                                params['path'], 
+																								params['status_code'],
+																								params['headers'],
+																								params['fixture'], 
+																								params[:scenario_id])
         redirect('/scenarios/'+params[:scenario_id])
       else
         redirect('/scenarios/'+params[:scenario_id]+'?error=invalid%20json')
@@ -144,7 +144,11 @@ class ScenarioServer < Sinatra::Base
     else
       json_body = JSON.parse(request.body.read)
       route_id = self.scenario_db.add_route_for_scenario(json_body['route_type'],
-                                                         json_body['path'], json_body['fixture'], params[:scenario_id])
+                                                         json_body['path'],
+																												 json_body['status_code'],
+																												 json_body['headers'], 
+																												 json_body['fixture'], 
+																												 params[:scenario_id])
       content = {'url'=>'/scenarios/'+params[:scenario_id]+'/routes/'+route_id.to_s}.to_json
       [200, content]
     end
@@ -176,7 +180,6 @@ class ScenarioServer < Sinatra::Base
   get '/scenarios/:scenario_id/routes/:route_id' do
     route = self.scenario_db.get_route(params[:route_id])
 
-
     if (request.env['HTTP_ACCEPT'] && request.env['HTTP_ACCEPT'].include?('text/html'))
       erb :'route', :locals => { :route => route }
     else
@@ -209,62 +212,95 @@ class ScenarioServer < Sinatra::Base
   end
 
   # route path calls
-  get "/*" do
-    content_type 'application/json'
+  get '/*' do		
+		#TODO: Validate scene from the list of scenarios
+		ordered_scenarios = self.scenario_db.get_ordered_scenarios
+
+
+		#TODO: dry up the implementation 
+		#TODO: add ignore scene header 
+		current_scenario = settings.scenario 
+    if (request.env['HTTP_SCENE'])
+			current_scenario = request.env['HTTP_SCENE']
+		end
 
     route_type  = request.request_method.upcase
     path   = request.path.downcase
 
-    fixture = get_fixture(route_type, path,settings.scenario)
-    if fixture.nil?
+    status_code, header, fixture = get_fixture(route_type, path, current_scenario)
+    if header.nil? || header == ""
+			header = {'Content-Type' => 'application/json'}
+		else
+			header = eval(header)			
+		end 
+
+		if fixture.nil?
       404
     else
-      fixture
+		  status status_code
+      headers header
+      body fixture
     end
   end
 
-  post "/*" do
+  post '/*' do
     content_type 'application/json'
 
     route_type  = request.request_method.upcase
     path    = request.path.downcase
 
-    fixture = get_fixture(route_type, path,settings.scenario)
+		current_scenario = settings.scenario 
+    if (request.env['HTTP_SCENE'])
+			current_scenario = request.env['HTTP_SCENE']
+		end
+
+    status_code, header, fixture = get_fixture(route_type, path, current_scenario)
     if fixture.nil?
       404
     else
-      fixture
+      [status_code, fixture]
     end
   end
 
-  put "/*" do
+  put '/*' do
     content_type 'application/json'
 
     route_type  = request.request_method.upcase
     path   = request.path.downcase
 
-    fixture = get_fixture(route_type, path,settings.scenario)
+		current_scenario = settings.scenario 
+    if (request.env['HTTP_SCENE'])
+			current_scenario = request.env['HTTP_SCENE']
+		end
+
+    status_code, header, fixture = get_fixture(route_type, path, current_scenario)
     if fixture.nil?
       404
     else
-      fixture
+      [status_code, fixture]
     end
+    
+
   end
 
-  delete "/*" do
+  delete '/*' do
     content_type 'application/json'
 
     route_type  = request.request_method.upcase
     path    = request.path.downcase
 
-    fixture = get_fixture(route_type, path,settings.scenario)
+		current_scenario = settings.scenario 
+    if (request.env['HTTP_SCENE'])
+			current_scenario = request.env['HTTP_SCENE']
+		end
+
+    status_code, header, fixture = get_fixture(route_type, path, current_scenario)
     if fixture.nil?
       404
     else
-      fixture
+      [status_code, fixture]
     end
   end
 
-
 end
 

data/lib/scenarios/application/app_helpers.rb

@@ -20,11 +20,14 @@ def default?(name)
 end
 
 def get_fixture(route_type, path, scenario_name)
-  fixture =   self.scenario_db.get_fixture_from_routes(route_type, path, scenario_name)
-
+  status_code, header, fixture = self.scenario_db.get_fixture_from_routes(route_type, path, scenario_name)
+  
   if fixture.nil? and default?(scenario_name)
-    fixture = self.scenario_db.get_fixture_from_routes(route_type, path, 'default')
+    status_code, header, fixture = self.scenario_db.get_fixture_from_routes(route_type, path, 'default')
   end
 
-  fixture
+	if status_code == nil 
+	  status_code = 200
+	end
+  return status_code, header, fixture
 end

data/lib/scenarios/application/public/css/style.css

@@ -0,0 +1,41 @@
+body { 
+		   font-family: Verdana; 
+		   color: navy; }
+
+h1   { 
+	color: black; 
+}
+
+table {
+	table-layout: fixed;
+	width: 100%;
+	border-collapse: collapse;
+	border: 1px solid black;
+}
+
+th {
+	height: 50px;
+	border: 1px solid black;
+}
+td {
+	height: 40px;
+	text-align: center;
+	vertical-align: center;
+	border: 1px solid black;
+}
+
+input[type="text"] {
+  width: 50%;
+	display: block;
+	font-size:18px;
+	margin-bottom: 10px;
+}
+
+textarea {
+  width: 50%;
+	display: block;
+	font-size:18px;
+	margin-bottom: 10px;
+}
+
+

data/lib/scenarios/application/views/index.erb

@@ -1,5 +1,7 @@
 <html xmlns="http://www.w3.org/1999/html">
-
+<head>
+	<link rel="stylesheet" type="text/css" href="/css/style.css">
+</head>				
 <body>
 <h1>Scenarios</h1>
 <table>

data/lib/scenarios/application/views/route.erb

@@ -1,4 +1,7 @@
 <html>
+<head>
+	 <link rel="stylesheet" type="text/css" href="/css/style.css">
+</head>				
 <body>
 <h1><%= route[:path] %></h1>
 <table>
@@ -9,6 +12,8 @@
     <th>Scenario ID</th>
     <th>Route Type</th>
     <th>Path</th>
+    <th>Status Code</th>
+    <th>Headers</th>
     <th>Fixture</th>
     <th>Created At</th>
     <th>Updated At</th>
@@ -20,6 +25,8 @@
   <td><%=route[:scenario_id]%></td>
   <td><%=route[:route_type]%></td>
   <td><%=route[:path]%></td>
+  <td><%=route[:status_code]%></td>
+  <td><%=route[:headers]%></td>
   <td><%=route[:fixture]%></td>
   <td><%=route[:created_at]%></td>
   <td><%=route[:updated_at]%></td>

data/lib/scenarios/application/views/scenario.erb

@@ -1,23 +1,34 @@
 <html>
+<head>
+	<link rel="stylesheet" type="text/css" href="/css/style.css">
+</head>				
+
 <body>
 <a href="/scenarios">Home</a>
 <br>
 
 <%= error %>
 <h2><%= scenario[:name] %></h2>
-<table>
-<thead>
-<tr>
-  <th>Request Type</th>
-  <th>Path</th>
-  <th>Fixture</th>
-</tr>
-</thead>
-<tbody>
+<% if routes.count > 0 %> 
+	<table>
+  <thead>
+  <tr>
+    <th>Request Type</th>
+    <th>Path</th>
+    <th>Status Code</th>
+    <th>Headers</th>
+    <th>Fixture</th>
+    <th>Action</th>
+  </tr>
+  </thead>
+	<tbody> 
+<% end %>				
 <% routes.each do |route| %>
     <tr>
       <td><%= route[:route_type] %></td>
       <td><a href="/scenarios/<%= scenario[:id] %>/routes/<%= route[:id]%>"><%= route[:path] %></a></td>
+      <td><%= route[:status_code] %></td>
+      <td><%= route[:headers] %></td>
       <td><%= route[:fixture] %></td>
       <td>
         <form action="/scenarios/<%= scenario[:id] %>/routes/<%= route[:id]%>" method="post" style="display:inline;">
@@ -29,25 +40,33 @@
 <% end %>
 </tbody>
 </table>
+<hr>
+<br>
+<br>
 <p>
 <form action="/scenarios/<%= scenario[:id] %>/routes/new" method="post" id="routeform">
   <p>
 
-    <label>Request Type</label>
-    <select name="route_type">
+	<label>Request Type</label> <br>
+    <select name="route_type" width="100" style="width: 100px">
       <option value="GET">GET</option>
       <option value="POST">POST</option>
       <option value="DELETE">DELETE</option>
       <option value="PUT">PUT</option>
     </select>
-    <br>
-    <label>Path</label>
+		<br>
+		<label>Path</label>
     <input type="text" name="path"> <br>
-    <label>Fixture</label>
+		<label>Status Code</label>
+    <input type="text" name="status_code"> <br>
+		<label>Headers</label><br>
+    <textarea name="headers" rows="5" ></textarea>
+     </p>
+		 <label>Fixture</label><br>
     <textarea name="fixture" rows="10" ></textarea>
   </p>
   <p>
-    <button type="submit">Submit</button>
+    <button type="submit"> Submit </button>
   </p>
 </form>
 </p>

data/lib/scenarios/scenario_db.rb

@@ -46,10 +46,10 @@ class ScenarioDB
       end
     end
 
-    if !options[:add_route].nil? && options[:add_route].length == 4
+    if !options[:add_route].nil? && options[:add_route].length == 6
       configure_database
 
-      add_route_for_scenario(options[:add_route][0], options[:add_route][1], options[:add_route][2], options[:add_route][3])
+      add_route_for_scenario(options[:add_route][0], options[:add_route][1], options[:add_route][2], options[:add_route][3], options[:add_route][4], options[:add_route][5])
       if self.routes.count > 0
         Sequel::PrettyTable.print(self.routes)
       else
@@ -210,6 +210,8 @@ class ScenarioDB
         foreign_key :scenario_id, :scenarios, :on_delete => :cascade, :on_update => :cascade
         String :route_type
         String :path
+				Integer :status_code
+				String :headers
         String :fixture
         DateTime :created_at
         DateTime :updated_at
@@ -217,10 +219,10 @@ class ScenarioDB
     end
   end
 
-  def add_route_for_scenario(route_type, path, fixture, scenario_id)
-    now = DateTime.now
+  def add_route_for_scenario(route_type, path, status_code, headers, fixture, scenario_id)
+		now = DateTime.now
     if self.routes.where(:scenario_id => scenario_id, :route_type=> route_type, :path=> path).to_a.count == 0
-      self.routes.insert(:scenario_id => scenario_id, :route_type=>route_type, :path => path, :fixture => fixture, :created_at => now, :updated_at => now)
+      self.routes.insert(:scenario_id => scenario_id, :route_type=> route_type, :path => path, :status_code => status_code, :headers => headers, :fixture => fixture, :created_at => now, :updated_at => now)
     end
 #    puts "<scenario_id: #{scenario_id} #{}route_type} #Path: #{path} fixture: #{fixture}>"
   end
@@ -230,17 +232,14 @@ class ScenarioDB
   end
 
   def get_routes_for_scenario(scenario_id)
-    return self.routes.filter(:scenario_id=>scenario_id).select(:id, :scenario_id,:route_type,:path,:fixture).to_a
+    return self.routes.filter(:scenario_id=>scenario_id).select(:id, :scenario_id, :route_type, :path, :status_code, :headers, :fixture).to_a
   end
 
   def get_fixture_from_routes(route_type, path, scenario_name)
-
     self.routes.left_outer_join(:scenarios, :id=>:scenario_id).where(:route_type=>route_type,
                                                                           :path=>path,
-                                                                          :name=>scenario_name).map(:fixture).first
-
+                                                                          :name=>scenario_name).map([:status_code, :headers, :fixture]).first
 
-    #TODO instead of returning first fixture, add checks to avoid duplicate insertions
   end
 
   def get_route(route_id)

data/lib/scenarios/version.rb

@@ -1,3 +1,3 @@
 module Scenarios
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scenario_server
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Vaibhav Bhatia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -178,6 +178,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- WIP.txt
 - bin/scenario_service
 - bin/scenarios
 - bin/scenariosdb
@@ -187,6 +188,7 @@ files:
 - lib/scenarios.rb
 - lib/scenarios/application/app.rb
 - lib/scenarios/application/app_helpers.rb
+- lib/scenarios/application/public/css/style.css
 - lib/scenarios/application/views/index.erb
 - lib/scenarios/application/views/route.erb
 - lib/scenarios/application/views/scenario.erb