pavlov_rss 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124cdf8d9daf80cd1469a706a6c3c910070b3e7b
-  data.tar.gz: 5e73a02d74061640507c3157eedce1e09067e14d
+  metadata.gz: 35a29663a549afb08c61d6f4b88619c588d6c172
+  data.tar.gz: 9b74530d53d962b0f2c9d50c9558a73ea15f8b5e
 SHA512:
-  metadata.gz: 41318068f97592b7e7ca3a82912c8aee572ae211c77c1be46bd1147dcfc4f00cec03189bd0e3b89b01bb94c6a0bb2280e1ca34218b1f89d8b659915368c57587
-  data.tar.gz: d2dd2b40e53d911cb9d9887922272545a9e8978cc68c73c56524f5c5d50fb8a9202a71a673e7132d6a806e968f20728581630290707e5ab44913ea4313c875a9
+  metadata.gz: ff7e6ae7cf8950adc99ae1efacd8a043dc35a17fcda5b172185c7645fef399204a78fa02f466b3f7e2c106c04afb9ae1da1a9592af112d3d3c12cf25d719b748
+  data.tar.gz: a58856d9e2bb5763a98a1eebd3740cfabc2a4e9b2ec5148035c446ae5462aeb4c7ae01e46bf416ec9abb844f0c33d425a2d9221fcdb02ac53d3c5b1ca08d30cb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pavlov_rss (0.0.3)
+    pavlov_rss (0.0.4)
       activesupport
       nokogiri
 

data/lib/pavlov_rss/reader.rb

@@ -4,42 +4,36 @@ require 'active_support/core_ext'
 
 module PavlovRss
   class Reader
-    def initialize(urls_or_lambdas)
-      @lambdas = Array(urls_or_lambdas).map do |url_or_lambda|
-        case url_or_lambda
-        when String
-          lambda {open(url_or_lambda, &:read)}
-        else
-          url_or_lambda
-        end
-      end
+    def opener &opener
+      @opener = opener
+    end
+
+    def fetch
+      hash_to_item(rss_to_hash(Nokogiri.XML(@opener.call)))
     end
 
     def check
-      now = @lambdas.map(&:call).map(&Nokogiri.method(:XML))
+      now = fetch
       @prev ||= now
-      result = @prev.zip(now).map do |p,n|
-        new_items p, n
-      end
+      result = now - @prev
       @prev = now
       return result
     end
 
-    def item_to_json rss
-      value = Hash.from_xml(rss.to_xml)
+    def rss_to_hash rss
+      Hash.from_xml(rss.to_xml)
+    end
+
+    def hash_to_item hash
       result = case
-               when value.has_key?('rss')
-                 value['rss']['channel']['item']
+               when hash.has_key?('rss')
+                 hash['rss']['channel']['item']
                when value.has_key?('feed')
-                 value['feed']['entry']
+                 hash['feed']['entry']
                end
       result ||= []
       return result if result.is_a? Array
       return [result]
     end
-
-    def new_items lhs, rhs
-      item_to_json(rhs) - item_to_json(lhs)
-    end
   end
 end

data/lib/pavlov_rss/version.rb

@@ -1,3 +1,3 @@
 module PavlovRss
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/pavlov_rss/reader_spec.rb

@@ -1,185 +1,203 @@
 require 'spec_helper'
 require 'pavlov_rss'
 require 'nokogiri'
-require 'fake_web'
 
 describe PavlovRss::Reader do
-  after do
-    FakeWeb.clean_registry
+  describe '#hash_to_item' do
+    subject { described_class.new.hash_to_item(hash) }
+
+    describe do
+      let(:hash) do
+        {'rss' => {'channel' => {'item' => []}}}
+      end
+      it { should be_empty }
+    end
+
+    describe do
+      let(:hash) do
+        {'rss' => {'channel' => {'item' =>
+          {'title' => 'title1'}
+        }}}
+      end
+      it { should have(1).item }
+    end
+
+    describe do
+      let(:hash) do
+        {'rss' => {'channel' => {'item' => [
+          {'title' => 'title1'},
+          {'title' => 'title2'},
+        ]}}}
+      end
+      it { should have(2).items }
+    end
   end
 
-  context "with an example reader" do
-    before do
-      @url = "http://example.com/rss.xml"
-      @reader = PavlovRss::Reader.new @url
-    end
-
-    describe "#check" do
-      context "with static rss" do
-        before do
-          FakeWeb.register_uri(:get, @url, body: feed('rss1.xml'))
-        end
-
-        it "returns [[]] at first time" do
-          @reader.check.should == [[]]
-        end
-
-        it "returns [[]] without changes" do
-          @reader.check
-          @reader.check.should == [[]]
-        end
-      end
-
-      it "does not return [[]] with any chagnes" do
-        FakeWeb.register_uri(:get, @url, [
-                             {body: feed('rss1.xml')},
-                             {body: feed('rss2.xml')},
-        ])
-        @reader.check
-        @reader.check.should_not == [[]]
-      end
-
-      it "returns new items" do
-        FakeWeb.register_uri(:get, @url, [
-                             {body: feed('rss0.xml')},
-                             {body: feed('rss1.xml')},
-                             {body: feed('rss2.xml')},
-                             {body: feed('rss3.xml')},
-                             {body: feed('rss4.xml')},
-                             {body: feed('rss5.xml')},
-        ])
-        @reader.check
-        @reader.check.should == [[
-          {
-          "title"=>"title1",
-          "link"=>"http://example.com/title1",
-          "description"=>"description1"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title2",
-          "link"=>"http://example.com/title2",
-          "description"=>"description2"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title3",
-          "link"=>"http://example.com/title3",
-          "description"=>"description3"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title4",
-          "link"=>"http://example.com/title4",
-          "description"=>"description4"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title5",
-          "link"=>"http://example.com/title5",
-          "description"=>"description5"
-        }]]
-        @reader.check.should == [[]]
-      end
-    end
-
-    describe "#new_items" do
-      it "returns empty with same rss" do
-        rss1 = Nokogiri.XML(feed('rss1.xml'))
-        rss2 = Nokogiri.XML(feed('rss1.xml'))
-        items = @reader.new_items rss1, rss2
-        items.should == []
-      end
-
-      it "returns empty with not same rss" do
-        rss1 = Nokogiri.XML(feed('rss1.xml'))
-        rss2 = Nokogiri.XML(feed('rss2.xml'))
-        items = @reader.new_items rss1, rss2
-
-        items.should == [
-          {
-          "title"=>"title2",
-          "link"=>"http://example.com/title2",
-          "description"=>"description2"
-        }]
-      end
-    end
-
-    describe "#item_to_json" do
-      it "works" do
-        rss = Nokogiri.XML(feed('rss1.xml'))
-        result = @reader.item_to_json rss
-        result.should == [
-          {
-          "title"=>"title1",
-          "link"=>"http://example.com/title1",
-          "description"=>"description1"
-        }]
-      end
-      it "works on 0-items rss" do
-        rss = Nokogiri.XML(feed('rss0.xml'))
-        result = @reader.item_to_json rss
-        result.should == []
-      end
-      it "works on atom" do
-        atom = Nokogiri.XML(feed('atom.xml'))
-        result = @reader.item_to_json atom
-        result.should == [{
-          "title"=>"title",
-          "id"=>"tag_string",
-          "content"=>"content"
-        }]
+  describe '#rss_to_hash' do
+    shared_examples 'hashfied rss', rss_to_hash: :works  do
+      subject { described_class.new.rss_to_hash(Nokogiri.XML(rss)) }
+      it { should == expected }
+    end
+
+    describe 'works on general rss', rss_to_hash: :works do
+      let(:rss) { feed('rss2.xml') }
+      let(:expected) do
+        {'rss'=>{'version'=>'2.0', 'channel'=>{'title'=>'title', 'link'=>'http://example.com', 'description'=>'description', 'item'=>[{'title'=>'title2', 'link'=>'http://example.com/title2', 'description'=>'description2'}, {'title'=>'title1', 'link'=>'http://example.com/title1', 'description'=>'description1'}]}}}
+      end
+    end
+
+    describe 'works on 1-item rss', rss_to_hash: :works do
+      let(:rss) { feed('rss1.xml') }
+      let(:expected) do
+        {'rss' => {'version'=>'2.0', 'channel'=>{'title'=>'title', 'link'=>'http://example.com', 'description'=>'description', 'item'=>{'title'=>'title1', 'link'=>'http://example.com/title1', 'description'=>'description1'}}}}
+      end
+    end
+
+    describe 'works on 0-item rss', rss_to_hash: :works do
+      let(:rss) { feed('rss0.xml') }
+      let(:expected) do
+        {'rss' => {'version'=>'2.0', 'channel'=>{'title'=>'title', 'link'=>'http://example.com', 'description'=>'description'}}}
+      end
+    end
+
+    describe 'works on atom', rss_to_hash: :works do
+      let(:rss) { feed('atom.xml') }
+      let(:expected) do
+        {'feed'=>{'xmlns'=>'http://www.w3.org/2005/Atom', 'entry'=>{'title'=>'title', 'id'=>'tag_string', 'content'=>'content'}}}
       end
     end
   end
 
-  context 'with a labmda' do
-    before do
-      @url = "http://example.com/rss.xml"
-      @reader = PavlovRss::Reader.new lambda { open(@url, &:read) }
-    end
-    describe '#check' do
-      it 'works' do
-        FakeWeb.register_uri(:get, @url, [
-                             {body: feed('rss0.xml')},
-                             {body: feed('rss1.xml')},
-                             {body: feed('rss2.xml')},
-                             {body: feed('rss3.xml')},
-                             {body: feed('rss4.xml')},
-                             {body: feed('rss5.xml')},
-        ])
-        @reader.check
-        @reader.check.should == [[
-          {
-          "title"=>"title1",
-          "link"=>"http://example.com/title1",
-          "description"=>"description1"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title2",
-          "link"=>"http://example.com/title2",
-          "description"=>"description2"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title3",
-          "link"=>"http://example.com/title3",
-          "description"=>"description3"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title4",
-          "link"=>"http://example.com/title4",
-          "description"=>"description4"
-        }]]
-        @reader.check.should == [[
-          {
-          "title"=>"title5",
-          "link"=>"http://example.com/title5",
-          "description"=>"description5"
-        }]]
-        @reader.check.should == [[]]
+  describe '#fetch' do
+    shared_examples 'fetched rss', fetch: :works do
+      before { subject.opener { rss } }
+      its(:fetch) { should == expected }
+    end
+
+    describe 'works with rss0.xml', fetch: :works do
+      let(:rss) { feed('rss0.xml') }
+      let(:expected) { [] }
+    end
+
+    describe 'works with rss1.xml', fetch: :works do
+      let(:rss) { feed('rss1.xml') }
+      let(:expected) do
+        [
+          {"title"=>"title1", "link"=>"http://example.com/title1", "description"=>"description1"},
+        ]
+      end
+    end
+
+    describe 'works with rss2.xml', fetch: :works do
+      let(:rss) { feed('rss2.xml') }
+      let(:expected) do
+        [
+          {"title"=>"title2", "link"=>"http://example.com/title2", "description"=>"description2"},
+          {"title"=>"title1", "link"=>"http://example.com/title1", "description"=>"description1"},
+        ]
+      end
+    end
+
+    describe 'works with rss3.xml', fetch: :works do
+      let(:rss) { feed('rss3.xml') }
+      let(:expected) do
+        [
+          {"title"=>"title3", "link"=>"http://example.com/title3", "description"=>"description3"},
+          {"title"=>"title2", "link"=>"http://example.com/title2", "description"=>"description2"},
+          {"title"=>"title1", "link"=>"http://example.com/title1", "description"=>"description1"},
+        ]
+      end
+    end
+
+    describe 'works with rss4.xml', fetch: :works do
+      let(:rss) { feed('rss4.xml') }
+      let(:expected) do
+        [
+          {"title"=>"title4", "link"=>"http://example.com/title4", "description"=>"description4"},
+          {"title"=>"title3", "link"=>"http://example.com/title3", "description"=>"description3"},
+          {"title"=>"title2", "link"=>"http://example.com/title2", "description"=>"description2"},
+        ]
+      end
+    end
+
+    describe 'works with rss5.xml', fetch: :works do
+      let(:rss) { feed('rss5.xml') }
+      let(:expected) do
+        [
+          {"title"=>"title5", "link"=>"http://example.com/title5", "description"=>"description5"},
+          {"title"=>"title4", "link"=>"http://example.com/title4", "description"=>"description4"},
+          {"title"=>"title3", "link"=>"http://example.com/title3", "description"=>"description3"},
+        ]
+      end
+    end
+  end
+
+  describe '#check' do
+    shared_examples 'check works', check: :works do
+      before do
+        subject.stub(:fetch).and_return(*fetches)
+        subject.check.should be_empty
+      end
+      its(:check) { should == expected }
+    end
+
+    describe 'works with empty items', check: :works do
+      let(:fetches) { [[], []] }
+      let(:expected) { [] }
+    end
+
+    describe 'works with same items', check: :works do
+      let(:fetches) do
+        [
+          [{'title' => '1'}],
+          [{'title' => '1'}],
+        ]
+      end
+      let(:expected) { [] }
+    end
+
+    describe 'works with added items', check: :works do
+      let(:fetches) do
+        [
+          [],
+          [{'title' => '1'}],
+        ]
+      end
+      let(:expected) { [{'title' => '1'}] }
+    end
+
+    describe 'works with removed items', check: :works do
+      let(:fetches) do
+        [
+          [{'title' => '1'}],
+          [],
+        ]
+      end
+      let(:expected) { [] }
+    end
+
+    describe 'works with various items', check: :works do
+      let(:fetches) do
+        [
+          [
+            {'title' => 'static1'},
+            {'title' => 'static2'},
+            {'title' => 'remove1'},
+            {'title' => 'remove2'},
+          ],
+          [
+            {'title' => 'static1'},
+            {'title' => 'static2'},
+            {'title' => 'add1'},
+            {'title' => 'add2'},
+          ],
+        ]
+      end
+      let(:expected) do
+        [
+          {'title' => 'add1'},
+          {'title' => 'add2'},
+        ]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pavlov_rss
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Minwoo Lee
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri