boutique 0.0.9 → 0.0.10

data/test/app_test.rb

@@ -3,86 +3,40 @@ require File.expand_path('helper', File.dirname(__FILE__))
 class AppTest < BoutiqueTest
   include Rack::Test::Methods
 
-  def test_redirect_to_paypal
-    ebook_product.save
-    get '/buy/ebook'
-
-    purchase = Boutique::Purchase.first
-    refute(purchase.nil?)
-    assert(last_response.ok?)
-  end
-
-  def test_purchase_non_existing_product
-    get '/buy/non-existing-product'
-    assert(last_response.not_found?)
-  end
-
-  def test_notify
-    product = ebook_product
-    purchase = Boutique::Purchase.new
-    product.purchases << purchase
-    product.save
-    refute(purchase.completed?)
-    assert_nil(Pony.last_mail)
-
-    post "/notify/#{purchase.boutique_id}?payment_status=Completed&txn_id=1337&receiver_email=#{Boutique.config.pp_email}&payer_email=john@mailinator.com&first_name=John"
+  def test_subscribe
+    list = new_list
+    post "/subscribe/#{list.key}", email: 'john@mailinator.com'
     assert(last_response.ok?)
-
-    purchase.reload
-    assert(purchase.completed?)
+    assert_equal(1, Boutique::Subscriber.count)
+    assert_equal(1, Boutique::Email.count)
     refute_nil(Pony.last_mail)
-    assert_equal('1337', purchase.transaction_id)
-  end
-
-  def test_notify_not_found
-    post "/notify/99-notfound"
-    assert(last_response.not_found?)
+    subscriber = Boutique::Subscriber.first
+    refute(subscriber.confirmed?)
   end
 
-  def test_recover
-    purchase = ebook_purchase
-    purchase.complete('1337', 'john@mailinator.com', 'John')
-    purchase.save
-    assert_nil(Pony.last_mail)
-
-    post "/recover/ebook", 'email' => 'john@mailinator.com'
+  def test_confirm
+    list = new_list
+    subscriber = Boutique::Subscriber.create(
+      list_key: list.key, email: 'john@mailinator.com')
+    refute(subscriber.confirmed?)
+    post "/confirm/#{list.key}/#{subscriber.id}/#{subscriber.secret}"
     assert(last_response.ok?)
-    assert_equal(purchase.boutique_id, last_response.body)
-    refute_nil(Pony.last_mail)
+    subscriber = Boutique::Subscriber.get(subscriber.id)
+    assert(subscriber.confirmed?)
   end
 
-  def test_recover_not_found
-    post "/recover/99-notfound"
-    assert(last_response.not_found?)
-  end
-
-  def test_record
-    purchase = ebook_purchase
-    get "/record/#{purchase.boutique_id}"
+  def test_unsubscribe
+    list = new_list
+    subscriber = Boutique::Subscriber.create(
+      list_key: list.key, email: 'john@mailinator.com', confirmed: true)
+    assert(subscriber.confirmed?)
+    post "/unsubscribe/#{list.key}/#{subscriber.id}/#{subscriber.secret}"
     assert(last_response.ok?)
-
-    json = JSON.parse(last_response.body)
-    assert(json['id'])
-    assert_equal('ebook', json['code'])
-    assert_equal('Ebook', json['name'])
-    assert_equal(0, json['counter'])
-    refute(json['completed'])
-  end
-
-  def test_record_not_found
-    get "/record/99-notfound"
-    assert(last_response.not_found?)
+    subscriber = Boutique::Subscriber.get(subscriber.id)
+    refute(subscriber.confirmed?)
   end
 
   private
-  def ebook_purchase
-    product = ebook_product
-    purchase = Boutique::Purchase.new
-    product.purchases << purchase
-    product.save
-    purchase
-  end
-
   def app
     @app ||= Rack::Server.new.app
   end

data/test/config_test.rb

@@ -3,18 +3,20 @@ require File.expand_path('helper', File.dirname(__FILE__))
 class ConfigTest < BoutiqueTest
   def test_db
     assert_equal('dev@localhost', Boutique.config.dev_email)
-    assert_equal('LONGCERTID', Boutique.config.pem_cert_id)
-    assert_equal(File.expand_path('../certs/private.pem', File.dirname(__FILE__)), Boutique.config.pem_private)
-    assert_equal(File.expand_path('../certs/public.pem', File.dirname(__FILE__)), Boutique.config.pem_public)
-    assert_equal(File.expand_path('../certs/private.pem', File.dirname(__FILE__)), Boutique.config.pem_private)
+    assert_equal(
+      'sk_test_abcdefghijklmnopqrstuvwxyz',
+      Boutique.config.stripe_api_key)
     assert_equal('/download', Boutique.config.download_path)
-    assert_equal(File.expand_path('../temp', File.dirname(__FILE__)), Boutique.config.download_dir)
-    assert_equal('sqlite3', Boutique.config.db_adapter)
-    assert_equal('localhost', Boutique.config.db_host)
-    assert_equal('root', Boutique.config.db_username)
-    assert_equal('secret', Boutique.config.db_password)
-    assert_equal('db.sqlite3', Boutique.config.db_database)
-    assert_equal('paypal_biz@mailinator.com', Boutique.config.pp_email)
-    assert_equal('http://localhost', Boutique.config.pp_url)
+    assert_equal(
+      File.expand_path('../temp', File.dirname(__FILE__)),
+      Boutique.config.download_dir)
+    assert_equal({
+      adapter: 'sqlite3',
+      host: 'localhost',
+      username: 'root',
+      password: 'secret',
+      database: 'db.sqlite3'},
+      Boutique.config.db_options)
+    assert_equal({via: :sendmail}, Boutique.config.email_options)
   end
 end

data/test/emailer_test.rb

@@ -0,0 +1,67 @@
+require File.expand_path('helper', File.dirname(__FILE__))
+require 'redcarpet'
+
+class EmailerTest < BoutiqueTest
+  def setup
+    super
+    @list = new_list
+    @emailer = Boutique::Emailer.new(@list)
+  end
+
+  def test_render
+    @emailer.render(
+      'intro.md.erb',
+      confirm_url: 'http://example.org/confirm',
+      unsubscribe_url: 'http://example.org/unsubscribe')
+  end
+
+  def test_blast
+    @emailer.blast('first.md.erb')
+    refute(Pony.last_mail)
+    assert_equal(0, Boutique::Email.count)
+
+    create_subscriber
+    @emailer.blast('first.md.erb')
+    mail = Pony.last_mail
+    assert_equal('john@mailinator.com', mail[:to])
+    assert_equal('learn-icon@example.com', mail[:from])
+    assert_equal('First Email', mail[:subject])
+    refute_nil(mail[:body])
+    assert_equal(1, Boutique::Email.count)
+
+    Pony.mail(nil)
+    @emailer.blast('first.md.erb')
+    assert_nil(Pony.last_mail)
+    assert_equal(1, Boutique::Email.count)
+  end
+
+  def test_drip
+    @emailer.drip
+    refute(Pony.last_mail)
+    assert_equal(0, Boutique::Email.count)
+
+    subscriber = create_subscriber
+    subscriber.drip_on = Date.today - 1
+    subscriber.save
+    assert_equal(0, subscriber.drip_day)
+    @emailer.drip
+    subscriber = Boutique::Subscriber.get(subscriber.id)
+    assert_equal(1, subscriber.drip_day)
+    refute_nil(Pony.last_mail)
+    assert_equal(1, Boutique::Email.count)
+    assert_equal('first', Boutique::Email.first.email_key)
+
+    Pony.mail(nil)
+    @emailer.drip
+    subscriber = Boutique::Subscriber.get(subscriber.id)
+    assert_equal(1, subscriber.drip_day)
+    assert_nil(Pony.last_mail)
+    assert_equal(1, Boutique::Email.count)
+  end
+
+  private
+  def create_subscriber
+    Boutique::Subscriber.create(
+      list_key: @list.key, email: 'john@mailinator.com', confirmed: true)
+  end
+end

data/test/helper.rb

@@ -19,25 +19,24 @@ module Pony
   end
 end
 
-class BoutiqueTest < MiniTest::Unit::TestCase
+class BoutiqueTest < MiniTest::Test
   def setup
     Boutique::Purchase.all.destroy
-    Boutique::Product.all.destroy
+    Boutique::Subscriber.all.destroy
+    Boutique::Email.all.destroy
+    Boutique::List.reset_db
+    Boutique::Product.reset_db
     Boutique.configure(false) do |c|
-      c.dev_email     'dev@localhost'
-      c.pem_cert_id   'LONGCERTID'
-      c.pem_private   File.expand_path('../certs/private.pem', File.dirname(__FILE__))
-      c.pem_public    File.expand_path('../certs/public.pem', File.dirname(__FILE__))
-      c.pem_paypal    File.expand_path('../certs/paypal.pem', File.dirname(__FILE__))
-      c.download_path '/download'
-      c.download_dir  File.expand_path('../temp', File.dirname(__FILE__))
-      c.db_adapter    'sqlite3'
-      c.db_host       'localhost'
-      c.db_username   'root'
-      c.db_password   'secret'
-      c.db_database   'db.sqlite3'
-      c.pp_email      'paypal_biz@mailinator.com'
-      c.pp_url        'http://localhost'
+      c.dev_email      'dev@localhost'
+      c.stripe_api_key 'sk_test_abcdefghijklmnopqrstuvwxyz'
+      c.download_path  '/download'
+      c.download_dir   File.expand_path('../temp', File.dirname(__FILE__))
+      c.db_options(adapter: 'sqlite3',
+        host: 'localhost',
+        username: 'root',
+        password: 'secret',
+        database: 'db.sqlite3')
+      c.email_options(via: :sendmail)
     end
     Pony.mail(nil)
   end
@@ -47,6 +46,15 @@ class BoutiqueTest < MiniTest::Unit::TestCase
   end
 
   private
+  def new_list
+    Boutique.list('learn-icon') do |l|
+      l.from   'learn-icon@example.com'
+      l.emails File.expand_path('../emails', File.dirname(__FILE__))
+      l.url    'http://example.com'
+    end
+    Boutique::List['learn-icon']
+  end
+
   def ebook_product
     Boutique::Product.new(
       :code => 'ebook',

data/test/model_test.rb

@@ -1,80 +1,88 @@
 require File.expand_path('helper', File.dirname(__FILE__))
 
 class ModelTest < BoutiqueTest
-  def test_purchase_create
-    product = ebook_product
-    product.save
-    count = Boutique::Purchase.count
-    purchase = Boutique::Purchase.new
-    product.purchases << purchase
-    product.save
-
-    assert_equal(count + 1, Boutique::Purchase.count)
-    assert_equal(0, purchase.counter)
-    assert_nil(purchase.transaction_id)
-    assert_nil(purchase.completed_at)
-    assert_nil(purchase.downloads)
-    refute_nil(purchase.secret)
-    refute_nil(purchase.created_at)
-    refute(purchase.completed?)
+  def test_product
+    Boutique.product('icon-set') do |p|
+      p.from  'support@zincmade.com'
+      p.files [File.expand_path('../README.md', File.dirname(__FILE__))]
+      p.price 10.5
+    end
 
-    purchase.complete('1', 'john@mailinator.com', 'John')
-    purchase.save
-    assert_equal('1', purchase.transaction_id)
-    refute_nil(purchase.completed_at)
-    assert(purchase.completed?)
-    assert_match(%r(/download/[^/]+/README.md), purchase.downloads[0])
+    set = Boutique::Product['icon-set']
+    assert_equal('icon-set', set.key)
+    assert_equal(
+      File.expand_path('../README.md', File.dirname(__FILE__)),
+      set.files[0])
+    assert_equal(10.5, set.price)
+    assert_equal('support@zincmade.com', set.from)
+  end
 
-    old_download = purchase.downloads[0]
-    `rm #{Boutique.config.download_dir}#{old_download.sub(Boutique.config.download_path, '')}`
-    purchase.maybe_refresh_downloads!
-    refute_equal(old_download, purchase.downloads[0])
+  def test_list
+    list = new_list
+    assert_equal('learn-icon', list.key)
+    assert_equal('learn-icon@example.com', list.from)
+    assert_equal('http://example.com', list.url)
+    assert_equal(File.expand_path('../emails', File.dirname(__FILE__)), list.emails)
+    assert_equal("http://example.com?boutique=subscribe/learn-icon", list.subscribe_url)
+  end
 
-    bid = purchase.boutique_id
-    assert_equal(purchase.id, bid.split('-')[0].to_i)
-    assert_equal(10, bid.split('-')[1].size)
+  def test_subscriber
+    list = new_list
+    subscriber = Boutique::Subscriber.new(
+      list_key: 'learn-icon',
+      email: 'john@mailinator.com')
+    subscriber.save
+    refute(subscriber.confirmed?)
+    refute_nil(subscriber.secret)
+    assert_equal(1, list.subscribers.count)
+    assert_equal(subscriber, list.subscribers.first)
+    assert_equal(0, subscriber.drip_day)
+    assert_equal(Date.today, subscriber.drip_on)
 
-    form = purchase.paypal_form('http://localhost/notify')
-    assert_equal('http://localhost', form['action'])
-    assert_equal('_s-xclick', form['cmd'])
-    refute_nil(form['encrypted'])
+    id, secret = subscriber.id, subscriber.secret
+    assert_equal(
+      "http://example.com?boutique=confirm/learn-icon/#{id}/#{secret}",
+      subscriber.confirm_url)
+    assert_equal(
+      "http://example.com?boutique=unsubscribe/learn-icon/#{id}/#{secret}",
+      subscriber.unsubscribe_url)
+  end
 
-    purchase.send_mail
-    assert_equal({
-      :to => 'john@mailinator.com',
-      :from => 'support@zincmade.com',
-      :subject => 'Ebook Receipt',
-      :body => "Thanks for purchasing Ebook!  To download it, follow this link:\n\n" +
-               "    http://zincmade.com?b=#{purchase.boutique_id}\n\n" +
-               "Please reply if you have any troubles.\n"
-    }, Pony.last_mail)
+  def test_subscriber_email_validation
+    list =  new_list
+    subscriber = Boutique::Subscriber.new(
+      list_key: 'learn-icon',
+      email: 'invalid-email')
+    refute(subscriber.valid?)
+    refute_empty(subscriber.errors[:email])
+  end
 
-    json = JSON.parse(purchase.to_json)
-    assert_equal(purchase.id, json['id'])
-    assert_equal(2, json['counter'])
-    assert(json['completed'])
-    assert_equal('Ebook', json['name'])
-    assert_equal('ebook', json['code'])
-    refute_nil(json['downloads'])
+  def test_subscriber_list_key_validation
+    subscriber = Boutique::Subscriber.new(
+      list_key: 'invalid-list-key',
+      email: 'john@mailinator.com')
+    refute(subscriber.valid?)
+    refute_empty(subscriber.errors[:list_key])
   end
 
-  def test_product_create
-    count = Boutique::Product.count
-    Boutique.product('icon-set') do |p|
-      p.name          'Icon Set'
-      p.files         [File.expand_path('../README.md', File.dirname(__FILE__))]
-      p.price         10.5
-      p.return_url    'http://zincmade.com'
-      p.support_email 'support@zincmade.com'
-    end
-    assert_equal(count + 1, Boutique::Product.count)
+  def test_subscriber_list_email_unique
+    list = new_list
+    attrs = {list_key: list.key, email: 'john@mailinator.com'}
+    Boutique::Subscriber.create(attrs)
+    subscriber = Boutique::Subscriber.new(attrs)
+    refute(subscriber.valid?)
+    refute_empty(subscriber.errors[:email])
+  end
 
-    set = Boutique::Product.first(:code => 'icon-set')
-    assert_equal('Icon Set', set.name)
-    assert_equal(File.expand_path('../README.md', File.dirname(__FILE__)), set.files[0])
-    assert_equal(10.5, set.price)
-    assert_equal('http://zincmade.com', set.return_url)
-    assert_equal('support@zincmade.com', set.support_email)
-    assert_equal(0, set.purchases.size)
+  def test_email_unique
+    list = new_list
+    sub = Boutique::Subscriber.create(list_key: list.key, email: 'john@mailinator.com')
+    Boutique::Email.create(email_key: 'first', subscriber: sub)
+    email = Boutique::Email.new(email_key: 'first', subscriber: sub)
+    refute(email.valid?)
+    refute_empty(email.errors[:email_key])
+    sub2 = Boutique::Subscriber.create(list_key: list.key, email: 'jane@mailinator.com')
+    email = Boutique::Email.create(email_key: 'first', subscriber: sub2)
+    assert(email.valid?)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boutique
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: .
 cert_chain: []
-date: 2012-02-03 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70210798513600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210798513600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: data_mapper
-  requirement: &70210798513080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210798513080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pony
-  requirement: &70210798512520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,47 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70210798512520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: preamble
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70210798512060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +101,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210798512060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70210798511540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,9 +133,46 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70210798511540
-description: A Sinatra module which accepts payments via PayPal and gives customers
-  a secret URL to download your product.
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: A Sinatra app that adds product checkouts and drip emails support to
+  any websites (both UI + backend).
 email:
 - hugh@hughbien.com
 executables:
@@ -80,10 +185,11 @@ files:
 - config.ru
 - boutique
 - lib/boutique.rb
-- test/app_test.rb
-- test/config_test.rb
 - test/helper.rb
 - test/model_test.rb
+- test/emailer_test.rb
+- test/config_test.rb
+- test/app_test.rb
 - ./boutique
 homepage: https://github.com/hughbien/boutique
 licenses: []
@@ -97,6 +203,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -412580643
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,8 +214,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Sinatra module for selling digital goods
+summary: Sinatra app product checkouts and drip emails
 test_files: []