newsletter 3.2.22.0 → 3.2.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bee9058c30f1db5dff731b8b612dace63b6b1c0e
-  data.tar.gz: d82e66d08d8ef44fd44db0325b932ecdb5212f70
+  metadata.gz: a03ff50b471d3693c1d8e8cf7f4da0e044cf4c8b
+  data.tar.gz: 7895bbee35cac571cd1f210ba3038cce4f04fa76
 SHA512:
-  metadata.gz: e114484f426dce3c2ab14d0d55ac8fea592ab82415586fa7c1a5f86e09c3b46188dbf63b8062c39ae6ec85521af7595ebf859e7902f6a561a48430c547f8ab25
-  data.tar.gz: f3de7ccdb8de99c05a22de8a3398112f06b665e89d2fa817c49a1eada9b0b2c8febc1e4f11d9f08aebfba670330dfbc43996d5d9ac2012d4105ac54a09c50852
+  metadata.gz: c151d3ba497f8af462c5d3649c6bfb1e30ae1d03221bcacb03c4d8b992d080ad368ad475a079542346a4df3776ca1f030cfe19444ce0a18f5dbb20b23f29bd55
+  data.tar.gz: 70cfa08ba67446e0b55527a822ca73e6067d03d520975154b08b493798157669d132aa7f329d08adfe297c7e85da2541aedef37d6c48d703fc758efbeb9779b4

data/README.md

@@ -16,7 +16,7 @@ Online Documentation
 Requirements
 ------------
 
-* Rails 3.2.x (currently tested against rails 3.2.21)
+* Rails 3.2.x (currently tested against rails 3.2.25)
 * Ruby 2.1.5 (currently tested against 2.1.5, we have also tested against 1.9.3 - but it is no longer supported by ruby devs)
 * [Bundler](http://bundler.io)
 

data/app/models/newsletter/area.rb

@@ -16,7 +16,7 @@ module Newsletter
     has_many  :pieces, :order => 'sequence', :class_name => "Newsletter::Piece"
     belongs_to :updated_by, :class_name => 'User'
   
-    attr_accessor :should_destroy
+    attr_accessor :_destroy
 
     attr_protected :id
   

data/app/models/newsletter/design.rb

@@ -15,7 +15,7 @@ module ::Newsletter
     belongs_to :updated_by, :class_name => 'User'
     after_create :write_design
   
-    accepts_nested_attributes_for :areas
+    accepts_nested_attributes_for :areas, allow_destroy: true
 
     attr_accessible :name, :description, :html_text, :areas_attributes,
       :stylesheet_text

data/app/models/newsletter/element.rb

@@ -20,7 +20,7 @@ module Newsletter
   
     validates_presence_of :name
 
-    accepts_nested_attributes_for :fields
+    accepts_nested_attributes_for :fields, allow_destroy: true
 
     attr_protected :id
     #FIXME: make this work with deletable or convert to auditable, and extend it to access destroyed records

data/app/models/newsletter/field.rb

@@ -15,6 +15,8 @@ module Newsletter
       has_many :field_values, :class_name => 'Newsletter::FieldValue'
       belongs_to :updated_by, :class_name => 'User'
 
+      attr_accessor :_destroy
+
       acts_as_list :scope => :element, :column => :sequence
 
       validates_presence_of :name
@@ -28,7 +30,7 @@ module Newsletter
         field.id]).nil? }
 =end
       attr_accessible :name, :type, :element_id, :label, :sequence, :is_required, 
-        :description, :updated_by
+        :description, :updated_by, :_destroy
       
       include Deleteable
 

data/app/views/newsletter/designs/_newsletter_area.html.erb

@@ -1,17 +1,6 @@
 <% div_for area do %>
   <% fields_for 'design[area_attributes][]', area do |naf| %>
 		<%= naf.text_field :name, :index => nil %> 
-		<% if area.new_record? %>
-			<%= link_to_function "Remove", "$(this).up('.area').remove()", :class => 'button' %><br/>
-		<% else %>
-			<%= link_to_function "Remove", "$(this).next('.should_destroy').value = 1; $(this).hide();"+
-			    "$('area_restore_#{area.id}').show()", :class => 'button', 
-			    :id =>  "area_remove_#{area.id}" %>
-			<%= link_to_function "Restore", "$(this).next('.should_destroy').value = 0; $(this).hide();"+
-			    "$('area_remove_#{area.id}').show()", :class => 'button', 
-			    :id =>  "area_restore_#{area.id}", :style => 'display:none' %><br/>
-			<%= naf.hidden_field :id, :index => nil %>
-			<%= naf.hidden_field :should_destroy, :index => nil, :class => 'should_destroy' %>
-		<% end %>
+	  <%= naff.link_to_remove "Remove", {class: 'button', style: 'margin-left: 130px;'} %>
 	<% end %>
 <% end %>

data/lib/deleteable.rb

@@ -11,6 +11,14 @@ module Deleteable
     !deleted_at.nil?
   end
 
+  def destroy(hard_delete=false)
+    if !hard_delete && self.class.column_names.include?('deleted_at')
+      delete
+    else
+      super
+    end
+  end
+
   def delete
     update_attribute(:deleted_at,Time.now)
   end

data/lib/newsletter/version.rb

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

data/newsletter.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   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"
+  gem.add_dependency "mini_magick", "=4.9.4"
   gem.add_dependency "will_paginate", "~>3.0"
   gem.add_dependency 'carrierwave', "~>0.10" 
   gem.add_dependency "dynamic_form", "~>1.1"

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

@@ -147,6 +147,15 @@ EOT
           expect(@nice_image_field.label).to eq "Nice Image"
           click_link "Back to Design"
         end
+        and_it "can delete an area" do
+          area = @design.areas.first
+          within(:css, "#area_#{area.id}") do
+            click_link "Remove"
+          end
+          click_button "Submit"
+          expect(Newsletter::Area.find_by_id(area.id)).to be_nil
+          expect(Newsletter::Area.deleted.find_by_id(area.id)).not_to be_nil
+        end
         and_it "soft deletes designs" do
           click_link "View All"
           click_link "Delete"

data/spec/test_app/spec/features/newsletter/element_spec.rb

@@ -35,6 +35,27 @@ RSpec.describe 'Element management', type: :feature do
     end
   end
 
+  it "removes a field from an element", js: true do
+    visit "/newsletter/designs/#{@design.id}/edit"
+    Debugging::wait_until_success do
+      click_link "Manage Elements", match: :first
+    end
+    element = @design.elements.first
+    Debugging::wait_until_success do
+      within(:css, "#element_#{element.id}") do
+        click_link "Edit"
+      end
+    end
+    field = element.fields.first
+    field_id = "field_#{field.type.split(/:+/).last.downcase}_#{field.id}"
+    find(:css, "##{field_id} a").click() # click Remove for the field
+    click_button "Submit"
+    Debugging::wait_until_success do
+      Newsletter::Field.deleted.find_by_id(field.id).present?
+      Newsletter::Field.find_by_id(field.id).blank?
+    end
+  end
+
   it "has javascript on the editor" do
     visit "/newsletters/#{@newsletter.id}/editor" 
     expect(page.body).to include('<script')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsletter
 version: !ruby/object:Gem::Version
-  version: 3.2.22.0
+  version: 3.2.25.1
 platform: ruby
 authors:
 - Lone Star Internet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -71,16 +71,16 @@ dependencies:
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: 4.9.4
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement