newsly 0.5.2 → 0.5.3

data/app/models/newsly/template.rb

@@ -8,7 +8,7 @@ module Newsly
     validates_presence_of :subject
     #validates_presence_of :parent_id, :if => :original
     #validates original is never draft and
-
+    validate :body_must_follow_validation_rules
     
     ### Methods
 
@@ -22,6 +22,16 @@ module Newsly
       original.save
       original
     end
-    
-  end
-end
+
+    def body_must_follow_validation_rules
+      failed = []
+      unless validation_rules.blank?
+        validation_rules.split(',').each do |rule|
+          rule = rule.strip
+          failed.push(rule) unless body=~ /{{rule}}/
+        end
+        errors.add(:body, "#{failed.to_sentence} is required") if failed.length > 0
+      end
+    end
+  end  
+end

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

@@ -21,7 +21,7 @@
 			    <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>
+			    	<span class="desc"><%=t(template.description)%></span>
 			    </td>
 			  </tr>
 			<% end %>

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

@@ -16,4 +16,4 @@
 	<div id="saved"></div>		
 </div>
 
-<%= javascript_include_tag "/mercury/javascripts/mercury_loader.js", "templates" %>
+<%= javascript_include_tag "templates", "/mercury/javascripts/mercury_loader.js" %>

data/db/migrate/20120201175314_add_validation_rules.rb

@@ -0,0 +1,5 @@
+class AddValidationRules < ActiveRecord::Migration
+  def change
+		add_column :newsly_templates, 	:validation_rules, :text  
+	end
+end

data/lib/newsly/version.rb

@@ -1,3 +1,3 @@
 module Newsly
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsly
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000 Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70133490220020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70133490220020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.1
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70133490218380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133490218380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: liquid
-  requirement: &70133490217240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +54,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133490217240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70133490214960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133490214960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: resque-async_deliver
-  requirement: &70133490210820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133490210820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70133490206260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490206260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: letter_opener
-  requirement: &70133490205040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490205040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70133490204060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490204060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70133490203280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +150,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490203280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70133490202460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490202460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
-  requirement: &70133490201280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490201280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70133490198440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +198,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70133490198440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage mailer templates via wysiwyg and liquid. Uses mercury editor for
   now. And send out newsletters.
 email:
@@ -182,6 +242,7 @@ files:
 - db/migrate/20111004085523_add_fields_to_newsletter.rb
 - db/migrate/20111025072740_add_friendly_fields_to_templates.rb
 - db/migrate/20111025132457_add_template_column.rb
+- db/migrate/20120201175314_add_validation_rules.rb
 - lib/newsly/engine.rb
 - lib/newsly/version.rb
 - lib/newsly.rb
@@ -218,7 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Manage mailer templates via wysiwyg and liquid. And send out newsletters.