activity_feed 1.2 → 1.2.1

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.2-p290@activity_feed_gem --create
+rvm use ruby-1.9.3-p0@activity_feed_gem --create

data/CHANGELOG.markdown

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.2.1
+
+* ActivityFeed.feed(user_id) will now return an instance of ActivityFeed::Feed
+* ActivityFeed::Ohm::Item will now return all of its attributes when calling to_json 
+
 ## 1.2
 
 * Support aggregate feeds

data/README.markdown

@@ -4,7 +4,7 @@ Activity feeds backed by Redis
 
 ## Compatibility
 
-The gem has been built and tested under Ruby 1.9.2-p290
+The gem has been built and tested under Ruby 1.9.2-p290 and Ruby 1.9.3-p0
 
 ## Installation
 
@@ -220,6 +220,18 @@ Consult the specs to see this working if you have questions.
 
 ### Feeds and Aggregation Feeds
 
+You can access an activity feed in a couple of ways.
+
+```ruby
+ActivityFeed.feed(user_id) # return an instance of ActivityFeed::Feed
+```
+
+or
+
+```ruby
+ActivityFeed::Feed.new(user_id)
+```
+
 activity_feed uses the following key in adding the item to Redis: `ActivityFeed.namespace:ActivityFeed.key:self.user_id`. By default, activity_feed in the `create_item` call will 
 also add the item in Redis to an aggregate feed using the key: `ActivityFeed.namespace:ActivityFeed.key:ActivityFeed.aggregate_key:self.user_id`.
 

data/lib/activity_feed/ohm/item.rb

@@ -18,6 +18,19 @@ module ActivityFeed
       
       after :save, :update_redis
       
+      def to_hash
+        super.merge(
+          :user_id => user_id,
+          :nickname => nickname,
+          :type => type,
+          :title => title,
+          :text => text,
+          :url => url,
+          :icon => icon,
+          :sticky => sticky
+        )
+      end
+      
       private
 
       def update_redis

data/lib/activity_feed/version.rb

@@ -1,3 +1,3 @@
 module ActivityFeed
-  VERSION = "1.2"
+  VERSION = "1.2.1"
 end

data/lib/activity_feed.rb

@@ -78,6 +78,10 @@ module ActivityFeed
     end
   end
   
+  def self.feed(user_id)
+    ActivityFeed::Feed.new(user_id)
+  end
+  
   self.namespace = 'activity'
   self.key = 'feed'
   self.aggregate_key = 'aggregate'

data/spec/activity_feed_spec.rb

@@ -133,4 +133,16 @@ describe ActivityFeed do
       loaded_item.should == JSON.parse(item.to_json)
     end
   end
+  
+  describe 'feed' do
+    it 'should allow you to create a new ActivityFeed::Feed instance' do
+      user_id = 1
+      ActivityFeed.persistence = :ohm
+      
+      item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      feed = ActivityFeed.feed(user_id)
+      
+      feed.total_items.should be(1)
+    end
+  end
 end

data/spec/item_spec.rb

@@ -45,4 +45,11 @@ describe 'ActivityFeed::Item' do
     ActivityFeed.aggregate_item(item)
     ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id, true)).should be(1)
   end
+  
+  it 'should output all the attributes for an item for Ohm' do
+    item = Fabricate.build(ActivityFeed::Ohm::Item)
+    
+    hash = JSON.parse(JSON.generate(item))
+    hash.keys.size.should be(8)
+  end
 end

data/spec/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe ActivityFeed do
   it "should be the correct version" do
-    ActivityFeed::VERSION.should == '1.2'
+    ActivityFeed::VERSION.should == '1.2.1'
   end
 end

metadata

@@ -1,203 +1,199 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: activity_feed
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  version: "1.2"
 platform: ruby
-authors: 
+authors:
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-12-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160989100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160989100
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2160988660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160988660
+- !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2160988200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160988200
+- !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2160987760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160987760
+- !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2160987340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160987340
+- !ruby/object:Gem::Dependency
   name: mongo_ext
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2160986860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160986860
+- !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2160986440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160986440
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2160985960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160985960
+- !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2160846320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160846320
+- !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2160845880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160845880
+- !ruby/object:Gem::Dependency
   name: ohm-contrib
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2160845460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160845460
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2160845000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160845000
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &2160844520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160844520
+- !ruby/object:Gem::Dependency
   name: json
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &2160844000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160844000
+- !ruby/object:Gem::Dependency
   name: redis
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &2160843300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2160843300
+- !ruby/object:Gem::Dependency
   name: leaderboard
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &2160842220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *2160842220
 description: Activity feeds backed by Redis
-email: 
+email:
 - dczarnecki@agoragames.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - CHANGELOG.markdown
@@ -222,38 +218,35 @@ files:
 - spec/version_spec.rb
 homepage: https://github.com/agoragames/activity_feed
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2506402929405040614
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 680484865266501391
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2506402929405040614
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 680484865266501391
 requirements: []
-
 rubyforge_project: activity_feed
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Activity feeds backed by Redis
-test_files: 
+test_files:
 - spec/activity_feed/custom/item.rb
 - spec/activity_feed_spec.rb
 - spec/fabricators/item_fabricator.rb