ajax-cat 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/ajax-cat.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ajax-cat"
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Odchazel"]
-  s.date = "2012-08-22"
+  s.date = "2012-08-25"
   s.description = "computer-aided translation backed by machine translation"
   s.email = "odchazel@gmail.com"
   s.executables = ["ajax-cat"]

data/lib/ajax-cat.rb

@@ -125,6 +125,6 @@ module AjaxCat
 
 end
 
-#AjaxCat::Runner.new(8585)
+AjaxCat::Runner.new(8585)
 
 

data/lib/ajax-cat/public/AjaxCatTranslation.coffee

@@ -80,7 +80,6 @@ class AjaxCatTranslation
     @doc.log = []
     @time()
     $("#log").append("<h2>Log</h2>")
-    @log()
 
   log: (type = false, param = false) =>
     return unless @doc.task_id
@@ -103,15 +102,15 @@ class AjaxCatTranslation
   bind_events: =>
     $("#target-sentence").on('keyup',
       =>
-        @log()
+        #@log()
     )
     $("#target-sentence").on('click',
       =>
-        @log()
+        #@log()
     )
     $("#target-sentence").on('keydown'
       (event) =>
-        @log()
+        @log("keydown", event.which)
         switch event.which
           when 13 #enter
             @suggestions.take_suggestion()
@@ -179,6 +178,7 @@ class AjaxCatTranslation
         pair: @pair
         q: sentence
       success: (data) =>
+        @log("translation_table_loaded", data)
         @table = new TranslationTable(@, data)
         $("#translation-table-container").html(@table.get_table())
         $(window).trigger('loadSuggestions')
@@ -192,6 +192,7 @@ class AjaxCatTranslation
       $("#suggestion-panel-is-on").text(@param_suggestion)
       $("#translated-status").text("translating sentence #{position + 1} out of #{@doc.source.length}")
       $("#send-experiment").text("Finish experiment") if (position + 1) == @doc.source.length
+      @log("start")
     @suggestions.clear()
     @save_target() if @cur_position != false
     $("#source-top").children().slice(0,position).show()

data/lib/ajax-cat/public/Suggestions.coffee

@@ -35,12 +35,15 @@ class Suggestions
     sentence = Utils.tokenize(sentence)
     translated = Utils.tokenize($("#source-target").text())
     covered = @translation.table.covered_vector()
+    data = (
+      pair: @translation.pair
+      q: Utils.tokenize(sentence)
+      covered: covered
+      translated: translated
+    )
+    @translation.log("load_suggestions", data)
     @suggestion_request = $.ajax "/api/suggestion"
-      data:
-        pair: @translation.pair
-        q: Utils.tokenize(sentence)
-        covered: covered
-        translated: translated
+      data: data
       success: (data) =>
         data = JSON.parse(data)
         @process_suggestions(data)
@@ -54,8 +57,13 @@ class Suggestions
     from = $(".suggestion-active").data('from')
     to = $(".suggestion-active").data('to')
     @translation.add_words(text)
-    #alert "#{from}-#{to}"
+    log_data(
+      text: text
+      from: from
+      to: to
+    )
     @translation.table.mark_interval(from, to)
+    @load_suggestions()
     #@translation.table.mark_words(text)
 
 

data/lib/ajax-cat/public/TranslationTable.coffee

@@ -2,7 +2,6 @@ class TranslationTable
 
   constructor: (@translation, data) ->
     @data = JSON.parse(data)
-    console.log @data
 
   get_table: =>
     ret = $("<table>"

data/lib/ajax-cat/public/ajax-cat.js

@@ -284,8 +284,7 @@ AjaxCatTranslation = (function() {
     });
     this.doc.log = [];
     this.time();
-    $("#log").append("<h2>Log</h2>");
-    return this.log();
+    return $("#log").append("<h2>Log</h2>");
   };
 
   AjaxCatTranslation.prototype.log = function(type, param) {
@@ -314,15 +313,11 @@ AjaxCatTranslation = (function() {
 
   AjaxCatTranslation.prototype.bind_events = function() {
     var _this = this;
-    $("#target-sentence").on('keyup', function() {
-      return _this.log();
-    });
-    $("#target-sentence").on('click', function() {
-      return _this.log();
-    });
+    $("#target-sentence").on('keyup', function() {});
+    $("#target-sentence").on('click', function() {});
     $("#target-sentence").on('keydown', function(event) {
       var ar, text, word;
-      _this.log();
+      _this.log("keydown", event.which);
       switch (event.which) {
         case 13:
           return _this.suggestions.take_suggestion();
@@ -400,6 +395,7 @@ AjaxCatTranslation = (function() {
         q: sentence
       },
       success: function(data) {
+        _this.log("translation_table_loaded", data);
         _this.table = new TranslationTable(_this, data);
         $("#translation-table-container").html(_this.table.get_table());
         return $(window).trigger('loadSuggestions');
@@ -419,6 +415,7 @@ AjaxCatTranslation = (function() {
       if ((position + 1) === this.doc.source.length) {
         $("#send-experiment").text("Finish experiment");
       }
+      this.log("start");
     }
     this.suggestions.clear();
     if (this.cur_position !== false) this.save_target();
@@ -502,7 +499,7 @@ Suggestions = (function() {
   };
 
   Suggestions.prototype.load_suggestions = function() {
-    var covered, sentence, translated,
+    var covered, data, sentence, translated,
       _this = this;
     this.clear();
     if (!this.translation.param_suggestion) return;
@@ -510,13 +507,15 @@ Suggestions = (function() {
     sentence = Utils.tokenize(sentence);
     translated = Utils.tokenize($("#source-target").text());
     covered = this.translation.table.covered_vector();
+    data = {
+      pair: this.translation.pair,
+      q: Utils.tokenize(sentence),
+      covered: covered,
+      translated: translated
+    };
+    this.translation.log("load_suggestions", data);
     return this.suggestion_request = $.ajax("/api/suggestion", {
-      data: {
-        pair: this.translation.pair,
-        q: Utils.tokenize(sentence),
-        covered: covered,
-        translated: translated
-      },
+      data: data,
       success: function(data) {
         data = JSON.parse(data);
         return _this.process_suggestions(data);
@@ -532,7 +531,13 @@ Suggestions = (function() {
     from = $(".suggestion-active").data('from');
     to = $(".suggestion-active").data('to');
     this.translation.add_words(text);
-    return this.translation.table.mark_interval(from, to);
+    log_data({
+      text: text,
+      from: from,
+      to: to
+    });
+    this.translation.table.mark_interval(from, to);
+    return this.load_suggestions();
   };
 
   Suggestions.prototype.process_suggestions = function(data) {
@@ -605,7 +610,6 @@ TranslationTable = (function() {
     this.get_header = __bind(this.get_header, this);
     this.get_table = __bind(this.get_table, this);
     this.data = JSON.parse(data);
-    console.log(this.data);
   }
 
   TranslationTable.prototype.get_table = function() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ajax-cat
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-22 00:00:00.000000000Z
+date: 2012-08-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2169646220 !ruby/object:Gem::Requirement
+  requirement: &2173563940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2169646220
+  version_requirements: *2173563940
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2169632960 !ruby/object:Gem::Requirement
+  requirement: &2173563440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *2169632960
+  version_requirements: *2173563440
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2169629220 !ruby/object:Gem::Requirement
+  requirement: &2173562960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169629220
+  version_requirements: *2173562960
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2169628260 !ruby/object:Gem::Requirement
+  requirement: &2173562400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.15.2
   type: :runtime
   prerelease: false
-  version_requirements: *2169628260
+  version_requirements: *2173562400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2169627120 !ruby/object:Gem::Requirement
+  requirement: &2173561840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169627120
+  version_requirements: *2173561840
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2169626380 !ruby/object:Gem::Requirement
+  requirement: &2173561340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169626380
+  version_requirements: *2173561340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2169625680 !ruby/object:Gem::Requirement
+  requirement: &2173560860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169625680
+  version_requirements: *2173560860
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2169625180 !ruby/object:Gem::Requirement
+  requirement: &2173560380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *2169625180
+  version_requirements: *2173560380
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2169624700 !ruby/object:Gem::Requirement
+  requirement: &2173559900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2169624700
+  version_requirements: *2173559900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2169624180 !ruby/object:Gem::Requirement
+  requirement: &2173559420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2169624180
+  version_requirements: *2173559420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2169623680 !ruby/object:Gem::Requirement
+  requirement: &2173558920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *2169623680
+  version_requirements: *2173558920
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &2169623080 !ruby/object:Gem::Requirement
+  requirement: &2173558320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: 0.8.0
   type: :development
   prerelease: false
-  version_requirements: *2169623080
+  version_requirements: *2173558320
 description: computer-aided translation backed by machine translation
 email: odchazel@gmail.com
 executables:
@@ -224,7 +224,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -353594361952857068
+      hash: 3408349770644549922
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: