spree_mail 0.40.0.3 → 0.40.0.4

data/README.md

@@ -14,7 +14,7 @@ To create a spree mail demo app, run the following:
     rails new spree_mail_example 
     cd spree_mail_example 
     echo "gem 'spree', '0.40.2'" >> Gemfile 
-    echo "gem 'spree_mail', '0.40.0.3'" >> Gemfile 
+    echo "gem 'spree_mail', '0.40.0.4'" >> Gemfile 
     rm public/index.html 
     bundle install 
     rake spree:install spree_mail:install db:migrate db:seed
@@ -22,9 +22,9 @@ To create a spree mail demo app, run the following:
 
 Or all at once:
 
-    rails new spree_mail_example; cd spree_mail_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_mail', '0.40.0.3'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_mail:install db:migrate db:seed
+    rails new spree_mail_example; cd spree_mail_example; echo "gem 'spree', '0.40.2'" >> Gemfile; echo "gem 'spree_mail', '0.40.0.4'" >> Gemfile; rm public/index.html; bundle install; rake spree:install spree_mail:install db:migrate db:seed
 
-`rake db:sample` if you want to...
+`rake spree_sample:install db:sample` if you want to...
 
 Then start the server with `rails s`
 
@@ -42,7 +42,7 @@ Before sending, you may need to create an action_mailer initializer.
 To Do
 -----
 
-* Write real tests 
+* Write more tests 
 * Write a rake task that converts current users to subscribers
 * Add checkbox on user signup: 'sign up for our mailing list'
 * Add user help to email form

data/Rakefile

@@ -1,94 +1,30 @@
-require 'bundler'
+# encoding: UTF-8
+require 'rubygems'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+require 'rake'
+require 'rake/rdoctask'
 require 'rake/testtask'
+
 Bundler::GemHelper.install_tasks
 
-Rake::TestTask.new do |t|
-  t.libs << "lib"
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.verbose = false
 end
 
+task :default => :test
 
-#task :test do
-#
-#  root = ENV["RAILS_ROOT"] || File.expand_path('../spec/test_app', __FILE__)
-#  env = File.join(root, 'config', 'environment.rb')
-#  puts "(Rails Root: #{root})"
-#
-#  require env
-#  require File.expand_path('../test/test_helper', __FILE__)
-#  Dir["test/**/*.rb"].reject{|file| file.match(/test_helper/) != nil }.each do |file|
-#    puts "Loading #{file}"
-#    load file
-#  end
-#  
-#end
-#
-
-
-
-desc "Default Task"
-task :default => [ :test ]
-
-
-
-
-
-
-
-
-# TODO: pull in the spree/core/Rakefile bits that set up for testing
-desc "Regenerates a Rails 3 app for testing"
-task :test_app do
-# TODO - this path requires a certain directory structure -- need
-# to think about how to refactor
-  
-  
-  files = `gem contents spree`.split("\n").select{|file| file.match("test_app_generator")}
-  if files.length == 1
-    require files.first
-    class SpreeMailTestAppGenerator < Spree::Generators::TestAppGenerator
-      def tweak_gemfile
-        append_file "Gemfile" ,
-          <<-gems
-gem 'activemerchant'
-gem 'spree_core', '>=0.40.2'
-gem 'spree_auth', '>=0.40.2'
-gem 'spree_mail', :path => "#{File.dirname(__FILE__)}"  
-          gems
-      end
-  
-      def install_spree_gems
-      
-        puts "-----------------------------------------"
-        puts "Installing gems..."
-        `bundle install --gemfile=spec/test_app/Gemfile`
-        puts "-----------------------------------------"
-      
-        inside "test_app" do
-          run 'rake spree_core:install'
-          run 'rake spree_auth:install'
-          run 'rake spree_mail:install'
-        end
-      end
-    
-      def migrate_db
-        run_migrations
-      end
-    end
-    
-    SpreeMailTestAppGenerator.start
-    
-    puts "spec/test_app created. "
-           
-  else
-    puts "Failed: Could not find lib/generators/spree/test_app_generator.rb"
-  end
-end
-
-namespace :test_app do
-  desc 'Rebuild test database'
-  task :rebuild_db do
-    system("cd spec/test_app && rake db:drop db:migrate RAILS_ENV=test")
-  end
-end
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'SpreeMail'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README.rdoc')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/app/controllers/admin/emails_controller.rb

@@ -2,18 +2,12 @@ class Admin::EmailsController < Admin::BaseController
   
   resource_controller
   
-  before_filter :check_json_authenticity, :only => :index
   before_filter :get_subscribers, :only => [:new, :create, :edit, :update]
   
-  index.response do |wants|
-    wants.html { render :action => :index }
-    wants.json { render :json => json_data }
-  end
   destroy.success.wants.js { render_js_for_destroy }
 
-
   def deliver
-    @email = Email.find(params[:id])
+    @email = object
     sent, count = @email.deliver!
     if sent
       flash[:notice] = t('delivery_success', count)
@@ -23,39 +17,21 @@ class Admin::EmailsController < Admin::BaseController
     redirect_to admin_email_path(@email)
   end 
 
-
-
   private
-
-  ## Allow different formats of json data to suit different ajax calls
-  #def json_data
-  #  json_format = params[:json_format] or 'default'
-  #  case json_format
-  #  when 'basic'
-  #    collection.map {|u| {'id' => u.id, 'name' => u.email}}.to_json
-  #  else
-  #    collection.to_json(:include =>
-  #      {:bill_address => {:include => [:state, :country]},
-  #      :ship_address => {:include => [:state, :country]}})
-  #  end
-  #end
-
-  def get_subscribers
-   @subscribers = Subscriber.active
-  end
   
-  def collection
-    return @collection if @collection.present?
-    unless request.xhr?
-      @search = Email.searchlogic(params[:search])
-
-      #set order by to default or form result
-      @search.order ||= "ascend_by_name"
-
-      @collection = @search.do_search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
-
-    else
-      @collection = Email.where("wholesalers.name like :search", {:search => "#{params[:q].strip}%"}).limit(params[:limit] || 100)
+    def get_subscribers
+     @subscribers = Subscriber.active
+    end
+    
+    def object
+      @object ||= Email.find_by_token(params[:id])
+    end
+    
+    def collection
+      params[:search] ||= {}
+      params[:search][:meta_sort] ||= "subject.asc"
+      @search = end_of_association_chain.metasearch(params[:search])
+      @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
     end
-  end  
+ 
 end

data/app/controllers/admin/subscribers_controller.rb

@@ -2,13 +2,6 @@ class Admin::SubscribersController < Admin::BaseController
   
   resource_controller
   
-  before_filter :check_json_authenticity, :only => :index
-  
-  #index.response do |wants|
-  #  wants.html { render :action => :index }
-  #  wants.json { render :json => json_data }
-  #end
-
   destroy.success.wants.js { render_js_for_destroy }
 
   create.response do |wants|
@@ -22,9 +15,9 @@ class Admin::SubscribersController < Admin::BaseController
   def resubscribe
     @subscriber = object
     if @subscriber.resubscribe!
-      flash[:notice] = t("resubscribe_success")
+      flash[:notice] = t('resubscribe_success')
     else
-      flash[:error] = t("resubscribe_failed")
+      flash[:error] = t('resubscribe_failed')
     end
     redirect_to request.referer
   end
@@ -32,47 +25,34 @@ class Admin::SubscribersController < Admin::BaseController
   def unsubscribe
     @subscriber = object
     if @subscriber.unsubscribe!
-      flash[:notice] = t("unsubscribe_success")
+      flash[:notice] = t('unsubscribe_success')
     else
-      flash[:error] = t("unsubscribe_failed")
+      flash[:error] = t('unsubscribe_failed')
     end
     redirect_to request.referer
   end
 
   def unsubscribed
-    @search = Subscriber.searchlogic(params[:search])
-    
-    #set order by to default or form result
-    @search.order ||= "ascend_by_name"
-
-    @subscribers = @collection = @search.do_search.unsubscribed.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+    params[:search] ||= {}
+    params[:search][:unsubscribed_at_is_not_null] = true
+    @subscribers = collection
     render :template => 'admin/subscribers/index'
   end
 
-
   private
-
-  # Allow different formats of json data to suit different ajax calls
-  #def json_data
-  #  json_format = params[:json_format] or 'default'
-  #  case json_format
-  #  when 'basic'
-  #    collection.map {|u| {'id' => u.id, 'name' => u.email}}.to_json
-  #  else
-  #    collection.to_json(:include =>
-  #      {:bill_address => {:include => [:state, :country]},
-  #      :ship_address => {:include => [:state, :country]}})
-  #  end
-  #end
-
-  def collection
-    return @collection if @collection.present?
-    @search = Subscriber.searchlogic(params[:search])
+  
+    def object
+      @object ||= Subscriber.find_by_token(params[:id])
+    end
     
-    #set order by to default or form result
-    @search.order ||= "ascend_by_name"
-
-    @collection = @search.do_search.active.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+    def collection
+      params[:search] ||= {}
+      params[:search][:meta_sort] ||= "name.asc"
+      unless params[:search].has_key?(:unsubscribed_at_is_not_null)
+        params[:search][:unsubscribed_at_is_null] = true
+      end    
+      @search = end_of_association_chain.metasearch(params[:search])
+      @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page], :page => params[:page])
+    end
     
-  end  
-end
+end

data/app/controllers/emails_controller.rb

@@ -4,16 +4,17 @@ class EmailsController < Spree::BaseController
   include ActionView::Helpers::TextHelper
   
   def show
-    @subscriber = Subscriber.find_by_token(params[:token])
-    @email = Email.find_by_token(params[:id])
-    
-    return redirect_to new_subscriber_path unless @email.recipients.include?(@subscriber.email)
-    
-    @email_subject = @email.render(:subject, @subscriber)
-    @text          = @email.render(:body,    @subscriber)
-    @base_url      = "http://#{Spree::Config[:site_url]}"
-    
-    render :layout => 'email', :text => simple_format(@text)    
+    @subscriber = Subscriber.find_by_token(params[:subscriber])
+    @email      = Email.find_by_token(params[:email])
+    if @email.recipients.include?(@subscriber.email)  
+      @email_subject = @email.render(:subject, @subscriber)
+      @text          = @email.render(:body,    @subscriber)
+      @base_url      = "http://#{Spree::Config[:site_url]}"
+      render :layout => 'email', :text => simple_format(@text)    
+    else
+      flash[:error] = t('unintened_email_view')
+      redirect_to new_subscriber_path
+    end
   end
   
 end

data/app/controllers/subscribers_controller.rb

@@ -16,21 +16,22 @@ class SubscribersController < Spree::BaseController
   def create
     @subscriber = Subscriber.new(params[:subscriber])
     if @subscriber.valid? && @subscriber.save
-      flash[:notice] = I18n.t( :subscribe_thanks)
+      flash[:notice] = t('subscribe_thanks')
       redirect_to new_subscriber_path
     else
-      flash[:error] = I18n.t( :subscribe_failed)
+      flash[:error] = t('subscribe_failed')
       render :action => 'new'
     end
   end
   
   def unsubscribe
     if @subscriber.email == params[:subscriber][:email] && @subscriber.unsubscribe!
-      flash[:notice] = I18n.t(:unsubscribe_success_public)
+      flash[:notice] = t('unsubscribe_success_public')
+      redirect_to new_subscriber_path
     else
-      flash[:error]  = I18n.t(:unsubscribe_failed_public)
+      flash[:error]  = t('unsubscribe_failed_public')    
+      redirect_to subscriber_path(@subscriber)
     end
-    redirect_to new_subscriber_path
   end
   
   private

data/app/model/email.rb

@@ -1,11 +1,11 @@
 class Email < ActiveRecord::Base
-  
+
+  include SpreeMail::HasToken
+
   validates :to,      :presence => true
   validates :subject, :presence => true
   validates :body,    :presence => true
   
-  before_create :set_token
-  
   def to=(value)
     value = {} unless value.is_a? Hash
     value.delete("0")
@@ -25,6 +25,10 @@ class Email < ActiveRecord::Base
   def recipient_list
     recipients.join(", ")
   end
+  
+  def render(attribute, subscriber)
+    Mustache.render(self.send(attribute), subscriber.attributes)
+  end
 
   def deliver!
     count = 0
@@ -37,20 +41,7 @@ class Email < ActiveRecord::Base
     end   
     return 0 < count, count
   end
-  
-  
-  
-  def render(attribute, subscriber)
-    Mustache.render(self.send(attribute), subscriber.attributes)
-  end
-  
-  private
- 
-    def set_token
-      write_attribute :token, Digest::SHA1.hexdigest(Time.now.to_s)
-    end
-  
-    
+      
   class << self
     
     def new(parameters={})

data/app/model/subscriber.rb

@@ -1,15 +1,15 @@
 class Subscriber < ActiveRecord::Base
 
-  attr_protected :token
+  include SpreeMail::HasToken
   
+  # ?? Do we need these scopes anywhere else 
+  # -> DRY (Later task)
   scope :active, where("unsubscribed_at IS NULL").order(:name)
   scope :unsubscribed, where("unsubscribed_at IS NOT NULL").order(:name)
   
   validates :name,  :presence => true
   validates :email, :email => true, :uniqueness => true
-  
-  before_create :set_token
-  
+    
   def active?
     unsubscribed_at.to_s.empty?
   end
@@ -29,11 +29,5 @@ class Subscriber < ActiveRecord::Base
   def email=(value)
     write_attribute :email, value.strip.downcase
   end
-    
-  private
-  
-    def set_token
-      write_attribute :token, Digest::SHA1.hexdigest(Time.now.to_s)
-    end
-  
+
 end

data/app/validators/email_validator.rb

@@ -15,6 +15,6 @@ class EmailValidator < ActiveModel::EachValidator
     rescue Exception => e   
       r = false
     end
-    record.errors[attribute] << (options[:message] || I18n.t(:invalid_email, :scope => [:activerecord, :errors, :messages])) unless r
+    record.errors[attribute] << (options[:message] || I18n.t('invalid_email', :scope => [:activerecord, :errors, :messages])) unless r
   end
 end

data/app/views/admin/emails/_form.html.erb

@@ -1,13 +1,10 @@
 <%- locals = {:f => f} %>
 
 <% content_for :head do %>
-  <%= stylesheet_link_tag 'admin/spree_mail' %>  
-  
+  <%= stylesheet_link_tag 'admin/spree_mail' %>
   <script type="text/javascript">
-  //<![CDATA[
-  
+  //<![CDATA[  
     $(document).ready(function() {
-  
       $('div.selection a').click(function(evt) {
         evt.preventDefault();
         var a = $(this);
@@ -22,20 +19,15 @@
             break;
         }
       });
-      
       $('div.selection li').click(function(evt) {
         if (evt.target.type == 'checkbox') return true;
         evt.preventDefault();
         var cb = $(this).find('input[type=checkbox]');
         cb.attr('checked', cb.is(':checked') ? false : true);
       });
-      
     });
-
-    
   //]]>
-  </script>
-  
+  </script>  
 <% end %>
 
 <%= hook :admin_email_form_fields, locals do %>
@@ -44,9 +36,9 @@
   
   <div class="selection left">
 
-    <h3><%= t("select_subscribers") %>:</h3>
-    <%= link_to t("select_all"), "#select-all" %> / 
-    <%= link_to t("deselect_all"), "#deselect-all" %>
+    <h3><%= t('select_subscribers') %>:</h3>
+    <%= link_to t('select_all'), "#select-all" %> / 
+    <%= link_to t('deselect_all'), "#deselect-all" %>
     <ul class="select">
       <% @subscribers.each do |subscriber| %>
         <li class="checkbox">
@@ -60,7 +52,7 @@
   
   <div class="right">
     
-    <h3><%= t("message_details")%></h3>
+    <h3><%= t('message_details')%></h3>
     <%= f.field_container :subject do %>
       <%= f.label :subject, t("subject") %><br />
       <%= f.text_field :subject, :class => "title" %>
@@ -68,7 +60,7 @@
     <% end %>
     
     <%= f.field_container :body do %>
-      <%= f.label :body, t("message_body") %><br />
+      <%= f.label :body, t('message_body') %><br />
       <%= f.text_area :body  %>
       <%= error_message_on :email, :body %>
     <% end %>

data/app/views/admin/emails/edit.html.erb

@@ -1,7 +1,7 @@
 <%= render 'admin/shared/spree_mail_sub_nav' %>
 
 <%= hook :admin_email_edit_form_header do %>
-  <h1><%= t("editing_email") %></h1>
+  <h1><%= t('editing_email') %></h1>
 <% end %>
 
 <%= hook :admin_email_edit_form do %>

data/app/views/admin/emails/index.html.erb

@@ -3,22 +3,22 @@
 <div class='toolbar'>
   <ul class='actions'>
     <li>
-      <p><%= button_link_to t("new_email"), new_object_url, :icon => 'add' %></p>
+      <p><%= button_link_to t('new_email'), new_object_url, :icon => 'add' %></p>
     </li>
   </ul>
   <br class='clear' />
 </div>
 
 
-<h1><%= t("listing_emails") %></h1>
+<h1><%= t('listing_emails') %></h1>
 
 
 <table class="index">
   <thead>
   <tr>
     <%= hook :admin_emails_index_headers do %>
-      <th><%= order @search, :by => :subject, :as => t("subject") %></th>
-      <th><%= order @search, :by => :body, :as => t("message_body") %></th>
+      <th><%= sort_link @search, :subject, t('subject') %></th>
+      <th><%= sort_link @search, :body, t('message_body') %></th>
       <th><%= hook :admin_emails_index_header_actions %></th>
     <% end %>
   </tr>
@@ -44,21 +44,26 @@
 
 <%= will_paginate(:previous_label => "&#171; #{t('previous')}", :next_label => "#{t('next')} &#187;") %>
 
-
 <% content_for :sidebar do %>
-  <div class="box">
-    <h3><%= t(:search) %></h3>
-    <%= form_for @search do |f| %>
-      <%- locals = {:f => f} %>
-      <%= hook :admin_emails_index_search, locals do %>
-        <p>
-          <%= t("to") %><br />
-          <%= f.text_field :to_contains, :size=>18 %>
-        </p>        
-      <% end %>
-      <%= hook :admin_emails_index_search_buttons, locals do %>
-        <p><%= button t("search") %></p>
-      <% end %>
+<div class="box">
+  <h3><%= t('search') %></h3>
+
+  <% @email = Email.metasearch %>
+  <%= form_for [:admin, @email] do |f| %>
+    <%- locals = {:f => f} %>
+    <%= hook :admin_emails_index_search, locals do %>
+      <p>
+        <label><%= t 'to' %></label><br />
+        <%= f.text_field :to_like, :size => 25 %>
+      </p>
+      <p>
+        <label><%= t 'subject' %></label><br />
+        <%= f.text_field :subject_like, :size => 25 %>
+      </p>
     <% end %>
-  </div>
-<% end %>
+    <%= hook :admin_emails_index_search_buttons, locals do %>
+      <p><%= button t('search') %></p>
+    <% end %>
+  <% end %>
+</div>
+<% end %>

data/app/views/admin/emails/new.html.erb

@@ -1,7 +1,7 @@
 <%= render 'admin/shared/spree_mail_sub_nav' %>
 
 <%= hook :admin_email_new_form_header do %>
-  <h1><%= t("new_email") %></h1>
+  <h1><%= t('new_email') %></h1>
 <% end %>
 
 <%= hook :admin_email_new_form do %>

data/app/views/admin/emails/show.html.erb

@@ -1,20 +1,20 @@
 <%= render 'admin/shared/spree_mail_sub_nav' %>
 
-<h1><%= t("show_email") %></h1>
+<h1><%= t('show_email') %></h1>
 
-<h5><%= t("to") %>: (<%= @email.recipients.length %>)</h5>
+<h5><%= t('to') %>: (<%= @email.recipients.length %>)</h5>
 <p><%= @email.recipient_list %></p>
 
-<h5><%= t("subject") %>:</h5>
+<h5><%= t('subject') %>:</h5>
 <p><%= @email.subject %></p>
 
-<h5><%= t("body") %>:</h5>
+<h5><%= t('body') %>:</h5>
 <%= simple_format @email.body %>
 
 <hr/>
 
 <p>
-  <%= link_to (image_tag("admin/icons/email.png") + " " + t("send")), deliver_admin_email_path(@email) %> &nbsp;
+  <%= link_to (image_tag("admin/icons/email.png") + " " + t('send')), deliver_admin_email_path(@email) %> &nbsp;
   <%= link_to_edit @email %> <%= t('or') %>
   <%= link_to t('back'), collection_url %>
 </p>

data/app/views/admin/subscribers/_form.html.erb

@@ -5,13 +5,13 @@
   <%= render "shared/error_messages", :target => @subscriber %>
   
   <%= f.field_container :name do %>
-    <%= f.label :name, t("name") %><br />
+    <%= f.label :name, t('name') %><br />
     <%= f.text_field :name, :class => 'title' %>
     <%= error_message_on :subscriber, :name %>
   <% end %>
   
   <%= f.field_container :email do %>
-    <%= f.label :email, t("email") %><br />
+    <%= f.label :email, t('email') %><br />
     <%= f.text_field :email, :class => 'title' %>
     <%= error_message_on :subscriber, :email %>
   <% end %>

data/app/views/admin/subscribers/_options.html.erb

@@ -1,5 +1,5 @@
 <% if subscriber.active? %>
-  <%= link_to t("unsubscribe"), unsubscribe_admin_subscriber_path(subscriber) %>
+  <%= link_to t('unsubscribe'), unsubscribe_admin_subscriber_path(subscriber) %>
 <% else %>
-  <%= link_to t("resubscribe"), resubscribe_admin_subscriber_path(subscriber) %>
+  <%= link_to t('resubscribe'), resubscribe_admin_subscriber_path(subscriber) %>
 <% end %>

data/app/views/admin/subscribers/edit.html.erb

@@ -1,7 +1,7 @@
 <%= render 'admin/shared/spree_mail_sub_nav' %>
 
 <%= hook :admin_subscriber_edit_form_header do %>
-  <h1><%= t("editing_subscriber") %></h1>
+  <h1><%= t('editing_subscriber') %></h1>
 <% end %>
 
 <%= hook :admin_subscriber_edit_form do %>

data/app/views/admin/subscribers/index.html.erb

@@ -5,11 +5,11 @@
     <li>
       <p>
         <% if controller.action_name == 'unsubscribed' %>
-          <%= button_link_to t("view_all_subscribers"), admin_subscribers_path %>
+          <%= button_link_to t('view_all_subscribers'), admin_subscribers_path %>
         <% else %>
-          <%= button_link_to t("view_unsubscribed"), unsubscribed_admin_subscribers_path %>
+          <%= button_link_to t('view_unsubscribed'), unsubscribed_admin_subscribers_path %>
         <% end %>        
-        <%= button_link_to t("new_subscriber"), new_object_url, :icon => 'add' %>
+        <%= button_link_to t('new_subscriber'), new_object_url, :icon => 'add' %>
       </p>
     </li>
   </ul>
@@ -17,15 +17,15 @@
 </div>
 
 
-<h1><%= t("listing_subscribers") %></h1>
+<h1><%= t('listing_subscribers') %></h1>
 
 
 <table class="index">
   <thead>
   <tr>
     <%= hook :admin_subscribers_index_headers do %>
-      <th><%= order @search, :by => :name, :as => t("name") %></th>
-      <th><%= order @search, :by => :email, :as => t("email") %></th>
+      <th><%= sort_link @search, :name, t('name') %></th>
+      <th><%= sort_link @search, :email, t('email') %></th>
       <th><%= hook :admin_subscribers_index_header_actions %></th>
     <% end %>
   </tr>
@@ -54,23 +54,25 @@
 
 
 <% content_for :sidebar do %>
-  <div class="box">
-    <h3><%= t(:search) %></h3>
-    <%= form_for @search do |f| %>
-      <%- locals = {:f => f} %>
-      <%= hook :admin_subscribers_index_search, locals do %>
-        <p>
-          <%= t("name") %><br />
-          <%= f.text_field :name_contains, :size=>18 %>
-        <p>
-          <%= t("email") %><br />
-          <%= f.text_field :email_contains, :size=>18 %>
-        </p>
-        
-      <% end %>
-      <%= hook :admin_subscribers_index_search_buttons, locals do %>
-        <p><%= button t("search") %></p>
-      <% end %>
+<div class="box">
+  <h3><%= t('search') %></h3>
+
+  <% @subscriber = Subscriber.metasearch %>
+  <%= form_for [:admin, @subscriber] do |f| %>
+    <%- locals = {:f => f} %>
+    <%= hook :admin_subscribers_index_search, locals do %>
+      <p>
+        <label><%= t 'name' %></label><br />
+        <%= f.text_field :name_like, :size => 25 %>
+      </p>
+      <p>
+        <label><%= t 'email' %></label><br />
+        <%= f.text_field :email_like, :size => 25 %>
+      </p>
+    <% end %>
+    <%= hook :admin_subscribers_index_search_buttons, locals do %>
+      <p><%= button t('search') %></p>
     <% end %>
-  </div>
-<% end %>
+  <% end %>
+</div>
+<% end %>

data/app/views/admin/subscribers/new.html.erb

@@ -1,7 +1,7 @@
 <%= render 'admin/shared/spree_mail_sub_nav' %>
 
 <%= hook :admin_subscriber_new_form_header do %>
-  <h1><%= t("new_subscriber") %></h1>
+  <h1><%= t('new_subscriber') %></h1>
 <% end %>
 
 <%= hook :admin_subscriber_new_form do %>

data/app/views/admin/subscribers/show.html.erb

@@ -1,6 +1,6 @@
 <%= render 'admin/shared/spree_mail_sub_nav' %>
 
-<h1><%= t("show_subscriber") %></h1>
+<h1><%= t('show_subscriber') %></h1>
 
   <h5>Name:</h5>
   <h3><%= @subscriber.name %></h3>

data/app/views/hooks/_footer_left.html.erb

@@ -1 +1 @@
-<%= link_to t("sign_up_for_our_newsletter"), new_subscriber_path %>
+<%= link_to t('sign_up_for_our_newsletter'), new_subscriber_path %>

data/app/views/hooks/_subscriber_static_content.html.erb

@@ -1,3 +1,3 @@
 <h1><%= t('newsletter_sign_up') %></h1>
 
-<p><%= t("newsletter_text_signup") %></p>
+<p><%= t('newsletter_text_signup') %></p>

data/app/views/layouts/email.html.erb

@@ -23,7 +23,7 @@
             <td><%= link_to image_tag(@base_url + Spree::Config[:logo], :alt => Spree::Config[:site_name], :style => "border: 0"), root_url %></td>
             <td align="right">
               <p><%= l @email.created_at, :format => "%B %d, %Y" %></p>
-              <p><b><%= t("subject") %>:</b> <%= @email_subject %></p>
+              <p><b><%= t('subject') %>:</b> <%= @email_subject %></p>
             </td>
           </tr>
           <tr>
@@ -36,8 +36,8 @@
           <tr>
             <td>
               <p style="font-size: 12px;"><%= t :received_in_error, :site_name => Spree::Config[:site_name] %></p>
-              <p style="font-size: 12px;"><%= t("contact") %>: <b><%= mail_to @email.from, @email.from, :style => "color: #5b8fb1;" %></b></p>
-              <p style="font-size: 12px;"><%= t("unsubscribe_text", :site_name => Spree::Config[:site_name]) %> <%= link_to t("click_here"), subscriber_url(@subscriber.token), :style => "color: #5b8fb1;" %></p>
+              <p style="font-size: 12px;"><%= t('contact') %>: <b><%= mail_to @email.from, @email.from, :style => "color: #5b8fb1;" %></b></p>
+              <p style="font-size: 12px;"><%= t('unsubscribe_text', :site_name => Spree::Config[:site_name]) %> <%= link_to t('click_here'), subscriber_url(@subscriber.token), :style => "color: #5b8fb1;" %></p>
               <h4 style="padding: 10px 0; margin: 0; border-top: 1px solid #e0e0e0;">
                 <%= link_to Spree::Config[:site_name], root_url, :style => "color: #5b8fb1;" %>
               </h4>  
@@ -59,10 +59,10 @@
       <td align="right">
         <p style="font-size: 12px">
           <% if @link_to_browser %>
-            <%= link_to t("click_here"), @link_to_browser, :style => "color: #5b8fb1;" %>
-            <%= t("view_in_browser") %>
+            <%= link_to t('click_here'), @link_to_browser, :style => "color: #5b8fb1;" %>
+            <%= t('view_in_browser') %>
           <% else %>
-	        <%= t("visit_online") %>      
+	        <%= t('visit_online') %>      
             <%= link_to Spree::Config[:site_url], root_url, :style => "color: #5b8fb1;" %>
           <% end %>
         </p>
@@ -71,7 +71,7 @@
     <tr>
       <td colspan="2" align="center">
         <br/>
-        <p style="font-size: 11px; color: #999;"><%= t(:message_sent_to_from_on,
+        <p style="font-size: 11px; color: #999;"><%= t('message_sent_to_from_on',
                                                        :to => @subscriber.email,
                                                        :from => @email.from,
                                                        :on => l(@email.created_at, :format => "%b %d, %Y at %I:%M:%S %p")) %>.</p>

data/app/views/subscribers/_fields.html.erb

@@ -7,5 +7,5 @@
   <%= form.text_field :email, :class => 'title required' %>
 </p>
 <p class="action">
-  <%= form.submit t("sign_up") %>
+  <%= form.submit t('sign_up') %>
 </p>

data/app/views/subscribers/show.html.erb

@@ -1,6 +1,6 @@
-<h1><%= t("unsubscribe_title") %></h1>
+<h1><%= t('unsubscribe_title') %></h1>
 
-<p><%= t("unsubscribe_mail") %>:</p>
+<p><%= t('unsubscribe_mail') %>:</p>
 
 <% token = Digest::SHA1.hexdigest(Time.now.to_s) %>
 <%= form_for @subscriber, :url => unsubscribe_subscriber_path(@subscriber.token) do |form| %>
@@ -10,7 +10,7 @@
     <%= form.hidden_field :token, :value => token %>
   </p>
   <p>
-    <%= form.submit t("unsubscribe") %> or
-    <%= link_to t("cancel"), root_path %>
+    <%= form.submit t('unsubscribe') %> or
+    <%= link_to t('cancel'), root_path %>
   </p>
 <% end %>

data/config/locales/en.yml

@@ -24,7 +24,7 @@ en:
   show_email: Show Email
   new_email: New Email
   editing_email: Editing Email
-  
+  unintened_email_view: This email was not intended for you.
   emails: Emails
   
   to: To
@@ -32,35 +32,32 @@ en:
   body: Body
   subject: Subject
   message_body: Message Body
+  contact: Contact
   
   delivery_success: Your email was successfully sent!
   delivery_failed: Sorry, your email could not be sent.
   
-  contact: "Contact"
-  
-  received_in_error: 'This is a message from the %{site_name} if you believe you have received this in error please let us know.'
-  unsubscribe_text: "If you would like to Unsubscribe"
-  click_here: "Click here"
-  view_in_browser: "to view this email in your browser"
-  visit_online: "visit us online at"
+  unsubscribe_text: If you would like to Unsubscribe
+  click_here: Click here
+  view_in_browser: to view this email in your browser
+  visit_online: visit us online at
+
+  received_in_error: "This is a message from the %{site_name} if you believe you have received this in error please let us know."
   message_sent_to_from_on: "This message was sent to %{to} from %{from} on %{on}."
   
+  unsubscribe_title: Unsubscribe from our Mailing List
+  unsubscribe_mail: Please enter your email address below
+  unsubscribe: Unsubscribe
   
-  unsubscribe_title: "Unsubscribe from our Mailing List"
-  unsubscribe_mail: "Please enter your email address below"
-  unsubscribe: "Unsubscribe"
-  
-  select_subscribers: "Select subscribers"
-  select_all: "Select All"
-  deselect_all: "Deselect All"
-  message_details: "Message Details"
-
-  sign_up_for_our_newsletter: "Sign up for our newsletter"
-
-  newsletter_text_signup: "Lorem Ipsum dolor sit amet..."
+  select_subscribers: Select subscribers
+  select_all: Select All
+  deselect_all: Deselect All
+  message_details: Message Details
 
+  sign_up_for_our_newsletter: Sign up for our newsletter
+  newsletter_text_signup: Lorem Ipsum dolor sit amet...
 
   activerecord:
     errors:
       messages:
-        invalid_email: "appears to be invalid"
+        invalid_email: appears to be invalid

data/config/routes.rb

@@ -1,6 +1,6 @@
 Rails.application.routes.draw do
   
-  get "/email/:token/:id", :to => "emails#show", :as => :read_email
+  get "/email/:subscriber/:email", :to => "emails#show", :as => :read_email
   
   resources :subscribers, :except => [:edit,:update] do
     put :unsubscribe,  :on => :member

data/lib/spree_mail.rb

@@ -1,6 +1,14 @@
+if ENV["RAILS_ENV"] == "test"
+  require 'spree_core'
+  require 'spree_auth'
+  require 'sqlite3'
+end
+
 require 'mail'
 require 'mustache'
+require 'meta_search'
 require 'spree_mail/custom_hooks'
+require 'spree_mail/has_token'
 
 module SpreeMail
   

data/lib/spree_mail/has_token.rb

@@ -0,0 +1,27 @@
+module SpreeMail  
+  module HasToken
+    
+    def self.included(model)
+      model.instance_eval do
+        attr_readonly :token
+        validates :token, :presence => true
+        before_validation :set_token, :on => :create
+      end
+      model.send(:include, InstanceMethods)
+    end
+    
+    module InstanceMethods
+      
+      def to_param
+        token
+      end
+      
+      private        
+        def set_token
+          write_attribute :token, Digest::SHA1.hexdigest((Time.now.to_i * rand).to_s)
+        end
+      
+    end
+    
+  end
+end

data/lib/spree_mail/version.rb

@@ -1,3 +1,3 @@
 module SpreeMail
-  VERSION = "0.40.0.3"
+  VERSION = "0.40.0.4"
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: spree_mail
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 40
-  - 0
-  - 3
-  version: 0.40.0.3
+  prerelease: 
+  version: 0.40.0.4
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -15,68 +10,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 -08:00
+date: 2011-02-22 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 30
-        - 1
         version: 0.30.1
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: spree_auth
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 30
-        - 1
         version: 0.30.1
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mustache
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 0
         version: 0.12.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mail
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 2
-        version: "2.2"
+        version: 2.2.0
   type: :runtime
+  prerelease: false
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: meta_search
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.11.3
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id007
 description: Spree Mail extends Spree by adding a mailing list subscriber model, sign up forms and an admin to send messages.
 email: 
 - spencer@citrusme.com
@@ -91,6 +104,7 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - lib/spree_mail/custom_hooks.rb
+- lib/spree_mail/has_token.rb
 - lib/spree_mail/version.rb
 - lib/spree_mail.rb
 - lib/tasks/install.rake
@@ -128,7 +142,7 @@ files:
 - public/images/mailer/postmark.png
 - public/stylesheets/admin/spree_mail.css
 - Rakefile
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/citrus/spree_mail
 licenses: []
 
@@ -142,6 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 104131697701234155
       segments: 
       - 0
       version: "0"
@@ -150,13 +165,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 104131697701234155
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Spree Mail adds mailing list signup and delivery features.