express_translate 1.0.2 → 1.0.3

data/README.md

@@ -22,7 +22,7 @@ Express Translate
 ##Installation
 ### 1. Gemfile
 ```bash
-gem 'express_translate', '~> 1.0.1'
+gem 'express_translate', '~> 1.0.3'
 ```
  
 ### 2. Setup
@@ -84,9 +84,12 @@ Note: You can see before login. Account for login in config file ("/config/expre
 ##Support
 
 ### Files
-Export and Import csv file
+#### Import
+* CSV file
+* YML file
+#### Export
+* CSV file
 
 ### Application
 Backend for Ruby on Rails
-
-Get data with json (for Javascript)
+Get data with json (for Javascript) => Development

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/app/assets/stylesheets/express_translate/express_translate.css.scss

@@ -112,7 +112,7 @@ body#express_translate {
         &:hover {
           box-shadow:0px 0px 3px #665;
           background: #398ac4;
-          p {display:none;}
+          & > p {display:none;}
           h5 {display:block;}
           h4 {display:block;}          
           .tool {
@@ -388,6 +388,32 @@ body#express_translate {
           }
         }
         
+        &.wait {
+          &:hover {
+            .tool {
+              z-index:-1;
+              opacity:0;
+            }
+          };
+          .waiting {
+            display:block;
+          }
+        }
+        
+        .waiting {
+          background: rgba(0,0,0,0.6);
+          width:100%;
+          height:100%;
+          position:relative;
+          top:0px;
+          left:0px;
+          border-radius:200px;
+          display:none;
+          .bubblingG {
+            margin-left:-30px;
+          }
+        }
+        
         span {
           text-align:center;
           width:90%;

data/app/controllers/express_translate/files_controller.rb

@@ -33,7 +33,9 @@ class ExpressTranslate::FilesController < ExpressTranslate::BaseController
     File.open(filename, 'wb') do |file|
       file.write(params[:file_yml].read)
     end
-    import_yml_file(File.open(filename, 'r').path)
+    @list_data = []
+    lang_id = import_yml_file(File.open(filename, 'r').path)
+    add_data_form_list(params["pack"], lang_id)
     render text: "Uploaded"
   end
   
@@ -76,23 +78,31 @@ class ExpressTranslate::FilesController < ExpressTranslate::BaseController
   # Import yml file
   def import_yml_file(path)
     data = YAML.load_file(path)
-    # data.each do |lang|
-#       lang[1].each do |item|
-#         puts item.inspect
-#         get_data_yml_file(item)
-#       end
-#     end
-  end
-  
-  # Get item data with key and value
-  def get_data_yml_file(item)
-    puts item.inspect
-    # if item[1].is_a?(String)
-#       puts item[1]
-#     elsif item[1].is_a?(Object)
-#       get_data_yml_file(item[1])
-#       # puts item[1]
-#     end
+    data.each do |lang|
+      @list_data = to_shallow_hash(lang[1])
+      return lang[0]
+    end
+  end
+  
+  def add_data_form_list(pack, lang)
+    language_detail = LanguageDetail.info({"id"=> lang, "packages"=> pack})
+    language_detail.destroy
+    @list_data.each do |item|
+      language_detail.add({code: item[0], text: item[1]})
+    end
+  end
+  
+  def to_shallow_hash(hash)
+    hash.inject({}) do |shallow_hash, (key, value)|
+      if value.is_a?(Hash)
+        to_shallow_hash(value).each do |sub_key, sub_value|
+          shallow_hash[[key, sub_key].join(".")] = sub_value
+        end
+      else
+        shallow_hash[key.to_s] = value
+      end
+      shallow_hash
+    end
   end
   
   # Processing

data/app/views/express_translate/ajax/languages/_content_language.html.erb

@@ -1,5 +1,5 @@
 <% @languages.each do |lang| %>
-  <a class="lang add_files origin_<%= lang['is_origin'] %>" href="/express_translate/language/<%= params[:packages] %>/<%= lang['id'] %>">
+  <a class="lang origin_<%= lang['is_origin'] %>" href="/express_translate/language/<%= params[:packages] %>/<%= lang['id'] %>">
     <span><%= lang['text'].slice(0,1).capitalize + lang['text'].slice(1..-1) %></span>
     <p><%= (@LanguageDetail.info(lang).all.count.to_f / (@max == 0 ? 1 : @max) * 100).to_i %>%</p>
     <h5><%= @LanguageDetail.info(lang).all.count %>/<%= @max %></h5>

data/app/views/express_translate/ajax/packages/_content_index.html.erb

@@ -1,5 +1,5 @@
 <% @packages.each do |package| %>
-  <a class="lang package <%= package['language'].count > 1 ? "multi" : "" %>" href="/express_translate/package/<%= package['id'] %>">
+  <a data="<%= package['id'] %>" class="lang package <%= package['language'].count > 1 ? "multi" : "" %>" href="/express_translate/package/<%= package['id'] %>">
     <span><%= package['text'].slice(0,1).capitalize + package['text'].slice(1..-1) %></span>
     <p><%= package['language'].count %></p>
     <div class="list_review">
@@ -12,6 +12,14 @@
       <div class="tool setting" data="<%= package['id'] %>" text="<%= package['text'] %>"></div>
       <div class="tool json" data="<%= package['id'] %>"></div>
     </div>
+    
+    <div class="waiting">
+      <div class="bubblingG">
+        <p id="bubblingG_1"></p>
+        <p id="bubblingG_2"></p>
+        <p id="bubblingG_3"></p>
+      </div>
+    </div>
   </a>
   <div class="delete_dialog_<%= package['id'] %>" style="display: none">
     <h4>Are you sure you want to delete?</br><%= package['text'] %></h4>

data/app/views/express_translate/options/index.html.erb

@@ -147,7 +147,74 @@
     $(".json").click(function(event) {
       event.preventDefault();
       openInNewTab(window.location.origin + "/express_translate/service/" + $(event.target).attr("data") + ".json");
-    })
+    });
+    
+    var obj = $(".package");
+
+    obj.on('dragenter', function (e){
+      e.stopPropagation();
+      e.preventDefault();
+      $(this).removeClass("add_files");
+    });
+
+    obj.on('dragover', function (e){
+       e.stopPropagation();
+       e.preventDefault();
+       $(this).addClass("add_files");
+    });
+
+    obj.on('drop', function (e){
+       $(this).removeClass("add_files");
+       e.preventDefault();
+       var files = e.originalEvent.dataTransfer.files;
+       handleFileUpload(files, obj);
+    }); 
+  
+    obj.on('dragleave', function (e) {
+      $(this).removeClass("add_files");
+    });  
+  
+    function handleFileUpload(files, obj) {
+      obj.addClass("wait");
+      for (var i = 0; i < files.length; i++) {
+        var fd = new FormData();
+        fd.append("pack", obj.attr("data"));
+        fd.append('file_yml', files[i]);
+        sendFileToServer(fd, obj);
+      }
+    }
+  
+    function sendFileToServer(formData, obj) {
+      var uploadURL ="/express_translate/import_yml";
+      var jqXHR = $.ajax({
+        xhr: function() {
+          var xhrobj = $.ajaxSettings.xhr();
+          if (xhrobj.upload) {
+            xhrobj.upload.addEventListener('progress', function(event) {
+              var percent = 0;
+              var position = event.loaded || event.position;
+              var total = event.total;
+              if (event.lengthComputable) {
+                percent = Math.ceil(position / total * 100);
+                console.log(percent)
+              }
+            }, false);
+          }
+          return xhrobj;
+        },
+        url: uploadURL,
+        type: "POST",
+        contentType:false,
+        processData: false,
+        cache: false,
+        data: formData,
+        success: function(data){
+          console.log(data)
+          // Uploaded
+          obj.removeClass("wait");
+        }
+      });
+    }
   }
 
   runJavascriptsIndex();

data/app/views/express_translate/options/languages.html.erb

@@ -172,75 +172,7 @@
     $(".json").click(function(event) {
       event.preventDefault();
       openInNewTab(window.location.origin + "/express_translate/service/" + $(event.target).attr("data") + ".json")
-    });
-    
-    var obj = $(".lang");
-
-    obj.on('dragenter', function (e){
-      e.stopPropagation();
-      e.preventDefault();
-      $(this).removeClass("add_files");
-    });
-
-    obj.on('dragover', function (e){
-       e.stopPropagation();
-       e.preventDefault();
-       $(this).addClass("add_files");
-    });
-
-    obj.on('drop', function (e){
-       $(this).removeClass("add_files");
-       e.preventDefault();
-       var files = e.originalEvent.dataTransfer.files;
-       handleFileUpload(files, obj);
-    }); 
-  
-    obj.on('dragleave', function (e) {
-      $(this).removeClass("add_files");
-    });  
-  
-    function handleFileUpload(files, obj) {
-      for (var i = 0; i < files.length; i++) {
-        var fd = new FormData();
-        fd.append('file_yml', files[i]);
-        sendFileToServer(fd);
-      }
-    }
-  
-    function sendFileToServer(formData) {
-      var uploadURL ="/express_translate/import_yml";
-      var extraData ={};
-      var jqXHR = $.ajax({
-        xhr: function() {
-          var xhrobj = $.ajaxSettings.xhr();
-          if (xhrobj.upload) {
-            xhrobj.upload.addEventListener('progress', function(event) {
-              var percent = 0;
-              var position = event.loaded || event.position;
-              var total = event.total;
-              if (event.lengthComputable) {
-                percent = Math.ceil(position / total * 100);
-              }
-            }, false);
-          }
-          return xhrobj;
-        },
-        url: uploadURL,
-        type: "POST",
-        contentType:false,
-        processData: false,
-        cache: false,
-        data: formData,
-        success: function(data){
-          console.log(data)
-          $(".import").html("Import");
-          setTimeout(function(){
-            // window.location.reload();
-          }, 100);
-        }
-      });
-    }
-    
+    });    
   }
 
   runJavascriptsLanguage();

data/express_translate.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "express_translate"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karl"]
-  s.date = "2014-06-30"
+  s.date = "2014-07-01"
   s.description = "longer description of your gem"
   s.email = "karl@rubify.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_translate
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -355,7 +355,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -587910395349454483
+      hash: 2342580513378280072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: