newsletter 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d3fe375c39131a88ec0ed914e5be808de7b4905
-  data.tar.gz: 867827becbeb93b65776148c34eabaf9c14c2c2c
+  metadata.gz: 34d92eca9bea6c0add79daa334bd161770f54466
+  data.tar.gz: 7201f1ee597aa433b656635afc2f55c1b59b52ca
 SHA512:
-  metadata.gz: 757dd0a080e250bfba7a484aadf905343c48c59732cb10d6305655c50061934ee37811ebdd23d6128cfd30b4dedc01fa79bcbd1059364243456955ae44cb1562
-  data.tar.gz: d449dff3abe43f00768ad6a26aa91da97cb5ff70f6fd707536e14a6e9714c3907b16850f6aee9f97ab3158f3b02b0b9e0f9ae3bbc36f2721ef7b7355a4bdde38
+  metadata.gz: c5ac9e0c4b9b806ee7863f4c8927b2dd7499ebcb63e42b1a291211c5993d47310f41ef6bdccb5c06a6d7fef8ede1d4aaa3f88064efd864f23013940e3f65f2e4
+  data.tar.gz: 317f06ca5d0bc1758b4ea05558bd5947e222c99c608bbf0fda42829e210d44476dcd5bdaae49a8e388f88c680f320a8c1f17a37e3b46c81e303b833108ce6370

data/app/helpers/newsletter/newsletters_helper.rb

@@ -16,7 +16,10 @@ module Newsletter
       options.each_pair do |key,value|
         options_text << %Q| #{key}="#{ERB::Util.html_escape value}"|
       end
-      %Q|<img src="#{ERB::Util.html_escape @newsletter.image_uri(image_filename)}"#{options_text}/>|.html_safe
+      %Q|<img src="#{ERB::Util.html_escape ::Newsletter.site_url + 
+        ::Newsletter.site_path +
+        @newsletter.image_uri(image_filename).gsub(%r#^/#,'')
+        }"#{options_text}/>|.html_safe
     end
 
     protected 

data/app/models/newsletter/design.rb

@@ -70,11 +70,13 @@ module ::Newsletter
 
     # returns path to newsletter design for use in views and is the same for actual file
     def view_path(this_name=nil)
+      this_name ||= name
       File.join(base_design_path(this_name),'layout.html.erb')
     end
   
     # returns the path to the base of the design's files
     def base_design_path(this_name=nil)
+      this_name ||= name
       File.join(::Newsletter.designs_path,'designs',name_as_path(this_name))
     end
 

data/app/views/layouts/newsletter/application.html.erb

@@ -13,7 +13,7 @@
 <div style="background-color: #fff;">
   <div id="menu">
     <ul>
-      <li><span onClick="$('#setup_submenu').toggle();return false">Setup</span>
+      <li><span onClick="$('#setup_submenu').toggle();return false" style="cursor: pointer;">Setup</span>
         <ul id='setup_submenu' <%= ' style="display:none"'.html_safe unless request.path =~ %r#/newsletter/designs|setup# %>>
           <%= content_tag(:li, link_to('Newsletter Designs', news.designs_path)) if can?(:manage, Newsletter::Design) %>
         </ul>

data/designs/exports/example-export.yaml

@@ -10,10 +10,8 @@
   padding: 0; line-height:1.2em;}\r\na{text-decoration:none; color: #0068b3;}\r\na:hover
   {color: #7fc348;}\r\n.footer {font-size:7pt;}\r\np a {font-size: 6pt; font-weight:
   bold;}\r\np.right a {font-size: 7pt;}\r\nhr{color: #7fc348; margin:5px 0; height:
-  1px; padding: 0;}\r\n.bullet {color: #7fc348; font-weight: bold; height: 5px;}\r\np.pullquote
-  {color: #333333; background:url(<%= asset_path( \"images/pullquote_bg.gif\") %>)
-  repeat-x ; margin:0; padding: 15px; text-align:center; font-style: italic; font-size:\r\n7pt;}\r\np.pullquote
-  a { color: #333333;}\r\np.pullquote a:hover {color: #0068b3;}\r\n  .wrappertable
+  1px; padding: 0;}\r\n.bullet {color: #7fc348; font-weight: bold; height: 5px;}\r\n
+  .wrappertable
   {\r\n\twidth: 587px;\r\n\tmargin: 0 8px;\r\n  }\r\n   .leftcoltable {\r\n\twidth:
   227px;\r\n  } \r\n  .rightcoltable {\r\n\twidth: 347px;\r\n  }\r\n  .left_col_img
   {\r\n\twidth: 220px;\r\n  }\r\n  .right_col_img {\r\n\twidth: 320px;\r\n  }\r\n

data/lib/newsletter/version.rb

@@ -1,3 +1,3 @@
 module Newsletter
-  VERSION = "3.2.0"
+  VERSION = "3.2.1"
 end

data/spec/test_app/spec/helpers/newsletter/newsletters_helper_spec.rb

@@ -58,7 +58,8 @@ RSpec.describe Newsletter::NewslettersHelper, :type => :helper do
       design = import_design
       @newsletter = FactoryGirl.create(:newsletter, design: design)
       expect(design_image('newsletter_header.png',width: '100',class: 'neat_image')).to \
-        eq(%Q|<img src="/images/#{design.name_as_path(design.name)
+        eq(%Q|<img src="#{Newsletter.site_url}#{Newsletter.site_path}images/#{
+          design.name_as_path(design.name)
         }/newsletter_header.png" width="100" class="neat_image"/>|)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newsletter
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Lone Star Internet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails