Merge remote-tracking branch 'origin/feature/CDB-627' into release/2.…

…3.0+
CartoDB · Oct 11, 2013 · bbfed80 · bbfed80
2 parents e5ed889 + 7f4e427
commit bbfed80
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/app/assets/stylesheets/common b/app/assets/stylesheets/common
diff --git a/lib/assets/javascripts/cartodb/table/header/views/sync_info_content.jst.ejs b/lib/assets/javascripts/cartodb/table/header/views/sync_info_content.jst.ejs
@@ -1,5 +1,7 @@
 <span class="sync <%= state %>">
-  <span class="circle"></span>
+  <div class="circle">
+    <span class="pulse"></span>
+  </div>
   <p>
     <% if (state != "failure") { %>
       synced

diff --git a/services/importer/lib/importer/downloader.rb b/services/importer/lib/importer/downloader.rb
@@ -77,14 +77,25 @@ def raise_if_over_storage_quota(headers, available_quota_in_bytes=nil)
           content_length_from(headers) > available_quota_in_bytes.to_i
       end
 
+      def typhoeus_options
+        {
+          cookiefile:     cookiejar,
+          cookiejar:      cookiejar,
+          followlocation: true
+        }
+      end 
+
       def headers
-        @headers ||=
-          Typhoeus.head(translate(url), followlocation: true).headers
+        @headers ||= Typhoeus.head(translate(url), typhoeus_options).headers
+      end
+
+      def cookiejar
+        repository.fullpath_for("#{seed}_cookiejar")
       end
 
       def download
-        Typhoeus.get(translate(url), followlocation: true)
-       end
+        Typhoeus.get(translate(url), typhoeus_options)
+      end
 
       def name_from(headers, url)
         name_from_http(headers) || name_in(url)

diff --git a/services/importer/lib/importer/url_translator/google_docs.rb b/services/importer/lib/importer/url_translator/google_docs.rb
@@ -10,8 +10,8 @@ class GoogleDocs
 
         def translate(url)
           return url if !supported?(url) || translated?(url) 
-          return url.gsub(%r{#gid=\d+}, '') 
-            .gsub(%r{spreadsheet/ccc}, 'spreadsheet/pub') + "&output=csv"
+          return url.gsub(%r{#gid=\d+}, '') + "&output=csv"
+          # .gsub(%r{spreadsheet/ccc}, 'spreadsheet/pub') 
         end #translate
 
         def supported?(url)