kurki 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db479d77a3a2d711264f9aefa65446bdd4ad9136
-  data.tar.gz: a04e7310befd0e261520818a21633d9187a766d1
+  metadata.gz: dfd88f581b6697927541b0bd0271fd001cb6e3bf
+  data.tar.gz: 50daa7d8c536c2d16379ac220e23693cd7ecdd4f
 SHA512:
-  metadata.gz: 4bc5a08affcd5280aa4b22ed5d5cd54b3ac27f345ba947d46a8026c826cd2732ad2188204b10cc8221a1dbf301f14ad2205bbce5047c74fd9ebc8f876fe03b8d
-  data.tar.gz: 7fd2b404a68472d513c4b7f6603e1302dbecd18e55aa1e7f3c95191803cb27946a638a013bc3506d1dd68a3635cbc67c9ff372aad73c3b6ae74bcc04e54532c9
+  metadata.gz: 801deab3c17fefd92de5b056e776f30136f0839203b263d2ab5c94741255483dc349ae11a53e1e138abb4a7370f877abebb14f55b7a4d220234cbc1438c77b65
+  data.tar.gz: 6262dbd7c3a7065d47409344b80b22747266fe5671d6e2b6e0d287c58cca1f4305b532b27865c4bc3980041fa01bdace1f6af45048f68f465d6a51af0837be7c

data/lib/kurki.rb

@@ -42,34 +42,74 @@ module Kurki
     set_grades course_id, grades
   end
 
+
+  # Exam points in format:
+  # {
+  # "123123123" => {
+  #   "1" => 1,
+  #   "2" => 56
+  #   }
+  # }
+  def self.set_exam_points(course_id, points)
+    post(url + "courses/#{course_id}/students", parse_exam_points(points))
+  end
+
+
+  # Exercise points in format:
+  # {
+  # "123123123" => {
+  #     "2" => 1,
+  #     "3" => 4
+  #   }
+  # }
+  def self.set_exercise_points(course_id, points)
+    post(url + "courses/#{course_id}/students", parse_exercise_points(points))
+  end
+
   private
 
-    def self.read_csv(file_path, delimiter)
-      CSV.read(file_path, col_sep: delimiter).drop(1)
-    end
+  def self.parse_exercise_points(points)
+    parse(points, lambda {|x,y| {id: x, exercises: y}})
+  end
 
-    def self.parse_students(student_ids)
-      parse(student_ids, lambda { |x| {"id": x} })
-    end
+  def self.parse_exam_points(points)
+      parse(points, lambda {|x,y| { id: x, exams: y } })
+  end
 
-    def self.parse_grades(grades)
-      parse(grades, lambda {|x,y| { "id": x, "arvosana": y } })
-    end
+  def self.read_csv(file_path, delimiter)
+    CSV.read(file_path, col_sep: delimiter).drop(1)
+  end
 
-    def self.parse(items, exp)
-      json = {}
-      json["students"] = items.map(&exp)
-      json
-    end
+  def self.parse_students(student_ids)
+    parse(student_ids, lambda { |x| {id: x} })
+  end
 
-    def self.post(address, data, params = {})
-      return unless data
-      params[:authorization] = ENV["KURKI_TOKEN"]
-      JSON.parse(RestClient.post address, data.to_json, params: params, content_type: :json, accept: :json)
-    end
+  def self.parse_grades(grades)
+    parse(grades, lambda {|x,y| { id: x, arvosana: y } })
+  end
 
-    def self.get(address, params = {})
-      params[:authorization] = ENV["KURKI_TOKEN"]
-      JSON.parse(RestClient.get address, { params: params, accept: :json, content_type: :json })
-    end
+  def self.parse(items, exp)
+    json = {}
+    json["students"] = items.map(&exp)
+    json
+  end
+
+  def self.post(address, data, params = {})
+    return unless data
+    params[:authorization] = ENV["KURKI_TOKEN"]
+    JSON.parse(RestClient.post address, data.to_json, params: params, content_type: :json, accept: :json)
+  end
+
+  def self.get(address, params = {})
+    params[:authorization] = ENV["KURKI_TOKEN"]
+    
+    result = RestClient::Request.execute(
+      :url => address, 
+      :method => :get, 
+      :headers => { params: params, accept: :json, content_type: :json },
+      :verify_ssl => false
+    )
+
+    JSON.parse result
+  end
 end

data/lib/kurki/version.rb

@@ -1,3 +1,3 @@
 module Kurki
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/spec/kurki_spec.rb

@@ -34,6 +34,23 @@ describe Kurki do
                           {\"id\":\"014291915\",\"arvosana\":\"1\"},
                           {\"id\":\"123456789\",\"arvosana\":\"0\"}],\"error\":[]}", :headers => {})
 
+    stub_request(:post, /.*581259.2012.K.K.1\/students.*/).
+        with(:body => "{\"students\":[{\"id\":\"01293492\",\"exams\":{\"2\":23,\"1\":11}},{\"id\":\"012312333\",\"exams\":{\"1\":22,\"2\":40}}]}",
+             :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'99', 'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "{\"success\":[
+                                              {\"id\":\"01293492\",\"exams\":{\"2\":23, \"1\":11}},
+                                              {\"id\":\"012312333\",\"exams\":{\"1\":22, \"2\":40}}
+                                            ],
+                                            \"error\":[]}", :headers => {})
+
+     stub_request(:post, /.*581259.2012.K.K.1\/students.*/).
+          with(:body => "{\"students\":[{\"id\":\"014475359\",\"exercises\":{\"2\":23,\"1\":11}},{\"id\":\"012312333\",\"exercises\":{\"1\":22,\"2\":40}}]}",
+               :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'108', 'Content-Type'=>'application/json', 'Host'=>'test'}).
+          to_return(:status => 200, :body => "{\"success\":[
+          {\"id\":\"014475359\", \"exercises\":{\"2\":23, \"1\":11}}],
+           \"error\":[{\"id\":\"012312333\", \"exercises\":{\"1\":22, \"2\":40}}]}", :headers => {})
+
+
   end
 
   describe "GET" do
@@ -71,7 +88,7 @@ describe Kurki do
       hash = Kurki.parse_students(["01293492","18239123","812383172"])
       expect(hash).to have_key("students")
       expect(hash["students"].size).to eq(3)
-      expect(hash["students"].first).to eq({"id": "01293492"})
+      expect(hash["students"].first).to eq({id: "01293492"})
     end
 
     it "can parse grades array correctly" do
@@ -79,7 +96,7 @@ describe Kurki do
       expect(hash).to have_key("students")
       expect(hash["students"].size).to eq 3
       expect(hash["students"].is_a? Array)
-      expect(hash["students"].first).to eq({id:"01293492", "arvosana": "3"})
+      expect(hash["students"].first).to eq({id:"01293492", arvosana: "3"})
     end
 
     it "can POST students to a course" do
@@ -106,5 +123,37 @@ describe Kurki do
                          )
                      )
     end
+
+    it "can parse exam points correctly" do
+      hash = Kurki.parse_exam_points({"01293492" => {"2" =>23, "1"=>11}, "012312333" => {"1"=>22, "2"=>40} })
+      expect(hash).to have_key("students")
+      expect(hash["students"].size).to eq 2
+      expect(hash["students"].is_a? Array)
+      expect(hash["students"].first).to have_key(:id)
+      expect(hash["students"].first[:id]).to eq("01293492")
+      expect(hash["students"][1][:exams]).to eq({"1"=>22, "2"=>40})
+    end
+
+    it "can POST exam points from a hash" do
+      exam_points = {"01293492" => {"2" =>23, "1"=>11}, "012312333" => {"1"=>22, "2"=>40} }
+      ans = Kurki.set_exam_points("581259.2012.K.K.1", exam_points)
+      expect(ans). to eq(
+                          JSON.parse("{\"success\":[
+                            {\"id\":\"01293492\",\"exams\":{\"2\":23, \"1\":11}},
+                            {\"id\":\"012312333\",\"exams\":{\"1\":22, \"2\":40}}
+                           ],
+                           \"error\":[]}" )
+                      )
+    end
+
+    it "can POST exercise points from a hash" do
+      exercise_points = {"014475359" => {"2" =>23, "1"=>11}, "012312333" => {"1"=>22, "2"=>40} }
+      ans = Kurki.set_exercise_points("581259.2012.K.K.1", exercise_points)
+      resp = "{\"success\":[
+      {\"id\":\"014475359\", \"exercises\":{\"2\":23, \"1\":11}}],
+       \"error\":[{\"id\":\"012312333\", \"exercises\":{\"1\":22, \"2\":40}}]}"
+      expect(ans). to eq(JSON.parse(resp))
+    end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kurki
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Chang Rajani
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler