kurki 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead63983b995b93ce4704249d06579fe9fe03df3
-  data.tar.gz: 63c6cae4d423d7fe15a1887b1f1ee1c28f031739
+  metadata.gz: abd040581cb690dfd3754b687b345ac81834ff6d
+  data.tar.gz: bd94ac99b08ef5afa54d238e00d2db1fe81256dd
 SHA512:
-  metadata.gz: 0670108ce07b761db746ecd550bc383b58acc90e4c6985925fc68e00823250bcf61c674be9e754cf624bc4cfefcc66983104721eca89824ef9b61a769f3d49b0
-  data.tar.gz: f3598f0e3b4c3a8d944c865e28163cc7fdaa0df1a80e37c6c8d09dfdbf444a3a73e66c58820ec720e482ee60d2410ec732119c105194cc8f3742568dbfb1993a
+  metadata.gz: b9925794efd6aedb7849cb04424c549ff50580069c8375a279b3c4e0ec2a5a9cd50ed450f83408415df3b9bc08a6426a7587688374db7f6975658fc64f422f07
+  data.tar.gz: 2f803a2196a3f3d0d2ee7c75af84123872e2dfc400a2e91105793246e4212171dc0c2230fdbcc5458ffe6f9c7185eef21b8cc377c495c3851e3cb766eb13adfa

data/.gitignore

@@ -13,3 +13,4 @@
 *.a
 mkmf.log
 *.gem
+.idea/

data/.travis.yml

@@ -2,4 +2,7 @@ language: ruby
 rvm:
  - "2.2.0"
 # uncomment this line if your project needs to run something other than `rake`:
-script: bundle exec rspec spec
+script:
+- bundle exec rspec spec
+- bundle exec codeclimate-test-reporter
+

data/README.md

@@ -1,4 +1,4 @@
-# Kurki [![Build Status](https://travis-ci.org/Coolnesss/kurki.svg?branch=master)](https://travis-ci.org/Coolnesss/kurki) [![Code Climate](https://codeclimate.com/github/Coolnesss/kurki/badges/gpa.svg)](https://codeclimate.com/github/Coolnesss/kurki)
+# Kurki [![Build Status](https://travis-ci.org/Coolnesss/kurki.svg?branch=master)](https://travis-ci.org/Coolnesss/kurki) [![Code Climate](https://codeclimate.com/github/Coolnesss/kurki/badges/gpa.svg)](https://codeclimate.com/github/Coolnesss/kurki) [![Test Coverage](https://codeclimate.com/github/Coolnesss/kurki/badges/coverage.svg)](https://codeclimate.com/github/Coolnesss/kurki/coverage)
 
 Helsinki University Kurki system API Rubygem.
 
@@ -69,6 +69,14 @@ irb(main):006:0> Kurki.set_grades("58131.2011.K.K.1", {"013595141" => "5"})
 => {"success"=>[{"id"=>"013595141", "arvosana"=>"5"}], "error"=>[]}
 ```
 
+```ruby
+pry(main)> Kurki.set_grade_from_csv("582368.2016.K.K.1", "./spec/fixtures/grades.csv")
+=> {"success"=>
+  [{"id"=>"014475359", "arvosana"=>"5"}, {"id"=>"014291915", "arvosana"=>"5"}],
+ "error"=>
+  [{"id"=>"123123123", "arvosana"=>"3"}, {"id"=>"123456789", "arvosana"=>"0"}]}
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/coolnesss/kurki/fork )

data/kurki.gemspec

@@ -6,7 +6,7 @@ require 'kurki/version'
 Gem::Specification.new do |spec|
   spec.name          = "kurki"
   spec.version       = Kurki::VERSION
-  spec.authors       = ["Chang Rajani"]
+  spec.authors       = ["Chang Rajani", "Ville Tanskanen"]
   spec.email         = ["chra@cs.helsinki.fi"]
   spec.summary       = %q{Helsinki University Kurki system API}
   spec.description   = %q{Support for students and teachers}
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "simplecov"
 
   spec.add_runtime_dependency 'rest-client'
 

data/lib/kurki/version.rb

@@ -1,3 +1,3 @@
 module Kurki
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/kurki.rb

@@ -1,16 +1,13 @@
 require "kurki/version"
 require 'rest-client'
+require 'json'
+require 'csv'
 
 module Kurki
-  @@url = "http://svm-23.cs.helsinki.fi:4567/"
-
-  def self.url=(url)
-    @@url = url
-    @@url += "/" if (url[-1, 1] != '/')
-  end
 
   def self.url
-    @@url
+    return ENV["KURKI_URL"] if ENV["KURKI_URL"][-1] == "/"
+    ENV["KURKI_URL"]+"/"
   end
 
   def self.get_courses
@@ -28,16 +25,29 @@ module Kurki
 
   # Student_ids in form ["12345678", "12345678"]
   def self.set_students(course_id, student_ids)
-    post(@@url + "courses/#{course_id}/students", parse_students(student_ids))
+    post(url + "courses/#{course_id}/students", parse_students(student_ids))
   end
 
   # Grades in form {"01234567": "3", "01243483": "4"}
   def self.set_grades(course_id, grades)
-    post(@@url + "courses/#{course_id}/students", parse_grades(grades))
+    post(url + "courses/#{course_id}/students", parse_grades(grades))
+  end
+
+  # .csv in two columns, with one header row
+  def self.set_grade_from_csv(course_id, file_path, delimiter=",")
+    grades = {}
+    read_csv(file_path, delimiter).each do |result|
+      grades[result[0]] = result[1]
+    end
+    set_grades course_id, grades
   end
 
   private
 
+    def self.read_csv(file_path, delimiter)
+      CSV.read(file_path, col_sep: delimiter).drop(1)
+    end
+
     def self.parse_students(student_ids)
       parse(student_ids, lambda { |x| {"id": x} })
     end

data/spec/fixtures/grades.csv

@@ -0,0 +1,5 @@
+Student,grade
+123123123,3
+014475359,5
+014291915,1
+123456789,0

data/spec/kurki_spec.rb

@@ -4,42 +4,42 @@ describe Kurki do
 
   before :each do
 
-    Kurki.url = "http://example.com"
-    ENV["KURKI_TOKEN"] = "fake"
-
     stub_request(:get, /.*courses.*/).
-      with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Type'=>'application/json'}).
         to_return(:status => 200, :body => IO.read("spec/fixtures/courses.json"), :headers => {})
 
     stub_request(:get, /.*courses\/581259.2012.K.K.1/).
-      with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Type'=>'application/json'}).
         to_return(:status => 200, :body => IO.read("spec/fixtures/course.json"), :headers => {})
 
     stub_request(:get, /.*courses\/581259.2012.K.K.1\/students.*/).
-      with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
+        with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Type'=>'application/json'}).
         to_return(:status => 200, :body => IO.read("spec/fixtures/students.json"), :headers => {})
 
     stub_request(:post, /.*581259.2012.K.K.1\/students.*/).
-         with(:body => "{\"students\":[{\"id\":\"012345678\"},{\"id\":\"01293492\"}]}",
-              :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'51', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
-                to_return(:status => 200, :body => "{\"success\":[{\"id\":\"012345678\"},{\"id\":\"01293492\"}],\"error\":[]}", :headers => {})
+        with(:body => "{\"students\":[{\"id\":\"012345678\"},{\"id\":\"01293492\"}]}",
+             :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'51', 'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "{\"success\":[{\"id\":\"012345678\"},{\"id\":\"01293492\"}],\"error\":[]}", :headers => {})
+
+    stub_request(:post, /.*581259.2012.K.K.1\/students.*/).
+        with(:body => "{\"students\":[{\"id\":\"012345678\",\"arvosana\":\"4\"}]}",
+             :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'48', 'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "{\"success\":[{\"id\":\"012345678\",\"arvosana\":\"4\"}],\"error\":[]}", :headers => {})
 
     stub_request(:post, /.*581259.2012.K.K.1\/students.*/).
-         with(:body => "{\"students\":[{\"id\":\"012345678\",\"arvosana\":\"4\"}]}",
-              :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'48', 'Content-Type'=>'application/json', 'User-Agent'=>'Ruby'}).
-                to_return(:status => 200, :body => "{\"success\":[{\"id\":\"012345678\",\"arvosana\":\"4\"}],\"error\":[]}", :headers => {})
+        with(:body => "{\"students\":[{\"id\":\"123123123\",\"arvosana\":\"3\"},{\"id\":\"014475359\",\"arvosana\":\"5\"},{\"id\":\"014291915\",\"arvosana\":\"1\"},{\"id\":\"123456789\",\"arvosana\":\"0\"}]}",
+             :headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip, deflate', 'Content-Length'=>'150', 'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => "{\"success\":[{\"id\":\"123123123\",\"arvosana\":\"3\"},
+                          {\"id\":\"014475359\",\"arvosana\":\"5\"},
+                          {\"id\":\"014291915\",\"arvosana\":\"1\"},
+                          {\"id\":\"123456789\",\"arvosana\":\"0\"}],\"error\":[]}", :headers => {})
 
   end
 
   describe "GET" do
 
-    it "allows setting of url" do
-      Kurki.url = "test/"
-      expect(Kurki.url).to eq("test/")
-    end
-
     it "setting an url without a backslash adds it" do
-      Kurki.url = "test"
+      ENV["KURKI_URL"] = "test"
       expect(Kurki.url).to eq("test/")
     end
 
@@ -86,14 +86,25 @@ describe Kurki do
       students = ["012345678", "01293492"]
       ans = Kurki.set_students("581259.2012.K.K.1", students)
       expect(ans).to eq(
-        JSON.parse("{\"success\":[{\"id\":\"012345678\"},{\"id\":\"01293492\"}],\"error\":[]}"))
+                         JSON.parse("{\"success\":[{\"id\":\"012345678\"},{\"id\":\"01293492\"}],\"error\":[]}"))
     end
 
-    it "can POST grades to a course" do
+    it "can POST grades from an array" do
       grades = {"012345678" => "4"}
       ans = Kurki.set_grades("581259.2012.K.K.1", grades)
       expect(ans).to eq(
-        JSON.parse("{\"success\":[{\"id\":\"012345678\",\"arvosana\":\"4\"}],\"error\":[]}"))
+                         JSON.parse("{\"success\":[{\"id\":\"012345678\",\"arvosana\":\"4\"}],\"error\":[]}"))
+    end
+
+    it "can POST grades from a CSV file" do
+      ans = Kurki.set_grade_from_csv("581259.2012.K.K.1", "spec/fixtures/grades.csv")
+      expect(ans).to eq(
+                          JSON.parse("{\"success\":[{\"id\":\"123123123\",\"arvosana\":\"3\"},
+                          {\"id\":\"014475359\",\"arvosana\":\"5\"},
+                          {\"id\":\"014291915\",\"arvosana\":\"1\"},
+                          {\"id\":\"123456789\",\"arvosana\":\"0\"}],\"error\":[]}"
+                         )
+                     )
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
+require 'simplecov'
+SimpleCov.start
 require 'bundler/setup'
 require 'webmock/rspec'
 require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+WebMock.disable_net_connect!(:allow => "codeclimate.com")
 Bundler.setup
 
 require 'kurki' # and any other gems you need

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: kurki
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chang Rajani
+- Ville Tanskanen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-08 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +128,7 @@ files:
 - lib/kurki/version.rb
 - spec/fixtures/course.json
 - spec/fixtures/courses.json
+- spec/fixtures/grades.csv
 - spec/fixtures/students.json
 - spec/kurki_spec.rb
 - spec/spec_helper.rb
@@ -136,13 +152,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Helsinki University Kurki system API
 test_files:
 - spec/fixtures/course.json
 - spec/fixtures/courses.json
+- spec/fixtures/grades.csv
 - spec/fixtures/students.json
 - spec/kurki_spec.rb
 - spec/spec_helper.rb