nightcrawler_swift 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04d9c076ba20ec7b69abfbdd9e12dfe1fb9bdbb
-  data.tar.gz: f0316bd255df069ec3d28bab88ec5c669ef0d14e
+  metadata.gz: fa3a7c817fbab29ce6d0775b57d43fd81bce658b
+  data.tar.gz: 2a4450d5398adcb8d3f6a87987d944af05181baf
 SHA512:
-  metadata.gz: 736a0dcc2f1262453ddc33fdc3094525743e2d38e0f57fff3797e6748590cc963950d7445ead3999a62de12502c3ef1b3096ab43e77df8b60e629d120bff6932
-  data.tar.gz: a21e6d537c5baf9373a276cb2e6cfa81941ef4d22e3aa2671ccd1ba7aa34b14efa03258f3022dafda821b2dae63a614472b80802f08f56b00ec9424ca5d382b5
+  metadata.gz: 30beffddd727dd1f344a01a301503c2dfd285ad609b9bc0b58d178ff93b89dc94636b921ee60cfae464df85626b882ea15f17f0de0b80c23cfd3b087deed9672
+  data.tar.gz: adade8009b82cb95234cc689ef55d319256b2f38d06038c12c03e69278d0f2a74ca37e4f84e5c7cec26c38aab54757ab9d89c3790bc9d76992cfb277d0f6cdb5

data/Changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.11.0
+
+  - Exclude ```Expires``` header when max-age used
+  - Add ```Expires``` header as an independent option
+
 ## 0.10.0
 
   - Added support for custom headers

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nightcrawler_swift (0.10.0)
+    nightcrawler_swift (0.11.0)
       concurrent-ruby (~> 0.8.0)
       multi_mime (>= 1.0.1)
       rest-client
@@ -48,6 +48,7 @@ GEM
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
+    timecop (0.8.0)
 
 PLATFORMS
   ruby
@@ -59,3 +60,4 @@ DEPENDENCIES
   nightcrawler_swift!
   rake
   rspec
+  timecop

data/README.md

@@ -94,6 +94,10 @@ config.nightcrawler_swift.logger = Logger.new(STDOUT)
 
 Defines the *Cache-Control:max-age=<value>* header.
 
+> expires
+
+Defines the *Expires* header.
+
 > content_encoding
 
 Defines the *Content-Encoding:<vaule>* header

data/lib/nightcrawler_swift.rb

@@ -1,4 +1,3 @@
-require "cgi"
 require "date"
 require "json"
 require "logger"

data/lib/nightcrawler_swift/cli/opt_parser.rb

@@ -36,6 +36,7 @@ module NightcrawlerSwift::CLI
       configure_option_bucket
       configure_option_max_age
       configure_option_content_encoding
+      configure_option_expires
       configure_option_config
       configure_option_no_cache
       configure_option_help
@@ -69,6 +70,15 @@ module NightcrawlerSwift::CLI
       end
     end
 
+    def configure_option_expires
+      desc = "Custom expires header value"
+      @parser.on("--expires=VALUE", String, desc) do |value|
+        expires = Time.parse(value)
+        @runner.options.config_hash[:expires] = expires
+        @runner.log "Using expires: #{expires}"
+      end
+    end
+
     def configure_option_config
       @parser.on("-c", "--config=PATH", String, "Alternative '#{NightcrawlerSwift::CLI::CONFIG_FILE}' file") do |path|
         path = File.expand_path(path.strip)

data/lib/nightcrawler_swift/commands/upload.rb

@@ -6,7 +6,10 @@ module NightcrawlerSwift
       headers = {etag: etag(body), content_type: content_type(file)}
 
       max_age = opts[:max_age] || options.max_age
-      headers.merge!(cache_control: "public, max-age=#{max_age}", expires: expires(max_age)) if max_age
+      headers.merge!(cache_control: "public, max-age=#{max_age}") if max_age
+
+      expires = opts[:expires]
+      headers.merge!(expires: CGI.rfc1123_date(expires)) if expires
 
       content_encoding = opts[:content_encoding] || options.content_encoding
       headers.merge!(content_encoding: content_encoding.to_s) if content_encoding
@@ -28,9 +31,5 @@ module NightcrawlerSwift
       Digest::MD5.hexdigest(content)
     end
 
-    def expires max_age
-      CGI.rfc1123_date(Time.now + max_age)
-    end
-
   end
 end

data/lib/nightcrawler_swift/version.rb

@@ -1,3 +1,3 @@
 module NightcrawlerSwift
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/nightcrawler_swift.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "codeclimate-test-reporter"
+  spec.add_development_dependency "timecop"
 
   if RUBY_VERSION =~ /1\.9/
     spec.add_development_dependency "debugger"

data/spec/lib/nightcrawler_swift/commands/upload_spec.rb

@@ -94,21 +94,6 @@ describe NightcrawlerSwift::Upload do
           )
         )
       end
-
-      it "also sends the expires header based on max_age" do
-        now = Time.now
-        allow(Time).to receive(:now).and_return(now)
-        expires = CGI.rfc1123_date(Time.now + max_age)
-
-        NightcrawlerSwift.configure max_age: max_age
-        execute
-        expect(subject).to have_received(:put).with(
-          anything,
-          hash_including(
-            headers: default_headers.merge(cache_control: "public, max-age=#{max_age}", expires:  expires)
-          )
-        )
-      end
     end
 
     context "custom_headers" do
@@ -128,6 +113,28 @@ describe NightcrawlerSwift::Upload do
       end
     end
 
+    context "expires" do
+      let :default_headers do
+        {content_type: "text/css", etag: etag}
+      end
+      let(:timestamp) { "Tue, 08 Dec 2015 17:03:31 GMT" }
+
+      it "allows custom content_encoding" do
+        time = Time.parse(timestamp)
+
+        Timecop.freeze(time) do
+          NightcrawlerSwift.configure
+          subject.execute path, file, expires: time
+          expect(subject).to have_received(:put).with(
+            anything,
+            hash_including(
+              headers: hash_including(expires: timestamp)
+            )
+          )
+        end
+      end
+    end
+
     context "content_encoding" do
       let :default_headers do
         {content_type: "text/css", etag: etag}

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
 require "rake"
+require "timecop"
 RUBY_VERSION =~ /1\.9/ ? require("debugger") : require("byebug")
 require "nightcrawler_swift"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nightcrawler_swift
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - tulios
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -109,6 +109,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement