publish_my_data 0.0.15 → 0.0.16

data/app/controllers/publish_my_data/datasets_controller.rb

@@ -51,8 +51,18 @@ module PublishMyData
       prefix = "dataset_data_#{@dataset.slug}_#{@dataset.modified.strftime("%Y%m%d")}"
       downloads = s3.buckets[PublishMyData.dataset_downloads_s3_bucket].objects.with_prefix(prefix).to_a
 
-      if downloads.any?
-        latest_download = downloads.last
+      # filter the downloads to only include ones with a timestamp equal to or after the dataset modified date.
+      # (ones older than this are out of date)
+      current_downloads = downloads.select do |d|
+        date_portion = d.public_url.to_s.split("_").last.split('.').first  #between last underscore and first dot.
+        file_timestamp = DateTime.parse(date_portion)
+        file_timestamp >= @dataset.modified
+      end
+
+      # if we can't find a current download it's cos we haven't generated it yet since ds was modified
+      # ... and we should 404.
+      if current_downloads.any?
+        latest_download = current_downloads.last
         redirect_to latest_download.public_url.to_s
       else
         raise Tripod::Errors::ResourceNotFound

data/lib/publish_my_data/version.rb

@@ -1,3 +1,3 @@
 module PublishMyData
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/controllers/publish_my_data/datasets_controller_spec.rb

@@ -204,7 +204,7 @@ module PublishMyData
 
         let(:dataset) { FactoryGirl.create(:my_dataset) }
 
-        context "when a download exists on s3" do
+        context "when a download exists on s3 for today" do
 
           before do
             # make some downloads.
@@ -229,12 +229,33 @@ module PublishMyData
 
         end
 
+        context "when a download exists on s3 for today, but before the modified date" do
+
+          before do
+            # make some downloads.
+            s3 = AWS::S3.new
+            bucket = s3.buckets[PublishMyData.dataset_downloads_s3_bucket]
+
+            @obj1 = bucket.objects.create("dataset_data_#{dataset.slug}_201007011159.nt.zip", 'data')
+
+            # make them public readable
+            [@obj1].each { |o| o.acl = :public_read }
+          end
+
+          it "should 404" do
+            get "dump", :id => dataset.slug, :use_route => :publish_my_data
+            response.should be_not_found
+          end
+
+        end
+
         context "when a download doesn't exist on s3" do
           it "should 404" do
             get "dump", :id => dataset.slug, :use_route => :publish_my_data
             response.should be_not_found
           end
         end
+
       end
 
       context "when a dataset with that slug doesn't exist" do