opendatakit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5bd13e9f36c32c40330ac4d04c107397dd8c8c9
-  data.tar.gz: ee33088cee8df395501ce708fc25225f1b0e9bea
+  metadata.gz: 16562bcc4a06f24a850b59f82e505fcbdde3c25a
+  data.tar.gz: cd01c37a8f5ec287d5521142b2185eb9916612e2
 SHA512:
-  metadata.gz: 86bd8d742e02f783d73aa8810ecbc1930d099fed3145b3b791c378e34b5f4a676240e649c630450c6d3374d2a3313111dad15944be83ac8a3e62a36191ddaf70
-  data.tar.gz: a66fbf25df83cdacf00ea1a8e23a70efd4e63cdb414957b81636a5212ea90e50667fe8aa26e85d83123e72adc7b7f007ffab295b924a8f28c7005288251fae7e
+  metadata.gz: 2cf6e5744a0b449c93b7c53b0a7acfe19ee242742b8e0e4a4378a71dc8e8e7bf47214990c44ca93702f6ee1f2d2fb5af64dab367feeef7a9053b629f69b36d91
+  data.tar.gz: 69b1616e0d43c755e76a17fa593a16639903b160e0572b041f0515e0b73910238cb5bfc321848bdd7ec1c182027a52ebcbb00dce173fd58640fde2d13d4ffac7

data/lib/opendatakit.rb

@@ -1,46 +1,71 @@
 require 'httpclient'
 require 'uri'
 require 'rexml/document'
+require 'stringio'
+require 'nokogiri'
+
 class OdkInstance
 attr_accessor:url
+
   def initialize(url)
     @url = URI.parse(url)
   end
+
   def url
-    puts @url
+    @url
   end
+
   def getSubmissions(formname)
-    submission_url = URI.join(@url,"/view/submissionList")
-    params = { :formId => formname}
-    submission_url.query = URI.encode_www_form( params )
+    submission_url = URI.join(@url,"view/submissionList")
+    params = { :formId => formname }
+    submission_url.query = URI.encode_www_form(params)
+
     http = HTTPClient.new
     httpresults = http.get submission_url
-    if httpresults.status == 404
-      puts "Form name not found"
-      exit
+
+    if httpresults.status == 200
+      submission_xml = httpresults.content
+      doc = REXML::Document.new(submission_xml)
+      all_id_elements = doc.elements.to_a( "//id" ).map { |el| el.text } 
+    else
+      "Form name not found"
     end
-    submission_xml = httpresults.content
-    doc = REXML::Document.new(submission_xml)
-    submissions = []
-    all_upc_strings = doc.elements.to_a("idChunk/idList")
-    all_id_elements = doc.elements.to_a( "//id" )
-    #doc.elements.each("idChunk/idList") { |element| submissions.push(element.elements["id"].text) }
-    puts all_id_elements 
   end
+
   def uploadForm(form_xml)
-    form_post_url = URI.join(@url,"/formUpload")
+    form_post_url = URI.join(@url,"formUpload")
     params = { :form_def_file => File.open(form_xml)}
     doc = REXML::Document.new(File.open(form_xml))
     title = REXML::XPath.first( doc, "//h:title" )
+
     http = HTTPClient.new
     httpresults = http.post(form_post_url,params)
-    puts title.text
+
+    if httpresults.status_code == 201
+      title.text
+    else
+      "Form could not be uploaded"
+    end
+  end
+  def uploadXmlform(doc)
+    form_post_url = URI.join(@url,"formUpload")
+    params = { :form_def_file => StringIO.new(doc.to_xml) }
+    http = HTTPClient.new
+    httpresults = http.post(form_post_url,params)
+    if httpresults.status_code == 201
+      httpresults.status_code
+    else
+      "Form could not be uploaded"
+    end
   end
+
   def addSubmissions(submission_data,media_files)
     submission_post_url = URI.join(@url,"submission")
     params = { :xml_submission_file => File.open(submission_data)}
+
     http = HTTPClient.new
     httpresults = http.post(submission_post_url,params)
-    puts httpresults.content
+    httpresults.content
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opendatakit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jude Mwenda