feedjira 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8f1b7fbf212aa429ee26e857cc641194c22584e
-  data.tar.gz: 78b69c9bf960dc288d750f339d0a36d009ec139e
+  metadata.gz: 6a95a55c16d70ffd628b86e4063a4a6bd5507451
+  data.tar.gz: e8b27d65d8e3734db3de73d85d0793f9c4aaba84
 SHA512:
-  metadata.gz: f7e75a6f8f4d421254fcf232168a6cb83da5fce3d06c61a3beccb3c0cb8747dbd37621762cf3185b8d06ac4e80f694586ef88e75f8e41138d4e5756dc53abc77
-  data.tar.gz: ed92126d6de4bacd62b6d179b90f2bd6df912838b6656f4f59ed7306d18fc2c2bbe2cade112b50439a621812d54bb04117a30f2c5c18dde9b26b49c06a2a5c21
+  metadata.gz: 30e378d04980d3d60e21fbb2dddeb64c5db9dac7c83e0927fb7c6220201f86873432c738b7936c9dff5b00e1e19f782a8844a11225411891a3527b9ecc2494f6
+  data.tar.gz: 59f3590bea5343fa5e619d711e67e34ba8b33490b7d12a96bf456bcbe506e087ddac1662ced445e4ce8b779cb011496e22086fd951874c8b0468290a5ae17906

data/.gitignore

@@ -1,14 +1,7 @@
-.DS_Store
-.rvmrc
-.ruby-version
+.bundle
 .ruby-gemset
-TODO
+.ruby-version
 Gemfile.lock
-rdoc/
 doc/
 pkg/
-coverage/
-.rbx
-.bundle
-*.swp
-*.swo
+rdoc/

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 bundler_args: --without tools
 
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
+  - 2.1.0
   - rbx

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Feedjira Changelog
 
+## 1.1.0
+
+* General
+  * Add 2.1 to list of supported Rubies, drop 1.9.2
+  * Remove Guard and Simplecov
+  * Extract sample feeds into RSpec helper module
+  * Random cleanup
+  * Quiet down default rake task
+  * Fix CHANGELOG links
+  * Point README at new site
+
+* Enhancements
+  * Add language setting to curl options [#206][]
+
+[#206]: https://github.com/feedjira/feedjira/pull/206
+
 ## 1.0.0
 
 * Removed deprecated features
@@ -11,44 +27,44 @@
 ## 0.7.1
 
 * Bugfix
-  * Don't use entry id for updating when feed doesn't provide it [[#205][]]
+  * Don't use entry id for updating when feed doesn't provide it [#205][]
 
-[#205]: https://github.com/pauldix/feedzirra/pull/205
+[#205]: https://github.com/feedjira/feedjira/pull/205
 
 ## 0.7.0
 
 * General
-  * README update for callback arity [[#202][]]
+  * README update for callback arity [#202][]
 
 * Enhancements
-  * Add error info to `on_failure` callback [[#194][]]
+  * Add error info to `on_failure` callback [#194][]
   * On failure callbacks get curl and error as args
-  * Bugfix for parsing dates that are ISO 8601 with milliseconds [[#203][]]
+  * Bugfix for parsing dates that are ISO 8601 with milliseconds [#203][]
 
-[#194]: https://github.com/pauldix/feedzirra/pull/194
-[#202]: https://github.com/pauldix/feedzirra/pull/202
-[#203]: https://github.com/pauldix/feedzirra/pull/203
+[#194]: https://github.com/feedjira/feedjira/pull/194
+[#202]: https://github.com/feedjira/feedjira/pull/202
+[#203]: https://github.com/feedjira/feedjira/pull/203
 
 ## 0.6.0
 
 * General
-  * Update expected parser classes in docs [[#200][]]
+  * Update expected parser classes in docs [#200][]
   * Fix Rubinius issue with Travis
 
 * Enhancements
-  * Added content to `itunes_rss_item` [[#198][]]
+  * Added content to `itunes_rss_item` [#198][]
   * Allow user to pass a particular parser using `parse_with`
-  * Strip leading whitespace from XML [[#196][]]
-  * Parse out RSS version [[#172][]]
+  * Strip leading whitespace from XML [#196][]
+  * Parse out RSS version [#172][]
   * Add generic preprocessing hook for Parsers
-  * Add preprocessing hook for Atom XHTML content [[#58][]] [[#130][]]
+  * Add preprocessing hook for Atom XHTML content [#58][] [#130][]
 
-[#58]: https://github.com/pauldix/feedzirra/pull/58
-[#130]: https://github.com/pauldix/feedzirra/issues/130
-[#172]: https://github.com/pauldix/feedzirra/issues/172
-[#196]: https://github.com/pauldix/feedzirra/pull/196
-[#198]: https://github.com/pauldix/feedzirra/pull/198
-[#200]: https://github.com/pauldix/feedzirra/pull/200
+[#58]: https://github.com/feedjira/feedjira/pull/58
+[#130]: https://github.com/feedjira/feedjira/issues/130
+[#172]: https://github.com/feedjira/feedjira/issues/172
+[#196]: https://github.com/feedjira/feedjira/pull/196
+[#198]: https://github.com/feedjira/feedjira/pull/198
+[#200]: https://github.com/feedjira/feedjira/pull/200
 
 ## 0.5.0
 
@@ -59,45 +75,45 @@
   * Upgrade to latest Rspec
 
 * Enhancements
-  * Allow spaces in rss tag when checking parse-ability [[#127][]]
-  * Compare `entry_id` and `url` for finding new entries [[#195][]]
-  * Add closed captioned and order tags for iTunesRSSItem [[#160][]]
+  * Allow spaces in rss tag when checking parse-ability [#127][]
+  * Compare `entry_id` and `url` for finding new entries [#195][]
+  * Add closed captioned and order tags for iTunesRSSItem [#160][]
 
-[#127]: https://github.com/pauldix/feedzirra/pull/127
-[#160]: https://github.com/pauldix/feedzirra/pull/160
-[#195]: https://github.com/pauldix/feedzirra/pull/195
+[#127]: https://github.com/feedjira/feedjira/pull/127
+[#160]: https://github.com/feedjira/feedjira/pull/160
+[#195]: https://github.com/feedjira/feedjira/pull/195
 
 ## 0.4.0
 
 * Enhancements
-  * Raise when parser invokes its failure callback [[#159][]]
-  * Add PubSubHubbub hub urls as feed element [[#138][]]
-  * Add support for iTunes image in iTunes RSS item [[#164][]]
+  * Raise when parser invokes its failure callback [#159][]
+  * Add PubSubHubbub hub urls as feed element [#138][]
+  * Add support for iTunes image in iTunes RSS item [#164][]
 
 * Bug fixes
-  * Use curb callbacks rather than response codes [[#161][]]
+  * Use curb callbacks rather than response codes [#161][]
 
-[#138]: https://github.com/pauldix/feedzirra/pull/138
-[#159]: https://github.com/pauldix/feedzirra/issues/159
-[#161]: https://github.com/pauldix/feedzirra/pull/161
-[#164]: https://github.com/pauldix/feedzirra/pull/164
+[#138]: https://github.com/feedjira/feedjira/pull/138
+[#159]: https://github.com/feedjira/feedjira/issues/159
+[#161]: https://github.com/feedjira/feedjira/pull/161
+[#164]: https://github.com/feedjira/feedjira/pull/164
 
 ## 0.3.0
 
 * General
-  * Add CodeClimate badge [[#192][]]
+  * Add CodeClimate badge [#192][]
 
 * Enhancements
-  * CURL SSL Version option [[#156][]]
-  * Cookie support for Curb [[#98][]]
+  * CURL SSL Version option [#156][]
+  * Cookie support for Curb [#98][]
 
 * Deprecations
-  * For `ITunesRSSItem`, use `id` instead of `guid` [[#169][]]
+  * For `ITunesRSSItem`, use `id` instead of `guid` [#169][]
 
-[#98]: https://github.com/pauldix/feedzirra/pull/98
-[#156]: https://github.com/pauldix/feedzirra/pull/156
-[#169]: https://github.com/pauldix/feedzirra/pull/169
-[#192]: https://github.com/pauldix/feedzirra/pull/192
+[#98]: https://github.com/feedjira/feedjira/pull/98
+[#156]: https://github.com/feedjira/feedjira/pull/156
+[#169]: https://github.com/feedjira/feedjira/pull/169
+[#192]: https://github.com/feedjira/feedjira/pull/192
 
 ## 0.2.2
 
@@ -108,35 +124,35 @@
   * README updates
 
 * Enhancements
-  * Also use dc:identifier for `entry_id` [[#182][]]
+  * Also use dc:identifier for `entry_id` [#182][]
 
 * Bug fixes
-  * Don't try to sanitize non-existent elements [[#174][]]
-  * Fix Rspec deprecations [[#188][]]
-  * Fix Travis [[#191][]]
+  * Don't try to sanitize non-existent elements [#174][]
+  * Fix Rspec deprecations [#188][]
+  * Fix Travis [#191][]
 
-[#174]: https://github.com/pauldix/feedzirra/pull/174
-[#182]: https://github.com/pauldix/feedzirra/pull/182
-[#188]: https://github.com/pauldix/feedzirra/pull/188
-[#191]: https://github.com/pauldix/feedzirra/pull/191
+[#174]: https://github.com/feedjira/feedjira/pull/174
+[#182]: https://github.com/feedjira/feedjira/pull/182
+[#188]: https://github.com/feedjira/feedjira/pull/188
+[#191]: https://github.com/feedjira/feedjira/pull/191
 
 ## 0.2.1
 
-* Use `Time.parse_safely` in `Feed.last_modified_from_header` [[#129][]].
-* Added image to the RSS Entry Parser [[#103][]].
-* Compatibility fixes for Ruby 2.0 [[#136][]].
-* Remove gorillib dependency [[#113][]].
+* Use `Time.parse_safely` in `Feed.last_modified_from_header` [#129][]
+* Added image to the RSS Entry Parser [#103][]
+* Compatibility fixes for Ruby 2.0 [#136][]
+* Remove gorillib dependency [#113][]
 
-[#103]: https://github.com/pauldix/feedzirra/pull/103
-[#113]: https://github.com/pauldix/feedzirra/pull/113
-[#129]: https://github.com/pauldix/feedzirra/pull/129
-[#136]: https://github.com/pauldix/feedzirra/pull/136
+[#103]: https://github.com/feedjira/feedjira/pull/103
+[#113]: https://github.com/feedjira/feedjira/pull/113
+[#129]: https://github.com/feedjira/feedjira/pull/129
+[#136]: https://github.com/feedjira/feedjira/pull/136
 
 ## 0.2.0.rc2
 
-* Bump sax-machine to `v0.2.0.rc1`, fixes encoding issues [[#76][]].
+* Bump sax-machine to `v0.2.0.rc1`, fixes encoding issues [#76][]
 
-[#76]: https://github.com/pauldix/feedzirra/issues/76
+[#76]: https://github.com/feedjira/feedjira/issues/76
 
 ## 0.2.0.rc1
 
@@ -147,7 +163,7 @@
 * Add Travis-CI integration
 * General repository and gem maintenance
 
-[3008ceb]: https://github.com/pauldix/feedzirra/commit/3008ceb338df1f4c37a211d0aab8a6ad4f584dbc
+[3008ceb]: https://github.com/feedjira/feedjira/commit/3008ceb338df1f4c37a211d0aab8a6ad4f584dbc
 
 ## 0.1.3
 

data/Gemfile

@@ -2,13 +2,10 @@ source 'https://rubygems.org/'
 
 gemspec
 
-group :development, :test do
-  gem 'rake'
-end
+gem 'pry'
 
-group :tools do
-  gem 'guard-rspec'
-  gem 'simplecov', :require => false, :platforms => :mri_19
+group :test do
+  gem 'rake'
 end
 
 platforms :rbx do

data/LICENSE

@@ -0,0 +1,26 @@
+The MIT License (MIT)
+
+Copyright (c) 2009-2014:
+
+- Paul Dix
+- Julien Kirch
+- Ezekiel Templin
+- Jon Allured
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -1,242 +1,14 @@
 # Feedjira [![Build Status][travis-badge]][travis] [![Code Climate][code-climate-badge]][code-climate]
 
-[travis-badge]: https://secure.travis-ci.org/feedjira/feedjira.png
+[travis-badge]: https://travis-ci.org/feedjira/feedjira.png
 [travis]: http://travis-ci.org/feedjira/feedjira
 [code-climate-badge]: https://codeclimate.com/github/feedjira/feedjira.png
 [code-climate]: https://codeclimate.com/github/feedjira/feedjira
 
-I'd like feedback on the api and any bugs encountered on feeds in the wild. I've
-set up a [google group][].
+Feedjira (formerly Feedzilla) is a Ruby library designed to fetch and parse
+feeds as quickly as possible. Version 1.0 was recently released and with it an
+[awesome new website][f].
 
-[google group]: http://groups.google.com/group/feedjira
+[f]: http://feedjira.com
 
-## Description
-
-Feedjira is a feed library that is designed to get and update many feeds as
-quickly as possible. This includes using libcurl-multi through the [curb][] gem
-for faster http gets, and libxml through [nokogiri][] and [sax-machine][] for
-faster parsing.  Feedjira requires at least Ruby 1.9.2.
-
-[curb]: https://github.com/taf2/curb
-[nokogiri]: https://github.com/sparklemotion/nokogiri
-[sax-machine]: https://github.com/pauldix/sax-machine
-
-Once you have fetched feeds using Feedjira, they can be updated using the feed
-objects. Feedjira automatically inserts etag and last-modified information from
-the http response headers to lower bandwidth usage, eliminate unnecessary
-parsing, and make things speedier in general.
-
-Another feature present in Feedjira is the ability to create callback functions
-that get called "on success" and "on failure" when getting a feed. This makes it
-easy to do things like log errors or update data stores.
-
-The fetching and parsing logic have been decoupled so that either of them can be
-used in isolation if you'd prefer not to use everything that Feedjira offers.
-However, the code examples below use helper methods in the Feed class that put
-everything together to make things as simple as possible.
-
-The final feature of Feedjira is the ability to define custom parsing classes.
-In truth, Feedjira could be used to parse much more than feeds. Microformats,
-page scraping, and almost anything else are fair game.
-
-## Speedup date parsing
-
-In MRI before 1.9.3 the date parsing code was written in Ruby and was optimized
-for readability over speed, to speed up this part you can install the
-[home_run][] gem to replace it with an optimized C version. In most cases, if
-you are using Ruby 1.9.3+, you will not need to use home\_run.
-
-[home_run]: https://github.com/jeremyevans/home_run
-
-## Usage
-
-[A gist of the following code](http://gist.github.com/57285)
-
-```ruby
-require 'feedjira'
-
-# fetching a single feed
-feed = Feedjira::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing")
-
-# feed and entries accessors
-feed.title          # => "Paul Dix Explains Nothing"
-feed.url            # => "http://www.pauldix.net"
-feed.feed_url       # => "http://feeds.feedburner.com/PaulDixExplainsNothing"
-feed.etag           # => "GunxqnEP4NeYhrqq9TyVKTuDnh0"
-feed.last_modified  # => Sat Jan 31 17:58:16 -0500 2009 # it's a Time object
-
-entry = feed.entries.first
-entry.title      # => "Ruby Http Client Library Performance"
-entry.url        # => "http://www.pauldix.net/2009/01/ruby-http-client-library-performance.html"
-entry.author     # => "Paul Dix"
-entry.summary    # => "..."
-entry.content    # => "..."
-entry.published  # => Thu Jan 29 17:00:19 UTC 2009 # it's a Time object
-entry.categories # => ["...", "..."]
-
-# sanitizing an entry's content
-entry.title.sanitize    # => returns the title with harmful stuff escaped
-entry.author.sanitize   # => returns the author with harmful stuff escaped
-entry.content.sanitize  # => returns the content with harmful stuff escaped
-entry.content.sanitize! # => returns content with harmful stuff escaped and replaces original (also exists for author and title)
-entry.sanitize!         # => sanitizes the entry's title, author, and content in place (as in, it changes the value to clean versions)
-feed.sanitize_entries!  # => sanitizes all entries in place
-
-# updating a single feed
-updated_feed = Feedjira::Feed.update(feed)
-
-# an updated feed has the following extra accessors
-updated_feed.updated?     # returns true if any of the feed attributes have been modified. will return false if no new entries
-updated_feed.new_entries  # a collection of the entry objects that are newer than the latest in the feed before update
-
-# fetching multiple feeds
-feed_urls = ["http://feeds.feedburner.com/PaulDixExplainsNothing", "http://feeds.feedburner.com/trottercashion"]
-feeds = Feedjira::Feed.fetch_and_parse(feed_urls)
-
-# feeds is now a hash with the feed_urls as keys and the parsed feed objects as values. If an error was thrown
-# there will be a Fixnum of the http response code instead of a feed object
-
-# updating multiple feeds. it expects a collection of feed objects
-updated_feeds = Feedjira::Feed.update(feeds.values)
-
-# defining custom behavior on failure or success. note that a return status of 304 (not updated) will call the on_success handler
-feed = Feedjira::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing",
-	:on_success => lambda {|url, feed| puts feed.title },
-	:on_failure => lambda {|curl, error| puts error })
-
-# if a collection was passed into fetch_and_parse, the handlers will be called for each one
-
-# the behavior for the handlers when using Feedjira::Feed.update is slightly different. The feed passed into on_success will be
-# the updated feed with the standard updated accessors. on failure it will be the original feed object passed into update
-
-# fetching a feed via a proxy (optional)
-feed = Feedjira::Feed.fetch_and_parse("http://feeds.feedburner.com/PaulDixExplainsNothing", {:proxy_url => '10.0.0.1', :proxy_port => 3084})
-```
-
-## Extending
-
-### Adding a feed parsing class
-
-When determining which parser to use for a given XML document, the following
-list of parser classes is used:
-
-* `Feedjira::Parser::RSSFeedBurner`
-* `Feedjira::Parser::GoogleDocsAtom`
-* `Feedjira::Parser::AtomFeedBurner`
-* `Feedjira::Parser::Atom`
-* `Feedjira::Parser::ITunesRSS`
-* `Feedjira::Parser::RSS`
-
-You can insert your own parser at the front of this stack by calling
-`add_feed_class`, like this:
-
-```ruby
-Feedjira::Feed.add_feed_class MyAwesomeParser
-```
-
-Now when you `fetch_and_parse`, `MyAwesomeParser` will be the first one to get a
-chance to parse the feed.
-
-If you have the XML and just want to provide a parser class for one parse, you
-can specify that using `parse_with`:
-
-```ruby
-Feedjira::Feed.parse_with MyAwesomeParser, xml
-```
-
-### Adding attributes to all feeds types / all entries types
-
-```ruby
-# Add the generator attribute to all feed types
-Feedjira::Feed.add_common_feed_element('generator')
-Feedjira::Feed.fetch_and_parse("href="http://www.pauldix.net/atom.xml").generator # => 'TypePad'
-
-# Add some GeoRss information
-Feedjira::Feed.add_common_feed_entry_element('geo:lat', :as => :lat)
-Feedjira::Feed.fetch_and_parse("http://www.earthpublisher.com/georss.php").entries.each do |e|
-  p "lat: #[e.lat}, long: #{e.long]"
-end
-```
-
-### Adding attributes to only one class
-
-If you want to add attributes for only one class you simply have to declare them
-in the class
-
-```ruby
-# Add some GeoRss information
-require 'lib/feedjira/parser/rss_entry'
-
-class Feedjira::Parser::RSSEntry
-  element 'geo:lat', :as => :lat
-  element 'geo:long', :as => :long
-end
-
-# Fetch a feed containing GeoRss info and print them
-Feedjira::Feed.fetch_and_parse("http://www.earthpublisher.com/georss.php").entries.each do |e|
-  p "lat: #{e.lat}, long: #{e.long}"
-end
-```
-
-## Testing
-
-Feedjira uses [curb][] to perform requests. `curb` provides bindings for
-[libcurl][] and supports numerous protocols, including FILE. To test Feedjira
-with local file use `file://` protocol:
-
-[libcurl]: http://curl.haxx.se/libcurl/
-
-```ruby
-feed = Feedjira::Feed.fetch_and_parse('file:///home/feedjira/examples/feed.rss')
-```
-
-## Benchmarks
-
-Since a major goal of Feedjira is speed, benchmarks are provided--see the
-[Benchmark README][benchmark_readme] for more details.
-
-[benchmark_readme]: https://github.com/feedjira/feedjira/blob/master/benchmarks/README.md
-
-## TODO
-
-This thing needs to hammer on many different feeds in the wild. I'm sure there
-will be bugs. I want to find them and crush them. I didn't bother using the test
-suite for feedparser. i wanted to start fresh.
-
-Here are some more specific TODOs.
-
-* Make a feedjira-rails gem to integrate feedjira seamlessly with Rails and ActiveRecord.
-* Add support for authenticated feeds.
-* Create a super sweet DSL for defining new parsers.
-* I'm not keeping track of modified on entries. Should I add this?
-* Clean up the fetching code inside feed.rb so it doesn't suck so hard.
-* Make the feed_spec actually mock stuff out so it doesn't hit the net.
-* Readdress how feeds determine if they can parse a document. Maybe I should use namespaces instead?
-
-## LICENSE
-
-(The MIT License)
-
-Copyright (c) 2009-2013:
-
-- [Paul Dix](http://pauldix.net)
-- [Julien Kirch](http://archiloque.net/)
-- [Ezekiel Templin](http://zeke.templ.in/)
-- [Jon Allured](http://jonallured.com/)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the 'Software'), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+There you'll find documentation, examples, announcements and more.

data/Rakefile

@@ -1,6 +1,7 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec)
-task :test => :spec
-task :default => :test
+
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.verbose = false
+end
+
+task default: :spec

data/lib/feedjira/feed.rb

@@ -136,6 +136,7 @@ module Feedjira
     # Setup curl from options.
     # Possible parameters:
     # * :user_agent          - overrides the default user agent.
+    # * :language            - accept language value.
     # * :compress            - any value to enable compression
     # * :enable_cookies      - boolean
     # * :cookiefile          - file to read cookies
@@ -151,6 +152,7 @@ module Feedjira
     def self.setup_easy(curl, options={})
       curl.headers["Accept-encoding"]   = 'gzip, deflate' if options.has_key?(:compress)
       curl.headers["User-Agent"]        = (options[:user_agent] || USER_AGENT)
+      curl.headers["Accept-Language"]   = options[:language] if options.has_key?(:language)
       curl.enable_cookies               = options[:enable_cookies] if options.has_key?(:enable_cookies)
       curl.cookiefile                   = options[:cookiefile] if options.has_key?(:cookiefile)
       curl.cookies                      = options[:cookies] if options.has_key?(:cookies)

data/lib/feedjira/parser.rb

@@ -1,20 +1 @@
-module Feedjira
-  module Parser
-    autoload :RSS,                'feedjira/parser/rss'
-    autoload :RSSEntry,           'feedjira/parser/rss_entry'
-    autoload :RSSFeedBurner,      'feedjira/parser/rss_feed_burner'
-    autoload :RSSFeedBurnerEntry, 'feedjira/parser/rss_feed_burner_entry'
-
-    autoload :ITunesRSS,      'feedjira/parser/itunes_rss'
-    autoload :ITunesRSSItem,  'feedjira/parser/itunes_rss_item'
-    autoload :ITunesRSSOwner, 'feedjira/parser/itunes_rss_owner'
-
-    autoload :GoogleDocsAtom,      'feedjira/parser/google_docs_atom'
-    autoload :GoogleDocsAtomEntry, 'feedjira/parser/google_docs_atom_entry'
-
-    autoload :Atom,                'feedjira/parser/atom'
-    autoload :AtomEntry,           'feedjira/parser/atom_entry'
-    autoload :AtomFeedBurner,      'feedjira/parser/atom_feed_burner'
-    autoload :AtomFeedBurnerEntry, 'feedjira/parser/atom_feed_burner_entry'
-  end
-end
+module Feedjira::Parser; end

data/lib/feedjira/version.rb

@@ -1,3 +1,3 @@
 module Feedjira
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/feedjira.rb

@@ -4,13 +4,26 @@ require 'sax-machine'
 require 'loofah'
 
 require 'feedjira/core_ext'
+require 'feedjira/feed_entry_utilities'
+require 'feedjira/feed_utilities'
+require 'feedjira/feed'
+require 'feedjira/parser'
+require 'feedjira/parser/rss_entry'
+require 'feedjira/parser/rss'
+require 'feedjira/parser/atom_entry'
+require 'feedjira/parser/atom'
 require 'feedjira/version'
 
-module Feedjira
-  autoload :FeedEntryUtilities, 'feedjira/feed_entry_utilities'
-  autoload :FeedUtilities,      'feedjira/feed_utilities'
-  autoload :Feed,               'feedjira/feed'
-  autoload :Parser,             'feedjira/parser'
+require 'feedjira/parser/rss_feed_burner_entry'
+require 'feedjira/parser/rss_feed_burner'
+require 'feedjira/parser/itunes_rss_owner'
+require 'feedjira/parser/itunes_rss_item'
+require 'feedjira/parser/itunes_rss'
+require 'feedjira/parser/atom_feed_burner_entry'
+require 'feedjira/parser/atom_feed_burner'
+require 'feedjira/parser/google_docs_atom_entry'
+require 'feedjira/parser/google_docs_atom'
 
+module Feedjira
   class NoParserAvailable < StandardError; end
 end

data/spec/feedjira/feed_spec.rb

@@ -174,6 +174,11 @@ describe Feedjira::Feed do
       curl.headers["User-Agent"].should eq '007'
     end
 
+    it "allows to set language" do
+      Feedjira::Feed.setup_easy(curl, language: 'en-US')
+      curl.headers["Accept-Language"].should eq 'en-US'
+    end
+
     it "enables compression" do
       Feedjira::Feed.setup_easy(curl, compress: true)
       curl.headers["Accept-encoding"].should eq 'gzip, deflate'
@@ -755,7 +760,7 @@ describe Feedjira::Feed do
         Feedjira::Feed.should_receive(:add_feed_to_multi).
           with(anything, anything, anything, anything, options)
 
-        Feedjira::Feed.update(sample_rss_feed, options)
+        Feedjira::Feed.update([nil], options)
       end
     end
   end

data/spec/sample_feeds.rb

@@ -0,0 +1,29 @@
+module SampleFeeds
+  FEEDS = {
+    sample_atom_feed: "AmazonWebServicesBlog.xml",
+    sample_atom_xhtml_feed: "pet_atom.xml",
+    sample_atom_feed_line_breaks: "AtomFeedWithSpacesAroundEquals.xml",
+    sample_atom_entry_content: "AmazonWebServicesBlogFirstEntryContent.xml",
+    sample_itunes_feed: "itunes.xml",
+    sample_itunes_feed_with_spaces: "ITunesWithSpacesInAttributes.xml",
+    sample_rdf_feed: "HREFConsideredHarmful.xml",
+    sample_rdf_entry_content: "HREFConsideredHarmfulFirstEntry.xml",
+    sample_rss_feed_burner_feed: "TechCrunch.xml",
+    sample_rss_feed_burner_entry_content: "TechCrunchFirstEntry.xml",
+    sample_rss_feed_burner_entry_description: "TechCrunchFirstEntryDescription.xml",
+    sample_rss_feed: "TenderLovemaking.xml",
+    sample_rss_entry_content: "TenderLovemakingFirstEntry.xml",
+    sample_feedburner_atom_feed: "PaulDixExplainsNothing.xml",
+    sample_feedburner_atom_entry_content: "PaulDixExplainsNothingFirstEntryContent.xml",
+    sample_wfw_feed: "PaulDixExplainsNothingWFW.xml",
+    sample_google_docs_list_feed: "GoogleDocsList.xml"
+  }
+
+  FEEDS.each do |method, filename|
+    define_method(method) { load_sample filename }
+  end
+
+  def load_sample(filename)
+    File.read("#{File.dirname(__FILE__)}/sample_feeds/#{filename}")
+  end
+end

data/spec/spec_helper.rb

@@ -1,88 +1,6 @@
-begin
-  require 'simplecov'
-  require 'json'
-  SimpleCov.start do
-    add_filter "/spec/"
-  end
-rescue LoadError
-end
-
 require File.expand_path(File.dirname(__FILE__) + '/../lib/feedjira')
+require 'sample_feeds'
 
-def load_sample(filename)
-  File.read("#{File.dirname(__FILE__)}/sample_feeds/#{filename}")
-end
-
-def sample_atom_feed
-  load_sample("AmazonWebServicesBlog.xml")
-end
-
-def sample_atom_xhtml_feed
-  load_sample("pet_atom.xml")
-end
-
-def sample_atom_feed_line_breaks
-  load_sample("AtomFeedWithSpacesAroundEquals.xml")
-end
-
-def sample_atom_entry_content
-  load_sample("AmazonWebServicesBlogFirstEntryContent.xml")
-end
-
-def sample_itunes_feed
-  load_sample("itunes.xml")
-end
-
-def sample_itunes_feed_with_spaces
-  load_sample("ITunesWithSpacesInAttributes.xml")
-end
-
-def sample_rdf_feed
-  load_sample("HREFConsideredHarmful.xml")
-end
-
-def sample_rdf_entry_content
-  load_sample("HREFConsideredHarmfulFirstEntry.xml")
-end
-
-def sample_rss_feed_burner_feed
-  load_sample("TechCrunch.xml")
-end
-
-def sample_rss_feed_burner_entry_content
-  load_sample("TechCrunchFirstEntry.xml")
-end
-
-def sample_rss_feed_burner_entry_description
-  load_sample("TechCrunchFirstEntryDescription.xml")
-end
-
-def sample_rss_feed
-  load_sample("TenderLovemaking.xml")
-end
-
-def sample_rss_entry_content
-  load_sample("TenderLovemakingFirstEntry.xml")
-end
-
-def sample_feedburner_atom_feed
-  load_sample("PaulDixExplainsNothing.xml")
-end
-
-def sample_feedburner_atom_entry_content
-  load_sample("PaulDixExplainsNothingFirstEntryContent.xml")
-end
-
-def sample_wfw_feed
-  load_sample("PaulDixExplainsNothingWFW.xml")
-end
-
-def sample_google_docs_list_feed
-  load_sample("GoogleDocsList.xml")
-end
-
-RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
+RSpec.configure do |c|
+  c.include SampleFeeds
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: feedjira
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Paul Dix
@@ -11,62 +11,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 description: A library designed to retrieve and parse feeds as quickly as possible
@@ -75,12 +75,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Guardfile
+- LICENSE
 - README.md
 - Rakefile
 - benchmarks/README.md
@@ -138,6 +138,7 @@ files:
 - spec/feedjira/parser/rss_feed_burner_entry_spec.rb
 - spec/feedjira/parser/rss_feed_burner_spec.rb
 - spec/feedjira/parser/rss_spec.rb
+- spec/sample_feeds.rb
 - spec/sample_feeds/AmazonWebServicesBlog.xml
 - spec/sample_feeds/AmazonWebServicesBlogFirstEntryContent.xml
 - spec/sample_feeds/AtomFeedWithSpacesAroundEquals.xml
@@ -172,17 +173,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A feed fetching and parsing library
@@ -203,6 +204,7 @@ test_files:
 - spec/feedjira/parser/rss_feed_burner_entry_spec.rb
 - spec/feedjira/parser/rss_feed_burner_spec.rb
 - spec/feedjira/parser/rss_spec.rb
+- spec/sample_feeds.rb
 - spec/sample_feeds/AmazonWebServicesBlog.xml
 - spec/sample_feeds/AmazonWebServicesBlogFirstEntryContent.xml
 - spec/sample_feeds/AtomFeedWithSpacesAroundEquals.xml

data/Guardfile

@@ -1,5 +0,0 @@
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end