eval_in 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ac0ca50e404a1fc715b523bc8b9db45a535408
-  data.tar.gz: 10ea5829dd2688d4d8ef0cb99e96698e444e4705
+  metadata.gz: 8331a9a20d6f485a925ca9e29ff4daf3c5beebad
+  data.tar.gz: 4c62d600cddd2acf41608da7832a2aa268a5a05e
 SHA512:
-  metadata.gz: 6765c3a9120b8799828308b123b383c8534ef2efeb4be536a3f42416109ca67b984bb435147091fadee23596a3a25e599c832eb7eb185ea3f79f643a0b25c56b
-  data.tar.gz: 2a522bc23122290b37ec8f41de2b87206764db9699fb61fc577660fe685accdb93efd468f894d162046fb34975c0516ccff5b4eeec1a7b49e8259ee44d1a9a41
+  metadata.gz: fd354b9ded63f728f01eb81b37952ae8ba97e2ceae8dd7b1d6e7cb76e06eb0d6eb2395ff74902e71f76497ddf470cf0b4dc49331c0153a2ff2f59aeb9ab9dadd
+  data.tar.gz: 0f15ac725abf2c871d3e50bc08244fbc6a2b8c8173bcdeb068ab4c4c7ed99ebeb53e1f3db0c00e11ab38a07bca5d3cddb142679b906086e76ab6654efa4eaf2c

data/Readme.md

@@ -24,11 +24,23 @@ result.code               # => "puts \"hello, \#{gets}\""
 result.status             # => "OK (0.064 sec real, 0.073 sec wall, 9 MB, 21 syscalls)"
 ```
 
+Docs are [here](http://rdoc.info/gems/eval_in/frames/EvalIn).
 
 What languages can this run?
 ----------------------------
 
 <table>
+  <tr>
+    <th align="left">Ruby</th>
+    </td>
+    <td>
+      ruby/mri-1.0<br />
+      ruby/mri-1.8.7<br />
+      ruby/mri-1.9.3<br />
+      ruby/mri-2.0.0<br />
+      ruby/mri-2.1<br />
+    </td>
+  </tr>
   <tr>
     <th align="left">C</th>
     </td>
@@ -125,17 +137,6 @@ What languages can this run?
       python/cpython-3.4.1<br />
     </td>
   </tr>
-  <tr>
-    <th align="left">Ruby</th>
-    </td>
-    <td>
-      ruby/mri-1.0<br />
-      ruby/mri-1.8.7<br />
-      ruby/mri-1.9.3<br />
-      ruby/mri-2.0.0<br />
-      ruby/mri-2.1<br />
-    </td>
-  </tr>
   <tr>
     <th align="left">Slash</th>
     </td>

data/eval_in.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   == Languages and Versions
 
+    Ruby          | MRI 1.0, MRI 1.8.7, MRI 1.9.3, MRI 2.0.0, MRI 2.1
     C             | GCC 4.4.3, GCC 4.9.1
     C++           | C++11 (GCC 4.9.1), GCC 4.4.3, GCC 4.9.1
     CoffeeScript  | CoffeeScript 1.7.1 (Node 0.10.29)
@@ -27,7 +28,6 @@ Gem::Specification.new do |s|
     Pascal        | Free Pascal 2.6.4
     Perl          | Perl 5.20.0
     Python        | CPython 2.7.8, CPython 3.4.1
-    Ruby          | MRI 1.0, MRI 1.8.7, MRI 1.9.3, MRI 2.0.0, MRI 2.1
     Slash         | Slash HEAD
     x86 Assembly  | NASM 2.07
 
@@ -35,8 +35,8 @@ Gem::Specification.new do |s|
 
   It's this simple:
 
-    result = EvalIn.call 'puts "hello, world"', language: "ruby/mri-2.1"
-    result.output # "hello, world\\n"
+    result = EvalIn.call 'puts "example"', language: "ruby/mri-2.1"
+    result.output # returns "example\\n"
 
   DESCRIPTION
   s.license     = "WTFPL"

data/lib/eval_in.rb

@@ -43,7 +43,11 @@ module EvalIn
   # The data structure containing the final result
   # its attributes default to null-objects for their given type
   class Result
-    attr_accessor :exitstatus, :language, :language_friendly, :code, :output, :status, :url
+    @attribute_names = [:exitstatus, :language, :language_friendly, :code, :output, :status, :url].freeze
+    attr_accessor *@attribute_names
+    class << self
+      attr_reader :attribute_names
+    end
 
     def initialize(attributes={})
       attributes = attributes.dup
@@ -54,7 +58,15 @@ module EvalIn
       self.output             = attributes.delete(:output)            || ""
       self.status             = attributes.delete(:status)            || ""
       self.url                = attributes.delete(:url)               || ""
-      $stderr.puts "Unexpected attributes! #{attributes.keys.inspect}" if attributes.any?
+      stderr                  = attributes.delete(:stderr)            || $stderr
+      stderr.puts "Unexpected attributes! #{attributes.keys.inspect}" if attributes.any?
+    end
+
+    # Returns representation of the result built out of JSON primitives (hash, string, int)
+    def as_json
+      self.class.attribute_names.each_with_object Hash.new do |name, attributes|
+        attributes[name.to_s] = public_send name
+      end
     end
   end
 
@@ -69,7 +81,16 @@ module EvalIn
   #   result = EvalIn.call 'puts "hello, #{gets}"', stdin: 'world', language: "ruby/mri-2.1"
   #   result.output # => "hello, world\n"
   def self.call(code, options={})
-    build_result fetch_result_json post_code(code, options)
+    fetch_result post_code(code, options)
+  end
+
+  # @param url [String] the url with the result
+  #
+  # @example
+  #   result = EvalIn.fetch_result "https://eval.in/147.json"
+  #   result.output # => "Hello Charlie! "
+  def self.fetch_result(url)
+    build_result fetch_result_json jsonify_url url
   end
 
   # @api private
@@ -94,9 +115,7 @@ module EvalIn
     }
 
     if result.code == '302'
-      location  = result['location']
-      location += '.json' unless location.end_with? '.json'
-      location
+      jsonify_url result['location']
     elsif KNOWN_LANGUAGES.include? language
       raise RequestError, "There was an unexpected error, we got back a response code of #{result.code}"
     else
@@ -107,20 +126,27 @@ module EvalIn
 
   # @api private
   def self.fetch_result_json(location)
-    if body = Net::HTTP.get(URI location)
-      JSON.parse(body).merge('url' => location)
-    else
-      raise ResultNotFound, "No json at #{location.inspect}"
-    end
+    # Can't just use Net::HTTP.get, b/c it doesn't use ssl on 1.9.3
+    # https://github.com/ruby/ruby/blob/v2_1_2/lib/net/http.rb#L478-479
+    # https://github.com/ruby/ruby/blob/v1_9_3_547/lib/net/http.rb#L454
+    uri = URI location
+    Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == 'https')) { |http|
+      body = http.request_get(uri.request_uri).body
+      if body
+        JSON.parse(body).merge('url' => location)
+      else
+        raise ResultNotFound, "No json at #{location.inspect}"
+      end
+    }
   end
 
   # @api private
   def self.build_result(response_json)
-    status     = response_json['status']
-    exitstatus = if    !status                   then nil # let it choose default
-                 elsif status =~ /status (\d+)$/ then $1.to_i
-                 elsif status =~ /^Forbidden/    then 1
-                 else                                 0
+    exitstatus = case response_json['status']
+                 when nil             then nil # let it choose default
+                 when /status (\d+)$/ then $1.to_i
+                 when /^Forbidden/    then 1
+                 else                      0
                  end
 
     Result.new exitstatus:          exitstatus,
@@ -131,4 +157,11 @@ module EvalIn
                status:              response_json['status'],
                url:                 response_json['url']
   end
+
+  # @api private
+  def self.jsonify_url(url)
+    uri = URI(url)
+    uri.path = Pathname.new(uri.path).sub_ext('.json').to_s
+    uri.to_s
+  end
 end

data/lib/eval_in/version.rb

@@ -1,3 +1,3 @@
 module EvalIn
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/spec/eval_in_spec.rb

@@ -28,15 +28,26 @@ RSpec.describe EvalIn, integration: true do
   end
 
   it 'evaluates Ruby code through eval.in' do
-    result = EvalIn.call 'print "hello, #{gets}"', stdin: "world", language: "ruby/mri-1.9.3", context: 'eval_in integration test'
+    result = EvalIn.call 'print "hello, #{gets}"', stdin: "world", language: "ruby/mri-2.1", context: 'eval_in integration test'
     expect(result.exitstatus       ).to eq 0
-    expect(result.language         ).to eq "ruby/mri-1.9.3"
-    expect(result.language_friendly).to eq "Ruby — MRI 1.9.3"
+    expect(result.language         ).to eq "ruby/mri-2.1"
+    expect(result.language_friendly).to eq "Ruby — MRI 2.1"
     expect(result.code             ).to eq 'print "hello, #{gets}"'
     expect(result.output           ).to eq "hello, world"
     expect(result.status           ).to match /OK \([\d.]+ sec real, [\d.]+ sec wall, \d MB, \d+ syscalls\)/
     expect(result.url              ).to match %r(https://eval.in/\d+.json)
   end
+
+  it 'fetches previous results from eval.in' do
+    result = EvalIn.fetch_result "https://eval.in/147.json"
+    expect(result.exitstatus       ).to eq 0
+    expect(result.language         ).to eq "ruby/mri-1.9.3"
+    expect(result.language_friendly).to eq "Ruby — MRI 1.9.3"
+    expect(result.code             ).to eq %'class Greeter\r\n  def initialize(name)\r\n    @name = name\r\n  end\r\n\r\n  def greet\r\n    puts \"Hello \#{@name}!\"\r\n  end\r\nend\r\n\r\ngreeter = Greeter.new \"Charlie\"\r\ngreeter.greet'
+    expect(result.output           ).to eq "Hello Charlie!\n"
+    expect(result.status           ).to match /OK \([\d.]+ sec real, [\d.]+ sec wall, \d MB, \d+ syscalls\)/
+    expect(result.url              ).to match %r(https://eval.in/147.json)
+  end
 end
 
 RSpec.describe EvalIn::Result do
@@ -86,10 +97,32 @@ RSpec.describe EvalIn::Result do
     expect(attributes).to eq status: 'OK'
   end
 
-  it 'logs extra attributes to the error stream' do
+  it 'logs extra attributes to stderr input' do
+    fake_error_stream = StringIO.new
+    EvalIn::Result.new a: 1, b: 2, stderr: fake_error_stream
+    expect(fake_error_stream.string).to eq "Unexpected attributes! [:a, :b]\n"
+  end
+
+  it 'defaults the error stream to $stderr' do
     expect { EvalIn::Result.new a: 1, b: 2 }.to \
       output("Unexpected attributes! [:a, :b]\n").to_stderr
   end
+
+  it 'has an as_json representation which dumps all its keys' do
+    result = EvalIn::Result.new(language:          'l',
+                                language_friendly: 'lf',
+                                code:              'c',
+                                output:            'o',
+                                status:            's',
+                                url:               'u')
+    expect(result.as_json).to eq 'exitstatus'        => -1,
+                                 'language'          => 'l',
+                                 'language_friendly' => 'lf',
+                                 'code'              => 'c',
+                                 'output'            => 'o',
+                                 'status'            => 's',
+                                 'url'               => 'u'
+  end
 end
 
 
@@ -271,3 +304,58 @@ RSpec.describe 'build_result' do
     expect(result.exitstatus).to eq 1
   end
 end
+
+
+RSpec.describe 'fetch_result' do
+  include WebMock::API
+
+  def stub_eval_in(url)
+    stub_request(:get, url)
+      .to_return(status: 200, body: json_result)
+  end
+
+  let(:ruby_result) { {'lang' => 'some lang', 'lang_friendly' => 'some lang friendly', 'code' => 'some code', 'output' => 'some output', 'status' => 'some status'} }
+  let(:json_result) { JSON.dump ruby_result }
+
+  it 'wraps fetch_result_json and build_result' do
+    url = 'https://eval.in/1.json'
+    stub_eval_in url
+    result = EvalIn.fetch_result url
+    assert_result result,
+                  exitstatus:        0,
+                  language:          ruby_result['lang'],
+                  language_friendly: ruby_result['lang_friendly'],
+                  code:              ruby_result['code'],
+                  output:            ruby_result['output'],
+                  status:            ruby_result['status'],
+                  url:               url
+  end
+
+  it 'jsonifies the url if it isn\'t already' do
+    stub_eval_in 'https://eval.in/1.json'
+    expect(EvalIn.fetch_result('https://eval.in/1').url).to      eq 'https://eval.in/1.json'
+    expect(EvalIn.fetch_result('https://eval.in/1.json').url).to eq 'https://eval.in/1.json'
+  end
+end
+
+
+RSpec.describe 'jsonify_url' do
+  def assert_transforms(initial_url, expected_url)
+    actual_url = EvalIn.jsonify_url(initial_url)
+    expect(actual_url).to eq expected_url
+  end
+
+  it 'appends .json to a url that is missing it' do
+    assert_transforms 'http://eval.in/1',          'http://eval.in/1.json'
+    assert_transforms 'http://eval.in/1.json',     'http://eval.in/1.json'
+
+    assert_transforms 'http://eval.in/1?a=b',      'http://eval.in/1.json?a=b'
+    assert_transforms 'http://eval.in/1.json?a=b', 'http://eval.in/1.json?a=b'
+  end
+
+  it 'changes .not-json to .json' do
+    assert_transforms 'http://eval.in/1.xml',      'http://eval.in/1.json'
+    assert_transforms 'http://eval.in/1.html',     'http://eval.in/1.json'
+    assert_transforms 'http://eval.in/1.html?a=b', 'http://eval.in/1.json?a=b'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eval_in
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,7 @@ description: |+
 
   == Languages and Versions
 
+    Ruby          | MRI 1.0, MRI 1.8.7, MRI 1.9.3, MRI 2.0.0, MRI 2.1
     C             | GCC 4.4.3, GCC 4.9.1
     C++           | C++11 (GCC 4.9.1), GCC 4.4.3, GCC 4.9.1
     CoffeeScript  | CoffeeScript 1.7.1 (Node 0.10.29)
@@ -56,7 +57,6 @@ description: |+
     Pascal        | Free Pascal 2.6.4
     Perl          | Perl 5.20.0
     Python        | CPython 2.7.8, CPython 3.4.1
-    Ruby          | MRI 1.0, MRI 1.8.7, MRI 1.9.3, MRI 2.0.0, MRI 2.1
     Slash         | Slash HEAD
     x86 Assembly  | NASM 2.07
 
@@ -64,8 +64,8 @@ description: |+
 
   It's this simple:
 
-    result = EvalIn.call 'puts "hello, world"', language: "ruby/mri-2.1"
-    result.output # "hello, world\n"
+    result = EvalIn.call 'puts "example"', language: "ruby/mri-2.1"
+    result.output # returns "example\n"
 
 email:
 - josh.cheek@gmail.com
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Evaluates code (Ruby and others) safely by sending it to https://eval.in