courier 0.1.2 → 0.1.3

data/README.rdoc

@@ -70,14 +70,21 @@ Gemfile:
 
 === Сервис отложенной отправки
 
-Достаточно реализовать метод <tt>deliver!</tt>, так как +message+ удачно складывает все сообщения в базу. Например:
+Достаточно реализовать метод <tt>deliver_all!</tt> или <tt>deliver_message</tt>, так как +message+ удачно складывает все сообщения в базу. Например:
 
-    def deliver!
-      courier_messages.fresh.each do |message|
-        send_message_my_way message.owner, message.text
+    def deliver_all!
+      messages.fresh.each do |message|
+        send_message_my_way(message.owner, message.text) and message.set_delivered
       end
     end
 
+или
+
+    def deliver_message(message)
+      send_message_my_way(message.owner, message.text)
+      # returns true to mark message as delivered
+    end
+
 === Сервис отправки в реальном времени
 
 Достаточно реализоват метод +message+. Например:

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/courier.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{courier}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]

data/lib/courier/message.rb

@@ -7,12 +7,11 @@ class Courier::Message < ActiveRecord::Base
   set_table_name 'courier_messages'
 
   belongs_to :owner, :polymorphic=>true
-  belongs_to :service #, :polymorphic=>true
-  belongs_to :template #, :polymorphic=>true
 
   serialize :options, Hash
 
   scope :fresh, where(:state=>:fresh)
+  scope :by_service, lambda { |service| where(:service=>service.to_s) }
 
   validates_presence_of :owner, :service, :template
 

data/lib/courier/owner.rb

@@ -14,6 +14,7 @@
 module Courier::Owner
   def has_courier
     has_one :courier, :as => :owner, :dependent => :destroy, :class_name=>'Courier::OwnerSetting'
+    has_many :courier_messages, :as => :owner, :dependent => :destroy, :class_name=>'Courier::Message'
     include InstanceMethods
 
     after_create do
@@ -24,8 +25,9 @@ module Courier::Owner
   module InstanceMethods
     def message(template_key, args={})
       template = Courier.template(template_key)
-      Courier.config.services_order.each do |service|
-        service.message(self, template, args) if courier.enabled?(template, service, args)
+      Courier.config.services_order.select do |service|
+        create_courier unless courier
+        courier.enabled?(template, service, args) and service.message(self, template, args)
       end
     end
   end

data/lib/courier/service/base.rb

@@ -36,20 +36,34 @@ class Courier::Service::Base
 
   def check_args owner, template, args
     args[:owner]  ||=owner
-    args[:text]   ||=template.get_text(args)
     args[:service]||=self
+    args[:text]   ||=template.get_text(args)
   end
 
   def message(owner, template, args)
     check_args owner, template, args
-    courier_messages.create! :owner=>owner, :template=>template, :options=>args
+    Courier::Message.create! :owner=>owner, :template=>template.name, :service=>name, :options=>args
+  end
+
+  def to_s
+    name
   end
 
   def name
     self.class.name.demodulize.underscore.to_sym
   end
 
-  def deliver!
-    raise 'inherit my class and implement me'
+  def deliver_message(message)
+    raise 'inherit and implement me'
+  end
+
+  def messages
+    Courier::Message.by_service(name)
+  end
+
+  def deliver_all!
+    messages.fresh.each do |message|
+      deliver_message(message) and message.set_delivered
+    end
   end
 end

data/lib/courier/service/facebook.rb

@@ -7,19 +7,19 @@ class Courier::Service::Facebook < Courier::Service::Base
   end
 
   def check_args owner, template, args
-    args[:to]|='me'
+    args[:to]||='me'
     args[:attachment]||={}
     super
   end
 
-  def deliver!
+  def deliver_all!
     cache={}
-    courier_messages.fresh.each do |message|
+    messages.fresh.each do |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"
       graph = cache[token] ||= Koala::Facebook::GraphAPI.new(token)
-      graph.put_wall_post(message.options[:text], message.options[:attachment], message.options[:to]) and
+      graph.put_wall_post(message.options[:text], message.options[:attachment], message.options[:to] || 'me') and
         message.set_delivered
     end
   end

data/lib/courier/template/base.rb

@@ -9,7 +9,8 @@ class Courier::Template::Base
   end
 
   def get_text(args)
-    args[:scope]=[:courier,:messages,args[:service].name] unless args[:scope]
+    raise 'Service is not defined' unless args[:service]
+    args[:scope]=[:courier, args[:service].name] unless args[:scope]
     args[:cascade]=true unless args.has_key? :cascade
     I18n::translate(name, args )
   end
@@ -26,6 +27,10 @@ class Courier::Template::Base
     defaults[service.name.to_sym] = check_val(val)
   end
 
+  def to_s
+    "Courier::Template(#{name})"
+  end
+
   def key
     name
   end

data/lib/courier.rb

@@ -19,7 +19,7 @@ module Courier
 
     def deliver_all!
       config.services.each do |service|
-        service.deliver!
+        service.deliver_all!
       end
     end
 

data/lib/generators/templates/migration.rb

@@ -19,15 +19,15 @@ class CreateCourierTables < ActiveRecord::Migration
     create_table :courier_messages, :force => true do |t|
       t.integer   :owner_id,                           :null => false
       t.string    :owner_type,                         :null => false
-      t.integer   :template_id,                        :null => false
-      t.integer   :service_id,                         :null => false
+      t.string    :template,                           :null => false
+      t.string    :service,                            :null => false
       t.string    :state,                              :null => false
       t.text      :options,                            :null => false
       t.timestamp :delivered_at
       t.timestamps
     end
 
-    add_index :courier_messages, [:service_id, :state]
+    add_index :courier_messages, [:service, :state]
   end
 
   def self.down

data/spec/courier/message_spec.rb

@@ -4,8 +4,6 @@ require 'spec_helper'
 describe Courier::Message do
 
   it { should belong_to(:owner) }
-  it { should belong_to(:template) }
-  it { should belong_to(:service) }
 
   it { should validate_presence_of(:owner) }
   it { should validate_presence_of(:service) }

data/spec/courier/owner_spec.rb

@@ -11,7 +11,8 @@ describe User, "Courier::Owner extention" do
   end
 
   describe '#message' do
-    let(:args) { {:level=>123,:text=>'some text'} }
+    let(:args) { {:level=>123, :text=>'some text'} }
+    subject{ Factory :user }
     it 'should send message to enabled services only' do
       template = mock_template
 
@@ -19,13 +20,14 @@ describe User, "Courier::Owner extention" do
       service2 = mock_service
       service1.should_receive(:message).with(subject, template, args)
 
+      subject.should_not_receive :create_courier
+
       subject.courier.should_receive(:enabled?).twice { |template, service, args|
         service==service1
       }
 
       Courier.should_receive(:config) { double :services_order=>[service1, service2] }
       Courier.should_receive(:template).with(:templ) { template }
-
       subject.message :templ, args
     end
   end

data/spec/courier/service/base_spec.rb

@@ -7,18 +7,18 @@ describe Courier::Service::Base do
   describe '#message' do
     it 'saves message in database' do
       args={:a=>1}
-      owner = double
-      template = double
-      cm = double
-      cm.should_receive(:create!).with(:owner=>owner, :template=>template, :options=>args)
-      subject.should_receive(:courier_messages) { cm }
+      owner = Factory :user
+      owner.courier_messages.should be_empty
+      template = double :template, :name=>:template_key
       subject.should_receive(:check_args).with(owner, template, args)
       subject.message owner, template, args
+      owner.courier_messages(true).should have(1).items
     end
   end
 
   # inherited in subclasses
-  describe '#deliver!'
+  describe '#deliver!' do
+  end
 
   describe 'last subclass title as name' do
     before do

data/spec/courier/service/facebook_spec.rb

@@ -15,8 +15,8 @@ describe Courier::Service::Facebook do
         with(message.options[:text], message.options[:attachment], message.options[:to]) { true }
       Koala::Facebook::GraphAPI.should_receive(:new).with('fbtoken') { graph }
 
-      subject.stub_chain('courier_messages.fresh') { [message] }
-      subject.deliver!
+      subject.stub_chain('messages.fresh') { [message] }
+      subject.deliver_all!
     end
   end
 end

data/spec/courier/template/base_spec.rb

@@ -12,7 +12,7 @@ describe Courier::Template::Base do
       subject.should_receive(:name) { 'template_key' }
       subject.
         get_text(:some_option=>123,:service=>double(:name=>'facebook')).should ==
-        'translation missing: en.courier.messages.facebook.template_key'
+        'translation missing: en.courier.facebook.template_key'
     end
   end
 

data/spec/courier_spec.rb

@@ -16,7 +16,7 @@ describe Courier do
   describe '.deliver_all!' do
     it 'should run deliver! for all services' do
       service = mock_service
-      service.should_receive(:deliver!).twice
+      service.should_receive(:deliver_all!).twice
       Courier.config.should_receive(:services) { [service, service]}
       Courier.deliver_all!
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: courier
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Danil Pismenny