courier 0.2.0 → 0.2.1

data/README.rdoc

@@ -28,10 +28,12 @@ Gemfile:
     Courier.init do |d|
       d.services                       :active_mailer, :gritter_notice, :facebook
       d.template :import_complete,     :off,           :on,              :off
-      d.template :avatar_loaded,       :on,            :off,             :on
-      d.template :weekly_subscription, :on,            :on,              :on
+      d.template :avatar_loaded,       :on,            :off,             :disabled
+      d.template :weekly_subscription, :on,            :on,              :disabled
     end
 
+Где :on и :off это значения по умолчанию, а :disabled - полный запрет на установку этого параметра пользователем (:off по умолчанию)
+
 В модели пользователя:
 
   class User << ActiveRecord::Base

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/courier.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{courier}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
@@ -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.5.0}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{Система управления пользовательскими оповещениями и подписками}
   s.test_files = [
     "spec/controllers/courier_settings_controller_spec.rb",

data/lib/courier/service/gritter_notice.rb

@@ -18,7 +18,7 @@ class Courier::Service::GritterNotice < Courier::Service::Base
   #
 
   def message(owner, template, options)
-    scope = [:courier, :services, :gritter_notice]
+    scope = [:courier, :services, :gritter_notice, :templates]
     opt = I18n::translate(template.name, :scope=>scope)
     opt.merge!(options)
     opt[:text]||=I18n::translate([template.name,:text], opt.merge(:scope=>scope) )

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
-      I18n.should_receive(:translate).with(template.name, :scope=>[:courier, :services, :gritter_notice]) {{:text=>'text of translation', :level=>:warning} }
+      I18n.should_receive(:translate).with(template.name, :scope=>[:courier, :services, :gritter_notice, :templates]) {{:text=>'text of translation', :level=>:warning} }
       owner.should_receive(:gritter_notice).with(template.name, {:text=>"text of translation", :a=>1, :level=>:warning})
       subject.message owner, template, args
     end

metadata

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