newsly 0.3.1 → 0.4.0

data/app/controllers/newsly/newsletters_controller.rb

@@ -5,10 +5,10 @@ module Newsly
     respond_to :text, :only => :preview
   
 
-    before_filter :get_newsletter, :except => [:index]
+    before_filter :get_newsletter, :except => [:new, :index]
     
     def index
-      @newsletters = Newsletter.all
+      @newsletters = Newsletter.order('created_at desc').all
     end
 
     def show
@@ -18,7 +18,8 @@ module Newsly
     end
 
     def new
-      render :show
+      @newsletter = Newsly::Newsletter.create(:title => "Nyhetsbrevs rubrik", :body => "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod.", :sent => false)
+      redirect_to newsletter_url(@newsletter)
     end
 
     def update
@@ -64,7 +65,7 @@ module Newsly
 
     protected
       def get_newsletter
-        @newsletter = params[:id] ? Newsly::Newsletter.find(params[:id]) : Newsly::Newsletter.create(:title => "Nyhetsbrevs rubrik", :body => "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod.", :sent => false)
+        @newsletter = Newsly::Newsletter.find(params[:id])
       end
   end
 end

data/app/controllers/newsly/templates_controller.rb

@@ -3,7 +3,8 @@ module Newsly
   class TemplatesController < ApplicationController
 	
   	def index
-  		@templates = Newsly::Template.where(:draft => false)
+  		@templates = Newsly::Template.where(:draft => false).order('friendly_name')
+      @template_types = Newsly::Template.all.map(&:template_type).uniq
   	end
 
   	def show
@@ -36,10 +37,7 @@ module Newsly
 
     def publish
       @draft = Newsly::Template.find(params[:id])
-      @original = Newsly::Template.find(@draft.parent_id)
-      @original.subject = @draft.subject
-      @original.body = @draft.body
-      @original.save
+      @draft.publish
       render :text => "Published"
     end
 

data/app/mailers/newsly/mailer.rb

@@ -12,7 +12,7 @@ module Newsly
       self.build_mail(@template.id, to, @template_data, @extra_headers)
   	end
 
-    def build_mail(template_id, to, template_data = {}, extra_headers = {})
+    def build_mail(template_id, to, template_data = {}, extra_headers = {}, layout = "newsly/mailer")
       headers = {}
       tmpl = Newsly::Template.find(template_id)
       headers[:to] = to
@@ -20,7 +20,7 @@ module Newsly
       body = tmpl.render(template_data)
       headers = headers.merge(extra_headers)
       mail(headers) do |format|
-        format.html { render :inline => body, :layout => "newsly/mailer" }
+        format.html { render :inline => body, :layout => layout }
       end
     end
 

data/app/models/newsly/newsletter.rb

@@ -3,9 +3,10 @@ module Newsly
   class Newsletter < ActiveRecord::Base
   	liquid_methods :title, :body
 
-  	def render(options={})
-  		Liquid::Template.parse(self.body).render options
-  	end
+
+    def render(options={})
+      Liquid::Template.parse(self.body).render options
+    end
 
   	def draft?
   		self.sent? || self.batch_sent? ? false : true

data/app/models/newsly/template.rb

@@ -1,11 +1,24 @@
 # encoding: UTF-8
 module Newsly
   class Template < ActiveRecord::Base
-  	liquid_methods :body
+
+  	liquid_methods :subject, :body
+
+  	validates_presence_of :subject
+  	validates_presence_of :body
+  	#validates_presence_of :parent_id, :if => :original
+  	#validates original is never draft and
 
   	def render(options={})
-  		Liquid::Template.parse(self.body).render options
+      Liquid::Template.parse(self.body).render options
+    end
+  	
+  	def publish
+  		original = Newsly::Template.find(self.parent_id)
+      original.subject = self.subject
+      original.body = self.body
+      original.save
   	end
-
-  end
+  
+	end
 end

data/app/views/newsly/templates/index.html.erb

@@ -1,15 +1,34 @@
 <%= render :partial => "/newsly/navigation" %>
 <div id="content">
 	<h2><%= t("Templates")%></h2>
-	<table cellspacing="0" cellpadding="0">
+	<ul class="type_tabs">
+		<li class="title">Show type:</li>
+		<li class="active"><%= link_to "All", templates_url %></li>
+		<% @template_types.each do |type| %>
+			<li class="<%=type.nil? ? "notype" : type %>">
+				<% if type.nil? %>
+					<%= link_to "No Type", "#", :data => {:type => "notype"} %>
+				<% else %>
+					<%= link_to type, "#", :data => {:type => type}%>
+				<% end %>
+			</li>
+		<% end %>
+	</ul>
+	<table cellspacing="0" cellpadding="0" id="templates">
 	  <tbody>
 			<% @templates.each do |template| %>
-			  <tr>
-			    <td class="title"><%= link_to template.name, template %> (<%=t(template.template_type)%>)</td>
+			  <tr class="<%= template.template_type.nil? ? "notype" : template.template_type%>">
+			    <td class="title">
+			    	<%= link_to template.friendly_name || template.name, template, :class => "friendly_name" %>
+			    	<span class="type"><%=t(template.template_type)%></span>
+			    	<span class="desc">Lorem ipsum dolor sit amet conseqteur dolor amet.</span>
+			    </td>
 			  </tr>
 			<% end %>
 		</tbody>
 	</table>
 </div>
 <div id="sidebar">
-</div>
+</div>
+
+<%= javascript_include_tag "templates" %>

data/db/migrate/20111025072740_add_friendly_fields_to_templates.rb

@@ -0,0 +1,6 @@
+class AddFriendlyFieldsToTemplates < ActiveRecord::Migration
+  def change
+  	add_column :newsly_templates, 	:friendly_name, :string
+  	add_column :newsly_templates, 	:description,		:string
+  end
+end

data/lib/newsly/version.rb

@@ -1,3 +1,3 @@
 module Newsly
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/public/javascripts/newsletters.js

@@ -14,7 +14,6 @@ jQuery(document).ready(function($) {
         }
       });
     }
-    
 
     $('a#deliver_batch').click(function(e){
       e.preventDefault();
@@ -30,7 +29,7 @@ jQuery(document).ready(function($) {
         var batch_size = parseInt($('#batch_size').val());
         if(answer == "BATCH"){
           $.ajax({
-            url:  url,        
+            url:  url,
             type: 'POST',
             data: {'_method': 'PUT', 'answer': answer, 'recipient_group': recipient_groups[0], 'batch_size': batch_size},
             success: function(data){
@@ -39,23 +38,23 @@ jQuery(document).ready(function($) {
               $('.groups').remove();
             }
           });
-        } 
+        }
       } else{
         alert('You have to select 1 (one) group to send to!');
       }
     });
 
     $('a#deliver').click(function(e){
-    	e.preventDefault();
+      e.preventDefault();
       top.Mercury.trigger('action', {action: 'save'});
-      var url = $(this).attr('href');    
+      var url = $(this).attr('href');
       var recipient_groups = get_recipient_groups();
       if(recipient_groups.length > 0){
         var newsletter_id = $("#newsletter").attr('data-id');
         var answer = prompt('Are you sure? Type "DELIVER"');
         if(answer == "DELIVER"){
           $.ajax({
-            url:  url,        
+            url:  url,
             type: 'POST',
             data: {'_method': 'PUT', 'answer': answer, 'recipient_groups[]': recipient_groups},
             success: function(data){
@@ -64,26 +63,26 @@ jQuery(document).ready(function($) {
               $('.groups').remove();
             }
           });
-        } 
+        }
       } else{
         alert('You have to select atleast one group to send to!');
       }
     });
 
     $('a#send_test').click(function(e){
-    	e.preventDefault();
-      top.Mercury.trigger('action', {action: 'save'});    
-  	 	var newsletter_id = $("#newsletter").attr('data-id');
-      var url = $(this).attr('href');    
+      e.preventDefault();
+      top.Mercury.trigger('action', {action: 'save'});
+      var newsletter_id = $("#newsletter").attr('data-id');
+      var url = $(this).attr('href');
       var to = prompt('to what email?');
-    	$.ajax({
+      $.ajax({
         url:  url,
-  			type: 'POST',
-  			data: {'_method': "PUT", 'to': to},
-  			success: function(data){
-  				$("#flash").html(data).show().hide("fade", {}, 1000);
-  			}
-  		});	
+        type: 'POST',
+        data: {'_method': "PUT", 'to': to},
+        success: function(data){
+          $("#flash").html(data).show().hide("fade", {}, 1000);
+        }
+      });
     });
 
     $('#groupform input[type=checkbox]').change(function(){
@@ -95,10 +94,10 @@ jQuery(document).ready(function($) {
         }
         set_batch_size();
       } else {
-        $('.deliverbutton').hide();      
+        $('.deliverbutton').hide();
       }
     });
-  }; 
+  };
 
 });
 
@@ -127,6 +126,6 @@ var get_maximum_batch_size = function(){
       max_size = max_size + parseInt($(this).attr('data-max'));
     }
   });
-  console.log('MAXIMUM SIZE '+ max_size);  
-  return max_size; 
+  console.log('MAXIMUM SIZE '+ max_size);
+  return max_size;
 }

data/public/javascripts/templates.js

@@ -38,4 +38,17 @@ jQuery(document).ready(function($) {
     });
   });
 
+  $('.type_tabs a').click(function(e){
+    e.preventDefault();
+    template_type = ''+$(this).attr('data-type')+'';
+    $('.type_tabs li').removeClass('active'); 
+    $('table#templates tr').hide();
+    $(this).parent('li').addClass('active');
+    if(template_type != "undefined"){
+      $('table#templates tr.'+template_type+'').show();
+    } else {
+      $('table#templates tr').show();
+    }
+  });
+
 });

data/public/mercury/javascripts/mercury.min.js

@@ -146,7 +146,7 @@ window.MercurySetup = {
       primary: {
         save:                  ['Save', 'Save this page'],
         //send_test:             ['Send Test', 'Send Test Email'],
-        //publish:               ['Publish', 'Publish'],        
+        //publish:               ['Publish', 'Publish'],
         sep1:                  ' ',
         undoredo:              {
           undo:                ['Undo', 'Undo your last action'],
@@ -8761,6 +8761,7 @@ function defaultDisplay( nodeName ) {
         iframe.frameBorder = iframe.width = iframe.height = 0;
       }
 
+
       document.body.appendChild( iframe );
 
       // Create a cacheable copy of the iframe document on first call.

data/public/stylesheets/application.css

@@ -69,17 +69,17 @@ a:hover {
 }
 
 
-	table{
-		width: 100%;
-	}
-	td.draft, td.sent, td.batch{
-		width: 20px;
-	}
-	td.action{
-		width: 20px;
-		padding: 5px;
-		font-size: 11px;
-	}
+table{
+	width: 100%;
+}
+td.draft, td.sent, td.batch{
+	width: 20px;
+}
+td.action{
+	width: 20px;
+	padding: 5px;
+	font-size: 11px;
+}
 td {
   padding: 5px 10px;
   text-align: left;
@@ -103,6 +103,22 @@ td.batch{
 table tr:nth-child(2n+2){
 	background: #eee;
 }
+td.title span.desc{
+  float: left;
+  width: 100%;
+  font-size: 0.8em;
+  color: #555;
+  text-indent: 100px;
+}
+td.title span.type{
+  float: left;
+  font-size: 0.8em;
+  width: 100px;
+}
+td a.friendly_name{
+  font-weight: bold;
+  text-transform: capitalize;
+}
 #sidebar ul {
   margin: 0;
   padding: 0;
@@ -270,4 +286,33 @@ form{
 }
 li.deliverbutton{
   display: none;
+}
+
+.type_tabs{
+  float: right;
+  margin-top: -40px;
+  font-size: 0.8em;
+  list-style: none;
+}
+.type_tabs li{
+  float: left;
+}
+.type_tabs li.title{
+  padding: 3px 5px;
+}
+.type_tabs li a {
+  padding: 3px 10px;
+  color: #000;
+  border-left: 1px solid #ccc;
+  float: left;
+  text-decoration: none;  
+}
+.type_tabs li a:hover{
+  text-indent: 0px;
+  background: #eee;
+  color: #000;
+}
+.type_tabs li.active a{
+  font-weight: bold;
+  background: #ccc;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsly
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-06 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165539980 !ruby/object:Gem::Requirement
+  requirement: &2158529960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165539980
+  version_requirements: *2158529960
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &2165539440 !ruby/object:Gem::Requirement
+  requirement: &2158529540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165539440
+  version_requirements: *2158529540
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &2165538860 !ruby/object:Gem::Requirement
+  requirement: &2158529080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165538860
+  version_requirements: *2158529080
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2165538360 !ruby/object:Gem::Requirement
+  requirement: &2158528660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165538360
+  version_requirements: *2158528660
 - !ruby/object:Gem::Dependency
   name: resque-async_deliver
-  requirement: &2165537860 !ruby/object:Gem::Requirement
+  requirement: &2158528240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165537860
+  version_requirements: *2158528240
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165537320 !ruby/object:Gem::Requirement
+  requirement: &2158527820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165537320
+  version_requirements: *2158527820
 - !ruby/object:Gem::Dependency
   name: letter_opener
-  requirement: &2165536780 !ruby/object:Gem::Requirement
+  requirement: &2158527400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165536780
+  version_requirements: *2158527400
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &2165536280 !ruby/object:Gem::Requirement
+  requirement: &2158526980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,51 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165536280
+  version_requirements: *2158526980
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2158553180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2158553180
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &2158552760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2158552760
+- !ruby/object:Gem::Dependency
+  name: capybara-webkit
+  requirement: &2158552340 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2158552340
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: &2158551920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2158551920
 description: Manage mailer templates via wysiwyg and liquid. Uses mercury editor for
   now. And send out newsletters.
 email:
@@ -115,7 +159,6 @@ files:
 - app/helpers/newsly/application_helper.rb
 - app/mailers/newsly/mailer.rb
 - app/models/newsly/newsletter.rb
-- app/models/newsly/recipient.rb
 - app/models/newsly/template.rb
 - app/views/layouts/newsly/application.html.erb
 - app/views/layouts/newsly/mailer.html.erb
@@ -136,7 +179,7 @@ files:
 - db/migrate/20110927120903_add_text_body_fields.rb
 - db/migrate/20110929142039_remove_text_body_fields.rb
 - db/migrate/20111004085523_add_fields_to_newsletter.rb
-- db/migrate/20111006122345_create_newsly_recipients.rb
+- db/migrate/20111025072740_add_friendly_fields_to_templates.rb
 - lib/newsly/engine.rb
 - lib/newsly/version.rb
 - lib/newsly.rb

data/app/models/newsly/recipient.rb

@@ -1,4 +0,0 @@
-module Newsly
-  class Recipient < ActiveRecord::Base
-  end
-end

data/db/migrate/20111006122345_create_newsly_recipients.rb

@@ -1,9 +0,0 @@
-class CreateNewslyRecipients < ActiveRecord::Migration
-  def change
-    create_table :newsly_recipients do |t|
-    	t.newsletter_id :integer
-    	t.email					:string
-      t.timestamps
-    end
-  end
-end