newsletter 3.2.7 → 3.2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 624c68b4546267131697484baeb37761fb6409da
-  data.tar.gz: c77304e432fd8af78762564f68aff2f236b0ae49
+  metadata.gz: bee9058c30f1db5dff731b8b612dace63b6b1c0e
+  data.tar.gz: d82e66d08d8ef44fd44db0325b932ecdb5212f70
 SHA512:
-  metadata.gz: e957c0dbe1deb75a342ec8de0b547858cb23ddf47878cad79036a76179c3d5e309e98271ee166d09a5b30c36031bcc81d491e3cd231f37addc99a802756f0d6c
-  data.tar.gz: 077ba6cad38aadd2617d2837689a43d038035a96cd5c5c6fb0726f6adc1a5f1f00931ca7a5740a160ad204ff56c1e5c25b1ae329d9654faee7b6ed632ac47084
+  metadata.gz: e114484f426dce3c2ab14d0d55ac8fea592ab82415586fa7c1a5f86e09c3b46188dbf63b8062c39ae6ec85521af7595ebf859e7902f6a561a48430c547f8ab25
+  data.tar.gz: f3de7ccdb8de99c05a22de8a3398112f06b665e89d2fa817c49a1eada9b0b2c8febc1e4f11d9f08aebfba670330dfbc43996d5d9ac2012d4105ac54a09c50852

data/Gemfile

@@ -15,8 +15,9 @@ gem 'jquery-ui-rails'
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-gem "devise"
-gem 'mysql2'
+#gem "devise"
+#removed since it's not needed in Gem
+gem 'mysql2', '~>0.3'
 gem "factory_girl_rails", "~>4.3"
 gem "faker"
 gem "sqlite3"
@@ -37,4 +38,6 @@ group :test do
   gem "rspec-rails", "~>3.2"
   gem "rspec-activemodel-mocks"
   gem "cucumber-rails", require: false
+  gem 'brakeman'
+  gem 'bundler-audit'
 end

data/app/assets/stylesheets/newsletter/admin.css

@@ -8,10 +8,19 @@ body {
 }
 
 #top {
-  background-image: url('/assets/newsletter/topMid.gif');
+  background-image: url('/assets/i_reach/topMid.gif');
   height: 85px;
   min-width: 766px;
 }
+
+.menu_expand {
+  cursor: pointer;
+}
+
+span.menu_expand:hover {
+  color: #fc6;
+}
+
 /*
 img {
    display: block;
@@ -46,7 +55,7 @@ h2.list_group {
 
 #page_content {
   overflow: hidden;
-  background-image: url('/assets/newsletter/MidRight.gif');
+  background-image: url('/assets/i_reach/MidRight.gif');
   background-repeat: repeat-y;
   background-position: right;
   padding: 10px 40px 10px 10px;
@@ -129,7 +138,9 @@ table.list tr.even {
 	background: #e2e8d9;
 }
 
-
+.mailing_buttons {
+	width: 310px;
+}
 /* form labels have different alignment*/
 label {font-size: 11pt;
    font-family: helvetica, arial, sans-serif;
@@ -143,6 +154,10 @@ label {font-size: 11pt;
    padding: 7px 7px 0 0;
 }       
 
+.field {
+  clear: both;
+}
+
 input, select, textarea {
         margin: 6px 0;
         padding: 2px;
@@ -173,7 +188,7 @@ input.button {
     font-size: 11pt;
     font-weight: bold;
     color: #555;
-    margin-right: 10px;
+    margin-right: 5px;
     cursor: pointer; 
 }
 
@@ -210,7 +225,7 @@ a.button:link, a.button:visited {
     font-size: 11pt;
     font-weight: bold;
     color: #555;
-    margin-right: 10px;
+    margin-right: 5px;
     /* do I need this? */
     cursor: pointer; 
 }

data/app/views/newsletter/fields/_text.html.erb

@@ -1,2 +1,3 @@
 <%= label_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', "#{field.label}:" %>
-<%= text_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', field.value_for_piece(piece,false), :style=>'width: 620px;' %><br />
+<%= text_field_tag 'piece[field_values_attributes]['+field.id.to_s+'][text]', field.value_for_piece(piece,false), :style=>'width: 620px;' %>
+<div style="clear: left;"></div>

data/app/views/newsletter/newsletters/_form.html.erb

@@ -6,6 +6,6 @@
     <%= f.select :design_id, @designs.collect {|design| [ design.name, design.id ] } %><br />
   <% end %>
     <%= f.label :name %>
-    <%= f.text_field :name, :style=> 'float: left; margin-right: 10px;' %>
+    <%= f.text_field :name, :style=> 'float: left; margin-right: 10px;', :size => '50' %>
     <%= f.submit "Save", :class => "button" %><div style="clear: both;"></div>
 <% end %>

data/app/views/newsletter/newsletters/edit.html.erb

@@ -8,7 +8,8 @@
       <%= hidden_field_tag 'area_id', area.id %>
       <%= label_tag "area_#{area.id}_element_id", "Area: #{area.name.humanize}" %>
       <%= select_tag 'element_id',  options_from_collection_for_select(area.elements, 'id', 'name'), :style=>'margin-right: 10px;', :id => "area_#{area.id}_element_id" %>
-      <%= submit_tag 'Add Element', :class => 'button', :id => "add_element_#{area.id}" %><br />
+      <%= submit_tag 'Add Element', :class => 'button', :id => "add_element_#{area.id}" %>
+      <div style="clear: left;"></div>
    <% end %>
 <% end %>
 

data/app/views/newsletter/pieces/_form.html.erb

@@ -3,7 +3,6 @@
 	<% @piece.element.fields.each do |field| %>
 		<!-- Rendering Field: <%= field.name %> <%= field.type %> -->
 		<%= render :partial => field.form_partial_path, :locals => { :piece => @piece, :field => field, :field_value => field.value_for_piece(@piece) } %>
-      
 	<% end %>
 	<%= f.hidden_field :element_id %>
 	<%= f.hidden_field :area_id %>

data/config/locales/newsletters.en.yml

@@ -26,3 +26,7 @@ en:
   helpers:
 
   messages:
+  will_paginate:
+    previous_label: "Previous"
+    next_label: "Next"
+    page_gap: "…"

data/lib/newsletter/version.rb

@@ -1,3 +1,3 @@
 module Newsletter
-  VERSION = "3.2.7"
+  VERSION = "3.2.22.0"
 end

data/newsletter.gemspec

@@ -2,7 +2,6 @@ $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
 require "newsletter/version"
-
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |gem|
   gem.name          = "newsletter"
@@ -26,6 +25,7 @@ Gem::Specification.new do |gem|
   EOT
 
   gem.add_dependency "rails", "~>3.2"
+  gem.add_dependency 'rack-protection', '=2.0.1'
   gem.add_dependency "jquery-rails", "~>3.1"
   gem.add_dependency "jquery-ui-rails", "~>5.0"
   gem.add_dependency "mini_magick", "~>4.1"

data/spec/test_app/config/locales/en.yml

@@ -2,4 +2,7 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
+  will_paginate:
+    previous_label: "Previous"
+    next_label: "Next"
+    page_gap: "…"

data/spec/test_app/script/full_suite

@@ -6,16 +6,18 @@ bundle exec rake db:schema:load
 
 export SQLITE_SUCCESS=0
 export CUC_SQLITE_SUCCESS=0
+export PGSQL_SUCCESS=''
+export CUC_PGSQL_SUCCESS=''
 
 DBADAPTER=sqlite bundle exec rspec spec && export SQLITE_SUCCESS=1
 DBADAPTER=sqlite bundle exec cucumber features && export CUC_SQLITE_SUCCESS=1
 
-if [ "$POSTGRES" -eq "1" ]; then
+if [ "$POSTGRES" = "1" ]; then
   #RUN FOR Postgresql
   cp config/database.postgres.local.yml config/database.yml
 
   bundle exec rake db:schema:load
-  
+
   export PGSQL_SUCCESS=0
   export CUC_PGSQL_SUCCESS=0
 
@@ -36,9 +38,9 @@ DBADAPTER=mysql bundle exec cucumber features && export CUC_MYSQL_SUCCESS=1
 
 unset RAILS_ENV
 
-if [ $MYSQL_SUCCESS -eq 0 ] ; then echo "Rspec Mysql Failed" && exit 1; fi
-if [ $PGSQL_SUCCESS -eq 0 ] ; then echo "Rspec Pgsql Failed" && exit 1; fi
-if [ $SQLITE_SUCCESS -eq 0 ] ; then  echo "Rspec SQLite Failed" && exit 1; fi
-if [ $CUC_MYSQL_SUCCESS -eq 0 ] ; then  echo "Cucumber Mysql Failed" && exit 1; fi
-if [ $CUC_PGSQL_SUCCESS -eq 0 ] ; then  echo "Cucumber Pgsql Failed" && exit 1; fi
-if [ $CUC_SQLITE_SUCCESS -eq 0 ] ; then  echo "Cucumber SQLite Failed" && exit 1; fi
+if [ "$MYSQL_SUCCESS" = "0" ] ; then echo "Rspec Mysql Failed" && exit 1; fi
+if [ "$PGSQL_SUCCESS" = "0" ] ; then echo "Rspec Pgsql Failed" && exit 1; fi
+if [ "$SQLITE_SUCCESS" = "0" ] ; then  echo "Rspec SQLite Failed" && exit 1; fi
+if [ "$CUC_MYSQL_SUCCESS" = "0" ] ; then  echo "Cucumber Mysql Failed" && exit 1; fi
+if [ "$CUC_PGSQL_SUCCESS" = "0" ] ; then  echo "Cucumber Pgsql Failed" && exit 1; fi
+if [ "$CUC_SQLITE_SUCCESS" = "0" ] ; then  echo "Cucumber SQLite Failed" && exit 1; fi

data/spec/test_app/spec/models/newsletter/design_spec.rb

@@ -2,6 +2,7 @@ require 'rails_helper'
 
 RSpec.describe Newsletter::Design do
   before(:each) do 
+    FileUtils.rm_rf(File.join(Rails.root, 'public', 'images', 'My_Design'))
     @design = import_design(nil,"My Design")
   end
 
@@ -16,6 +17,10 @@ RSpec.describe Newsletter::Design do
       expect(@design.images_path).to include("public/images/#{@design.name_as_path(@design.name)}")
       expect(File.exist?(@design.images_path)).to be true
       new_name = @design.name + " NEW!"
+      FileUtils.rm_rf(File.join(Newsletter.designs_path,'designs',
+        'My_Design_NEW_'))
+      FileUtils.rm_rf(File.join(Rails.root, 'public', 'images', 
+        'My_Design_NEW_'))
       expect{@design.update_attributes(name: new_name)}.not_to raise_error
       expect(@design.name).to eq new_name
       expect(@design.images_path).to include("public/images/#{@design.name_as_path(new_name)}")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsletter
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.22.0
 platform: ruby
 authors:
 - Lone Star Internet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rack-protection
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement