added call to web service for dissassembly

Author: jkeam

.gitignore

@@ -4,3 +4,5 @@
 .ruby-version
 .ruby-gemset
 coverage
+.byebug_history
+.env

Gemfile

@@ -5,8 +5,14 @@ gem 'puma'
 gem 'json'
 gem 'rake'
 gem 'coveralls', require: false
+gem 'faraday'
 
 group :test do
   gem 'rack-test'
-  gem 'minitest'  
+  gem 'minitest'
+end
+
+group :development, :test do
+  gem 'dotenv'
+  gem 'pry'
 end

Gemfile.lock

@@ -1,15 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.1)
     coveralls (0.8.13)
       json (~> 1.8)
       simplecov (~> 0.11.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6.0)
     docile (1.1.5)
+    dotenv (2.1.1)
+    faraday (0.10.0)
+      multipart-post (>= 1.2, < 3)
     json (1.8.3)
+    method_source (0.8.2)
     minitest (5.9.0)
+    multipart-post (2.0.0)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
     puma (3.4.0)
     rack (1.6.4)
     rack-protection (1.5.3)
@@ -26,6 +36,7 @@ GEM
       rack (~> 1.5)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
+    slop (3.6.0)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     thor (0.19.1)
@@ -37,8 +48,11 @@ PLATFORMS
 
 DEPENDENCIES
   coveralls
+  dotenv
+  faraday
   json
   minitest
+  pry
   puma
   rack-test
   rake

models/disassembler.rb

@@ -0,0 +1,36 @@
+require 'faraday'
+require 'json'
+
+class DisassemblerService
+
+  def self.disassemble(version, src)
+    case version
+    when 'ruby_21'
+      url = ENV['RUBY21_API']
+    when 'ruby_22'
+      url = ENV['RUBY22_API']
+    when 'ruby_23'
+      url = ENV['RUBY23_API']
+    else
+      url = nil
+    end
+
+    if url.nil?
+      puts "Unknown ruby target: #{version}"
+      return "Unknown ruby target"
+    else
+      puts "Hitting #{url} for #{version}"
+    end
+
+    begin
+      conn = Faraday.new(url: url)
+      resp = JSON.parse(conn.post('/', { code: src }).body)
+      return resp['result'] if resp['result']
+      return resp['errors'] if resp['errors']
+    rescue StandardError => e
+      puts e.message
+      "Unknown error occurred"
+    end
+  end
+
+end

models/disassembler_service.rb

@@ -7,8 +7,13 @@ function Codebytes() {
     outputMirror.setValue("Running...");
 
     var rawText = inputMirror.getValue();
-    if (!rawText) return;
-    var jsonText = JSON.stringify({"code":rawText});
+    var version = $('#rubyVersion').val();
+    if (!rawText || !version) {
+      outputMirror.setValue("Please make sure code and version are not blank.");
+      return;
+    }
+
+    var jsonText = JSON.stringify({"code":rawText, "version":version});
     $.ajax({
       type: 'POST',
       url: '/',
@@ -27,7 +32,7 @@ function Codebytes() {
       }
     });
   };
- 
+
   this.onReady= function() {
     inputMirror = CodeMirror.fromTextArea($("#inputTextArea").get(0), {lineNumbers:true});
     outputMirror = CodeMirror.fromTextArea($("#outputTextArea").get(0), {lineNumbers:true, readOnly :true});

public/javascripts/main.js

@@ -16,17 +16,23 @@ html {
 }
 
 #container {
-  padding:10px;
+  padding: 10px;
 }
 
 .page-header {
-  margin: 5px 0 50px;
+  margin: 5px 0 20px;
 }
 
 .console-container {
   width: 45%;
   float: left;
-  margin: 0 2%; 
+  margin: 0 2%;
+  padding-bottom: 2em;
+}
+
+.console-container-full {
+  margin: 0 2%;
+  width: 45%;
 }
 
 .console {

public/stylesheets/main.css

@@ -4,15 +4,16 @@
 require 'coveralls'
 Coveralls.wear!
 
-describe "my example spec" do  
+describe "my example spec" do
   it "should successfully return the main index page" do
     get '/'
     last_response.body.must_include 'Ruby Dissassembler'
   end
 
   it "should be able to post some code to disassemble" do
     code = "puts 'hi'"
-    post('/', "{\"code\": \"#{code}\"}", { "CONTENT_TYPE" => "application/json" })
+    version = "ruby_21"
+    post('/', "{\"code\": \"#{code}\", \"version\": \"#{version}\"}", { "CONTENT_TYPE" => "application/json" })
     last_response.body.must_include 'disasm'
   end
-end  
+end

spec/main_spec.rb

@@ -12,6 +12,16 @@
   </div>
 
   <div id="main">
+    <div class="console-container-full">
+      <div class="form-group">
+        <label for="rubyVersion" class="control-label">Ruby Version</label>
+        <select class="form-control" id="rubyVersion">
+          <option value="ruby_21">2.1</option>
+          <option value="ruby_22">2.2</option>
+          <option value="ruby_23">2.3</option>
+        </select>
+      </div>
+    </div>
     <div class="console-container">
       Ruby Code
       <div class="console">

views/index.erb

@@ -1,16 +1,18 @@
+require 'dotenv'
+Dotenv.load
+
 require 'sinatra'
 require 'json'
-require_relative 'models/disassembler'
+require_relative 'models/disassembler_service'
 
 get '/' do
   erb :index
 end
 
 post '/?' do
   begin
-    json = JSON.parse request.body.read 
-    code = json['code']
-    @diss = Disassembler.disassemble code
+    json = JSON.parse request.body.read
+    @diss = DisassemblerService.disassemble json['version'], json['code']
   rescue => e
     logger.error "Error encountered while trying to dissassemble code"
     logger.error e