vimgolf 0.4.3 → 0.4.4

data/lib/vimgolf.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'net/http'
 require 'strscan'
+require 'json'
 require 'yaml'
 require 'thor'
 

data/lib/vimgolf/challenge.rb

@@ -13,14 +13,14 @@ module VimGolf
 
     def download
       begin
-        url = URI.parse("#{GOLFHOST}/challenges/#{@id}.yaml")
+        url = URI.parse("#{GOLFHOST}/challenges/#{@id}.json")
         req = Net::HTTP::Get.new(url.path)
 
         proxy_url, proxy_user, proxy_pass = get_proxy
         proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
         res = proxy.start(url.host, url.port) { |http| http.request(req) }
 
-        @data = YAML.load(res.body)
+        @data = JSON.parse(res.body)
 
         if !@data.is_a? Hash
           raise
@@ -31,6 +31,9 @@ module VimGolf
           raise "Bad Version"
         end
 
+        @data['in']['data'].gsub!(/\r\n/, "\n")
+        @data['out']['data'].gsub!(/\r\n/, "\n")
+
         @type = @data['in']['type']
         save
         start
@@ -52,7 +55,7 @@ module VimGolf
 
     def upload
       begin
-        url = URI.parse("#{GOLFHOST}/entry.yaml")
+        url = URI.parse("#{GOLFHOST}/entry.json")
 
         proxy_url, proxy_user, proxy_pass = get_proxy
         proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_user, proxy_pass)
@@ -60,10 +63,10 @@ module VimGolf
         proxy.start(url.host, url.port) do |http|
           request = Net::HTTP::Post.new(url.request_uri)
           request.set_form_data({"challenge_id" => @id, "apikey" => Config.load['key'], "entry" => IO.read(log_path)})
-          request["Accept"] = "text/yaml"
+          request["Accept"] = "application/json"
 
           res = http.request(request)
-          res = YAML.load(res.body)
+          res = JSON.parse(res.body)
 
           raise if !res.is_a? Hash
           res['status'].to_sym

data/lib/vimgolf/version.rb

@@ -1,3 +1,3 @@
 module Vimgolf
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/vimgolf.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "vimgolf"
   s.add_dependency "thor", ">= 0.14.6"
+  s.add_dependency "json_pure"
   s.add_dependency "highline"
 
   s.add_development_dependency "rspec"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimgolf
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.14.6
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +137,7 @@ post_install_message: ! '
 
   ------------------------------------------------------------------------------
 
-  Thank you for installing vimgolf-0.4.3.
+  Thank you for installing vimgolf-0.4.4.
 
 
   0.1.3: custom vimgolf .vimrc file to help level the playing field