courier 0.2.1 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.3

data/courier.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{courier}
-  s.version = "0.2.1"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-04-19}
   s.description = %q{Система управления пользовательскими оповещениями и подписками}
   s.email = %q{danil@orionet.ru}
   s.extra_rdoc_files = [
@@ -67,7 +67,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/dapi/courier}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Система управления пользовательскими оповещениями и подписками}
   s.test_files = [
     "spec/controllers/courier_settings_controller_spec.rb",

data/lib/courier/config.rb

@@ -26,7 +26,7 @@ class Courier::Config
 
   def get_service name
     name=name.to_sym
-    services_hash[name] or raise "No such service '#{name}'"
+    services_hash[name] or raise "No such service '#{name}'. Specify it by Courier.init in ./config/initializers/courier.rb"
   end
 
   def template name, *sets
@@ -42,7 +42,7 @@ class Courier::Config
   end
 
   def get_template key
-    templates_hash[key.to_sym] or raise "No such template '#{key}'"
+    templates_hash[key.to_sym] or raise "No such template '#{key}'. Specify it by Courier.init in ./config/initializers/courier.rb"
   end
 
   def class_of_service(name)

data/lib/courier/owner.rb

@@ -1,13 +1,9 @@
 # -*- coding: utf-8 -*-
 
-
-# # Courier::Sender (extenstion для AR-модели пользователя-отправителя)
-
-# Подключается через `acts_as_sender` дает модели метод `message(key, options)`. Пример вызова:
-
+# Подключается через `has_courier` дает модели метод `message(key, options)`. Пример вызова:
+#
 # @@@
-# user.notify :comments_in_my_plan, :comments=>@comments, :level=>:success
-# user.notify_failure :cant_import_plans, :provider=>:facebook
+# user.message :comments_in_my_plan, :comments=>@comments, :level=>:success
 # @@@
 
 

data/lib/courier/service/facebook.rb

@@ -2,6 +2,9 @@
 
 class Courier::Service::Facebook < Courier::Service::Base
 
+  FACEBOOK_PROPERTY_ATTRS = [:from, :to, :picture, :link, :name, :caption, :description, :message,
+    :source, :icon, :attribution, :actions, :privacy, :targeting]
+
   def initialize
     raise "No Koala defined. Add gem 'koala' to your Gemfile. " unless defined? Koala
     attr_accessor={}
@@ -13,15 +16,22 @@ class Courier::Service::Facebook < Courier::Service::Base
   # http://developers.facebook.com/docs/reference/api/post/
   #
   def deliver_message(message)
-    message.owner.respond_to?(:facebook_token) or
-      raise "method facebook_token is not defined in your owner's model #{owner.class}"
-    token = message.owner.facebook_token or raise "owner's facebook_token is empty"
-
-    unless args = message.options[:facebook_properties]
-      args = message.options.slice(:from, :to, :picture, :link, :name, :caption, :message,
-        :description, :source, :icon, :attribution, :actions, :privacy, :targeting)
-    end
-    args[:message] ||= message.options[:text] || Courier.template(message.template).get_text(message.service, message.options)
-    Koala::Facebook::GraphAPI.new(token).put_object(args[:to] || 'me', "feed", args)
+    return true unless message.owner.facebook_id
+
+    args = message.options[:facebook_properties] || message.options.slice(FACEBOOK_PROPERTY_ATTRS)
+
+    args[:message] ||= message.options[:text] || Courier.template(message.template).
+      get_text(message.service, message.options)
+
+    token = args[:token]
+    token ||= message.owner.facebook_token if message.owner.respond_to?(:facebook_token)
+
+    return nil unless token
+
+    to = args[:to] || (message.owner.respond_to?(:facebook_id) ? message.owner.facebook_id : nil) || 'me'
+
+    # Settings.omniauth.facebook.app_id, Settings.omniauth.facebook.secret
+    # Это post_on_wall
+    Koala::Facebook::GraphAPI.new(token).put_object(to, "feed", args)
   end
 end

data/spec/courier/message_spec.rb

@@ -8,10 +8,4 @@ describe Courier::Message do
   it { should validate_presence_of(:owner) }
   it { should validate_presence_of(:service) }
   it { should validate_presence_of(:template) }
-
-  describe do
-    before do
-      pending
-    end
-  end
 end

data/spec/courier/service/facebook_spec.rb

@@ -3,19 +3,30 @@ require 'spec_helper'
 
 describe Courier::Service::Facebook do
   describe '#deliver!' do
+    before do
+      @owner = mock_owner :facebook_id=>123
+    end
+    let(:owner) { @owner }
+    let(:message) { mock_message :owner=>owner, :options=>{:text=>'text'} }
+
     it 'posts messages with Koala' do
-      owner = mock_owner :facebook_token=>'fbtoken'
+      owner.stub(:facebook_token) { 'fbtoken' }
 
-      message = mock_message :owner=>owner, :options=>{:text=>'text'}
       message.should_receive(:mark_as_delivered!)
 
       graph = double
-      graph.should_receive(:put_object).
-        with('me','feed',{:message=>'text'}) { true }
+      graph.should_receive(:put_object).with(123,'feed',{:message=>'text'}) { true }
       Koala::Facebook::GraphAPI.should_receive(:new).with('fbtoken') { graph }
 
       subject.stub_chain('messages.fresh') { [message] }
       subject.deliver_all!
     end
+
+    it 'do nothing if there is no token' do
+      Koala::Facebook::GraphAPI.should_not_receive(:new)
+
+      subject.stub_chain('messages.fresh') { [message] }
+      subject.deliver_all!
+    end
   end
 end

data/spec/support/gems_simulation.rb

@@ -5,7 +5,8 @@ module GritterNotices end
 
 module Koala
   module Facebook
-    module GraphAPI end
+    class GraphAPI
     end
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: courier
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Danil Pismenny
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 +04:00
+date: 2011-04-19 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +30,11 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  version_requirements: *id001
   name: rails
+  version_requirements: *id001
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,11 +46,11 @@ dependencies:
         - 10
         - 2
         version: 0.10.2
-  version_requirements: *id002
   name: state_machine
+  version_requirements: *id002
   prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -59,11 +60,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
   name: pg
+  version_requirements: *id003
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -73,11 +74,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id004
   name: ruby-debug
+  version_requirements: *id004
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -87,11 +88,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id005
   name: watchr
+  version_requirements: *id005
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -101,11 +102,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id006
   name: sqlite3
+  version_requirements: *id006
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,11 +116,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id007
   name: factory_girl
+  version_requirements: *id007
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,11 +130,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id008
   name: shoulda
+  version_requirements: *id008
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,11 +145,11 @@ dependencies:
         - 2
         - 5
         version: "2.5"
-  version_requirements: *id009
   name: rspec
+  version_requirements: *id009
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +159,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id010
   name: rspec-rails
+  version_requirements: *id010
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +175,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id011
   name: bundler
+  version_requirements: *id011
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,11 +191,11 @@ dependencies:
         - 5
         - 2
         version: 1.5.2
-  version_requirements: *id012
   name: jeweler
+  version_requirements: *id012
   prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -204,10 +205,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id013
   name: rcov
+  version_requirements: *id013
   prerelease: false
-  type: :development
 description: !binary |
   0KHQuNGB0YLQtdC80LAg0YPQv9GA0LDQstC70LXQvdC40Y8g0L/QvtC70YzQ
   t9C+0LLQsNGC0LXQu9GM0YHQutC40LzQuCDQvtC/0L7QstC10YnQtdC90LjR
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: !binary |