mailee 0.4.3 → 0.5.0

data/.gitignore

@@ -0,0 +1 @@
+mailee-api-test.db

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.markdown

@@ -42,7 +42,7 @@ Instalação
 Compatibilidade
 =
 
-  Rails 3. 'Nuff said. Se você precisa de suporte aoRails 2, baixe a versão 0.1.0, mas ela possui muito menos funcionalidades do que a versão atual.
+  Rails 3. 'Nuff said. Se você precisa de suporte ao Rails 2, baixe a versão 0.1.0, mas ela possui muito menos funcionalidades do que a versão atual.
 
 Uso
 =
@@ -93,6 +93,11 @@ Uso
       sync_with_mailee :name => :my_name_column
     end  
   Se o valor do campo "news" (ou o que você utilizar para optin) for false, a gem não cadastrará o contato no Mailee. Se o contato já estiver cadastrado e o valor deste campo mudar para falso, o contato será descadastrado e _não_ poderá ser mais cadastrado no Mailee (normas de privacidade). Se ele estiver falso e mudar para verdadeiro, ele irá cadastrá-lo.
+  =code
+    class Contact < ActiveRecord::Base
+      sync_with_mailee :list => "Nome da sua lista"
+    end  
+  Você também pode (e a gente recomenda que você o faça) informar a lista na qual você quer que o contato seja inscrito quando ele for cadastrado no Mailee.me. Assim, quando você for criar uma campanha todos seus contatos cadastrados pelo seu sistema já estarão em uma lista. Aí é só enviar para esta lista e pronto.
 
   * Com mailers (ActionMailer)
   

data/Rakefile

@@ -18,29 +18,13 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/*_spec.rb']
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
+task :default => :spec
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/app/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.0.0'
-gem 'mailee', '0.4.0'
+gem 'mailee', '0.4.3'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 

data/app/Gemfile.lock

@@ -38,7 +38,7 @@ GEM
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
-    mailee (0.4.0)
+    mailee (0.4.3)
     mime-types (1.16)
     polyglot (0.3.1)
     rack (1.2.1)
@@ -70,6 +70,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  mailee (= 0.4.0)
+  mailee (= 0.4.3)
   rails (= 3.0.0)
   sqlite3-ruby

data/app/app/mailers/foo.rb

@@ -6,7 +6,7 @@ class Foo < ActionMailer::Base
 
   def bar(date=Time.now)
     @greeting = "Hi"
-    mail :date => date, :to => ["juanmaiz@gmail.com"]
+    mail :date => date, :to => ["juanmaiz@gmail.com"], :subject => "Bar"
   end
 
 end

data/app/config/initializers/mailee.rb

@@ -1 +1 @@
-Mailee::Config.site = 'http://api.bdb28c0a0a4a3.softa.mailee.me'
+Mailee::Config.site = "http://api.869a72b17b05a.mailee-api.mailee.me"

data/app/db/schema.rb

@@ -0,0 +1,15 @@
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+end

data/app/test/functional/foo_test.rb

@@ -4,16 +4,8 @@ class FooTest < ActionMailer::TestCase
   test "bar" do
     mail = Foo.bar
     assert_equal "Bar", mail.subject
-    assert_equal ["to@example.org"], mail.to
-    assert_equal ["from@example.com"], mail.from
-    assert_match "Hi", mail.body.encoded
-  end
-
-  test "baz" do
-    mail = Foo.baz
-    assert_equal "Baz", mail.subject
-    assert_equal ["to@example.org"], mail.to
-    assert_equal ["from@example.com"], mail.from
+    assert_equal ["juanmaiz@gmail.com"], mail.to
+    assert_equal ["maiz@softa.com.br"], mail.from
     assert_match "Hi", mail.body.encoded
   end
 

data/lib/mailee.rb

@@ -5,4 +5,4 @@ module Mailee; end
 require 'mailee/active_resource'
 require 'mailee/railties' if defined?(Rails)
 require 'mailee/active_record' if defined?(ActiveRecord)
-require 'mailee/action_mailer' if defined?(ActionMailer)
+require 'mailee/action_mailer' if defined?(ActionMailer)

data/lib/mailee/active_record.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # The Sync module is responsible for keeping a model syncd with Mailee.
 # It's behaviour is still too rails-twooish. But soon I'll make it more
 # treeish using Railties and stuff. But it works.
@@ -42,6 +43,10 @@ module Mailee
           unless self.column_names.include?(self.sync_options[:news].to_s)
             self.sync_options[:news] = nil
           end
+          if self.sync_options[:list]
+            lists = List.find(:all).map(&:name)
+            raise "A lista '#{self.sync_options[:list]}' não existe no Mailee.me." unless lists.include?(self.sync_options[:list])
+          end
         end
         include InstanceMethods
       end
@@ -66,6 +71,7 @@ module Mailee
           contact.email = send(sync_options[:email])
           contact.name = send(sync_options[:name]) if sync_options[:name]
           contact.save
+          contact.put(:subscribe, :list => sync_options[:list]) if sync_options[:list]
         end
       rescue
         logger.warn "MAILEE-API: Falhou ao criar o contato #{id} no Mailee"
@@ -82,6 +88,7 @@ module Mailee
               contact.email = send(sync_options[:email])
               contact.name = send(sync_options[:name]) if sync_options[:name]
               contact.save
+              contact.put(:subscribe, :list => sync_options[:list]) if sync_options[:list]
             end
           else
             create_in_mailee # Se não achou o contato tem q inserir.
@@ -150,4 +157,4 @@ module Mailee
     end
   end
 end
-ActiveRecord::Base.send(:include, Mailee::Sync) if defined?(ActiveRecord)
+ActiveRecord::Base.send(:include, Mailee::Sync) if defined?(ActiveRecord)

data/lib/mailee/active_resource.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 module Mailee
 
   # The Config class is used to set your api url.
@@ -20,7 +22,11 @@ module Mailee
   # If you use mailee gem to sync a model, it will always set the internal_id
   # to your "local" model id and then search based on it to update de remote
   # record.
+  #
+  # Writable attributes:
+  #   :name, :email, :internal_id, :sex, :birthday, :age, :phone, :mobile, :address, :notes, :photo, :company, :position
   class Contact < Config
+
     def self.find_by_internal_id iid
       find(:first, :params => {:internal_id => iid})
     end
@@ -40,11 +46,21 @@ module Mailee
   end
 
   # The List class gives you default access to your lists (all, first, create, update, destroy)
+  # Writable attributes:
+  #   :name, :active, :company, :description, :address, :phone, :site
   class List < Config
   end
 
   # The Template class gives you default access to your templates (all, first, create, update, destroy)
+  # Writable attributes:
+  #   :title, :html
   class Template < Config
+    def self.writable_attributes
+      [:title, :html]
+    end
+    def thumb
+      "http://assets.mailee.me/system/templates/#{id}/thumbs/thumb/#{id}.png"
+    end
   end
 
   # The Quick class allows you to import contacts to mailee just like
@@ -75,12 +91,27 @@ module Mailee
   #   # Creating a message (still a draft):
   #   message = Mailee::Message.create :title => "TITLE", :subject => "SUBJ", :from_name => "NAME", :from_email => "your@email.com", :html => "<h1>Hello</h1>", :list_id => 666
   #   # Sending tests. 33, 44 and 55 are contact's ids.
-  #   message.test([33,44,55]).should_not be nil
+  #   message.test([33,44,55])
   #   # Sending the message now ...
   #   message.ready
   #   # ... or sending the message 10 days from now
   #   message.ready(10.days.from_now)
+  #
+  # Writeable attributes:
+  #  :newsletter_id, :template_id, :list_id, :segment_id, :title, :subject, :from_name, :from_email, :reply_email, :html, :analytics
   class Message < Config
+    def self.writeable_attributes
+      [:newsletter_id, :template_id, :list_id, :contacts, :segment_id, :title, :subject, :from_name, :from_email, :reply_email, :html, :analytics]
+    end
+    def human_status
+        ['','draft','sending','sent','generating'][status]
+    end
+    def signature
+      "#{from_name} <#{from_email}>"
+    end
+    def thumb(size='thumb')
+      "http://assets.mailee.me/system/messages/#{id}/thumbs/#{size}/#{id}.png"
+    end
     def test contacts
       put(:test, :contacts => contacts)
     end
@@ -99,4 +130,4 @@ module Mailee
   class Report < Config
   end
 
-end
+end

data/mailee.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mailee}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Juan Maiz"]
-  s.date = %q{2010-10-16}
+  s.date = %q{2011-03-28}
   s.description = %q{Permite sincronizar automaticamente seus modelos com o Mailee.me, inclusive com gerenciamento de optin.}
   s.email = %q{suporte@mailee.me}
   s.extra_rdoc_files = [
@@ -19,7 +19,9 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     ".rspec",
+     "LICENSE",
      "MIT-LICENSE",
      "README.markdown",
      "README.rdoc",
@@ -52,6 +54,7 @@ Gem::Specification.new do |s|
      "app/config/initializers/session_store.rb",
      "app/config/locales/en.yml",
      "app/config/routes.rb",
+     "app/db/schema.rb",
      "app/db/seeds.rb",
      "app/doc/README_FOR_APP",
      "app/lib/tasks/.gitkeep",
@@ -86,12 +89,12 @@ Gem::Specification.new do |s|
      "pkg/mailee-0.1.0.gem",
      "pkg/mailee-0.1.1.gem",
      "pkg/mailee-0.1.2.gem",
+     "pkg/mailee-0.4.4.gem",
      "spec/am_spec_helper.rb",
      "spec/ar_spec_helper.rb",
-     "spec/mailee-api-am.rb",
-     "spec/mailee-api-ar.rb",
-     "spec/mailee-api.rb",
-     "spec/spec.opts",
+     "spec/mailee-api-am_spec.rb",
+     "spec/mailee-api-ar_spec.rb",
+     "spec/mailee-api_spec.rb",
      "spec/spec_helper.rb",
      "tasks/mailee_tasks.rake"
   ]
@@ -103,9 +106,9 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/am_spec_helper.rb",
      "spec/ar_spec_helper.rb",
-     "spec/mailee-api-am.rb",
-     "spec/mailee-api-ar.rb",
-     "spec/mailee-api.rb",
+     "spec/mailee-api-am_spec.rb",
+     "spec/mailee-api-ar_spec.rb",
+     "spec/mailee-api_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/spec/am_spec_helper.rb

@@ -1,15 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
+require 'rspec'
 require 'action_mailer'
 require 'mailee'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
+  Mailee::Config.site = "http://api.869a72b17b05a.mailee-api.mailee.me"
 end
 
-class Foo < ActionMailer::Base
+class FooMailer < ActionMailer::Base
 
   send_with_mailee
 

data/spec/ar_spec_helper.rb

@@ -1,13 +1,12 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rspec'
 require 'sqlite3'
 require 'active_record'
 require 'mailee'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  Mailee::Config.site = "http://api.869a72b17b05a.mailee-api.mailee.me"
 end
 
 db = "mailee-api-test.db"
@@ -33,4 +32,17 @@ end
 
 class Bar < ActiveRecord::Base
   sync_with_mailee :email => :other_email, :name => :other_name, :news => :other_news
-end
+end
+
+class FooList < ActiveRecord::Base
+  set_table_name 'foos'
+  @@moment = Time.now.strftime('%Y%m%d%H%M%S')
+  @@list = Mailee::List.create :name => "Foo List #{@@moment}"
+  sync_with_mailee :list => @@list.name
+  def self.list
+    @@list
+  end
+  def self.contacts_count
+    Mailee::List.find(@@list.id).lists_contacts_count
+  end
+end

data/spec/{mailee-api-am.rb → mailee-api-am_spec.rb}

@@ -2,20 +2,16 @@ require File.expand_path(File.dirname(__FILE__) + '/am_spec_helper')
   
 describe "Mailee" do
 
-  before(:each) do
-    Mailee::Config.site = "http://api.bdb28c0a0a4a3.softa.server:3000"
-  end
-  
   it "should respond to send_with_mailee" do
     ActionMailer::Base.should respond_to(:send_with_mailee)
   end
 
   it "should use Mailee::Mailer as the delivery method" do
-    Foo.delivery_method.should be(Mailee::Mailer)
+    FooMailer.delivery_method.should be(Mailee::Mailer)
   end
 
   it "should deliver" do
-    result = Foo.bar.deliver
+    result = FooMailer.bar.deliver
     result.should_not be(false)
     result.class.should be(Mail::Message)
     result.delivery_method.class.should be(Mailee::Mailer)

data/spec/{mailee-api-ar.rb → mailee-api-ar_spec.rb}

@@ -1,9 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/ar_spec_helper')
-  
+
 describe "Mailee" do
 
   before(:each) do
-    Mailee::Config.site = "http://api.bdb28c0a0a4a3.softa.server:3000"
     @moment = Time.now.strftime('%Y%m%d%H%M%S')
   end
 
@@ -11,7 +10,6 @@ describe "Mailee" do
     ActiveRecord::Base.should respond_to(:sync_with_mailee)
   end
 
-
   it "should create if news is checked" do
     foo = Foo.create :name => "rest_test_foo_#{@moment}", :email => "rest_test_foo_#{@moment}@test.com", :news => true
     found = Mailee::Contact.find_by_email("rest_test_foo_#{@moment}@test.com")
@@ -44,4 +42,9 @@ describe "Mailee" do
     found.internal_id.to_i.should be bar.id
   end
   
+  it "should subscribe to a list if :list is set" do
+    foo = FooList.create :name => "rest_test_foo_#{@moment}", :email => "rest_test_foo_#{@moment}@test.com", :news => true
+    # TODO I really cannot know if the email was subscribed successfully :S
+  end
+
 end

data/spec/{mailee-api.rb → mailee-api_spec.rb}

@@ -3,7 +3,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe "Mailee" do
 
   before(:each) do
-    Mailee::Config.site = "http://api.bdb28c0a0a4a3.softa.server:3000"
     @moment = Time.now.strftime('%Y%m%d%H%M%S')
   end
 

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-#require 'active_record'
+require 'rspec'
+require 'active_record'
 require 'mailee'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  Mailee::Config.site = "http://api.869a72b17b05a.mailee-api.mailee.me"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mailee
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Juan Maiz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 -04:00
+date: 2011-03-28 00:00:00 -03:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,8 @@ extra_rdoc_files:
 - README.markdown.pt
 - README.rdoc
 files: 
+- .gitignore
+- .rspec
 - LICENSE
 - MIT-LICENSE
 - README.markdown
@@ -64,6 +66,7 @@ files:
 - app/config/initializers/session_store.rb
 - app/config/locales/en.yml
 - app/config/routes.rb
+- app/db/schema.rb
 - app/db/seeds.rb
 - app/doc/README_FOR_APP
 - app/lib/tasks/.gitkeep
@@ -98,12 +101,12 @@ files:
 - pkg/mailee-0.1.0.gem
 - pkg/mailee-0.1.1.gem
 - pkg/mailee-0.1.2.gem
+- pkg/mailee-0.4.4.gem
 - spec/am_spec_helper.rb
 - spec/ar_spec_helper.rb
-- spec/mailee-api-am.rb
-- spec/mailee-api-ar.rb
-- spec/mailee-api.rb
-- spec/spec.opts
+- spec/mailee-api-am_spec.rb
+- spec/mailee-api-ar_spec.rb
+- spec/mailee-api_spec.rb
 - spec/spec_helper.rb
 - tasks/mailee_tasks.rake
 - README.markdown.pt
@@ -144,7 +147,7 @@ summary: "Gem de integra\xC3\xA7\xC3\xA3o do Mailee.me"
 test_files: 
 - spec/am_spec_helper.rb
 - spec/ar_spec_helper.rb
-- spec/mailee-api-am.rb
-- spec/mailee-api-ar.rb
-- spec/mailee-api.rb
+- spec/mailee-api-am_spec.rb
+- spec/mailee-api-ar_spec.rb
+- spec/mailee-api_spec.rb
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1 +0,0 @@
---color