hentry_consumer 0.7.0 → 0.8.0

data/README.md

@@ -34,7 +34,7 @@ The returned Object structure looks something like this:
 
 ## Current Version
 
-0.7.0
+0.8.0
 
 
 ## Requirements

data/lib/hentry_consumer/h_entry.rb

@@ -5,6 +5,10 @@ module HentryConsumer
     attr_accessor :name, :categories, :author, :content, :bookmark, :published_at, :summary
     alias_method :authors, :author
 
+    def older_than(time)
+      Time.parse(published_at.first) < time if time
+    end
+    
     def parse_p_name(element)
       assign_value :name, element.text
     end

data/lib/hentry_consumer/h_feed.rb

@@ -1,8 +1,11 @@
+require 'cgi'
+
 module HentryConsumer
   class HFeed
-    attr_accessor :html, :entries
+    attr_accessor :html, :entries, :options
 
-    def initialize(html, headers={})
+    def initialize(html, options={})
+      @options = options
       @html = Nokogiri::HTML(open(html, headers).read)
       @entries = []
       parse_html
@@ -11,6 +14,7 @@ module HentryConsumer
     def parse_html
       self.html.css(".h-entry").each do |hentry|
         entry = HEntry.new(hentry.children)
+        next if entry.older_than(last_modified_at)
         self.entries << entry
       end
     end
@@ -35,5 +39,17 @@ module HentryConsumer
       to_hash.to_json(a)
     end
     
+    def last_modified_at
+      time = @options[:last_modified_at] || return
+      time = Time.parse(time) if time.is_a? String
+      time.to_time
+    end
+    
+    def headers
+      h = {}
+      h["If-Modified-Since"] = CGI.rfc1123_date(last_modified_at) if last_modified_at
+      h
+    end
+    
   end
 end

data/lib/hentry_consumer/version.rb

@@ -1,3 +1,3 @@
 module HentryConsumer
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/lib/hentry_consumer/h_entry_spec.rb

@@ -15,8 +15,17 @@ describe HentryConsumer::HEntry do
       entry.summary.should eq ["Signed up with 3 locations"]
     end
     it "has a time" do
-      entry.published_at.should eq ["2012-08-26 20:09-0700"]
+      entry.published_at.should eq ["2012-08-24 20:09-0700"]
     end
+    
+    it "is older than now" do
+      entry.older_than(Time.now).should be_true
+    end
+    
+    it "is not older than 2010" do
+      entry.older_than(Time.parse("Jan 1 2010")).should be_false
+    end
+
     it "has a bookmark" do
       entry.bookmark.should eq "http://g5.com/feed/entries/2012-08-26-20-09-0700"
     end
@@ -56,7 +65,7 @@ describe HentryConsumer::HEntry do
       it { json["properties"]["author"].should be_an_instance_of Array }
       it { json["properties"]["author"].first["type"].should include "h-card" }
       it { json["properties"]["bookmark"].should eq "http://g5.com/feed/entries/2012-08-26-20-09-0700" }
-      it { json["properties"]["published_at"].should eq ["2012-08-26 20:09-0700"] }
+      it { json["properties"]["published_at"].should eq ["2012-08-24 20:09-0700"] }
       it { json["properties"]["summary"].should be_an_instance_of Array }
     end
   end

data/spec/lib/hentry_consumer/h_feed_spec.rb

@@ -2,18 +2,31 @@ require 'hentry_consumer'
 
 describe HentryConsumer::HFeed do
   let(:feed) { HentryConsumer.parse(File.open("spec/support/example.html")) }
-  
+
   describe "caching" do
+    let(:time_feed) { HentryConsumer::HFeed.new("spec/support/example.html", last_modified_at: "8:09pm on August 25th, 2012") }
     it "returns false on 304" do
       HentryConsumer::HFeed.any_instance.stub(:open).
-        with("spec/support/example.html", last_modified: Time.parse("Jan 1 2012")).
+        with("spec/support/example.html", "If-Modified-Since" => "Sun, 26 Aug 2012 03:09:00 GMT").
         and_raise( OpenURI::HTTPError.new("304 Not Modified", nil) )
 
-      lambda { HentryConsumer::HFeed.new("spec/support/example.html", last_modified: Time.parse("Jan 1 2012")) }.
+      lambda { HentryConsumer::HFeed.new("spec/support/example.html", last_modified_at: Time.parse("8:09pm on August 25th, 2012")) }.
         should raise_error OpenURI::HTTPError, "304 Not Modified"
     end
+
+    it "doesn't add old entries" do
+      time_feed.entries.should have(1).thing
+    end
+    
+    it "header has last modified since" do
+      time_feed.headers.should eq({"If-Modified-Since" => "Sun, 26 Aug 2012 03:09:00 GMT"})
+    end
+    
+    it "header has last modified since" do
+      feed.headers.should eq({})
+    end
   end
-  
+
 
   describe "#to_json" do
     let(:json) { JSON.parse(feed.to_json) }
@@ -22,7 +35,7 @@ describe HentryConsumer::HFeed do
     it { json["items"].first["properties"]["entries"].should be_an_instance_of Array }
     it { json["items"].first["properties"]["entries"].first["type"].should include "h-entry" }
   end
-  
+
   describe "#to_s" do
     let(:string) { feed.to_s }
     it "should have nicely formatted content" do

data/spec/support/example.html

@@ -2,8 +2,8 @@
   <h1 class="p-name">Senior Cat Living</h1>
   <p class="woot p-summary woot">Signed up with 3 locations</p>
   <p class="p-five">Signed up with 3 locations</p>
-  <time datetime="2012-08-26 20:09-0700" class="dt-published">
-    8:09pm on August 26th, 2012
+  <time datetime="2012-08-24 20:09-0700" class="dt-published">
+    8:09pm on August 24th, 2012
   </time>
   <a class="p-category" href="http://g5.com/tag/new-customer" rel="tag">
     New Customer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hentry_consumer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors: