mailee 0.6.1 → 0.6.2

data/Gemfile

@@ -5,7 +5,7 @@ gem "activeresource", "~> 3.0"
 gem "activerecord", "~> 3.0"
 
 group :development, :test do
-  gem "rspec", "~> 2.6.0"
+  gem "rspec", "~> 2.8.0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "sqlite3", "~> 1.3.4"

data/Gemfile.lock

@@ -52,14 +52,14 @@ GEM
     rack-test (0.5.7)
       rack (>= 1.0)
     rake (0.9.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rspec-mocks (2.8.0)
     sqlite3 (1.3.4)
     treetop (1.4.10)
       polyglot
@@ -75,5 +75,5 @@ DEPENDENCIES
   activeresource (~> 3.0)
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  rspec (~> 2.6.0)
+  rspec (~> 2.8.0)
   sqlite3 (~> 1.3.4)

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/lib/mailee/active_record.rb

@@ -67,7 +67,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]
+          contact.put(:list_subscribe, :list => sync_options[:list]) if sync_options[:list]
         end
       rescue
         logger.warn "MAILEE-API: Falhou ao criar o contato #{id} no Mailee"
@@ -84,7 +84,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]
+              contact.put(:list_subscribe, :list => sync_options[:list]) if sync_options[:list]
             end
           else
             create_in_mailee # Se não achou o contato tem q inserir.

data/lib/mailee/active_resource.rb

@@ -32,10 +32,10 @@ module Mailee
       find(:first, :params => {:internal_id => iid})
     end
     def self.find_by_email email
-      find(:first, :params => {:email => email})
+      find(:first, :params => {:email => email, :status => 'all'})
     end
     def self.search keyword, page=1
-      find(:all, :params => {:page => page, :by_keyword => keyword })
+      find(:all, :params => {:page => page, :by_keyword => keyword, :status => 'all' })
     end
     def unsubscribe(data={})
       #E.g. data --> {:reason => 'Trip to nowhere', :spam => false}

data/lib/mailee/railties.rb

@@ -25,6 +25,7 @@ class MaileeRails < Rails::Railtie
           exit
         end
       end
+      url.gsub!('http://','https://')
       initializer("mailee.rb") do
         "Mailee::Config.site = '#{url}'"
       end
@@ -33,4 +34,4 @@ class MaileeRails < Rails::Railtie
       puts "*** Thanks for using Mailee.me"
     end
   end
-end
+end

data/mailee.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mailee}
-  s.version = "0.6.1"
+  s.name = "mailee"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Juan Maiz"]
-  s.date = %q{2011-11-01}
-  s.description = %q{Permite sincronizar automaticamente seus modelos com o Mailee.me, inclusive com gerenciamento de optin.}
-  s.email = %q{suporte@mailee.me}
+  s.date = "2012-01-13"
+  s.description = "Permite sincronizar automaticamente seus modelos com o Mailee.me, inclusive com gerenciamento de optin."
+  s.email = "suporte@mailee.me"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.markdown"
@@ -97,20 +97,19 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "tasks/mailee_tasks.rake"
   ]
-  s.homepage = %q{http://help.mailee.me/integration_rails.html}
+  s.homepage = "http://help.mailee.me/integration_rails.html"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Gem para uso da API do Mailee.me}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Gem para uso da API do Mailee.me"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<actionmailer>, ["~> 3.0"])
       s.add_runtime_dependency(%q<activeresource>, ["~> 3.0"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<sqlite3>, ["~> 1.3.4"])
@@ -118,7 +117,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<actionmailer>, ["~> 3.0"])
       s.add_dependency(%q<activeresource>, ["~> 3.0"])
       s.add_dependency(%q<activerecord>, ["~> 3.0"])
-      s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3.4"])
@@ -127,7 +126,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<actionmailer>, ["~> 3.0"])
     s.add_dependency(%q<activeresource>, ["~> 3.0"])
     s.add_dependency(%q<activerecord>, ["~> 3.0"])
-    s.add_dependency(%q<rspec>, ["~> 2.6.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3.4"])

data/spec/mailee-api-ar_spec.rb

@@ -35,7 +35,7 @@ describe "Mailee" do
     foo.update_attribute :news, true
     found = Mailee::Contact.find_by_email("rest_test_foo_#{@moment}@test.com")
     found.internal_id.to_i.should be foo.id
-    # ==
+     #==
     bar = Bar.create :other_name => "rest_test_bar_#{@moment}", :other_email => "rest_test_bar_#{@moment}@test.com", :other_news => false
     bar.update_attribute :other_news, true
     found = Mailee::Contact.find_by_email("rest_test_bar_#{@moment}@test.com")
@@ -47,4 +47,4 @@ describe "Mailee" do
     # TODO I really cannot know if the email was subscribed successfully :S
   end
 
-end
+end

data/spec/mailee-api_spec.rb

@@ -36,7 +36,7 @@ describe "Mailee" do
     Array.new(25){|i| Mailee::Contact.create :email => "rest_test_#{@moment}_#{i}@test.com"}
     contacts = Mailee::Contact.find(:all)
     contacts.size.should == 15
-    contacts = Mailee::Contact.find(:all, :params => {:page => 2, :by_keyword => "rest_test_#{@moment}" })
+    contacts = Mailee::Contact.find(:all, :params => {:page => 2, :status => 'all', :by_keyword => "rest_test_#{@moment}" })
     contacts.size.should == 10
   end
 
@@ -125,12 +125,24 @@ describe "Mailee" do
     found.id.should be(contact.id)
   end
 
+  #it "should create an invalid contact and find by internal id" do
+    #contact = Mailee::Contact.create :email => "rest_test_#{@moment}@test.com", :internal_id => @moment, :contact_status_id => -1
+    #found = Mailee::Contact.find_by_internal_id(@moment)
+    #found.id.should be(contact.id)
+  #end
+
   it "should create and find by email" do
     contact = Mailee::Contact.create :email => "rest_test_#{@moment}@test.com"
     found = Mailee::Contact.find_by_email("rest_test_#{@moment}@test.com")
     found.id.should be(contact.id)
   end
 
+  it "should create an invalid contact and find by email" do
+    contact = Mailee::Contact.create :email => "rest_test_#{@moment}@test.com", :contact_status_id => -1
+    found = Mailee::Contact.find_by_email("rest_test_#{@moment}@test.com")
+    found.id.should be(contact.id)
+  end
+
   it "should create, test and send message - specific methods" do
     list = Mailee::List.create :name => "rest_test_#{@moment}"
     contact = Mailee::Contact.create :email => "rest_test_#{@moment}@test.com"
@@ -153,4 +165,4 @@ describe "Mailee" do
     Mailee::Quick.import("rest_test_#{@moment}@test.com\nrest_test_2_#{@moment}@test.com\nrest_test_3_#{@moment}@test.com").should_not be nil
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -5,5 +5,5 @@ require 'active_record'
 require 'mailee'
 
 RSpec.configure do |config|
-  Mailee::Config.site = "http://api.869a72b17b05a.mailee-api.mailee.me"
+  Mailee::Config.site = "https://api.869a72b17b05a.mailee-api.mailee.me"
 end

metadata

@@ -1,142 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mailee
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.6.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Juan Maiz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-01 00:00:00 -02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-01-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: &2154127700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  name: actionmailer
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154127700
+- !ruby/object:Gem::Dependency
+  name: activeresource
+  requirement: &2154127200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  name: activeresource
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154127200
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2154126620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  name: activerecord
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154126620
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2154126060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 2
-        - 6
-        - 0
-        version: 2.6.0
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  name: rspec
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2154126060
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2154125540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2154125540
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2154125020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2154125020
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2154124480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 3
-        - 4
+      - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
-  name: sqlite3
   prerelease: false
-  version_requirements: *id007
-description: Permite sincronizar automaticamente seus modelos com o Mailee.me, inclusive com gerenciamento de optin.
+  version_requirements: *2154124480
+description: Permite sincronizar automaticamente seus modelos com o Mailee.me, inclusive
+  com gerenciamento de optin.
 email: suporte@mailee.me
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.markdown
-files: 
+files:
 - .rspec
 - Gemfile
 - Gemfile.lock
@@ -216,39 +176,31 @@ files:
 - spec/mailee-api_spec.rb
 - spec/spec_helper.rb
 - tasks/mailee_tasks.rake
-has_rdoc: true
 homepage: http://help.mailee.me/integration_rails.html
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 73340575297455940
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Gem para uso da API do Mailee.me
 test_files: []
-