RubyGems - maktoub - Versions diffs - 0.1.0 → 0.2.0 - Mend

maktoub 0.1.0 → 0.2.0

Files changed (65) hide show

data/README.rdoc CHANGED

@@ -24,6 +24,11 @@ Follow instructions inside the file to configure it the way you want.
 Create a newsletter as a normal view partial in app/views/maktoub/newsletters/.
 The subject of the newsletter will be automatically deduced from the partial's name.
+=== Editing Styles
+Create a view partial in app/views/layouts/maktoub/_styles.erb. Note that this completely overrides the styles that come with maktoub.
+You can copy the built-in styles and override them.
 === Sending messages
 Maktoub comes with two rake tasks to allow you to:
 * send a test message to the "from" address of your newsletter.

data/Rakefile CHANGED

@@ -20,20 +20,24 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 Bundler::GemHelper.install_tasks
-require 'rake/testtask'
+require 'rspec/core/rake_task'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+#Rake::TestTask.new(:test) do |t|
+#  t.libs << 'lib'
+#  t.libs << 'spec'
+#  t.pattern = 'spec/**/*_spec.rb'
+#  t.verbose = false
+#end
-task :default => :test
+#task :default => :test

data/app/controllers/maktoub/subscribers_controller.rb ADDED

@@ -0,0 +1,14 @@
+module Maktoub
+	class SubscribersController < ApplicationController
+		def edit
+		end
+		def update
+			Maktoub.unsubscribe params[:email]
+		end
+	end
+end

data/app/views/layouts/maktoub/application.html.erb CHANGED

@@ -5,10 +5,19 @@
   <%= stylesheet_link_tag    "maktoub/application" %>
   <%= javascript_include_tag "maktoub/application" %>
   <%= csrf_meta_tags %>
+  <style type="text/css">
+    <%= render 'layouts/maktoub/styles' %>
+    div.container {
+      width: 600px;
+      margin: auto;
+      margin-top: 50px;
+    }
+  </style>
 </head>
 <body>
-<%= yield %>
+  <div class="container">
+  <%= yield %>
+  </div>
 </body>
 </html>

data/app/views/layouts/maktoub/newsletter_mailer.erb CHANGED

@@ -8,7 +8,7 @@
         <meta name="viewport" content="width=680px, initial-scale=0.5">
         <title><%= @subject %></title>
 		<style type="text/css">
-			<%= render 'layouts/maktoub/styles.erb' %>
+			<%= render 'layouts/maktoub/styles' %>
 		</style>
 	</head>
     <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
@@ -121,14 +121,14 @@
                                                     <tr>
                                                         <td valign="top" width="350">
                                                             <div mc:edit="std_footer">
-																<em>Copyright &copy; <%= Time.now.year %> Sandglaz, All rights reserved.</em>
+																<em>Copyright &copy; <%= Time.now.year %> <%= Maktoub.app_name %>, All rights reserved.</em>
 																<br />
 																<em>You are receiving this email because you opted in at our website <%= link_to Maktoub.home_url, Maktoub.home_url, :target => "_blank" %>.</em>
 																<br />
 																<%- unless @archive %>
 																  <%# we are not including mailing addresses %>
 																  <%#<br /><strong>Our mailing address is:</strong><br /> %>
-																  <%# 928 Greenwood Ave, Toronto ON, M4J4C3 Canada %>
+																  <%#  %>
 																<%- end %>
                                                             </div>
                                                         </td>
@@ -137,7 +137,7 @@
                                                     <tr>
                                                         <td colspan="2" valign="middle" id="utility">
                                                             <div>
-                                                                &nbsp;<%= link_to 'update subscription preferences', Maktoub.subscription_preferences_url, :target => "_blank" %>&nbsp;
+                                                                &nbsp;<%= link_to 'update subscription preferences', Maktoub.subscription_preferences_url, :target => "_blank" %>&nbsp; | <%= link_to 'unsubscribe', edit_subscribers_url, :target => "_blank", :rel => "nofollow" %>
                                                             </div>
                                                         </td>
                                                     </tr>

data/app/views/maktoub/subscribers/edit.html.erb ADDED

@@ -0,0 +1,13 @@
+<h1>Unsubscribe from newsletter</h1>
+<%= form_tag subscribers_path, :method => :put do |f| %>
+	<p>
+	<%= label :subscribers, 'Email', :for => 'email' %>
+	<br/>
+	<%= text_field :subscribers, 'email', {:type => "email", :id => 'email'} %>
+	<br />
+	</p>
+	<p>
+	<%= button_tag 'submit', :type => 'submit' %>
+	</o>
+<% end %>

data/app/views/maktoub/subscribers/update.html.erb ADDED

	@@ -0,0 +1 @@
1	+ <h1>Unsubscribe successful</h1>

data/config/routes.rb CHANGED

@@ -3,6 +3,8 @@ Maktoub::Engine.routes.draw do
   get "newsletter/(:newsletter)" => "archives#show", as: "newsletter"
   root to: "archives#show"
+  resource :subscribers, :only => [:edit, :update]
 end

data/lib/maktoub.rb CHANGED

@@ -9,7 +9,8 @@ module Maktoub
                   :subscription_preferences_url,
                   :logo,
                   :home_domain,
-                  :app_name
+                  :app_name,
+                  :unsubscribe_method
     attr_writer :email_field, :name_field
@@ -28,6 +29,14 @@ module Maktoub
     def subscribers_extractor (&block)
       @subscribers = Proc.new &block
     end
+    def unsubscribe(email)
+      subscribers.select do |s|
+        s.send(email_field) == email
+      end.each do |s|
+        s.send(unsubscribe_method) if unsubscribe_method
+      end
+    end
     def home_url
       "http://" + home_domain

data/lib/maktoub/version.rb CHANGED

@@ -1,4 +1,4 @@
 module Maktoub
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maktoub
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70186435746960 !ruby/object:Gem::Requirement
+  requirement: &70201790028320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70186435746960
+  version_requirements: *70201790028320
 - !ruby/object:Gem::Dependency
   name: premailer
-  requirement: &70186435746220 !ruby/object:Gem::Requirement
+  requirement: &70201790010320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186435746220
+  version_requirements: *70201790010320
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70186435745420 !ruby/object:Gem::Requirement
+  requirement: &70201790008940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70186435745420
+  version_requirements: *70201790008940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70186435744940 !ruby/object:Gem::Requirement
+  requirement: &70201790007940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70186435744940
+  version_requirements: *70201790007940
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &70201790007200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70201790007200
 description: A simple newsletter engine for rails.
 email:
 executables: []
@@ -67,6 +78,7 @@ files:
 - app/assets/stylesheets/maktoub/archives.css
 - app/controllers/maktoub/application_controller.rb
 - app/controllers/maktoub/archives_controller.rb
+- app/controllers/maktoub/subscribers_controller.rb
 - app/helpers/maktoub/application_helper.rb
 - app/helpers/maktoub/archives_helper.rb
 - app/mailers/maktoub/newsletter_mailer.rb
@@ -74,6 +86,8 @@ files:
 - app/views/layouts/maktoub/application.html.erb
 - app/views/layouts/maktoub/newsletter_mailer.erb
 - app/views/maktoub/newsletters/readme.erb
+- app/views/maktoub/subscribers/edit.html.erb
+- app/views/maktoub/subscribers/update.html.erb
 - config/routes.rb
 - lib/generators/maktoub/config_generator.rb
 - lib/generators/maktoub/templates/maktoub.rb
@@ -85,60 +99,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-- test/dummy/app/assets/images/logo.jpg
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/maktoub/newsletters/test_template.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/maktoub.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/script/rails
-- test/dummy/tmp/cache/assets/CA2/C20/sprockets%2F5603f1da541a5e3c72d26611478813da
-- test/dummy/tmp/cache/assets/CB4/BE0/sprockets%2F57f7e5c53278ac52062992433f317acc
-- test/dummy/tmp/cache/assets/CBC/F80/sprockets%2F95bdffc2824328543384db8ea7890153
-- test/dummy/tmp/cache/assets/CCF/9C0/sprockets%2Fae24de6a552b3d6057517681a1a363e0
-- test/dummy/tmp/cache/assets/CDD/630/sprockets%2F75757e115102f4fcc9ed52a2249bf082
-- test/dummy/tmp/cache/assets/D34/130/sprockets%2F9a5c11d810e2e1f87ea6452113cc7e4c
-- test/dummy/tmp/cache/assets/D68/E80/sprockets%2F2c93d36471b04c04bb72a9aeeaf496a8
-- test/dummy/tmp/cache/assets/D6E/8A0/sprockets%2Fa833bda5303fa2c89da36ec6b469618d
-- test/dummy/tmp/cache/assets/D70/6F0/sprockets%2Ff37da951add08a3d2866a4767b5afc43
-- test/dummy/tmp/cache/assets/D74/710/sprockets%2F4865a147f154cadc0b49ebe873be7a85
-- test/dummy/tmp/cache/assets/D76/B40/sprockets%2F8aea19137c7b683ef195fa3bf2a9704f
-- test/dummy/tmp/cache/assets/D7D/170/sprockets%2F15742d263cfefba79b76652f6e94ac6d
-- test/dummy/tmp/cache/assets/DC6/1E0/sprockets%2F5fad4aa8ef2c006cc0dd5233e98dd922
-- test/functional/maktoub/archives_controller_test.rb
-- test/functional/maktoub/newsletter_mailer_test.rb
-- test/integration/navigation_test.rb
-- test/maktoub_test.rb
-- test/test_helper.rb
-- test/unit/helpers/maktoub/archives_helper_test.rb
 homepage: http://sandglaz.com
 licenses: []
 post_install_message:
@@ -153,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2985720037328625356
+      hash: 853280269530404285
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -162,65 +122,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2985720037328625356
+      hash: 853280269530404285
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.10
 signing_key:
 specification_version: 3
 summary: A simple newsletter engine for rails.
-test_files:
-- test/dummy/app/assets/images/logo.jpg
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/maktoub/newsletters/test_template.erb
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
-- test/dummy/config/initializers/inflections.rb
-- test/dummy/config/initializers/maktoub.rb
-- test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
-- test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config.ru
-- test/dummy/db/development.sqlite3
-- test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.log
-- test/dummy/log/test.log
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/script/rails
-- test/dummy/tmp/cache/assets/CA2/C20/sprockets%2F5603f1da541a5e3c72d26611478813da
-- test/dummy/tmp/cache/assets/CB4/BE0/sprockets%2F57f7e5c53278ac52062992433f317acc
-- test/dummy/tmp/cache/assets/CBC/F80/sprockets%2F95bdffc2824328543384db8ea7890153
-- test/dummy/tmp/cache/assets/CCF/9C0/sprockets%2Fae24de6a552b3d6057517681a1a363e0
-- test/dummy/tmp/cache/assets/CDD/630/sprockets%2F75757e115102f4fcc9ed52a2249bf082
-- test/dummy/tmp/cache/assets/D34/130/sprockets%2F9a5c11d810e2e1f87ea6452113cc7e4c
-- test/dummy/tmp/cache/assets/D68/E80/sprockets%2F2c93d36471b04c04bb72a9aeeaf496a8
-- test/dummy/tmp/cache/assets/D6E/8A0/sprockets%2Fa833bda5303fa2c89da36ec6b469618d
-- test/dummy/tmp/cache/assets/D70/6F0/sprockets%2Ff37da951add08a3d2866a4767b5afc43
-- test/dummy/tmp/cache/assets/D74/710/sprockets%2F4865a147f154cadc0b49ebe873be7a85
-- test/dummy/tmp/cache/assets/D76/B40/sprockets%2F8aea19137c7b683ef195fa3bf2a9704f
-- test/dummy/tmp/cache/assets/D7D/170/sprockets%2F15742d263cfefba79b76652f6e94ac6d
-- test/dummy/tmp/cache/assets/DC6/1E0/sprockets%2F5fad4aa8ef2c006cc0dd5233e98dd922
-- test/functional/maktoub/archives_controller_test.rb
-- test/functional/maktoub/newsletter_mailer_test.rb
-- test/integration/navigation_test.rb
-- test/maktoub_test.rb
-- test/test_helper.rb
-- test/unit/helpers/maktoub/archives_helper_test.rb
+test_files: []

data/test/dummy/Rakefile DELETED

@@ -1,7 +0,0 @@
-#!/usr/bin/env rake
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-require File.expand_path('../config/application', __FILE__)
-Dummy::Application.load_tasks

data/test/dummy/app/assets/images/logo.jpg DELETED

Binary file

data/test/dummy/app/assets/javascripts/application.js DELETED

@@ -1,9 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .

data/test/dummy/app/assets/stylesheets/application.css DELETED

@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require_tree .
-*/

data/test/dummy/app/controllers/application_controller.rb DELETED

@@ -1,3 +0,0 @@
-class ApplicationController < ActionController::Base
-  protect_from_forgery
-end

data/test/dummy/app/helpers/application_helper.rb DELETED

	@@ -1,2 +0,0 @@
1	- module ApplicationHelper
2	- end