rssly 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e7668f11f0cec7ba5f1da6674e516a46df57bef
-  data.tar.gz: 4969418e2ef5a9d8e55433988a02b8342bc1ee41
+  metadata.gz: 25eaa53235e3ff7b4810a2d4a6b4dd900f5610ad
+  data.tar.gz: 38602296454922cea9ff3d0ec88a5b840a626762
 SHA512:
-  metadata.gz: 788e43bd09c3f51e61a7693efaf292ffe434979444b543828ded0141390fde2273ba61d4396033c38b8785c7ccb41837c349649609c4d5d06c2375ce2e460f21
-  data.tar.gz: ae3af50267214d349159fb09a9412779ef81f2b05a5d5fbbb6b1a265dc0473c10d44032eee981a9c8ab5c5a3be068b99b930c113d1868119a37da15c664a1654
+  metadata.gz: a99bc70e2a15a275fd315d1553c1c82e880d3583ab646c922c69a2f90d756549b2706fed9d2ccc521db296941485bdac2c00ab90b7a0918e1cc3c84cb835fab9
+  data.tar.gz: 5a95cd19d6b3cf6a7e6eabee10ebfbc29b6b94fd45fe587888c68ff93165f0976a80f8d8ee1f0a2164ba2d8c4e12ebd69efa4a9dc0b51b82b1353b6b0a1bff0b

data/lib/rssly/article.rb

@@ -13,21 +13,17 @@ module Rssly
       end
     end
 
-    SUMMARY_RATIO = 35
-
     attr_accessor :title
     attr_accessor :url
     attr_accessor :summary
     attr_accessor :topics
     attr_accessor :published
 
-    def initialize(
-      title: nil,
-      url: nil,
-      published: nil,
-      summary: nil,
-      topics: nil
-    )
+    def initialize(title: nil,
+                   url: nil,
+                   published: nil,
+                   summary: nil,
+                   topics: nil)
       self.title = title
       self.url = url
       self.published = published
@@ -41,7 +37,7 @@ module Rssly
 
     def summary
       @summary ||= summarized.summarize(
-        percent: SUMMARY_RATIO
+        percent: Rssly::CONFIG[:summary_ratio]
       ).reduce('') do |text, o|
         text << o[:sentence].strip + ' '
       end.strip
@@ -60,7 +56,13 @@ module Rssly
       @published ||= Time.now
     end
 
-    private
+    def to_h
+      { title: title,
+        url: url,
+        summary: summary,
+        topics: topics,
+        published: published }
+    end
 
     def summarized
       @summarized ||= begin
@@ -74,6 +76,9 @@ module Rssly
                        source = open(url).read
                        Readability::Document.new(source)
                      end
+    rescue OpenURI::HTTPError
+      raise Rssly::HTTPError,
+            "Could not retrieve document for arcitle at: #{url}"
     end
   end
 end

data/lib/rssly/cli.rb

@@ -4,25 +4,35 @@ require 'rssly'
 module Rssly
   # The rssly CLI
   class CLI < Thor
-    desc 'fetch URL1 URL2', 'Fetch feeds and output them in a given format.'
+    desc 'fetch URL1 [URL2...]',
+         'Fetch feeds and output them in a given format.'
 
     option :format, default: 'text', desc: <<-EOT
       Choose from one of the following serializers:
 
       `text` : Output articles in a simple text layout.
       `html` : Output articles in an html format.
+      `json` : Ouput articles with a json representation.
+    EOT
+
+    option :summary_ratio, default: 50, type: :numeric, desc: <<-EOT
+      Choose the summary ratio in a percentage.
+    EOT
+
+    option :discover, default: true, type: :boolean, desc: <<-EOT
+      Whether rss feed urls should be auto discovered from the given url.
     EOT
 
     def fetch(*feed_urls)
-      feeds = feed_urls.map do |url|
-        Rssly::Feed.new url: url
-      end
+      Rssly::CONFIG[:summary_ratio] = options[:summary_ratio]
+      Rssly::CONFIG[:discover_feeds] = options[:discover]
 
+      feeds = feed_urls.map { |url| Rssly::Feed.new url: url }
       collection = Rssly::Collection.create_from_feeds(*feeds)
-
       serializer = case options[:format]
                    when 'text' then Rssly::Serializers::Text
                    when 'html' then Rssly::Serializers::HTML
+                   when 'json' then Rssly::Serializers::JSON
                    else fail "Serializer #{options[:format]} not found."
                    end
 

data/lib/rssly/collection.rb

@@ -1,3 +1,5 @@
+require 'json'
+
 module Rssly
   # Represents a collection of articles
   class Collection
@@ -18,20 +20,32 @@ module Rssly
       self.articles = items
     end
 
-    def each(&block)
-      articles.each(&block)
-    end
-
     def length
       articles.length
     end
 
     def articles
       @articles ||= []
+
+      # Remove all the inaccessible ones
+      @articles.select! do |a|
+        begin
+          a.extracted
+          true
+        rescue Rssly::HTTPError
+          false
+        end
+      end
+
+      @articles
     end
 
     def filter(filter, **opts)
       self.articles = filter.parse(articles, **opts)
     end
+
+    def to_json
+      JSON.generate(articles.map { |a| a.to_h })
+    end
   end
 end

data/lib/rssly/feed.rb

@@ -1,4 +1,5 @@
 require 'feedjira'
+require 'feedbag'
 
 module Rssly
   # Represents a single rss feed and it's metadata
@@ -22,11 +23,16 @@ module Rssly
     private
 
     def fetch_articles
-      result = Feedjira::Feed.fetch_and_parse @url
+      urls = [@url]
+      urls = Feedbag.find(@url) if Rssly::CONFIG[:discover_feeds]
+      result = Feedjira::Feed.fetch_and_parse(*urls)
       self.title = result.title
       result.entries.map do |obj|
         Article.create_from_feedjira_entry(obj)
       end
+    rescue RuntimeError
+      raise Rssly::HTTPError,
+            "Could not fetch articles for feed: #{url}"
     end
   end
 end

data/lib/rssly/http_error.rb

@@ -0,0 +1,3 @@
+module Rssly
+  class HTTPError < RuntimeError; end
+end

data/lib/rssly/serializers.rb

@@ -52,5 +52,12 @@ module Rssly
       </article>
       EOT
     end
+
+    # Transforms a collection into a json representation
+    class JSON < Serializer
+      def perform
+        @collection.to_json
+      end
+    end
   end
 end

data/lib/rssly/version.rb

@@ -1,3 +1,3 @@
 module Rssly
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/rssly.rb

@@ -1,12 +1,17 @@
-require 'active_support'
-require "rssly/version"
-require "rssly/article"
-require "rssly/feed"
-require "rssly/deserializers"
-require "rssly/serializers"
-require "rssly/collection"
-require "rssly/collection/unique_filter"
-require "rssly/collection/age_filter"
+require 'rssly/version'
+require 'rssly/article'
+require 'rssly/feed'
+require 'rssly/deserializers'
+require 'rssly/serializers'
+require 'rssly/http_error'
+require 'rssly/collection'
+require 'rssly/collection/unique_filter'
+require 'rssly/collection/age_filter'
 
+# Rssly namespace
 module Rssly
+  CONFIG = {
+    summary_ratio: 35,
+    discover_feeds: false
+  }
 end

data/rssly.gemspec

@@ -28,6 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ots", "~> 0.5"
   spec.add_dependency "addressable", "~> 2.3"
   spec.add_dependency "bloomfilter-rb", "~> 2.1"
+  spec.add_dependency "redis", "~> 3.0.7"
+  spec.add_dependency "json", "~> 1.8.1"
   spec.add_dependency "thor"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/collection_spec.rb

@@ -38,10 +38,6 @@ describe 'Rssly::Collection' do
       @collection = Rssly::Collection.new(@articles)
     end
 
-    it 'should respond to #each' do
-      expect(@collection.respond_to?(:each)).to eq(true)
-    end
-
     it 'should respond to #length' do
       expect(@collection.length).to eq(3)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rssly
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Nathan Kot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: feedbag
@@ -108,6 +108,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.7
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +216,7 @@ files:
 - lib/rssly/collection/unique_filter.rb
 - lib/rssly/deserializers.rb
 - lib/rssly/feed.rb
+- lib/rssly/http_error.rb
 - lib/rssly/serializers.rb
 - lib/rssly/version.rb
 - rssly.gemspec