doing_stream 0.0.2 → 0.0.3

data/README.md

@@ -34,7 +34,7 @@ them to `DoingStream::DoingStream.new`:
 
     streams = []
     streams << DoingStream::Streams::GitHub.new('foobar')
-    streams << DoingStream::Streams::LastFM.new('foobar')
+    streams << DoingStream::Streams::LastFM.new('foobar', api_key: 'my_awesome_api_key')
     streams << DoingStream::Streams::Pinboard.new('foobar')
     streams << DoingStream::Streams::StackOverflow.new(42)
     streams << DoingStream::Streams::Vimeo.new('foobar')

data/doing_stream.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = DoingStream::VERSION
 
   gem.add_dependency 'curb'
-  gem.add_dependency 'feedzirra'
+  gem.add_dependency 'feedzirra', '~> 0.1.3'
   gem.add_dependency 'json'
 end

data/lib/doing_stream.rb

@@ -9,10 +9,10 @@ class DoingStream::DoingStream
     @streams = streams
   end
 
-  def latest
-    @latest ||= streams.map do |stream|
-      stream.entries.take(2)
-    end.flatten.sort_by(&:published).reverse.take(5)
+  def latest n = 5, m = 2
+    streams.map do |stream|
+      stream.entries.take((m.respond_to? :call) ? m.call(stream) : m)
+    end.flatten.sort_by(&:published).reverse.take(n)
   end
 
   def entries

data/lib/doing_stream/stream/stream.rb

@@ -3,10 +3,11 @@ require 'uri'
 
 module DoingStream::Stream
   class Stream
-    attr_accessor :entries, :uri
+    attr_accessor :entries, :user
 
-    def initialize user
-      @uri = ::URI.parse(ERB.new(self.class::URI).result(binding))
+    def initialize user, options = {}
+      @user = user
+      @options = options
     end
 
     def entry_class
@@ -20,5 +21,9 @@ module DoingStream::Stream
     def name
       self.class.to_s.split('::').last.downcase
     end
+
+    def uri
+      ::URI.parse(ERB.new(self.class::URI).result(binding))
+    end
   end
 end

data/lib/doing_stream/streams/last_fm.rb

@@ -1,6 +1,13 @@
 module DoingStream
   class Streams::LastFM < Stream::JSONStream
-    URI = 'http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=<%= user %>&format=json&limit=5&api_key=b25b959554ed76058ac220b7b2e0a026'
+    URI = 'http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=<%= user %>&format=json&limit=5&api_key=<%= api_key %>'
+
+    attr_accessor :api_key
+
+    def initialize user, options = {}
+      super
+      @api_key = options[:api_key]
+    end
 
     def json
       super['recenttracks']['track']

data/lib/doing_stream/streams/vimeo.rb

@@ -6,7 +6,13 @@ module DoingStream
     end
 
     def entries
-      @entries ||= (@likes.entries + @videos.entries).sort_by(&:published).reverse
+      @entries ||= begin
+                     (@likes.entries + @videos.entries).sort_by(&:published).reverse.each do |entry|
+                       class << entry; alias_method :type, :name; end
+                       entry.define_singleton_method(:name) { "vimeo" }
+                       def entry.to_h; super.tap { |h| h['data']['type'] = type }; end
+                     end
+                   end
     end
   end
 

data/lib/doing_stream/version.rb

@@ -1,3 +1,3 @@
 module DoingStream
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doing_stream
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -32,17 +32,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement