twithub 0.1.2 → 0.1.3

data/lib/twithub/entries.rb

@@ -0,0 +1,18 @@
+module Twithub
+  class Entries
+    def from_json(json)
+      parsed = JSON.parse(json)
+      return entry_for(parsed) if parsed.is_a?(Hash)
+      if parsed.is_a?(Array)
+        return  parsed.map {|e| entry_for(e) } 
+      end
+    end
+
+    private
+    def entry_for(hash)
+      entry = hash["origin"] == Twithub::TWITTER ? Twithub::TwitterEntry.new : Twithub::GithubEntry.new
+      time = Time.parse(hash["posted_at"])
+      entry.with_content(hash["content"]).with_username(hash["username"]).with_posted_at(time)
+    end 
+  end
+end

data/lib/twithub/feed_entry.rb

@@ -1,12 +1,16 @@
+
 module Twithub
   class FeedEntry
     include Comparable
-    TWITTER = "twitter"
-    GITHUB = "github"
     attr_reader :content, :posted_at, :origin, :username
 
     def <=>(other_entry)
       other_entry.posted_at <=> posted_at
     end
+
+    def to_json(*args)
+      { :content => content, :username => username, 
+        :posted_at => posted_at, :origin => origin }.to_json      
+    end
   end
 end

data/lib/twithub/version.rb

@@ -1,3 +1,3 @@
 module Twithub
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/twithub.rb

@@ -1,3 +1,4 @@
+require 'json'
 require 'twitter'
 require 'feedzirra'
 require_relative 'twithub/entry_builder_methods'
@@ -6,11 +7,19 @@ require_relative 'twithub/twitter'
 require_relative 'twithub/github'
 require_relative 'twithub/twitter_entry'
 require_relative 'twithub/github_entry'
+require_relative 'twithub/entries'
 
 module Twithub
+  TWITTER = "twitter"
+  GITHUB = "github"
   def entries_for(params)
     entries = Twitter.entries_for(params[:twitter]) + Github.entries_for(params[:github])
-    entries.sort
+    entries.sort.take(params[:count] || entries.size)
   end
   module_function :entries_for
+
+  def from_json(json)
+    Entries.new.from_json(json)
+  end
+  module_function :from_json
 end

data/spec/twithub/feed_entry_spec.rb

@@ -23,5 +23,23 @@ describe Twithub::FeedEntry do
         (old_entry < new_entry).should be_false
       end 
     end
+
+    describe "an entry with stubbed out attributes" do
+      let(:entry) { Twithub::FeedEntry.new }
+      let(:time) { Time.now }
+      let(:expected_hash) { {"posted_at" => time.to_s, "content" => "the content",
+                             "username" => "pzimbelman", "origin" => "twitter" } }
+
+      before do
+        entry.stub(:posted_at).and_return(time)
+        entry.stub(:content).and_return("the content")
+        entry.stub(:username).and_return("pzimbelman")
+        entry.stub(:origin).and_return("twitter")
+      end
+
+      it "should take the entry to json" do
+        JSON.parse(entry.to_json).should == expected_hash
+      end 
+    end
   end
 end

data/spec/twithub/github_entry_spec.rb

@@ -10,6 +10,6 @@ describe Twithub::GithubEntry do
     entry.content.should == text
     entry.username.should == username
     entry.posted_at.should == time
-    entry.origin.should == Twithub::FeedEntry::GITHUB
+    entry.origin.should == Twithub::GITHUB
   end
 end

data/spec/twithub/twitter_entry_spec.rb

@@ -10,6 +10,6 @@ describe Twithub::TwitterEntry do
     entry.content.should == text
     entry.username.should == username
     entry.posted_at.should == time
-    entry.origin.should == Twithub::FeedEntry::TWITTER
+    entry.origin.should == Twithub::TWITTER
   end
 end

data/spec/twithub_spec.rb

@@ -30,4 +30,39 @@ describe Twithub do
       Twithub.entries_for(:twitter => twitter_name, :github => github_name).should == [github_entry, twitter_entry]
     end
   end
+
+  describe "when lots of entries are returned" do
+    let(:fake_entries) { (1..100).to_a }
+
+    before do
+      Twithub::Twitter.stub(:entries_for).and_return(fake_entries)
+    end
+
+    it "should allow the user to limit the count of the returned entries" do
+      Twithub.entries_for(:twitter => "stuff", :count => 7).size.should == 7
+    end
+
+    it "should return all entries if no count parameter is given or if count is larger than the number of entries" do
+      Twithub.entries_for(:twitter => "stuff").size.should == 100
+      Twithub.entries_for(:twitter => "stuff", :count => 200).size.should == 100
+    end
+  end
+
+  describe "from_json" do
+    let(:time) { Time.parse("Jan 1st 2011") }
+    let(:entry) { Twithub::TwitterEntry.new.with_content("foobar").with_username("thing").with_posted_at(time) }
+
+    it "should be able accept a json string for a single entry" do
+      new_entry = Twithub.from_json(entry.to_json)
+      new_entry.content.should == "foobar"
+      new_entry.posted_at.should == time
+    end 
+
+    it "should be able to accept a json string of an array of entries" do
+      json = [entry].to_json
+      new_entry = Twithub.from_json(json).first
+      new_entry.content.should == "foobar"
+      new_entry.posted_at.should == time
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twithub
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70257084190660 !ruby/object:Gem::Requirement
+  requirement: &70108269820160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257084190660
+  version_requirements: *70108269820160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70257084190220 !ruby/object:Gem::Requirement
+  requirement: &70108269819700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257084190220
+  version_requirements: *70108269819700
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70257084189680 !ruby/object:Gem::Requirement
+  requirement: &70108269819180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70257084189680
+  version_requirements: *70108269819180
 - !ruby/object:Gem::Dependency
   name: feedzirra
-  requirement: &70257084189100 !ruby/object:Gem::Requirement
+  requirement: &70108269818580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.2.0.rc2
   type: :runtime
   prerelease: false
-  version_requirements: *70257084189100
+  version_requirements: *70108269818580
 description: A gem to aggregate your recent twitter and github activity into a single
   feed. Can accept multiple logins for either service.
 email:
@@ -68,6 +68,7 @@ files:
 - README.markdown
 - Rakefile
 - lib/twithub.rb
+- lib/twithub/entries.rb
 - lib/twithub/entry_builder_methods.rb
 - lib/twithub/feed_entry.rb
 - lib/twithub/github.rb