canvas_oauth_engine 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd71940eac39f52a99da306965eb23fba309c976
-  data.tar.gz: 97c14ba4e0722765bdd5882fb21ca6b8a4718166
+  metadata.gz: 2678d6d70df8098c96fc980993d1101b531da101
+  data.tar.gz: 053b76ff287adf0d75cbd384f0187cf1ae87166f
 SHA512:
-  metadata.gz: d3d6fa87ad02ac0a56d1841502f61f2222e8ef322cc4f3d3533858fde597e9cd16e327960f8846f67266c495bd7e34286bd29aae6e45ca1fef63ae790213e7f2
-  data.tar.gz: 652903cb90ff4453d540079deaf9c43ede5d4491e963c4d3c1fe9f07c438cfd13222fd3ebb3ac0f65481b451b04931454300271bb57067a8aaa8d10d7265f2f9
+  metadata.gz: 7e65e0f1baaff06bd0c1c31dcb22cc53bb406904a751f2b4812d8945a370b5cad979fdfd2731749c6e0e9dfc0e8ec66e687a69980685ce80080b46662991db2c
+  data.tar.gz: 8aef10c7d01cbabf450da980031797fabc40ecdb009d1bfa6cdea57fa9d38d408c8107c67112a3de20d0687800bf26b9d731a03a53ce9278be7e56dae3129f61

data/lib/canvas_oauth/canvas_api.rb

@@ -96,7 +96,7 @@ module CanvasOauth
     def hash_csv(csv_string)
       require 'csv'
 
-      csv = CSV.parse(csv_string)
+      csv = csv_string.is_a?(String) ? CSV.parse(csv_string) : csv_string
       headers = csv.shift
       output = []
 

data/lib/canvas_oauth/version.rb

@@ -1,3 +1,3 @@
 module CanvasOauth
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/dummy/db/migrate/{20130326194409_create_canvas_oauth_authorizations.canvas_oauth.rb → 20160711200737_create_canvas_oauth_authorizations.canvas_oauth.rb}

@@ -9,5 +9,8 @@ class CreateCanvasOauthAuthorizations < ActiveRecord::Migration
       t.datetime "created_at",                  :null => false
       t.datetime "updated_at",                  :null => false
     end
+
+    add_index :canvas_oauth_authorizations, [:canvas_user_id, :tool_consumer_instance_guid],
+      name: 'index_canvas_oauth_auths_on_user_id_and_tciguid'
   end
 end

data/spec/dummy/db/schema.rb

@@ -9,17 +9,19 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130326194409) do
+ActiveRecord::Schema.define(version: 20121121005358) do
 
-  create_table "canvas_oauth_authorizations", :force => true do |t|
-    t.integer  "canvas_user_id",              :limit => 8
-    t.string   "tool_consumer_instance_guid",              :null => false
+  create_table "canvas_oauth_authorizations", force: true do |t|
+    t.integer  "canvas_user_id",              limit: 8
+    t.string   "tool_consumer_instance_guid",           null: false
     t.string   "token"
     t.datetime "last_used_at"
-    t.datetime "created_at",                               :null => false
-    t.datetime "updated_at",                               :null => false
+    t.datetime "created_at",                            null: false
+    t.datetime "updated_at",                            null: false
   end
 
+  add_index "canvas_oauth_authorizations", ["canvas_user_id", "tool_consumer_instance_guid"], name: "index_canvas_oauth_auths_on_user_id_and_tciguid"
+
 end

data/spec/lib/canvas_oauth/canvas_api_spec.rb

@@ -18,6 +18,26 @@ describe CanvasOauth::CanvasApi do
     it { is_expected.to eq "http://test.canvas/login/oauth2/auth?client_id=key&response_type=code&state=zzxxyy&redirect_uri=http://localhost:3001/canvas/oauth" }
   end
 
+  describe "hash_csv" do
+    it "accepts a csv string and hashes it" do
+      csv = "canvas_course_id,course_id,short_name\n1,,Test Course"
+      expect(canvas.hash_csv(csv)).to eq([{
+        "canvas_course_id" => "1",
+        "course_id" => "",
+        "short_name" => "Test Course"
+      }])
+    end
+
+    it "accepts a parsed csv array and hashes it" do
+      csv = [["canvas_course_id", "course_id", "short_name"], ["1", nil, "Test Course"]]
+      expect(canvas.hash_csv(csv)).to eq([{
+        "canvas_course_id" => "1",
+        "course_id" => "",
+        "short_name" => "Test Course"
+      }])
+    end
+  end
+
   describe "get_access_token" do
     it "POSTs to /login/oauth2/token" do
       expect(CanvasOauth::CanvasApi).to receive(:post).with('/login/oauth2/token', anything()).and_return({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_oauth_engine
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Dave Donahue
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -248,7 +248,7 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/20130326194409_create_canvas_oauth_authorizations.canvas_oauth.rb
+- spec/dummy/db/migrate/20160711200737_create_canvas_oauth_authorizations.canvas_oauth.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/test.log
@@ -307,7 +307,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/migrate/20130326194409_create_canvas_oauth_authorizations.canvas_oauth.rb
+- spec/dummy/db/migrate/20160711200737_create_canvas_oauth_authorizations.canvas_oauth.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/test.log