importr 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 200e1ae712c85a1384e4457b03d2e03b27879d03
-  data.tar.gz: bd1a84310f148253bfc741fd3912f7e060ccfa57
+  metadata.gz: 17a29355c196c8aac87b18a1d1aeb27d896897f2
+  data.tar.gz: aba05d865b2156224475e6a1aa94e13342ad7bf1
 SHA512:
-  metadata.gz: 1661949302202ec3f98a1dd462228c0665cc8747b1bbbdf42dc5ee2e9011c4f513df2d30206570dedc943d64eee0dc1f9f3a953bc16ef4d0bb0073c14212e7cb
-  data.tar.gz: 45be464372780cb563481e5f702d9f4b899ea628754c3952fd321792601e88936734d46d3893f55390bf3df709c877f30cc3350d1074defae57ae4599d5ca4c2
+  metadata.gz: 837ea81edf3b88a6ead963188b7d40b52e67f8614232118ea58745745de24efa7303cca5d00ede087253128e1e9039e7015605a184800e337e88330ff3328a66
+  data.tar.gz: 51f72029dfa4253f11f1ea7b32c847a9f4c87b88dce0272fb88f1d074758df8c77df42874ec5b88d23bc22bee33da1c26c4f781922ccbdbe48c7649c1f368913

data/app/views/importr/admin/data_imports/_rows_with_errors.haml

@@ -5,5 +5,12 @@
         Row Number
       %th
         Error Messages
+
   %tbody
-    %tr
+    
+    - @data_import.error_messages.each do |err|
+      %tr
+        %td= err[:index]
+        %td= err[:error]
+
+

data/app/views/importr/admin/data_imports/_ws_client.haml

@@ -1,12 +1,17 @@
 :javascript
   (function() {
-
-  
     var client = new Faye.Client("#{websocket_url_service}", { retry: 5 });
 
+    var max = {
+      processed_rows: 0,
+      success_count: 0,
+      error_count: 0,
+    };
+
     function update_row_count(message) {
       if (typeof(message.processed_rows) != 'undefined') {
-        $('#rows-processed').html('' + message.processed_rows + ' / ' + message.total_rows)
+        max.processed_rows = Math.max(message.processed_rows, max.processed_rows)
+        $('#rows-processed').html('' + max.processed_rows + ' / ' + message.total_rows)
       }
       console.log(message)
     }
@@ -18,13 +23,15 @@
 
     client.subscribe("#{@data_import.websocket_channel(:error)}", function(message) {
       update_row_count(message)
-      $('#rows-with-errors').html(message.error_count)
+      max.error_count = Math.max(message.error_count, max.error_count)
+      $('#rows-with-errors').html(max.error_count)
 
       $('#row-errors-panel tbody').append("<tr><td>" + message.index + "</td><td>" + message.error + "</td></tr>")
       $('#row-errors-panel').show();
     });
 
     client.subscribe("#{@data_import.websocket_channel(:success)}", function(message) {
+      max.success_count = Math.max(message.success_count, max.success_count)
       update_row_count(message)
     });
 

data/lib/importr/active_admin.rb

@@ -8,7 +8,7 @@ module Importr
       importer_type ||= "#{klass}Importer".constantize
 
       action_item :only => :index do
-        link_to 'Import from Excel', :action => 'upload_excel'
+        link_to 'Import from Excel', :action => 'upload_excel' #if current_admin_user.is_admin?
       end
 
       collection_action :upload_excel do
@@ -27,8 +27,14 @@ module Importr
       end
 
       controller do
-        def permitted_params
-          params.permit data_import: [:document, :uuid, :importer_type]
+        before_filter :check_permisions, only: [:import_excel, :upload_excel]
+        
+        def check_permisions
+          self.send(Importr::Config.restriction_method.to_sym) unless Importr::Config.restriction_method.blank?
+        end
+
+        def importer_params
+          {data_import: [:document, :uuid, :importer_type]}
         end
       end
     end

data/lib/importr/config.rb

@@ -8,7 +8,8 @@ module Importr
     end
 
     mattr_accessor  :web_socket_class, :web_socket_method, 
-                    :websocket_url_service, :websocket_client_script
+                    :websocket_url_service, :websocket_client_script, 
+                    :restriction_method
 
 
   end

data/lib/importr/importer.rb

@@ -14,24 +14,21 @@ module Importr
 
     alias_method :data_import, :context
 
-    def row_success
-      super
+    on :row_success do
       update_counters
       notify(:success, @counters)
     end
 
-    def row_error(error_message)
-      super
-      update_counters
-      notify(:error, @counters.merge(index: row_index, error: error_message))
+    on :row_error do |e|
+      update_counters({index: row_index, error: e.message})
+      notify(:error, @counters.merge(index: row_index, error: e.message))
     end
 
-    def import_failed(error_message)
-      super
-      notify(:base, error: error_message)
+    on :import_failed do |e|
+      notify(:base, error: e.message)
     end
 
-    def import_finished
+    on :import_finished do
       data_import.update_attribute(:finished, true) if data_import
     end
 
@@ -42,14 +39,21 @@ module Importr
       Importr::Notifier.notify(channel, message)
     end
 
-    def update_counters
+    def update_counters(err= {})
       @counters = {
         success_count: row_success_count,
         error_count: row_error_count,
         processed_rows: row_processed_count,
         total_rows: row_count,
       }
-      data_import.update_attributes(@counters) if data_import
+      if data_import
+        data_import.update_attributes(@counters) 
+        add_error(err) unless err.blank?
+      end
+    end
+
+    def add_error(err)
+      data_import.update_attributes(error_messages: data_import.error_messages << err ) if data_import
     end
   end
 end

data/lib/importr/version.rb

@@ -1,3 +1,3 @@
 module Importr
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importr
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ernesto Garcia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,16 +29,16 @@ dependencies:
   name: active_importer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement