wayback 0.2.0 → 0.2.1

data/lib/wayback/api/archive.rb

@@ -23,7 +23,7 @@ module Wayback
       # @raise [Wayback::Error::Unauthorized] Error raised when supplied user credentials are not valid.
       # @return [Wayback::Page]
       # @param url [String] The page URI that of which was archived.
-      # @param date [String, Symbol, Time, Fixnum, Integer] A date or symbol to describe which dated archive page. Symbols include :first and :last. Strings are converted to integer timestamps.
+      # @param date [String, Symbol, Date, DateTime, Time, Fixnum, Integer, Float] A date or symbol to describe which dated archive page. Symbols include :first and :last. Strings are converted to integer timestamps.
       # @param options [Hash] A customizable set of options.
       # @example Return the HTML archive for the page.
       #   Wayback.page('http://gleu.ch')
@@ -32,10 +32,27 @@ module Wayback
       #   Wayback.page('http://gleu.ch', :first)
       #   Wayback.page('http://gleu.ch', :last)
       def page(url, date=0, options={})
-        date = 0 if date == :first
-        date = Time.now if date == :last
-        date = Time.parse(date).to_i unless [Fixnum,Time,Integer].include?(date.class)
-        object_from_response(Wayback::Page, :get, "/#{date.to_i}/#{url}", options)
+        archive_date = case date.class.to_s
+          when 'Time'
+            date
+          when 'Date', 'DateTime'
+            date.to_time
+          when 'Symbol'
+            (date == :first ? 0 : Time.now)
+          when 'String'
+            Time.parse(date).strftime('%Y%m%d%H%M%S')
+          when 'Fixnum', 'Integer', 'Float'
+            # Epoch vs date string as number
+            (date.to_i <= Time.now.to_i ? Time.at(date.to_i) : Time.parse(date.to_i.to_s))
+          else
+            raise Wayback::Error::ClientError
+        end
+
+        # Format accordingly
+        archive_date = archive_date.strftime('%Y%m%d%H%M%S') if archive_date.class == Time
+
+        # Get it
+        object_from_response(Wayback::Page, :get, "/#{archive_date}/#{url}", options)
       end
 
     end

data/lib/wayback/response/parse_memento.rb

@@ -19,7 +19,7 @@ module Wayback
                 k, v = a.gsub(/^([A-Z0-9\-]+)(=.*)$/i, '\1'), a.gsub(/^([A-Z0-9\-]+)(=(\'|\"))(.*)(\'|\")(,)?$/i, '\4')
                 case k
                   when 'datetime'
-                    datetime, date = v, Time.parse(v).to_i
+                    datetime, date = v, Time.parse(v).utc.strftime('%Y%m%d%H%M%S').to_i
                   when 'rel'
                     rels = v.split(' ')
                   when 'from'

data/lib/wayback/version.rb

@@ -2,7 +2,7 @@ module Wayback
   class Version
     MAJOR = 0 unless defined? Wayback::Version::MAJOR
     MINOR = 2 unless defined? Wayback::Version::MINOR
-    PATCH = 0 unless defined? Wayback::Version::PATCH
+    PATCH = 1 unless defined? Wayback::Version::PATCH
     PRE = nil unless defined? Wayback::Version::PRE
 
     class << self

data/spec/wayback/api/archive_spec.rb

@@ -20,7 +20,7 @@ describe Wayback::API::Archive do
       timemap = @client.list('gleu.ch')
       expect(timemap).to be_a Wayback::Archive
       expect(timemap.id).to eq ('http://gleu.ch')
-      expect(timemap.first_date).to eq (1303064571)
+      expect(timemap.first_date).to eq(20110417182251)
       expect(timemap.first_date?).to be_true
     end
   end
@@ -29,45 +29,87 @@ describe Wayback::API::Archive do
     before do
       stub_get("/20130129170322/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
     end
+
     it "requests the correct resource" do
       @client.page('gleu.ch', 20130129170322)
       expect(a_get("/20130129170322/gleu.ch")).to have_been_made
     end
+
     it "returns the desired page on date" do
+      stub_get("/20130129170322/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
       page = @client.page('gleu.ch', 20130129170322)
       expect(page).to be_a Wayback::Page
       expect(page.html).to match /^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im
     end
+
     it "returns the first desired page" do
       stub_get("/0/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
       page = @client.page('gleu.ch', :first)
       expect(page).to be_a Wayback::Page
       expect(page.html).to match /^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im
     end
+
     it "returns the last desired page" do
-      stub_get("/#{Time.now.to_i}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+      stub_get("/#{Time.now.strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
       page = @client.page('gleu.ch', :last)
       expect(page).to be_a Wayback::Page
       expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
     end
+
     it "returns the desired page for Time" do
-      stub_get("/#{Time.now.to_i}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+      stub_get("/#{Time.now.strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
       page = @client.page('gleu.ch', Time.now)
       expect(page).to be_a Wayback::Page
       expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
     end
-    it "returns the desired page for Time string" do
-      stub_get("/#{Time.now.to_i}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
+    it "returns the desired page for Date" do
+      stub_get("/#{Time.parse(Date.today.to_s).strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
+      page = @client.page('gleu.ch', Date.today)
+      expect(page).to be_a Wayback::Page
+      expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
+    end
+
+    it "returns the desired page for DateTime" do
+      stub_get("/#{Time.parse(DateTime.new(2013,1,1).to_s).strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
+      page = @client.page('gleu.ch', DateTime.new(2013,1,1))
+      expect(page).to be_a Wayback::Page
+      expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
+    end
+
+    it "returns the desired page for String" do
+      stub_get("/#{Time.now.strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+
       page = @client.page('gleu.ch', Time.now.to_s)
       expect(page).to be_a Wayback::Page
       expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
     end
-    # it "handles when error exists" do
-    #   stub_get("/#{Time.now.to_i}/gleu.ch").to_return(:status => 204, :body => '', :headers => {:content_type => "text/xml"})
-    #   page = @client.page('gleu.ch', Time.now.to_s)
-    #   expect(page).to be_a Wayback::Page
-    #   expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
-    # end
+
+    it "returns the desired page for Fixnum" do
+      stub_get("/#{Time.now.strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+      page = @client.page('gleu.ch', Time.now.to_i)
+      expect(page).to be_a Wayback::Page
+      expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
+    end
+
+    it "returns the desired page for Float" do
+      stub_get("/#{Time.now.strftime('%Y%m%d%H%M%S')}/gleu.ch").to_return(:body => fixture("page.html"), :headers => {:content_type => "text/html"})
+      page = @client.page('gleu.ch', Time.now.to_f)
+      expect(page).to be_a Wayback::Page
+      expect(page.html).to match(/^\<\!DOCTYPE html\>.*http\:\/\/gleu\.ch.*\<\/html\>/im)
+    end
+
+    [[0], {:a => 'b'}, File].each do |t|
+      it "returns error for #{t.class}" do
+        expect{page = @client.page('gleu.ch', t)}.to raise_error(Wayback::Error::ClientError)
+      end
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wayback
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday