streama 0.3.5 → 0.3.6

data/.travis.yml

@@ -1,2 +1,17 @@
-rvm:
-  - 1.9.2
+language: ruby
+matrix:
+  include:
+    - rvm: 1.9.3
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+      jdk: oraclejdk7
+      env: JRUBY_OPTS="-Xmx512m"
+    - rvm: jruby-19mode
+      jdk: openjdk7
+      env: JRUBY_OPTS="-Xmx512m"
+    - rvm: jruby-head
+      jdk: oraclejdk7
+      env: JRUBY_OPTS="-Xmx512m"
+    - rvm: jruby-head
+      jdk: openjdk7
+      env: JRUBY_OPTS="-Xmx512m"

data/README.md

@@ -1,16 +1,17 @@
 # Streama
 
-**ALPHA**
-
 Streama is a simple Ruby activity stream gem for use with the Mongoid ODM framework.
 
 It works by posting to and querying from a firehose of individual activity items.
 
 [![travis](https://secure.travis-ci.org/christospappas/streama.png)](http://travis-ci.org/christospappas/streama)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/christospappas/streama)
 
 ## Project Tracking
 
 * [Streama Google Group](http://groups.google.com/group/streama)
+* [Code Climate](https://codeclimate.com/github/christospappas/streama)
+* [Website Demo](http://streamaweb.info)
 
 ## Install
 
@@ -132,6 +133,10 @@ activity.refresh_data
 
 ## Upgrading
 
+### 0.3.6
+
+Mongoid 3.0 support added.
+
 ### 0.3.3
 
 The Activity "target" field was renamed to "target_object". If you are upgrading from a previous version of Streama you will need to rename the field in existing documents.
@@ -146,8 +151,4 @@ Once you've made your great commits
 1. Create a topic branch - git checkout -b my_branch
 1. Push to your branch - git push origin my_branch
 1. Create a Pull Request from your branch
-1. That's it!
-
-## Contributors
-
-* Christos Pappas		(@christospappas)
+1. That's it!

data/lib/streama/activity.rb

@@ -6,19 +6,19 @@ module Streama
       
       include Mongoid::Document
       include Mongoid::Timestamps
-    
+
       field :verb,          :type => Symbol
-      field :actor,         :type => Hash
-      field :object,        :type => Hash
-      field :target_object, :type => Hash
+      field :actor
+      field :object
+      field :target_object
       field :receivers,     :type => Array
-          
-      index :name
-      index [['actor._id', Mongo::ASCENDING], ['actor._type', Mongo::ASCENDING]]
-      index [['object._id', Mongo::ASCENDING], ['object._type', Mongo::ASCENDING]]
-      index [['target_object._id', Mongo::ASCENDING], ['target_object._type', Mongo::ASCENDING]]
-      index [['receivers.id', Mongo::ASCENDING], ['receivers.type', Mongo::ASCENDING]]
-          
+
+      index :name => 1
+      index({ 'actor._id' => 1, 'actor._type' => 1 })
+      index({ 'object._id' => 1, 'object._type' => 1 })
+      index({ 'target_object._id' => 1, 'target_object._type' => 1 })
+      index({ 'receivers.id' => 1, 'receivers.type' => 1 })
+
       validates_presence_of :actor, :verb
       before_save :assign_data
       
@@ -75,7 +75,7 @@ module Streama
     # @param [ Hash ] options The options to publish with.
     #
     def publish(options = {})
-      actor = load_instance(:actor)        
+      actor = load_instance(:actor) 
       self.receivers = (options[:receivers] || actor.followers).map { |r| { :id => r.id, :type => r.class.to_s } }
       self.save
       self
@@ -87,12 +87,12 @@ module Streama
     #
     # @return [Mongoid::Document] document A mongoid document instance
     def load_instance(type)
-      (data = self.send(type)).is_a?(Hash) ? data['type'].to_s.camelcase.constantize.find(data['id']) : data
+      (data = self.read_attribute(type)).is_a?(Hash) ? data['type'].to_s.camelcase.constantize.find(data['id']) : data
     end
   
     def refresh_data
       assign_data
-      save(:validate => false)
+      save(:validates_presence_of => false)
     end
   
     protected

data/lib/streama/definition_dsl.rb

@@ -15,11 +15,6 @@ module Streama
     
     delegate :[], :to => :@attributes
     
-    def target(*args)
-      warn "[DEPRECATION] #target is deprecated. Please use #target_object instead."
-      @attributes[:target_object].store(args[0].is_a?(Symbol) ? args[0] : args[0].class.to_sym, args[1])
-    end
-    
     def self.data_methods(*args)
       args.each do |method|
         define_method method do |*args|

data/lib/streama/version.rb

@@ -1,3 +1,3 @@
 module Streama
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/lib/definition_dsl_spec.rb

@@ -33,10 +33,4 @@ describe "Definition" do
     dsl.attributes[:target_object].should eq :company => { :cache=>[:id, :name] }
   end
   
-  it "deprecates target method" do
-    dsl = definition_dsl
-    dsl.target(:company, :cache => [:id, :name])
-    dsl.attributes[:target_object].should eq :company => { :cache=>[:id, :name] }
-  end
-  
 end

data/spec/spec_helper.rb

@@ -12,15 +12,15 @@ require 'rspec'
 require 'database_cleaner'
  
 LOGGER = Logger.new($stdout)
-DATABASE_ID = Process.pid
 
 DatabaseCleaner.strategy = :truncation
 
+def database_id
+  ENV["CI"] ? "mongoid_#{Process.pid}" : "mongoid_test"
+end
+
 Mongoid.configure do |config|
-  database = Mongo::Connection.new.db("streama_#{DATABASE_ID}")
-  database.add_user("streama", "test")
-  config.master = database
-  config.logger = nil
+  config.connect_to(database_id)
 end
 
 Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
@@ -46,8 +46,10 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
   
-  config.after :suite do
-    Mongoid.master.connection.drop_database("streama_#{DATABASE_ID}")
+  config.after(:suite) do
+    if ENV["CI"]
+      Mongoid::Threaded.sessions[:default].drop
+    end
   end
   
 end

data/streama.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "rspec", "~> 2.5"
   s.add_development_dependency "database_cleaner", "~> 0.8"
-  s.add_development_dependency "mongoid", "~> 2.4"
-  s.add_development_dependency "bson_ext", "~> 1.5"
+  s.add_development_dependency "mongoid", "~> 3.0.0"
   s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: streama
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70201716311720 !ruby/object:Gem::Requirement
+  requirement: &70100852275820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70201716311720
+  version_requirements: *70100852275820
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70201716311220 !ruby/object:Gem::Requirement
+  requirement: &70100852275320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,32 +32,21 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70201716311220
+  version_requirements: *70100852275320
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70201716310740 !ruby/object:Gem::Requirement
+  requirement: &70100852274860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70201716310740
-- !ruby/object:Gem::Dependency
-  name: bson_ext
-  requirement: &70201716310280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: *70201716310280
+  version_requirements: *70100852274860
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70201716309880 !ruby/object:Gem::Requirement
+  requirement: &70100852274480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70201716309880
+  version_requirements: *70100852274480
 description: Streama is a simple activity stream gem for use with the Mongoid ODM
   framework
 email:
@@ -113,12 +102,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4280395878127855216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4280395878127855216
 requirements: []
 rubyforge_project: streama
 rubygems_version: 1.8.17