lml · rlgreen91 · May 18, 2012 · May 18, 2012 · May 18, 2012 · May 21, 2012
diff --git a/Gemfile b/Gemfile
@@ -12,6 +12,14 @@ end
 
 gem 'jquery-rails', '~> 2.0.2'
 
+gem 'nokogiri'
+
+gem 'htmlentities'
+
+gem 'rubyzip'
+
+gem 'archive-zip'
+
 # Deploy with Capistrano
 gem 'capistrano', '~> 2.12.0'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -30,9 +30,10 @@ GEM
       multi_json (~> 1.0)
     acts-as-taggable-on (2.3.1)
       rails (~> 3.0)
+    archive-zip (0.5.0)
+      io-like (>= 0.3.0)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
-    bcrypt-ruby (3.0.1-x86-mingw32)
     blankslate (2.1.2.4)
     builder (3.0.0)
     bullring (0.8.2)
@@ -81,7 +82,9 @@ GEM
       i18n (~> 0.4)
     highline (1.6.13)
     hike (1.2.1)
+    htmlentities (4.3.1)
     i18n (0.6.0)
+    io-like (0.3.0)
     journey (1.0.4)
     jquery-rails (2.0.2)
       railties (>= 3.2.0, < 5.0)
@@ -100,14 +103,14 @@ GEM
     mime-types (1.19)
     multi_json (1.3.6)
     mysql2 (0.3.11)
-    mysql2 (0.3.11-x86-mingw32)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
     net-sftp (2.0.5)
       net-ssh (>= 2.0.9)
     net-ssh (2.5.2)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
+    nokogiri (1.5.4)
     orm_adapter (0.3.0)
     paperclip (3.0.4)
       activemodel (>= 3.0.0)
@@ -151,6 +154,7 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     recaptcha (0.3.4)
+    rubyzip (0.9.9)
     sass (3.1.19)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
@@ -163,7 +167,6 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
-    sqlite3 (1.3.6-x86-mingw32)
     squeel (1.0.6)
       activerecord (~> 3.0)
       activesupport (~> 3.0)
@@ -182,21 +185,25 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
+    uglifier (1.2.5)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.3)
     uglifier (1.2.6)
       execjs (>= 0.3.0)
       multi_json (~> 1.3)
+    upmark (0.1.3)
+      parslet
     warden (1.2.1)
       rack (>= 1.0)
     will_paginate (3.0.3)
     yajl-ruby (1.1.0)
-    yajl-ruby (1.1.0-x86-mingw32)
 
 PLATFORMS
   ruby
-  x86-mingw32
 
 DEPENDENCIES
   acts-as-taggable-on (~> 2.3.1)
+  archive-zip
   bullring (~> 0.8.2)
   capistrano (~> 2.12.0)
   coffee-rails (~> 3.2.2)
@@ -205,18 +212,21 @@ DEPENDENCIES
   execjs (~> 1.4.0)
   factory_girl_rails (~> 3.4.0)
   faker (~> 1.0.1)
+  htmlentities
   jquery-rails (~> 2.0.2)
   jsonify (~> 0.3.1)
   jsonify-rails (~> 0.3.2)
   mime-types (~> 1.18)
   mysql2 (~> 0.3.11)
+  nokogiri
   paperclip (~> 3.0.4)
   parslet (~> 1.4.0)
   quiet_assets (~> 1.0.1)
   rack-ssl-enforcer (~> 0.2.4)
   rails (= 3.2.4)
   rails3-jquery-autocomplete (~> 1.0.7)
   recaptcha (~> 0.3.4)
+  rubyzip
   sass-rails (~> 3.2.5)
   single_test (~> 0.5.1)
   sqlite3 (~> 1.3.6)

diff --git a/Rakefile b/Rakefile
@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.
 

diff --git a/app/controllers/import_controller.rb b/app/controllers/import_controller.rb
@@ -0,0 +1,5 @@
+class ImportController < ApplicationController
+	def index
+		@qt_import = QtImport.new
+	end
+end
diff --git a/app/controllers/qt_import_controller.rb b/app/controllers/qt_import_controller.rb
@@ -0,0 +1,30 @@
+#encoding: utf-8
+
+# Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details.
+
+require 'mime/types'
+
+class QtImportController < ApplicationController
+	def new
+		@content_types = QTImport.content_types
+	end
+
+	def create
+		begin
+			a = params[:file]
+			a,images =  QTImport.unzip(a.path,"#{Rails.root}/tmp/import") if a.content_type == 'application/zip'
+			document = QTImport.openfile(a.path)
+			project = QTImport.createproject(current_user)
+			parser, transformer = QTImport.choose_import(params[:content_type])
+			content = QTImport.iterate_items(document)	
+			QTImport.get_questions(project,content,parser,transformer,current_user) unless images
+			QTImport.get_questions(project,content,parser,transformer,current_user,images) unless !images
+
+		rescue			
+			flash[:alert] = 'Unfortunately we could not import all of your questions.  This may be due to formatting errors in your questions, such as HTML.
+However, we were most likely able to import some of your questions.  They are listed under a new project called Import, and are now unpublished questions.'
+			redirect_to :action => :new		
+		end
+    end
+end
diff --git a/app/helpers/qt_import_helper.rb b/app/helpers/qt_import_helper.rb
@@ -0,0 +1,5 @@
+# Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details.
+
+module QtImportHelper
+end
diff --git a/app/views/qt_import/_form.html.erb b/app/views/qt_import/_form.html.erb
@@ -0,0 +1,16 @@
+<!-- # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details. -->
+
+<%= form_tag("/import/qti", :multipart => true) do %>
+  <%= label_tag("File") %>
+  <br>
+  <%= file_field_tag(:file) %>
+  <br>
+  <br>
+  <%= label_tag("Content Type") %>
+  <br>
+  <%= select_tag(:content_type, options_for_select(@content_types).html_safe ) %>
+  <br>
+  <br>
+  <%= submit_tag("Import") %>
+<% end %>
diff --git a/app/views/qt_import/create.html.erb b/app/views/qt_import/create.html.erb
@@ -0,0 +1,6 @@
+<!-- # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details. -->
+
+<p>Your questions were successfully imported!
+<br>
+They have been added to a new project named "Import", and are now unpublished questions.</p>
diff --git a/app/views/qt_import/error.html.erb b/app/views/qt_import/error.html.erb
@@ -0,0 +1,3 @@
+<p>Unfortunately we could not import all of your questions.  This may be due to formatting errors in your questions, such as HTML.
+However, we were most likely able to import <i>some</i> of your questions.  They are listed under a new project called Import, and 
+are now unpublished questions.</p>
diff --git a/app/views/qt_import/index.html.erb b/app/views/qt_import/index.html.erb
@@ -0,0 +1,4 @@
+<h1>Import Questions</h1>
+<p> Note: All files uploaded MUST be XML files. </p>
+
+<%= render 'form' %>
diff --git a/app/views/qt_import/new.html.erb b/app/views/qt_import/new.html.erb
@@ -0,0 +1,7 @@
+<!-- # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
+# License version 3 or later.  See the COPYRIGHT file for details. -->
+
+<h1>Import Questions</h1>
+<p> Note: All files uploaded MUST be XML files. </p>
+
+<%= render 'form' %>
diff --git a/app/views/questions/new.html.erb b/app/views/questions/new.html.erb
@@ -73,3 +73,10 @@ Use this type for simple free-form questions that may or may not have a multiple
 
 
 </table>
+
+<br>
+<big>
+<b>
+<%= link_to "Or click this link to import a file of questions.", import_qti_new_path %>
+</b>
+</big>
diff --git a/config/application.rb b/config/application.rb
@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.
 

diff --git a/config/environment.rb b/config/environment.rb
@@ -1,3 +1,5 @@
+#encoding: utf-8
+
 # Copyright 2011-2012 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.
 
@@ -14,8 +16,13 @@
 require 'form_builder_extensions'
 require 'acts_as_numberable'
 require 'variated_content_html'
+require 'spqr_parser'
+require 'qti_import'
+
 
 ActionMailer::Base.delivery_method = :sendmail
 
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 # Initialize the rails application
 Quadbase::Application.initialize!
diff --git a/config/routes.rb b/config/routes.rb
@@ -3,6 +3,9 @@
 
 Quadbase::Application.routes.draw do
 
+  get "/import/qti/new", :to => 'qt_import#new'
+  post "/import/qti", :to => 'qt_import#create'
+
   namespace :admin do 
     resources :logic_libraries do
       resources :logic_library_versions, :shallow => true

diff --git a/db/migrate/20120613190208_create_file_uploads.rb b/db/migrate/20120613190208_create_file_uploads.rb
@@ -0,0 +1,12 @@
+class CreateFileUploads < ActiveRecord::Migration
+  def self.up
+    create_table :file_uploads do |t|
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :file_uploads
+  end
+end
-Original file line number
+Diff line change
@@ Expand Up @@
     </table>
+    <br>
+    <big>
+    <b>
+    <%= link_to "Or click this link to import a file of questions.", import_qti_new_path %>
+    </b>
+    </big>