social_current 0.0.5 → 0.0.6

data/README.md

@@ -23,7 +23,7 @@ Or install it yourself as:
 You may use Social Current directly within your view like.
 
 ```ruby
-<% SocialCurrent::Stream.new({ :twitter => "tristanoneil", :github => "tristanoneil" }).each do |item| %>
+<% SocialCurrent::Stream.new({ :twitter => "tristanoneil", :github => "tristanoneil" }).build.each do |item| %>
   <%= item[:message] >
 <% end %>
 ```
@@ -33,7 +33,7 @@ Though it's probably a better idea to add a method to a class or model like.
 ```ruby
 class User < ActiveRecord::Base
   def stream
-    SocialCurrent::Stream.new({ :twitter => twitter_username, :github => github_username })
+    SocialCurrent::Stream.new({ :twitter => twitter_username, :github => github_username }).build
   end
 end
 ```

data/lib/social_current/github.rb

@@ -4,15 +4,15 @@ module SocialCurrent
     base_uri "https://api.github.com"
 
     def raw_user
-      @raw_user ||= fetch("/users/#{@user}", "#{@user}_github_raw_user.json")
+      fetch("/users/#{@user}", "#{@user}_github_raw_user.json")
     end
 
     def raw_stream
-      @raw_stream ||= fetch("/users/#{@user}/events", "#{@user}_github_raw_stream.json")
+      fetch("/users/#{@user}/events", "#{@user}_github_raw_stream.json")
     end
 
     def stream
-      @stream ||= raw_stream.collect do |s|
+      raw_stream.collect do |s|
         { :message => format_message(s), :created_at => Time.parse(s["created_at"]).utc, :service => "github" }
       end
     end
@@ -22,13 +22,13 @@ module SocialCurrent
     def format_message(event)
       case event["type"]
       when "PushEvent"
-        return "#{self.raw_user["name"]} pushed to <a href='http://github.com/#{event["repo"]["name"]}'>#{event["repo"]["name"]}</a>."
+        "#{self.raw_user["name"]} pushed to <a href='http://github.com/#{event["repo"]["name"]}'>#{event["repo"]["name"]}</a>."
       when "FollowEvent"
-        return "#{self.raw_user["name"]} followed <a href='#{event["payload"]["target"]["html_url"]}'>#{event["payload"]["target"]["name"]}</a>."
+        "#{self.raw_user["name"]} followed <a href='#{event["payload"]["target"]["html_url"]}'>#{event["payload"]["target"]["name"]}</a>."
       when "CreateEvent"
-        return "#{self.raw_user["name"]} created <a href='http://github.com/#{event["repo"]["name"]}'>#{event["repo"]["name"]}</a>."
+        "#{self.raw_user["name"]} created <a href='http://github.com/#{event["repo"]["name"]}'>#{event["repo"]["name"]}</a>."
       when "WatchEvent"
-        return "#{self.raw_user["name"]} started watching <a href='http://github.com/#{event["repo"]["name"]}'>#{event["repo"]["name"]}</a>."
+        "#{self.raw_user["name"]} started watching <a href='http://github.com/#{event["repo"]["name"]}'>#{event["repo"]["name"]}</a>."
       end
     end
   end

data/lib/social_current/service.rb

@@ -5,10 +5,16 @@ module SocialCurrent
     end
 
     def fetch(remote, local)
-      @contents = if cache_valid?("#{Dir.tmpdir}/#{local}")
+      if cache_valid?("#{Dir.tmpdir}/#{local}")
         JSON.parse(File.read("#{Dir.tmpdir}/#{local}"))
       else
-        write_cache(local, JSON.parse(self.class.get(remote).body))
+        response = self.class.get(remote)
+        if response.header.code == "404"
+          []
+        else
+          write_cache(local, JSON.parse(response.body))
+          JSON.parse(response.body)
+        end
       end
     end
 
@@ -18,7 +24,6 @@ module SocialCurrent
       File.open("#{Dir.tmpdir}/#{local}", "w") do |f|
         f.write(contents.to_json)
       end
-      contents
     end
 
     def cache_valid?(cache)

data/lib/social_current/twitter.rb

@@ -4,15 +4,15 @@ module SocialCurrent
     base_uri "https://api.twitter.com/1"
 
     def raw_user
-      @raw_user ||= fetch("/users/show.json?screen_name=#{@user}", "#{@user}_twitter_raw_user.json")
+      fetch("/users/show.json?screen_name=#{@user}", "#{@user}_twitter_raw_user.json")
     end
 
     def raw_stream
-      @raw_stream ||= fetch("/statuses/user_timeline.json?&screen_name=#{@user}", "#{@user}_twitter_raw_stream.json")
+      fetch("/statuses/user_timeline.json?&screen_name=#{@user}", "#{@user}_twitter_raw_stream.json")
     end
 
     def stream
-      @stream ||= raw_stream.collect do |s|
+      raw_stream.collect do |s|
         { :message => format_message(s), :created_at => Time.parse(s["created_at"]).utc, :service => "twitter" }
       end
     end

data/lib/social_current/version.rb

@@ -1,4 +1,4 @@
 module SocialCurrent
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
   SUPPORTED_INTEGRATIONS = [:github, :twitter]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_current
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: