eval_in 0.1.4 → 0.1.5

data/lib/eval_in.rb

@@ -11,7 +11,7 @@ module EvalIn
   ResultNotFound = Class.new EvalInError
 
   # @example Generated with
-  #   curl https://eval.in | ruby -rnokogiri -e 'puts Nokogiri::HTML($stdin.read).css("option").map { |o| o["value"] }'
+  #   nokogiri https://eval.in -e 'puts $_.xpath("//option/@value")'
   KNOWN_LANGUAGES = %w[
     c/gcc-4.4.3
     c/gcc-4.9.1
@@ -81,38 +81,29 @@ 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={})
-    fetch_result post_code(code, options)
+    url = post_code(code, options)
+    fetch_result url, options
   end
 
   # @param url [String] the url with the result
+  # @option options [String] :context Will be included in the user agent
   #
   # @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
+  def self.fetch_result(raw_url, options={})
+    raw_json_url = jsonify_url(raw_url)
+    build_result fetch_result_json(raw_json_url, options)
   end
 
   # @api private
   def self.post_code(code, options)
-    uri        = URI(options.fetch(:url, "https://eval.in/"))
+    url        = options.fetch(:url, "https://eval.in/")
     input      = options.fetch(:stdin, "")
     language   = options.fetch(:language) { raise ArgumentError, ":language is mandatory, but options only has #{options.keys.inspect}" }
-    user_agent = 'http://rubygems.org/gems/eval_in'
-    user_agent << " (#{options[:context]})" if options[:context]
-    path       = uri.path
-    path       = '/' if path.empty?
-
-    # stole this out of implementation for post_form https://github.com/ruby/ruby/blob/2afed6eceff2951b949db7ded8167a75b431bad6/lib/net/http.rb#L503
-    request = Net::HTTP::Post.new(path)
-    request.form_data = {"utf8" => "√", "code" => code, "execute" => "on", "lang" => language, "input" => input}
-    request['User-Agent'] = user_agent
-    request.basic_auth uri.user, uri.password if uri.user
-    net = Net::HTTP.new(uri.hostname, uri.port)
-    # net.set_debug_output $stdout
-    result = Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == 'https')) { |http|
-      http.request(request)
-    }
+    form_data  = {"utf8" => "√", "code" => code, "execute" => "on", "lang" => language, "input" => input}
+
+    result = post_request url, form_data, user_agent_for(options[:context])
 
     if result.code == '302'
       jsonify_url result['location']
@@ -125,19 +116,10 @@ module EvalIn
   end
 
   # @api private
-  def self.fetch_result_json(location)
-    # 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
-    }
+  def self.fetch_result_json(raw_url, options={})
+    result = get_request raw_url, user_agent_for(options[:context])
+    return JSON.parse(result.body).merge('url' => raw_url) if result.body
+    raise ResultNotFound, "No json at #{raw_url.inspect}"
   end
 
   # @api private
@@ -164,4 +146,43 @@ module EvalIn
     uri.path = Pathname.new(uri.path).sub_ext('.json').to_s
     uri.to_s
   end
+
+  # @private
+  def self.user_agent_for(context)
+    'http://rubygems.org/gems/eval_in'.tap do |agent|
+      context && agent.concat(" (#{context})")
+    end
+  end
+
+  # @api private
+  # 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
+  def self.get_request(raw_url, user_agent)
+    generic_request_for raw_url:      raw_url,
+                        request_type: Net::HTTP::Get,
+                        user_agent:   user_agent
+  end
+
+  # @private
+  def self.post_request(raw_url, form_data, user_agent)
+    generic_request_for raw_url:      raw_url,
+                        request_type: Net::HTTP::Post,
+                        user_agent:   user_agent,
+                        form_data:    form_data
+  end
+
+  # @private
+  # stole this out of implementation for post_form https://github.com/ruby/ruby/blob/2afed6eceff2951b949db7ded8167a75b431bad6/lib/net/http.rb#L503
+  # can use this to view the request: http.set_debug_output $stdout
+  def self.generic_request_for(params)
+    uri                   = URI params.fetch(:raw_url)
+    path                  = uri.path
+    path                  = '/' if path.empty?
+    request               = params.fetch(:request_type).new(path)
+    request['User-Agent'] = params[:user_agent] if params.key? :user_agent
+    request.form_data     = params[:form_data]  if params.key? :form_data
+    request.basic_auth uri.user, uri.password   if uri.user
+    Net::HTTP.start(uri.hostname, uri.port, use_ssl: (uri.scheme == 'https')) { |http| http.request request }
+  end
 end

data/lib/eval_in/version.rb

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

data/spec/eval_in_spec.rb

@@ -27,8 +27,10 @@ RSpec.describe EvalIn, integration: true do
     WebMock.disable_net_connect!
   end
 
+  let(:context) { 'eval_in integration test' }
+
   it 'evaluates Ruby code through eval.in' do
-    result = EvalIn.call 'print "hello, #{gets}"', stdin: "world", language: "ruby/mri-2.1", context: 'eval_in integration test'
+    result = EvalIn.call 'print "hello, #{gets}"', stdin: "world", language: "ruby/mri-2.1", context: context
     expect(result.exitstatus       ).to eq 0
     expect(result.language         ).to eq "ruby/mri-2.1"
     expect(result.language_friendly).to eq "Ruby — MRI 2.1"
@@ -48,6 +50,18 @@ RSpec.describe EvalIn, integration: true do
     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
+
+  it 'is in sync with known languages' do
+    # iffy solution, but it's simple and works,
+    # Rexml might get taken out of stdlib, so is more likely than this regex to fail in the future,
+    # and I don't want to add dep on Nokogiri (w/ libxml & libxslt) where a small regex works adequately
+    current_known_languages = EvalIn.get_request('https://eval.in', context)
+                                    .body
+                                    .each_line
+                                    .map { |line| line[/option.*?value="([^"]+)"/, 1] }
+                                    .compact
+    expect(EvalIn::KNOWN_LANGUAGES).to eq current_known_languages
+  end
 end
 
 RSpec.describe EvalIn::Result do
@@ -309,8 +323,9 @@ end
 RSpec.describe 'fetch_result' do
   include WebMock::API
 
-  def stub_eval_in(url)
+  def stub_eval_in(url, options={})
     stub_request(:get, url)
+      .with(headers: {'User-Agent' => options.fetch(:user_agent, 'http://rubygems.org/gems/eval_in')})
       .to_return(status: 200, body: json_result)
   end
 
@@ -336,6 +351,11 @@ RSpec.describe 'fetch_result' do
     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
+
+  it 'can take a context for the user agent' do
+    stub_eval_in 'https://eval.in/1.json', user_agent: 'http://rubygems.org/gems/eval_in (c)'
+    expect(EvalIn.fetch_result('https://eval.in/1', context: 'c').url).to eq 'https://eval.in/1.json'
+  end
 end
 
 

metadata

@@ -1,80 +1,67 @@
 --- !ruby/object:Gem::Specification
 name: eval_in
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
+  prerelease: 
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.18'
-description: |+
-  Safely evaluates code (Ruby and others) by sending it through https://eval.in
-
-  == 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)
-    Fortran       | F95 (GCC 4.4.3)
-    Haskell       | Hugs98 September 2006
-    Io            | Io 20131204
-    JavaScript    | Node 0.10.29
-    Lua           | Lua 5.1.5, Lua 5.2.3
-    OCaml         | OCaml 4.01.0
-    PHP           | PHP 5.5.14
-    Pascal        | Free Pascal 2.6.4
-    Perl          | Perl 5.20.0
-    Python        | CPython 2.7.8, CPython 3.4.1
-    Slash         | Slash HEAD
-    x86 Assembly  | NASM 2.07
-
-  == Example:
-
-  It's this simple:
-
-    result = EvalIn.call 'puts "example"', language: "ruby/mri-2.1"
-    result.output # returns "example\n"
-
+description: ! "Safely evaluates code (Ruby and others) by sending it through https://eval.in\n\n==
+  Languages and Versions\n\n  Ruby          | MRI 1.0, MRI 1.8.7, MRI 1.9.3, MRI 2.0.0,
+  MRI 2.1\n  C             | GCC 4.4.3, GCC 4.9.1\n  C++           | C++11 (GCC 4.9.1),
+  GCC 4.4.3, GCC 4.9.1\n  CoffeeScript  | CoffeeScript 1.7.1 (Node 0.10.29)\n  Fortran
+  \      | F95 (GCC 4.4.3)\n  Haskell       | Hugs98 September 2006\n  Io            |
+  Io 20131204\n  JavaScript    | Node 0.10.29\n  Lua           | Lua 5.1.5, Lua 5.2.3\n
+  \ OCaml         | OCaml 4.01.0\n  PHP           | PHP 5.5.14\n  Pascal        |
+  Free Pascal 2.6.4\n  Perl          | Perl 5.20.0\n  Python        | CPython 2.7.8,
+  CPython 3.4.1\n  Slash         | Slash HEAD\n  x86 Assembly  | NASM 2.07\n\n== Example:\n\nIt's
+  this simple:\n\n  result = EvalIn.call 'puts \"example\"', language: \"ruby/mri-2.1\"\n
+  \ result.output # returns \"example\\n\"\n\n"
 email:
 - josh.cheek@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
 - Readme.md
 - eval_in.gemspec
@@ -84,26 +71,27 @@ files:
 homepage: https://github.com/JoshCheek/eval_in
 licenses:
 - WTFPL
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Evaluates code (Ruby and others) safely by sending it to https://eval.in
 test_files:
 - spec/eval_in_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 8331a9a20d6f485a925ca9e29ff4daf3c5beebad
-  data.tar.gz: 4c62d600cddd2acf41608da7832a2aa268a5a05e
-SHA512:
-  metadata.gz: fd354b9ded63f728f01eb81b37952ae8ba97e2ceae8dd7b1d6e7cb76e06eb0d6eb2395ff74902e71f76497ddf470cf0b4dc49331c0153a2ff2f59aeb9ab9dadd
-  data.tar.gz: 0f15ac725abf2c871d3e50bc08244fbc6a2b8c8173bcdeb068ab4c4c7ed99ebeb53e1f3db0c00e11ab38a07bca5d3cddb142679b906086e76ab6654efa4eaf2c