gnarus_exercise 1.0.1 → 1.0.2

data/README.md

@@ -3,21 +3,21 @@ GnarusExercise
 
 This project rocks and uses MIT-LICENSE.
 
-Configuring a new project without user ownership
-================================================
+Configuring a new project
+=========================
 
 ```
 rails new my_exercise -m https://raw.github.com/caelum/gnarus-exercise/master/template.rb
 ```
 
-You will be prompted about add <code>devise</code> into your application, then is up
-to you accept or not. The template will handle all the configurations for you.
+You will be prompted about adding <code>devise</code> into your application, then it is up
+to you accept or not (if you want to auth your exercises). The template will handle all configuration required for you.
 
 
 TODO
 ====
 
 - update method UPDATE from exercise to be safe
-- exercisecontroller entire code should work with/without devise
-- no need to override gnarusexercises:exercise would be lovely
-- eval solution?
+- rename to gnarus-exercise
+- we are using the index file to show an attempt, nasty. a GET to a better named method
+- automatic reload from ActivityProcessor

data/app/assets/javascripts/gnarus_exercise/attempt.js

@@ -0,0 +1,27 @@
+var gnarus = {
+	attemptForm : function(solution, viewer, returnUri) {
+		
+		var viewChanged = function(execution) {
+			viewer(execution);
+			if(execution.suceeded) {
+				var form = $('<form action=' + returnUri + '></form>');
+				var input = $('<input name="solution" />');
+				input.val(execution.solution);
+				form.insertAfter(input);
+				form.submit();
+			}
+		};
+		
+		return {
+			process : function() {
+				var target = $('#exercise').attr('action');
+				$.post(target, solution(), function(r) {
+					viewChanged(r);
+				});
+			},
+			setup : function() {
+				$('#try').click(this.process);
+			}
+		};	
+	}
+};

data/app/controllers/gnarus_exercise/attempts_controller.rb

@@ -1,21 +1,13 @@
 module GnarusExercise
-class AttemptsController < ApplicationController
+  class AttemptsController < ApplicationController
   
-  skip_before_filter :verify_authenticity_token
+    skip_before_filter :verify_authenticity_token
 
-  def update
-    @attempt = Attempt.find(params[:id])
-    if(@attempt.not_finished)
-      @attempt.update_attributes(:solution => params[:path])
+    def index
+      exercise = Exercise.find(params[:exercise_id])
+      @attempt = exercise.attempts.create(params[:attempt])
+      @attempt.save
     end
-    redirect_to @attempt.full_return_uri
-  end
 
-  def index
-    exercise = Exercise.find(params[:exercise_id])
-    @attempt = exercise.attempts.create(params[:attempt])
-    @attempt.save
   end
-
-end
 end

data/app/controllers/gnarus_exercise/executions_controller.rb

@@ -0,0 +1,14 @@
+module GnarusExercise
+  class ExecutionsController < ApplicationController
+  
+    skip_before_filter :verify_authenticity_token
+
+    def create
+      @attempt = Attempt.find params[:attempt_id]
+      execution = ::ActivityProcessor.process @attempt, params
+      execution.save
+      render :json => execution.to_json(:includes => :attempt)
+    end
+
+  end
+end

data/app/models/activity_processor.rb

@@ -0,0 +1,5 @@
+class ActivityProcessor
+  def self.process(attempt, params)
+    attempt.executions.create :solution => params[:solution], :suceeded => true
+  end
+end

data/app/models/gnarus_exercise/attempt.rb

@@ -1,13 +1,16 @@
 module GnarusExercise
   class Attempt < ActiveRecord::Base
     belongs_to :exercise
-    attr_accessible :return_uri, :solution
+    has_many :executions
+    attr_accessible :return_uri, :author_id
 
-    def not_finished
-      solution.nil?
-    end
     def full_return_uri
        (return_uri || "") + "?answer=" + (solution || "")
     end
+    
+    def process(params)
+      executions.create :solution => params[:solution], :suceeded => params[:suceeded]
+    end
+    
   end
 end

data/app/models/gnarus_exercise/execution.rb

@@ -0,0 +1,6 @@
+module GnarusExercise
+  class Execution < ActiveRecord::Base
+    attr_accessible :attempt, :solution, :suceeded
+    belongs_to :attempt
+  end
+end

data/config/initializers/gnarus_exercise.rb

@@ -0,0 +1 @@
+require 'activity_processor'

data/config/routes.rb

@@ -3,7 +3,9 @@ GnarusExercise::Engine.routes.draw do
   root :to => "exercises#index"
 
   resources :exercises do
-    resources :attempts
+    resources :attempts do
+      resources :executions
+    end
   end
   
 end

data/db/migrate/20120405185533_create_gnarus_exercise_attempts.rb

@@ -3,7 +3,7 @@ class CreateGnarusExerciseAttempts < ActiveRecord::Migration
     create_table :gnarus_exercise_attempts do |t|
       t.references :exercise
       t.text :return_uri
-      t.text :solution
+      t.string :author_id
 
       t.timestamps
     end

data/db/migrate/20120408064126_create_gnarus_exercise_executions.rb

@@ -0,0 +1,12 @@
+class CreateGnarusExerciseExecutions < ActiveRecord::Migration
+  def change
+    create_table :gnarus_exercise_executions do |t|
+      t.references :attempt
+      t.text :solution
+      t.boolean :suceeded
+
+      t.timestamps
+    end
+    add_index :gnarus_exercise_executions, :attempt_id
+  end
+end

data/lib/gnarus_exercise/version.rb

@@ -1,3 +1,3 @@
 module GnarusExercise
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/fixtures/gnarus_exercise/executions.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  attempt: 
+  solution: MyString
+  suceeded: false
+
+two:
+  attempt: 
+  solution: MyString
+  suceeded: false

data/test/unit/gnarus_exercise/execution_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+module GnarusExercise
+  class ExecutionTest < ActiveSupport::TestCase
+    # test "the truth" do
+    #   assert true
+    # end
+  end
+end

metadata

@@ -1,80 +1,79 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gnarus_exercise
-version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Guilherme Silveira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-06 00:00:00 -03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 3
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
         version: 3.2.2
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Create external exercises by mounting this plugin.
-email: 
+email:
 - guilherme.silveira@caelum.com.br
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/assets/javascripts/gnarus_exercise/application.js
+- app/assets/javascripts/gnarus_exercise/attempt.js
 - app/assets/stylesheets/gnarus_exercise/application.css
 - app/controllers/gnarus_exercise/application_controller.rb
 - app/controllers/gnarus_exercise/attempts_controller.rb
+- app/controllers/gnarus_exercise/executions_controller.rb
 - app/controllers/gnarus_exercise/exercises_controller.rb
 - app/helpers/gnarus_exercise/application_helper.rb
+- app/models/activity_processor.rb
 - app/models/gnarus_exercise/attempt.rb
+- app/models/gnarus_exercise/execution.rb
 - app/models/gnarus_exercise/exercise.rb
 - app/views/gnarus_exercise/exercises/_form.html.erb
+- app/views/gnarus_exercise/exercises/_my_fields.html.erb
 - app/views/gnarus_exercise/exercises/edit.html.erb
 - app/views/gnarus_exercise/exercises/index.html.erb
 - app/views/gnarus_exercise/exercises/new.html.erb
 - app/views/gnarus_exercise/exercises/show.html.erb
 - app/views/layouts/gnarus_exercise/application.html.erb
+- config/initializers/gnarus_exercise.rb
 - config/routes.rb
 - db/migrate/20120405185453_create_gnarus_exercise_exercises.rb
 - db/migrate/20120405185533_create_gnarus_exercise_attempts.rb
+- db/migrate/20120408064126_create_gnarus_exercise_executions.rb
 - lib/gnarus_exercise/engine.rb
 - lib/gnarus_exercise/version.rb
 - lib/gnarus_exercise.rb
@@ -111,49 +110,41 @@ files:
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/fixtures/gnarus_exercise/attempts.yml
+- test/fixtures/gnarus_exercise/executions.yml
 - test/fixtures/gnarus_exercise/exercises.yml
 - test/fixtures/gnarus_exercise/users.yml
 - test/gnarus_exercise_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
 - test/unit/gnarus_exercise/attempt_test.rb
+- test/unit/gnarus_exercise/execution_test.rb
 - test/unit/gnarus_exercise/exercise_test.rb
 - test/unit/gnarus_exercise/user_test.rb
-has_rdoc: true
 homepage: http://online.caelum.com.br
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: A plugin structure for external exercises.
-test_files: 
+test_files:
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/controllers/application_controller.rb
@@ -183,11 +174,13 @@ test_files:
 - test/dummy/README.rdoc
 - test/dummy/script/rails
 - test/fixtures/gnarus_exercise/attempts.yml
+- test/fixtures/gnarus_exercise/executions.yml
 - test/fixtures/gnarus_exercise/exercises.yml
 - test/fixtures/gnarus_exercise/users.yml
 - test/gnarus_exercise_test.rb
 - test/integration/navigation_test.rb
 - test/test_helper.rb
 - test/unit/gnarus_exercise/attempt_test.rb
+- test/unit/gnarus_exercise/execution_test.rb
 - test/unit/gnarus_exercise/exercise_test.rb
 - test/unit/gnarus_exercise/user_test.rb