newsletter 3.2.6 → 3.2.7

data/lib/newsletter/engine.rb

@@ -106,6 +106,8 @@ module Newsletter
           ::Newsletter::Area,
           ::Newsletter::Field
         ]
+        can [:sort,:publish,:unpublish], ::Newsletter::Newsletter
+        can :sort, ::Newsletter::Area
       end
       can :read, [
         ::Newsletter::Newsletter,
@@ -125,7 +127,11 @@ module Newsletter
   # initializes the configuration options pulled from config/newsletter.yml and 
   # overrides with config/newsletter.local.yml if it exists
   def self.initialize_with_config(conf)
-    ::Newsletter.table_prefix ||= conf.table_prefix || 'newsletter_' rescue 'newsletter_'
+    if conf.params.has_key?('table_prefix')
+      ::Newsletter.table_prefix ||= conf.table_prefix.to_s # allow empty
+    else
+      ::Newsletter.table_prefix ||= 'newsletter_'
+    end
     ::Newsletter.designs_path ||= conf.designs_path || "#{Rails.root}/designs" rescue "#{Rails.root}/designs"
     default_url_options = ActionController::Base.default_url_options
     default_site_url = "#{default_url_options[:protocol]||'http'}://#{default_url_options[:domain]}" 

data/lib/newsletter/version.rb

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

data/newsletter.gemspec

@@ -13,6 +13,17 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Email newsletter templating and management system which allows a designer to develop templates and elements that are email-friendly and allows a user to create newsletters without html/css knowledge utilizing a wysiwyg interface. Also available with the mail manager (including contact and mailing list management, double opt-in mailing list sign up, mailer, and bounce processing) and user access as the iReach gem.}
   gem.summary       = %q{Newsletter templating and management system.}
   gem.homepage      = "http://ireachnews.com"
+  gem.post_install_message = <<-EOT
+    Added 'Style Sheet' text area to newsletter design.
+      **This allows us to properly trigger viewport for mobile window size in newsletter editor.
+      
+    ** Required Actions ( pre 3.2.7 ) **
+    Please move your inline styles to the new 'Style Sheet' text area in the newsletter design editor.
+    
+    ** Required Actions for every upgrade **
+    rake newsletter:upgrade # this adds any new migrations and migrates your DB ...
+      ** NOTE! you should try this in development before pushing to your production site
+  EOT
 
   gem.add_dependency "rails", "~>3.2"
   gem.add_dependency "jquery-rails", "~>3.1"

data/spec/test_app/config/database.postgres.yml

@@ -10,12 +10,12 @@ credentials: &credentials
 
 development:
   <<: *credentials 
-  database: mail_manager_development
+  database: newsletter_development
  
 test:
   <<: *credentials 
-  database: mail_manager_test
+  database: newsletter_test
  
 production:
   <<: *credentials 
-  database: mail_manager
+  database: newsletter

data/spec/test_app/db/migrate/20150507154748_carrier_wave_for_assets.rb

@@ -0,0 +1,19 @@
+class CarrierWaveForAssets < ActiveRecord::Migration
+  def up
+    table_prefix = 'newsletter_'
+    begin
+      table_prefix = ::Newsletter.table_prefix
+    rescue
+    end
+    rename_column :"#{table_prefix}assets", :filename, :image
+  end
+
+  def down
+    table_prefix = 'newsletter_'
+    begin
+      table_prefix = ::Newsletter.table_prefix
+    rescue
+    end
+    rename_column :"#{table_prefix}assets", :image, :filename
+  end
+end

data/spec/test_app/db/migrate/20150507195612_add_stylesheet_text_to_designs.rb

@@ -0,0 +1,12 @@
+class AddStylesheetTextToDesigns < ActiveRecord::Migration
+  def table_prefix
+    table_prefix = 'newsletter_'
+    begin
+      table_prefix = ::Newsletter.table_prefix
+    rescue
+    end
+  end
+  def change
+    add_column :"#{table_prefix}designs", :stylesheet_text, :text
+  end
+end

data/spec/test_app/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150414102034) do
+ActiveRecord::Schema.define(:version => 20150507195612) do
 
   create_table "news_areas", :force => true do |t|
     t.string   "name",        :null => false
@@ -45,13 +45,14 @@ ActiveRecord::Schema.define(:version => 20150414102034) do
   end
 
   create_table "news_designs", :force => true do |t|
-    t.string   "name",        :null => false
+    t.string   "name",            :null => false
     t.string   "description"
     t.text     "html_design"
     t.integer  "updated_by"
     t.datetime "deleted_at"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.text     "stylesheet_text"
   end
 
   create_table "news_elements", :force => true do |t|

data/spec/test_app/script/full_suite

@@ -10,14 +10,14 @@ export CUC_SQLITE_SUCCESS=0
 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" -eq "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 CUCPGSQL_SUCCESS=0
+  export CUC_PGSQL_SUCCESS=0
 
   DBADAPTER=pg bundle exec rspec spec && export PGSQL_SUCCESS=1
   DBADAPTER=pg bundle exec cucumber features && export CUC_PGSQL_SUCCESS=1
@@ -29,7 +29,7 @@ cp config/database.mysql.local.yml config/database.yml
 bundle exec rake db:schema:load
 
 export MYSQL_SUCCESS=0
-export CUCMYSQL_SUCCESS=0
+export CUC_MYSQL_SUCCESS=0
 
 DBADAPTER=mysql bundle exec rspec spec && export MYSQL_SUCCESS=1
 DBADAPTER=mysql bundle exec cucumber features && export CUC_MYSQL_SUCCESS=1

data/spec/test_app/spec/factories/designs.rb

@@ -2,7 +2,9 @@
 def import_design(file=nil, name=nil)
   name ||= Faker::Company.bs.split(/\s+/).each(&:capitalize).join(' ')
   file ||= File.join(Newsletter::PLUGIN_ROOT,'designs','exports','example-export.yaml')
-  Newsletter::Design.import(file,name)
+  design = Newsletter::Design.import(file,name)
+  design.update_attribute(:stylesheet_text, ".blah{background-color: red}")
+  design
 end
 
 FactoryGirl.define do

data/spec/test_app/spec/factories/newsletters.rb

@@ -3,7 +3,7 @@
 FactoryGirl.define do
   factory :newsletter, class: Newsletter::Newsletter do
     name {Faker::Company.name}
-    description {Faker::Lorem.paragraphs(1)[0..125]}
+    description {Faker::Lorem.paragraphs(1).join("\n")[0..125]}
     association :design
     pieces do |newsletter|
       left_area = newsletter.design.areas.where(name: 'left_column').first

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

@@ -19,6 +19,7 @@ EOT
       fill_in "Name", with: "My Design"
       fill_in "Description", with: "This is an awesome design!"
       fill_in "HTML code", with: left_area_only_layout
+      fill_in "Style Sheet", with: ".bobos { background-color: blue; }"
       click_link "Add Area"
       find(:css, ".area input").set 'left_area'
       click_button "Submit"
@@ -41,6 +42,7 @@ EOT
         @right_area = @design.areas.detect{|a| a.name.eql?('right_area')}
         @left_area = @design.areas.detect{|a| a.name.eql?('left_area')}
         expect(remove_whitespace(@design.html_text)).to eq remove_whitespace(full_layout)
+        expect(@design.stylesheet_text).to eq ".bobos { background-color: blue; }"
       end
       and_it "when managing elements" do
         and_it "can create an element with a text area in the left area" do

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

@@ -9,6 +9,27 @@ RSpec.describe Newsletter::Design do
     expect(@design.name).to eq("My Design")
   end
 
+  context "when name changed/moved" do
+    it "moves its images" do
+      old_images_path = @design.images_path
+      old_name = @design.name
+      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!"
+      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)}")
+      expect(File.exist?(old_images_path)).to be false
+      expect(File.exist?(@design.images_path)).to be true
+    end
+  end
+
+  context "has an associated stylesheet" do
+    it "that is accessible" do
+      expect{@design.stylesheet_text}.not_to raise_error
+    end
+  end
+
   context "whether it exports and imports correctly" do
     it "doesn't blow up" do
       reimported_design = nil
@@ -20,11 +41,14 @@ RSpec.describe Newsletter::Design do
         )
       end
       and_it "has the same elements" do
-        expect(@design.elements.pluck(:name).sort).to eq reimported_design.elements.
-          pluck(:name).sort
+        expect(reimported_design.elements.pluck(:name).sort).to eq @design.
+          elements.pluck(:name).sort
       end
       and_it "knows its images" do
-        expect(@design.images).to include("newsletter_header.png")
+        expect(reimported_design.images).to include("newsletter_header.png")
+      end
+      and_it "knows its stylesheet" do
+        expect(reimported_design.stylesheet_text).to eq @design.stylesheet_text
       end
     end
     

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

@@ -0,0 +1,11 @@
+require 'rails_helper'
+
+RSpec.describe Newsletter::Engine do
+  it "can set table prefix to empty" do
+    Newsletter.table_prefix = nil
+    conf = Newsletter::Settings.new(
+      'spec/support/files/newsletter_empty_table_prefix.yml')
+    Newsletter.initialize_with_config(conf)
+    expect(Newsletter.table_prefix).to eq ''
+  end
+end

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

@@ -25,6 +25,10 @@ RSpec.describe Newsletter::Newsletter do
       expect(@newsletter.generate(:email)).not_to include('<script>')
     end
 
+    it "contains its stylesheet" do
+      expect(@newsletter.generate(:email)).to match %r|<style>\s+#{@design.stylesheet_text}\s+</style>|
+    end
+
     it "can generate an email_html" do
       email_html = @newsletter.email_html
       expect(email_html.strip).not_to eq ''
@@ -89,6 +93,23 @@ EOT
     end
   end
 
+  it "contains its stylesheet for public generation", js: true do
+    visit '/newsletters/archive'
+    expect(@newsletter.generate(:public)).to \
+      match %r|<link.*/newsletters/#{@newsletter.id}/stylesheet.css|
+  end
+
+  it "returns its stylesheet from the public url: /newsletters/:id/stylesheet.css" do
+    visit "/newsletters/#{@newsletter.id}/stylesheet.css"
+    expect(page.body.strip).to eq @newsletter.design.stylesheet_text.strip
+  end
+
+  it "contains its stylesheet for editor generation", js: true do
+    visit '/newsletters/archive'
+    expect(@newsletter.generate(:editor)).to \
+      match %r|<link.*/newsletters/#{@newsletter.id}/stylesheet.css|
+  end
+
   context "regarding its public url" do
     it "goes to the default without any mode" do
       expect(@newsletter.public_url).to eq \

data/spec/test_app/spec/support/files/newsletter_empty_table_prefix.yml

@@ -0,0 +1,12 @@
+--- 
+common:
+  site_url: http://newsletter.dev
+  table_prefix: 
+  designs_path: <%= "#{Rails.root}/" %>
+  use_show_for_resources: false
+  asset_path: newsletter_assets
+  site_path: /
+  layout: newsletter/application
+test:
+  site_url: http://newsletter.lvh.me:4447
+  designs_path: <%= "#{Rails.root}/tmp" %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newsletter
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
 platform: ruby
 authors:
 - Lone Star Internet
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -247,7 +247,9 @@ files:
 - app/views/newsletter/newsletters/edit.html.erb
 - app/views/newsletter/newsletters/index.html.erb
 - app/views/newsletter/newsletters/new.html.erb
+- app/views/newsletter/newsletters/show.css.erb
 - app/views/newsletter/newsletters/show.html.erb
+- app/views/newsletter/newsletters/stylesheet.css
 - app/views/newsletter/pieces/_form.html.erb
 - app/views/newsletter/pieces/edit.html.erb
 - app/views/newsletter/pieces/new.html.erb
@@ -258,6 +260,8 @@ files:
 - config/routes.rb
 - config/spring.rb
 - db/migrate/001_newsletter_initial.rb
+- db/migrate/002_carrier_wave_for_assets.rb
+- db/migrate/003_add_stylesheet_text_to_designs.rb
 - db/pre-scoped/002_newsletter_scoped.rb
 - designs/exports/Example.yml
 - designs/exports/example-export.yaml
@@ -310,6 +314,8 @@ files:
 - spec/test_app/config/spring.rb
 - spec/test_app/db/migrate/20131222171229_newsletter_initial.rb
 - spec/test_app/db/migrate/20131222171230_create_users.rb
+- spec/test_app/db/migrate/20150507154748_carrier_wave_for_assets.rb
+- spec/test_app/db/migrate/20150507195612_add_stylesheet_text_to_designs.rb
 - spec/test_app/db/schema.rb
 - spec/test_app/features/newsletter_management.feature
 - spec/test_app/features/piece_management.feature
@@ -348,6 +354,7 @@ files:
 - spec/test_app/spec/models/newsletter/asset_spec.rb
 - spec/test_app/spec/models/newsletter/design_spec.rb
 - spec/test_app/spec/models/newsletter/element_spec.rb
+- spec/test_app/spec/models/newsletter/engine_spec.rb
 - spec/test_app/spec/models/newsletter/inline_asset_spec.rb
 - spec/test_app/spec/models/newsletter/newsletter_spec.rb
 - spec/test_app/spec/models/newsletter/piece_spec.rb
@@ -358,13 +365,20 @@ files:
 - spec/test_app/spec/support/continuances.rb
 - spec/test_app/spec/support/database_cleaner.rb
 - spec/test_app/spec/support/files/iReach_logo.gif
+- spec/test_app/spec/support/files/newsletter_empty_table_prefix.yml
 - spec/test_app/spec/support/files/test.pdf
 - spec/test_app/spec/support/functions.rb
 homepage: http://ireachnews.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: "    Added 'Style Sheet' text area to newsletter design.\n      **This
+  allows us to properly trigger viewport for mobile window size in newsletter editor.\n
+  \     \n    ** Required Actions ( pre 3.2.7 ) **\n    Please move your inline styles
+  to the new 'Style Sheet' text area in the newsletter design editor.\n    \n    **
+  Required Actions for every upgrade **\n    rake newsletter:upgrade # this adds any
+  new migrations and migrates your DB ...\n      ** NOTE! you should try this in development
+  before pushing to your production site\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -423,6 +437,8 @@ test_files:
 - spec/test_app/config/spring.rb
 - spec/test_app/db/migrate/20131222171229_newsletter_initial.rb
 - spec/test_app/db/migrate/20131222171230_create_users.rb
+- spec/test_app/db/migrate/20150507154748_carrier_wave_for_assets.rb
+- spec/test_app/db/migrate/20150507195612_add_stylesheet_text_to_designs.rb
 - spec/test_app/db/schema.rb
 - spec/test_app/features/newsletter_management.feature
 - spec/test_app/features/piece_management.feature
@@ -461,6 +477,7 @@ test_files:
 - spec/test_app/spec/models/newsletter/asset_spec.rb
 - spec/test_app/spec/models/newsletter/design_spec.rb
 - spec/test_app/spec/models/newsletter/element_spec.rb
+- spec/test_app/spec/models/newsletter/engine_spec.rb
 - spec/test_app/spec/models/newsletter/inline_asset_spec.rb
 - spec/test_app/spec/models/newsletter/newsletter_spec.rb
 - spec/test_app/spec/models/newsletter/piece_spec.rb
@@ -471,5 +488,6 @@ test_files:
 - spec/test_app/spec/support/continuances.rb
 - spec/test_app/spec/support/database_cleaner.rb
 - spec/test_app/spec/support/files/iReach_logo.gif
+- spec/test_app/spec/support/files/newsletter_empty_table_prefix.yml
 - spec/test_app/spec/support/files/test.pdf
 - spec/test_app/spec/support/functions.rb