activitystreams 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/activitystreams.rb

@@ -4,11 +4,23 @@ require 'attr_required'
 require 'attr_optional'
 require 'addressable/uri'
 
+module ActivityStreams
+  def self.logger
+    @@logger
+  end
+  def self.logger=(logger)
+    @@logger = logger
+  end
+  @@logger = Logger.new(STDERR)
+  @@logger.progname = 'ActivityStreams'
+end
+
 require 'activitystreams/validator'
 require 'activitystreams/exception'
 require 'activitystreams/base'
 require 'activitystreams/collection'
 require 'activitystreams/stream'
+require 'activitystreams/ext_properties'
 require 'activitystreams/activity'
 require 'activitystreams/object'
 require 'activitystreams/verb'

data/lib/activitystreams/activity.rb

@@ -1,5 +1,7 @@
 module ActivityStreams
   class Activity < Base
+    include ExtProperties
+
     attr_required :actor, :verb, :published
     attr_optional(
       # SHOULD
@@ -34,6 +36,18 @@ module ActivityStreams
       end
       validate_attribute! :verb, Verb
       validate_attribute! :icon, MediaLink
+      unless recommended_verb?
+        ActivityStreams.logger.warn "\"#{verb.to_s}\" is not recommended. \"#{recommended_verbs.join('", "')}\" are recommended."
+      end
+    end
+
+    def recommended_verb?
+      recommended_verbs.blank? ||
+      recommended_verbs.include?(verb.to_s)
+    end
+
+    def recommended_verbs
+      (object.try(:recommended_verbs) || []).collect(&:to_s)
     end
   end
 end

data/lib/activitystreams/base.rb

@@ -17,7 +17,7 @@ module ActivityStreams
       (required_attributes + optional_attributes).inject({}) do |hash, _attr_|
         _value_ = self.send _attr_
         hash.merge!(
-          _attr_ => case _value_
+          _attr_.to_s.camelize(:lower).to_sym => case _value_
           when Symbol, Addressable::URI
             _value_.to_s
           when Time

data/lib/activitystreams/ext_properties.rb

@@ -0,0 +1,26 @@
+module ActivityStreams
+  module ExtProperties
+    class Mood < Base
+      attr_optional :display_name, :image
+    end
+
+    def self.included(klass)
+      klass.attr_optional(
+        :location,
+        :mood,
+        :rating,
+        :source,
+        :tags
+      ) 
+    end
+
+    def validate_attributes!
+      super
+      validate_attribute! :location, Object::Place
+      validate_attribute! :mood,     Mood
+      validate_attribute! :rating,   Object::Review
+      validate_attribute! :source,   Object
+      validate_attribute! :tags,     Object, :arrayed!
+    end
+  end
+end

data/lib/activitystreams/object.rb

@@ -1,5 +1,7 @@
 module ActivityStreams
   class Object < Base
+    include ExtProperties
+
     attr_optional(
       # SHOULD
       :id,
@@ -11,16 +13,24 @@ module ActivityStreams
       :content,
       :display_name,
       :image,
-      :type,
+      :object_type,
       :published,
       :summary,
       :updated,
       :url
     )
 
+    def initialize(attributes = {})
+      _type_ = if self.class.superclass == Object
+        self.class.name.demodulize.underscore
+      end
+      attributes = {:object_type => _type_}.merge(attributes)
+      super attributes
+    end
+
     def validate_attributes!
       super
-      [:id, :type, :url].each do |_attr_|
+      [:id, :object_type, :url].each do |_attr_|
         to_iri _attr_
       end
       [:published, :updated].each do |_attr_|
@@ -34,5 +44,18 @@ module ActivityStreams
       end
       # TODO: display_name MUST NOT include HTML
     end
+
+    def recommended_verbs
+      self.class.recommended_verbs
+    end
+
+    def self.recommended_verbs(*verbs)
+      @recommended_verbs ||= []
+      @recommended_verbs += verbs
+    end
   end
 end
+
+Dir[File.dirname(__FILE__) + '/object/*.rb'].each do |file| 
+  require file
+end

data/lib/activitystreams/object/article.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Object::Article < Object
+  end
+end

data/lib/activitystreams/object/audio.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Audio < Object
+    attr_optional :embed_code, :stream
+
+    def validate_attributes!
+      super
+      validate_attribute! :stream, MediaLink
+    end
+  end
+end

data/lib/activitystreams/object/badge.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Object::Badge < Object
+  end
+end

data/lib/activitystreams/object/bookmark.rb

@@ -0,0 +1,11 @@
+module ActivityStreams
+  class Object::Bookmark < Object
+    attr_optional :target_url
+    recommended_verbs :post, :favorite
+
+    def validate_attributes!
+      super
+      to_iri :target_url
+    end
+  end
+end

data/lib/activitystreams/object/collection.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Collection < Object
+    attr_optional :object_types
+
+    def validate_attributes!
+      super
+      validate_attribute! :object_types, Array
+    end
+  end
+end

data/lib/activitystreams/object/comment.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Comment < Object
+    attr_optional :in_reply_to
+
+    def validate_attributes!
+      super
+      validate_attribute! :in_reply_to, Object, :arrayed!
+    end
+  end
+end

data/lib/activitystreams/object/event.rb

@@ -0,0 +1,15 @@
+module ActivityStreams
+  class Object::Event < Object
+    attr_optional :attending, :maybe_attending, :not_attending, :start_time, :end_time
+
+    def validate_attributes!
+      super
+      [:attending, :maybe_attending, :not_attending].each do |_attr_|
+        validate_attribute! _attr_, Object::Collection
+      end
+      [:start_time, :end_time].each do |_attr_|
+        to_time _attr_
+      end
+    end
+  end
+end

data/lib/activitystreams/object/file.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::File < Object
+    attr_optional :file_url, :mime_type
+
+    def validate_attributes!
+      super
+      to_iri :file_url
+    end
+  end
+end

data/lib/activitystreams/object/group.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Object::Group < Object
+  end
+end

data/lib/activitystreams/object/image.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Image < Object
+    attr_optional :full_image
+
+    def validate_attributes!
+      super
+      validate_attribute! :full_image, MediaLink
+    end
+  end
+end

data/lib/activitystreams/object/note.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Object::Note < Object
+  end
+end

data/lib/activitystreams/object/person.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Object::Person < Object
+  end
+end

data/lib/activitystreams/object/place.rb

@@ -0,0 +1,25 @@
+module ActivityStreams
+  class Object::Place < Object
+    attr_optional :position, :address
+
+    class GeoLocation < Base
+      attr_required :latitude, :longitude
+      attr_optional :altitude
+
+      def to_s
+        "+" + [latitude, longitude, altitude].compact.join('+')
+      end
+      alias_method :as_json, :to_s
+    end
+
+    class Address < Base
+      attr_optional :formatted, :street_address, :locality, :region, :postal_code, :country
+    end
+
+    def validate_attributes!
+      super
+      validate_attribute! :position, GeoLocation
+      validate_attribute! :address,  Address
+    end
+  end
+end

data/lib/activitystreams/object/product.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Product < Object
+    attr_optional :full_image
+
+    def validate_attributes!
+      super
+      validate_attribute! :full_image, MediaLink
+    end
+  end
+end

data/lib/activitystreams/object/question.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Question < Object
+    attr_optional :options
+
+    def validate_attributes!
+      super
+      validate_attribute! :options, Object, :arrayed!
+    end
+  end
+end

data/lib/activitystreams/object/review.rb

@@ -0,0 +1,16 @@
+module ActivityStreams
+  class Object::Review < Object
+    attr_optional :_rating_
+
+    def validate_attributes!
+      super
+      to_float :_rating_, :precision => 1, :range => 1.0..5.0
+    end
+
+    def as_json
+      hash = super
+      hash[:rating] = hash.delete(:_rating_)
+      hash
+    end
+  end
+end

data/lib/activitystreams/object/service.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Object::Service < Object
+  end
+end

data/lib/activitystreams/object/video.rb

@@ -0,0 +1,10 @@
+module ActivityStreams
+  class Object::Video < Object
+    attr_optional :embed_code, :stream
+
+    def validate_attributes!
+      super
+      validate_attribute! :stream, MediaLink
+    end
+  end
+end

data/lib/activitystreams/validator.rb

@@ -43,12 +43,22 @@ module ActivityStreams
       end
       self.send :"#{attribute}=", _value_
     rescue ArgumentError, NoMethodError => e
-      raise InvalidAttribute.new("#{attribute} ")
+      raise InvalidAttribute.new("#{attribute} should be a valid date-time")
     end
 
     def to_integer(attribute)
       _value_ = self.send attribute
       self.send :"#{attribute}=", _value_.try(:to_i)
     end
+
+    def to_float(attribute, options = {})
+      _value_ = self.send attribute
+      return unless _value_
+      _value_ = BigDecimal.new(_value_.to_s).round(options[:precision]) if options[:precision]
+      if options[:range] && !options[:range].include?(_value_)
+        raise InvalidAttribute.new("#{attribute} should be within #{options[:range]}")
+      end
+      self.send :"#{attribute}=", _value_.to_f
+    end
   end
 end

data/lib/activitystreams/verb.rb

@@ -2,13 +2,27 @@ module ActivityStreams
   class Verb < Base
     attr_required :verb
 
-    def initialize(attributes = {})
-      attributes[:verb] ||= :post
+    def initialize
+      _verb_ = if self.class.superclass == Verb
+        self.class.name.demodulize.underscore.dasherize
+      else
+        'post'
+      end
+      super :verb => _verb_
+    end
+
+    def validate_attributes!
       super
+      to_iri :verb
     end
 
-    def as_json(options = {})
+    def to_s(options = {})
       verb.to_s
     end
+    alias_method :as_json, :to_s
   end
 end
+
+Dir[File.dirname(__FILE__) + '/verb/*.rb'].each do |file| 
+  require file
+end

data/lib/activitystreams/verb/add.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Add < Verb
+  end
+end

data/lib/activitystreams/verb/cancel.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Cancel < Verb
+  end
+end

data/lib/activitystreams/verb/checkin.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Checkin < Verb
+  end
+end

data/lib/activitystreams/verb/delete.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Delete < Verb
+  end
+end

data/lib/activitystreams/verb/favorite.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Favorite < Verb
+  end
+end

data/lib/activitystreams/verb/follow.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Follow < Verb
+  end
+end

data/lib/activitystreams/verb/give.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Give < Verb
+  end
+end

data/lib/activitystreams/verb/ignore.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Ignore < Verb
+  end
+end

data/lib/activitystreams/verb/invite.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Invite < Verb
+  end
+end

data/lib/activitystreams/verb/join.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Join < Verb
+  end
+end

data/lib/activitystreams/verb/leave.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Leave < Verb
+  end
+end

data/lib/activitystreams/verb/like.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Like < Verb
+  end
+end

data/lib/activitystreams/verb/make_friend.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::MakeFriend < Verb
+  end
+end

data/lib/activitystreams/verb/play.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Play < Verb
+  end
+end

data/lib/activitystreams/verb/receive.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Receive < Verb
+  end
+end

data/lib/activitystreams/verb/remove.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Remove < Verb
+  end
+end

data/lib/activitystreams/verb/remove_friend.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::RemoveFriend < Verb
+  end
+end

data/lib/activitystreams/verb/request_friend.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::RequestFriend < Verb
+  end
+end

data/lib/activitystreams/verb/rsvp_maybe.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::RSVPMaybe < Verb
+  end
+end

data/lib/activitystreams/verb/rsvp_no.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::RSVPNo < Verb
+  end
+end

data/lib/activitystreams/verb/rsvp_yes.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::RSVPYes < Verb
+  end
+end

data/lib/activitystreams/verb/save.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Save < Verb
+  end
+end

data/lib/activitystreams/verb/share.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Share < Verb
+  end
+end

data/lib/activitystreams/verb/stop_following.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::StopFollowing < Verb
+  end
+end

data/lib/activitystreams/verb/tag.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Tag < Verb
+  end
+end

data/lib/activitystreams/verb/unfavorite.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Unfavorite < Verb
+  end
+end

data/lib/activitystreams/verb/unlike.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Unlike < Verb
+  end
+end

data/lib/activitystreams/verb/unsave.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Unsave < Verb
+  end
+end

data/lib/activitystreams/verb/update.rb

@@ -0,0 +1,4 @@
+module ActivityStreams
+  class Verb::Update < Verb
+  end
+end

data/spec/activitystreams/activity_spec.rb

@@ -48,4 +48,35 @@ describe ActivityStreams::Activity do
       expect { ActivityStreams::Activity.new valid_attributes }.should_not raise_error AttrRequired::AttrMissing
     end
   end
+
+  describe '#recommended_verb?' do
+    let(:activity) do
+      ActivityStreams::Activity.new valid_attributes.merge(
+        :object => object,
+        :verb => verb
+      )
+    end
+
+    context 'when object is Bookmark' do
+      let(:object) { ActivityStreams::Object::Bookmark.new }
+
+      context 'when recommended verb used' do
+        let(:verb) { ActivityStreams::Verb.new }
+        it 'should not warn' do
+          ActivityStreams.logger.should_not_receive(:warn)
+          activity
+        end
+      end
+
+      context 'otherwise' do
+        let(:verb) { ActivityStreams::Verb::Add.new }
+        it 'should warn' do
+          ActivityStreams.logger.should_receive(:warn).with(
+            "\"#{verb.to_s}\" is not recommended. \"#{object.recommended_verbs.collect(&:to_s).join('", "')}\" are recommended."
+          )
+          activity
+        end
+      end
+    end
+  end
 end

data/spec/activitystreams/base_spec.rb

@@ -30,9 +30,9 @@ describe ActivityStreams::Base do
       SubClass.new(
         :required => time,
         :optional => iri
-      )
+      ).as_json
     end
-    its(:as_json) do
+    it do
       should == {
         :required => time.iso8601,
         :optional => iri.to_s

data/spec/activitystreams/media_link_spec.rb

@@ -40,8 +40,8 @@ describe ActivityStreams::MediaLink do
 
   describe '#as_json' do
     let(:attributes) { required_attributes.merge(optional_attributes) }
-    subject { ActivityStreams::MediaLink.new required_attributes.merge(optional_attributes) }
-    its(:as_json) do
+    subject { ActivityStreams::MediaLink.new(required_attributes.merge(optional_attributes)).as_json }
+    it do
       should == {
         :url      => required_attributes[:url],
         :duration => optional_attributes[:duration].to_i,

data/spec/activitystreams/object/article_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Article do
+  its(:object_type) { should == Addressable::URI.parse('article') }
+  its(:recommended_verbs) { should == [] }
+end

data/spec/activitystreams/object/audio_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Audio do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:stream => 'invalid'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Audio.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/bookmark_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Bookmark do
+  its(:recommended_verbs) { should == [:post, :favorite] }
+
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:target_url => 'http://'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Bookmark.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/collection_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Collection do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:object_types => 'bookmark,person'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Collection.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/comment_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Comment do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:in_reply_to => ['object_a', 'object_b']}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Comment.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/event_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Event do
+  context 'when invalid attributes given' do
+    [:attending, :maybe_attending, :not_attending, :start_time, :end_time].each do |_attr_|
+      context "when #{_attr_} is invalid" do
+        let(:invalid_attributes) do
+          {_attr_ => 'invalid'}
+        end
+
+        it do
+          expect { ActivityStreams::Object::Event.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+        end
+      end
+    end
+  end
+end

data/spec/activitystreams/object/file_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::File do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:file_url => 'http://'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::File.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/image_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Image do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:full_image => 'invalid'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Image.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/place_spec.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Place do
+  context 'when invalid attributes given' do
+    [:position, :address].each do |_attr_|
+      context "when #{_attr_} is invalid" do
+        let(:invalid_attributes) do
+          {_attr_ => 'invalid'}
+        end
+
+        it do
+          expect { ActivityStreams::Object::Place.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+        end
+      end
+    end
+  end
+
+  describe ActivityStreams::Object::Place::GeoLocation do
+    context 'when missing attributes' do
+      it do
+        expect { ActivityStreams::Object::Place::GeoLocation.new }.should raise_error AttrRequired::AttrMissing
+      end
+    end
+
+    describe '#as_json' do
+      let(:latitude)  { 35.0  }
+      let(:longitude) { 140.0 }
+      let(:altitude)  { 100   }
+      subject { ActivityStreams::Object::Place::GeoLocation.new attributes }
+      context 'when altitude given' do
+        let(:attributes) do
+          {
+            :latitude  => latitude,
+            :longitude => longitude
+          }
+        end
+        its(:as_json) { should == "+#{latitude}+#{longitude}" }
+      end
+
+      context 'otherwise' do
+        let(:attributes) do
+          {
+            :latitude  => latitude,
+            :longitude => longitude,
+            :altitude  => altitude
+          }
+        end
+        its(:as_json) { should == "+#{latitude}+#{longitude}+#{altitude}" }
+      end
+    end
+  end
+end

data/spec/activitystreams/object/product_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Product do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:full_image => 'invalid'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Product.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/question_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Question do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:options => ['invalid']}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Question.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object/review_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Review do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:_rating_ => 0}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Review.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+
+  describe '#rating' do
+    subject { ActivityStreams::Object::Review.new(:_rating_ => rate) }
+    context 'when integer' do
+      let(:rate) { 3 }
+      its(:_rating_) { should be_a Float }
+    end
+
+    context 'when float' do
+      let(:rate) { 1.36 }
+      its(:_rating_) { should == rate.round(1) }
+    end
+  end
+
+  describe '#as_json' do
+    subject { ActivityStreams::Object::Review.new(:_rating_ => 1).as_json }
+    its(:keys) { should include :rating }
+    its(:keys) { should_not include :_rating_ }
+  end
+end

data/spec/activitystreams/object/video_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe ActivityStreams::Object::Video do
+  context 'when invalid attributes given' do
+    let(:invalid_attributes) do
+      {:stream => 'invalid'}
+    end
+
+    it do
+      expect { ActivityStreams::Object::Video.new invalid_attributes }.should raise_error ActivityStreams::InvalidAttribute
+    end
+  end
+end

data/spec/activitystreams/object_spec.rb

@@ -44,4 +44,13 @@ describe ActivityStreams::Object do
       expect { ActivityStreams::Object.new valid_attributes }.should_not raise_error AttrRequired::AttrMissing
     end
   end
+
+  describe '#as_json' do
+    subject { ActivityStreams::Object.new(:display_name => 'Nov').as_json }
+    it do
+      should == {
+        :displayName => 'Nov'
+      }
+    end
+  end
 end

data/spec/activitystreams/verb/add_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe ActivityStreams::Verb::Add do
+  its(:verb) { should == Addressable::URI.parse('add') }
+  its(:as_json) { should == 'add' }
+end

data/spec/activitystreams/verb/make_friend_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe ActivityStreams::Verb::MakeFriend do
+  its(:verb) { should == Addressable::URI.parse('make-friend') }
+  its(:as_json) { should == 'make-friend' }
+end

data/spec/activitystreams/verb/rsvp_maybe_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe ActivityStreams::Verb::RSVPMaybe do
+  its(:verb) { should == Addressable::URI.parse('rsvp-maybe') }
+  its(:as_json) { should == 'rsvp-maybe' }
+end

data/spec/activitystreams/verb_spec.rb

@@ -1,18 +1,6 @@
 require 'spec_helper'
 
 describe ActivityStreams::Verb do
-  context 'when missing attributes' do
-    subject { ActivityStreams::Verb.new }
-    its(:verb) { should == :post }
-  end
-
-  context 'otherwise' do
-    subject { ActivityStreams::Verb.new(:verb => :my_verb) }
-    its(:verb) { should == :my_verb }
-  end
-
-  describe '#as_json' do
-    subject { ActivityStreams::Verb.new(:verb => :my_verb) }
-    its(:as_json) { should == 'my_verb' }
-  end
+  its(:verb) { should == Addressable::URI.parse('post') }
+  its(:as_json) { should == 'post' }
 end

data/spec/activitystreams_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe ActivityStreams do
+  its(:logger) { should be_a Logger}
+
+  describe '.logger=' do
+    class CustomLogger < Logger; end
+
+    it 'should set custom logger' do
+      ActivityStreams.logger = CustomLogger.new(STDERR)
+      ActivityStreams.logger.should be_a CustomLogger
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activitystreams
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - nov matake
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 Z
+date: 2011-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -157,19 +157,84 @@ files:
 - lib/activitystreams/base.rb
 - lib/activitystreams/collection.rb
 - lib/activitystreams/exception.rb
+- lib/activitystreams/ext_properties.rb
 - lib/activitystreams/media_link.rb
 - lib/activitystreams/object.rb
+- lib/activitystreams/object/article.rb
+- lib/activitystreams/object/audio.rb
+- lib/activitystreams/object/badge.rb
+- lib/activitystreams/object/bookmark.rb
+- lib/activitystreams/object/collection.rb
+- lib/activitystreams/object/comment.rb
+- lib/activitystreams/object/event.rb
+- lib/activitystreams/object/file.rb
+- lib/activitystreams/object/group.rb
+- lib/activitystreams/object/image.rb
+- lib/activitystreams/object/note.rb
+- lib/activitystreams/object/person.rb
+- lib/activitystreams/object/place.rb
+- lib/activitystreams/object/product.rb
+- lib/activitystreams/object/question.rb
+- lib/activitystreams/object/review.rb
+- lib/activitystreams/object/service.rb
+- lib/activitystreams/object/video.rb
 - lib/activitystreams/stream.rb
 - lib/activitystreams/validator.rb
 - lib/activitystreams/verb.rb
+- lib/activitystreams/verb/add.rb
+- lib/activitystreams/verb/cancel.rb
+- lib/activitystreams/verb/checkin.rb
+- lib/activitystreams/verb/delete.rb
+- lib/activitystreams/verb/favorite.rb
+- lib/activitystreams/verb/follow.rb
+- lib/activitystreams/verb/give.rb
+- lib/activitystreams/verb/ignore.rb
+- lib/activitystreams/verb/invite.rb
+- lib/activitystreams/verb/join.rb
+- lib/activitystreams/verb/leave.rb
+- lib/activitystreams/verb/like.rb
+- lib/activitystreams/verb/make_friend.rb
+- lib/activitystreams/verb/play.rb
+- lib/activitystreams/verb/receive.rb
+- lib/activitystreams/verb/remove.rb
+- lib/activitystreams/verb/remove_friend.rb
+- lib/activitystreams/verb/request_friend.rb
+- lib/activitystreams/verb/rsvp_maybe.rb
+- lib/activitystreams/verb/rsvp_no.rb
+- lib/activitystreams/verb/rsvp_yes.rb
+- lib/activitystreams/verb/save.rb
+- lib/activitystreams/verb/share.rb
+- lib/activitystreams/verb/stop_following.rb
+- lib/activitystreams/verb/tag.rb
+- lib/activitystreams/verb/unfavorite.rb
+- lib/activitystreams/verb/unlike.rb
+- lib/activitystreams/verb/unsave.rb
+- lib/activitystreams/verb/update.rb
 - spec/activitystreams/activity_spec.rb
 - spec/activitystreams/base_spec.rb
 - spec/activitystreams/collection_spec.rb
 - spec/activitystreams/media_link_spec.rb
+- spec/activitystreams/object/article_spec.rb
+- spec/activitystreams/object/audio_spec.rb
+- spec/activitystreams/object/bookmark_spec.rb
+- spec/activitystreams/object/collection_spec.rb
+- spec/activitystreams/object/comment_spec.rb
+- spec/activitystreams/object/event_spec.rb
+- spec/activitystreams/object/file_spec.rb
+- spec/activitystreams/object/image_spec.rb
+- spec/activitystreams/object/place_spec.rb
+- spec/activitystreams/object/product_spec.rb
+- spec/activitystreams/object/question_spec.rb
+- spec/activitystreams/object/review_spec.rb
+- spec/activitystreams/object/video_spec.rb
 - spec/activitystreams/object_spec.rb
 - spec/activitystreams/stream_spec.rb
 - spec/activitystreams/validator_spec.rb
+- spec/activitystreams/verb/add_spec.rb
+- spec/activitystreams/verb/make_friend_spec.rb
+- spec/activitystreams/verb/rsvp_maybe_spec.rb
 - spec/activitystreams/verb_spec.rb
+- spec/activitystreams_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/nov/activitystreams
 licenses: []
@@ -200,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: A RubyGem for ActivityStreams Publishers
@@ -209,8 +274,25 @@ test_files:
 - spec/activitystreams/base_spec.rb
 - spec/activitystreams/collection_spec.rb
 - spec/activitystreams/media_link_spec.rb
+- spec/activitystreams/object/article_spec.rb
+- spec/activitystreams/object/audio_spec.rb
+- spec/activitystreams/object/bookmark_spec.rb
+- spec/activitystreams/object/collection_spec.rb
+- spec/activitystreams/object/comment_spec.rb
+- spec/activitystreams/object/event_spec.rb
+- spec/activitystreams/object/file_spec.rb
+- spec/activitystreams/object/image_spec.rb
+- spec/activitystreams/object/place_spec.rb
+- spec/activitystreams/object/product_spec.rb
+- spec/activitystreams/object/question_spec.rb
+- spec/activitystreams/object/review_spec.rb
+- spec/activitystreams/object/video_spec.rb
 - spec/activitystreams/object_spec.rb
 - spec/activitystreams/stream_spec.rb
 - spec/activitystreams/validator_spec.rb
+- spec/activitystreams/verb/add_spec.rb
+- spec/activitystreams/verb/make_friend_spec.rb
+- spec/activitystreams/verb/rsvp_maybe_spec.rb
 - spec/activitystreams/verb_spec.rb
+- spec/activitystreams_spec.rb
 - spec/spec_helper.rb