courier 0.1.3 → 0.1.4

data/README.rdoc

@@ -48,7 +48,11 @@ Gemfile:
 отправил, а если сообщения собираются для дальнейшей отправки, то
 осуществляется эта доставка так:
 
-    Courier.deliver_all!
+    Courier.deliver_all! # Запускает доставку по всем сервисам
+
+Для каждого сервиса можно запускать доставку отдельно:
+
+    Courier.service(:facebook).deliver_all!
 
 == Сервисы
 
@@ -74,7 +78,7 @@ Gemfile:
 
     def deliver_all!
       messages.fresh.each do |message|
-        send_message_my_way(message.owner, message.text) and message.set_delivered
+        send_message_my_way(message.owner, message.text) and message.mark_as_delivered!
       end
     end
 
@@ -94,7 +98,6 @@ Gemfile:
     end
 
 
-
 == Contributing to courier
 
 * Yes, please.

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/courier.gemspec

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

data/lib/courier/message.rb

@@ -22,4 +22,16 @@ class Courier::Message < ActiveRecord::Base
       transition :fresh => :delivered
     end
   end
+
+  def destroy_when_delivered?
+    true
+  end
+
+  def mark_as_delivered!
+    if destroy_when_delivered?
+      destroy
+    else
+      set_delivered
+    end
+  end
 end

data/lib/courier/service/base.rb

@@ -35,9 +35,7 @@ class Courier::Service::Base
   end
 
   def check_args owner, template, args
-    args[:owner]  ||=owner
-    args[:service]||=self
-    args[:text]   ||=template.get_text(args)
+    # args[:text]||=template.get_text(self, args)
   end
 
   def message(owner, template, args)
@@ -63,7 +61,7 @@ class Courier::Service::Base
 
   def deliver_all!
     messages.fresh.each do |message|
-      deliver_message(message) and message.set_delivered
+      deliver_message(message) and message.mark_as_delivered!
     end
   end
 end

data/lib/courier/service/facebook.rb

@@ -1,26 +1,27 @@
 # -*- coding: utf-8 -*-
 
 class Courier::Service::Facebook < Courier::Service::Base
+
   def initialize
     raise "No Koala defined. Add gem 'koala' to your Gemfile. " unless defined? Koala
+    attr_accessor={}
     super
   end
 
-  def check_args owner, template, args
-    args[:to]||='me'
-    args[:attachment]||={}
-    super
-  end
+  #
+  # message.options[:facebook_properties] are all available options from
+  # 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"
 
-  def deliver_all!
-    cache={}
-    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] || 'me') and
-        message.set_delivered
+    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)
   end
 end

data/lib/courier/service/gritter_notice.rb

@@ -6,10 +6,20 @@ class Courier::Service::GritterNotice < Courier::Service::Base
     super
   end
 
+  #
+  # В локале создается хеш всех параметров принимаемых GritterNotice
+  #
+  # template_key:
+  #   title: Внимание!
+  #   text: Ва прошли на новый уровень
+  #   level: warning
+  #   image: /images/warning.png
+  #
+  #
+
   def message(owner, template, options)
-    options[:scope]=[:courier,:messages,:gritter_notice] unless options[:scope]
-    options[:text]=I18n::translate(name, options )
-    owner.gritter_notice template.name, options
+    options[:scope]=[:courier, :gritter_notice] unless options[:scope]
+    owner.gritter_notice template.name, I18n::translate(template.name, options )
   end
 
   def deliver!

data/lib/courier/template/base.rb

@@ -8,9 +8,8 @@ class Courier::Template::Base
     self.defaults={}
   end
 
-  def get_text(args)
-    raise 'Service is not defined' unless args[:service]
-    args[:scope]=[:courier, args[:service].name] unless args[:scope]
+  def get_text(service, args)
+    args[:scope]=[:courier, service.to_s] unless args[:scope]
     args[:cascade]=true unless args.has_key? :cascade
     I18n::translate(name, args )
   end

data/spec/courier/service/facebook_spec.rb

@@ -6,13 +6,12 @@ describe Courier::Service::Facebook do
     it 'posts messages with Koala' do
       owner = mock_owner :facebook_token=>'fbtoken'
 
-      message = mock_message :owner=>owner, :options=>{:text=>'text',:attachment=>{},:to=>'123'}
-      message.should_receive(:owner)
-      message.should_receive(:set_delivered)
+      message = mock_message :owner=>owner, :options=>{:text=>'text'}
+      message.should_receive(:mark_as_delivered!)
 
       graph = double
-      graph.should_receive(:put_wall_post).
-        with(message.options[:text], message.options[:attachment], message.options[:to]) { true }
+      graph.should_receive(:put_object).
+        with('me','feed',{:message=>'text'}) { true }
       Koala::Facebook::GraphAPI.should_receive(:new).with('fbtoken') { graph }
 
       subject.stub_chain('messages.fresh') { [message] }

data/spec/courier/service/gritter_notice_spec.rb

@@ -7,7 +7,7 @@ describe Courier::Service::GritterNotice do
       args={:a=>1}
       owner = double
       template = double :name=>:template_key
-      owner.should_receive(:gritter_notice).with(template.name, args)
+      owner.should_receive(:gritter_notice).with(template.name, "translation missing: en.courier.gritter_notice.template_key")
       subject.message owner, template, args
     end
   end

data/spec/courier/template/base_spec.rb

@@ -11,7 +11,7 @@ describe Courier::Template::Base do
     it 'should return text with localized tranlation' do
       subject.should_receive(:name) { 'template_key' }
       subject.
-        get_text(:some_option=>123,:service=>double(:name=>'facebook')).should ==
+        get_text(mock_service(:to_s=>'facebook'), :some_option=>123).should ==
         'translation missing: en.courier.facebook.template_key'
     end
   end

metadata

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