technicalpickles-feedra 0.0.2 → 0.1.1

data/.gitignore

@@ -3,3 +3,5 @@
 coverage
 rdoc
 pkg
+spec/*.log
+spec/migrate/*

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.1

data/feedra.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{feedra}
-  s.version = "0.0.2"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nichols"]
-  s.date = %q{2009-05-26}
+  s.date = %q{2009-07-29}
   s.email = %q{josh@technicalpickles.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -29,26 +29,31 @@ Gem::Specification.new do |s|
      "lib/feedra/entry.rb",
      "lib/feedra/extensions/feedzirra.rb",
      "lib/feedra/feed.rb",
-     "spec/feedra_spec.rb",
+     "lib/feedra/feed_error.rb",
+     "lib/summifire.rb",
+     "spec/entry_spec.rb",
+     "spec/feed_error_spec.rb",
+     "spec/feed_spec.rb",
      "spec/spec_helper.rb",
      "spec/summifire_spec.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/technicalpickles/feedra}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{pickles}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.4}
   s.summary = %q{Simple feed aggregation for Rails.}
   s.test_files = [
-    "spec/feedra_spec.rb",
+    "spec/entry_spec.rb",
+     "spec/feed_error_spec.rb",
+     "spec/feed_spec.rb",
      "spec/spec_helper.rb",
      "spec/summifire_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<pauldix-feedzirra>, [">= 0"])

data/generators/feedra/templates/feed_error.rb

@@ -1,2 +1,3 @@
 class FeedError < ActiveRecord::Base
+  include Feedra::FeedError
 end

data/generators/feedra/templates/migration.rb

@@ -6,7 +6,7 @@ class CreateFeedAndEvents < ActiveRecord::Migration
       t.string :etag
       t.time :last_modified_at
       t.string :feed_url
-      t.time :stale_at
+      t.datetime :stale_at
 
       t.timestamps
     end

data/lib/feedra.rb

@@ -1,5 +1,19 @@
-require 'feedzirra'
+if defined? Rails.configuration
+  config = Rails.configuration
 
-require 'feedra/feed'
+  config.gem 'taf2-curb', :lib => 'curb', :version => '0.2.8.0' # feezirra would normally depend on this, but doesn't depend a working it works with
+  config.gem 'pauldix-feedzirra', :lib => 'feedzirra', :source => 'http://gems.github.com'
+else
+  gem 'taf2-curb', '= 0.2.8.0'
+  gem 'pauldix-feedzirra'
+
+  require 'curb'
+  require 'feedzirra'
+end
+
+
+require 'summifire'
 require 'feedra/entry'
+require 'feedra/feed'
+require 'feedra/feed_error'
 require 'feedra/extensions/feedzirra'

data/lib/feedra/entry.rb

@@ -3,6 +3,7 @@ module Feedra
     
     def self.included(other)
       other.class_eval do
+        extend ClassMethods
         validates_presence_of :checksum
         belongs_to :feed
       end
@@ -18,5 +19,12 @@ module Feedra
       Summifire.new(self.summary, self.content).to_s(options)
     end
 
+    module ClassMethods
+      def find_by_feedzirra_entry(feedzirra_entry)
+        find_by_title_and_url(feedzirra_entry.title, feedzirra_entry.url)
+      end
+
+    end
+
   end
 end

data/lib/feedra/feed.rb

@@ -12,17 +12,19 @@ module Feedra
         has_many :feed_errors
         named_scope :stale, lambda {{ :conditions => ['stale_at < ? OR stale_at IS NULL', Time.now] }}
         
-        before_create :populate_metadata_from_feed
+        #before_create :populate_metadata_from_feed
         before_validation :normalize_feed_url 
       end
     end
 
     def create_feed_error_from_exception(ex)
-      case ex
-      when Fixnum, nil
-        self.feed_errors.create :error_type => ex.class.to_s, :message => ex.to_s
-      else
-        self.feed_errors.create :error_type => ex.class.to_s, :message => ex.message, :trace => ex.backtrace
+      self.feed_errors.create_from_feedzirra_error(ex)
+    end
+
+    def create_entries_from_feedzirra_entries(feedzirra_entries)
+      feedzirra_entries.each do |entry|
+        entry_attributes = build_entry_attributes(entry.attributes)
+        entries.create!(entry_attributes) unless entries.find_by_feedzirra_entry(entry)
       end
     end
 
@@ -57,16 +59,16 @@ module Feedra
         else
           feedzirra_feed.sanitize_entries!
 
-          feedzirra_feed.entries.each do |entry|
-            entry_attributes = build_entry_attributes(entry.attributes)
-            entries.create!(entry_attributes) unless entries.find_by_checksum(entry.checksum)
-          end
+          create_entries_from_feedzirra_entries(feedzirra_feed.entries)
         end
+      rescue NoMethodError
+        raise
       rescue Exception => ex
         create_feed_error_from_exception(ex)
       end
     end
 
+    # hook, in case you need to add anything extra
     def build_entry_attributes(attributes)
       attributes
     end

data/lib/feedra/feed_error.rb

@@ -0,0 +1,30 @@
+module Feedra
+  module FeedError
+
+    def self.included(other)
+      other.class_eval do
+        extend ClassMethods
+      end
+    end
+
+    module ClassMethods
+      def create_from_feedzirra_error(feedzirra_error)
+        attributes = {:error_type => feedzirra_error.class.to_s}
+
+        attributes[:message] = if feedzirra_error.respond_to?(:message)
+                                 feedzirra_error.message
+                               else
+                                 feedzirra_error.inspect
+                               end
+        if feedzirra_error.respond_to?(:backtrace)
+          attributes[:backtrace] = feedzirra_error.backtrace
+        end
+
+        create(attributes)
+      end
+
+    end
+
+  end
+end
+

data/lib/summifire.rb

@@ -0,0 +1,13 @@
+class Summifire
+
+  attr_accessor :summary, :content
+  def initialize(summary, content)
+    @summary = summary
+    @content = content
+  end
+
+  def to_s(options = {})
+    @summary.present? ? @summary : @content
+  end
+
+end

data/spec/entry_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Entry do
+
+  describe "find_by_feedzirra_entry" do
+
+    it "should return a entry found by title and url" do
+      feedzirra_entry = "feedzirra entry"
+      stub(feedzirra_entry).title { "zomg" }
+      stub(feedzirra_entry).url { "http://example.com/zomg" }
+
+      entry = "entry"
+      mock(Entry).find(:first, :conditions => {:title => "zomg", :url => "http://example.com/zomg"}) { entry }
+
+      Entry.find_by_feedzirra_entry(feedzirra_entry).should == entry
+    end
+
+  end
+
+end

data/spec/feed_error_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe FeedError do
+  describe "create_from_feedzirra_error" do
+    it "should work from a Fixnum" do
+      expected_attributes = {:error_type => "Fixnum", :message => "404"}
+
+      mock(FeedError).create(expected_attributes)
+
+      FeedError.create_from_feedzirra_error(404)
+    end
+    
+    it "should work from nil" do
+      expected_attributes = {:error_type => "NilClass", :message => "nil"}
+
+      mock(FeedError).create(expected_attributes)
+
+      FeedError.create_from_feedzirra_error(nil)
+    end
+
+    it "should work from an RuntimeError or otherwise" do
+      expected_attributes = {:error_type => "RuntimeError", :message => "zomg", :backtrace => "somebacktrace"}
+
+      mock(FeedError).create(expected_attributes)
+
+      feedzirra_error = RuntimeError.new
+      stub(feedzirra_error).backtrace { "somebacktrace" }
+      stub(feedzirra_error).message { "zomg" }
+      FeedError.create_from_feedzirra_error(feedzirra_error)
+    end
+
+  end
+end

data/spec/feed_spec.rb

@@ -0,0 +1,84 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Feed do
+  it { should validate_presence_of(:feed_url) }
+  it { should have_many(:entries).dependent(:destroy) }
+  it { should have_many(:feed_errors) }
+
+  describe "normalize_feed_url" do
+    it "should prepend http if feed_url is missing it" do
+      feed = Feed.new(:feed_url => 'example.com/atom')
+
+      feed.normalize_feed_url
+
+      feed.feed_url_changed?.should be_true
+      feed.feed_url.should == 'http://example.com/atom'
+    end
+
+    it "should not change if feed_url is nil" do
+      feed = Feed.new(:feed_url => nil)
+
+      feed.normalize_feed_url
+
+      feed.feed_url.should == nil
+    end
+
+    it "should not change if feed_url is a empty string" do
+      feed = Feed.new(:feed_url => "")
+
+      feed.normalize_feed_url
+
+      feed.feed_url.should == ""
+    end
+  end
+
+  describe "fetch!" do
+    it "should create a feed error if feedzirra returns a number" do
+      feed = Feed.new(:feed_url => 'http://example.com/atom')
+
+      stub(Feedzirra::Feed).fetch_and_parse('http://example.com/atom') { 404 }
+
+      mock(feed).create_feed_error_from_exception(404)
+
+      feed.fetch!
+    end
+
+    it "should create a feed error if feedzirra returns nil" do
+      feed = Feed.new(:feed_url => 'http://example.com/atom')
+
+      stub(Feedzirra::Feed).fetch_and_parse('http://example.com/atom') { nil }
+
+      mock(feed).create_feed_error_from_exception(nil)
+
+      feed.fetch!
+    end
+
+    it "should create a feed error if feedzirra raises an error" do
+      feed = Feed.new(:feed_url => 'http://example.com/atom')
+
+      error = RuntimeError.new("zomg")
+      stub(Feedzirra::Feed).fetch_and_parse('http://example.com/atom') { raise error }
+
+      mock(feed).create_feed_error_from_exception(error)
+
+      feed.fetch!
+    end
+
+    it "should create entries from feedzirra entries" do
+      feed = Feed.new(:feed_url => 'http://example.com/atom')
+
+      feedzirra_feed = "fake feed"
+      feedzirra_entries = "fake entries"
+      stub(feedzirra_feed).entries { feedzirra_entries }
+
+      stub(Feedzirra::Feed).fetch_and_parse('http://example.com/atom') { feedzirra_feed }
+
+      mock(feedzirra_feed).sanitize_entries!
+
+      mock(feed).create_entries_from_feedzirra_entries(feedzirra_entries)
+
+      feed.fetch!
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,9 +1,49 @@
-require 'spec'
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+
+here = File.dirname(__FILE__)
+$LOAD_PATH.unshift here
+$LOAD_PATH.unshift "#{here}/../lib"
+
+require 'activerecord'
+
 require 'feedra'
 
+ActiveRecord::Migration.verbose = false
+RAILS_ENV = 'test'
+RAILS_ROOT = here
+RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/test.log") 
+
+require 'spec'
+require 'shoulda/active_record/matchers'
+
+class Feed < ActiveRecord::Base
+  include Feedra::Feed
+end
+
+class Entry < ActiveRecord::Base
+  include Feedra::Entry
+end
+
+class FeedError < ActiveRecord::Base
+  include Feedra::FeedError
+end
+
+require 'shoulda'
 Spec::Runner.configure do |config|
+  config.mock_with :rr
+  
+  config.include(Shoulda::ActiveRecord::Matchers)
+
+  config.before(:all) do
+    FileUtils.mkdir_p "#{here}/migrate"
+    FileUtils.cp "#{here}/../generators/feedra/templates/migration.rb", "#{here}/migrate/001_create_feed_and_events.rb"
+
+    ActiveRecord::Base.logger = Logger.new("#{here}/activerecord_base.log")
+
+    ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
+                                            :database => ':memory:'
+    
+    ActiveRecord::Migrator.migrate "#{here}/migrate"
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: technicalpickles-feedra
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors: 
 - Josh Nichols
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -07:00
+date: 2009-07-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,11 +48,16 @@ files:
 - lib/feedra/entry.rb
 - lib/feedra/extensions/feedzirra.rb
 - lib/feedra/feed.rb
-- spec/feedra_spec.rb
+- lib/feedra/feed_error.rb
+- lib/summifire.rb
+- spec/entry_spec.rb
+- spec/feed_error_spec.rb
+- spec/feed_spec.rb
 - spec/spec_helper.rb
 - spec/summifire_spec.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/technicalpickles/feedra
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -73,11 +78,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pickles
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Simple feed aggregation for Rails.
 test_files: 
-- spec/feedra_spec.rb
+- spec/entry_spec.rb
+- spec/feed_error_spec.rb
+- spec/feed_spec.rb
 - spec/spec_helper.rb
 - spec/summifire_spec.rb

data/spec/feedra_spec.rb

@@ -1,7 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "Feedra" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
-  end
-end