From fc0d96e481165064ce70d5b3ebab042c0fc7d336 Mon Sep 17 00:00:00 2001 From: Tyrel Souza Date: Fri, 25 Apr 2014 16:35:42 -0400 Subject: [PATCH] fix types, coverage up to 99.26% --- app/controllers/application_controller.rb | 17 +------- app/views/campaigns/_videolisting.html.erb | 5 ++- app/views/campaigns/show.html.erb | 42 +++++++++---------- config/routes.rb | 3 +- ...5200716_change_field_types_videolisting.rb | 1 - ...0425201114_change_field_types_campaigns.rb | 5 +++ db/schema.rb | 4 +- 7 files changed, 35 insertions(+), 42 deletions(-) create mode 100644 db/migrate/20140425201114_change_field_types_campaigns.rb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index ee0b043..037d529 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -16,23 +16,10 @@ class ApplicationController < ActionController::Base end end - private def authenticate_user_from_token! - if request.headers["HTTP_AUTHORIZATION"] - authenticate_or_request_with_http_token do |token, options| - email = token.split[1].split("=")[1] - token = token.split[0] - user_email = email.presence - end - else - user_email = params[:user_email].presence - token = params[:user_token] - end - log_it_in(token, user_email) - end - - def log_it_in(token, user_email) + user_email = params[:user_email].presence + token = params[:user_token] user = user_email && User.find_by_email(user_email) if user && Devise.secure_compare(user.authentication_token, token) sign_in user, store: false diff --git a/app/views/campaigns/_videolisting.html.erb b/app/views/campaigns/_videolisting.html.erb index 864a95f..54e2fbd 100644 --- a/app/views/campaigns/_videolisting.html.erb +++ b/app/views/campaigns/_videolisting.html.erb @@ -25,10 +25,11 @@ <% end %> <% unless videolisting.asseturls.empty? %>
  • -

    asseturls
    +

    asseturls
    <% videolisting.asseturls_array.each do |asset| %> - <%= asset[:asseturl] %>

    + <%= asset[:asseturl] %>
    <% end %> +

    • <% end %> diff --git a/app/views/campaigns/show.html.erb b/app/views/campaigns/show.html.erb index 2299753..bfaa0ae 100644 --- a/app/views/campaigns/show.html.erb +++ b/app/views/campaigns/show.html.erb @@ -10,121 +10,121 @@
      - <% unless @campaign.listingcode.empty? %> + <% unless @campaign.listingcode.blank? %>

    • Listing Code
      <%= @campaign.listingcode %>

      • <% end %> - <% unless @campaign.description.empty? %> + <% unless @campaign.description.blank? %>

    • Description
      <%= @campaign.description %>

      • <% end %> - <% unless @campaign.productsandservices.empty? %> + <% unless @campaign.productsandservices.blank? %>

    • Products & Services
      <%= @campaign.productsandservices %>

      • <% end %> - <% unless @campaign.websiteurl.empty? %> + <% unless @campaign.websiteurl.blank? %>

    • Websiteurl
      <%= @campaign.websiteurl %>

      • <% end %> - <% unless @campaign.vpa.empty? %> + <% unless @campaign.vpa.blank? %>

    • Client Services Rep
      <%= @campaign.vpa %>

      • <% end %> - <% unless @campaign.billingcode.empty? %> + <% unless @campaign.billingcode.blank? %>

    • Billing Code
      <%= @campaign.billingcode %>

      • <% end %> - <% unless @campaign.emailaddress.empty? %> + <% unless @campaign.emailaddress.blank? %>

    • Email Address
      <%= @campaign.emailaddress %>

      • <% end %> - <% unless @campaign.businessphone.empty? %> + <% unless @campaign.businessphone.blank? %>

    • Business Phone
      <%= number_to_phone @campaign.businessphone %>

      • <% end %> - <% unless @campaign.contactphone.empty? %> + <% unless @campaign.contactphone.blank? %>

    • Contact Phone
      <%= number_to_phone @campaign.contactphone %>

      • <% end %> - <% unless @campaign.customerfirstname.empty? %> + <% unless @campaign.customerfirstname.blank? %>

    • Customer First Name
      <%= @campaign.customerfirstname %>

      • <% end %> - <% unless @campaign.customerlastname.empty? %> + <% unless @campaign.customerlastname.blank? %>

    • Customer Last Name
      <%= @campaign.customerlastname %>

      • <% end %> - <% unless @campaign.address.empty? %> + <% unless @campaign.address.blank? %>

    • Address
      <%= @campaign.address %>

      • <% end %> - <% if @campaign.city.empty? || @campaign.state || @campaign.zip %> + <% if @campaign.city.blank? || @campaign.state || @campaign.zip %>

    • City, State, Zip
      <%= @campaign.city %>, <%= us_states item: @campaign.state %>, <%= @campaign.zip %>

      • <% end %> - <% unless @campaign.awards %>.empty? + <% unless @campaign.awards.blank? %>

    • Awards
      <%= @campaign.awards %>

      • <% end %> - <% unless @campaign.background.empty? %> + <% unless @campaign.background.blank? %>

    • Background
      <%= @campaign.background %>

      • <% end %> - <% unless @campaign.categories.empty? %> + <% unless @campaign.categories.blank? %>

    • Industry Categories
      <%= @campaign.categories %>

      • <% end %> - <% unless @campaign.companycolors.empty? %> + <% unless @campaign.companycolors.blank? %>

    • Company Colors
      <%= @campaign.companycolors %>

      • <% end %> - <% unless @campaign.facebookurl.empty? %> + <% unless @campaign.facebookurl.blank? %>

    • Facebook URL
      <%= @campaign.facebookurl %>

      • <% end %> - <% unless @campaign.targetaudience.empty? %> + <% unless @campaign.targetaudience.blank? %>

    • Target Audience
      <%= @campaign.targetaudience %>

      • <% end %> - <% unless @campaign.tollfreephone.empty? %> + <% unless @campaign.tollfreephone.blank? %>

    • Tollfree Phone
      <%= @campaign.tollfreephone %>

      @@ -137,7 +137,7 @@ <% @campaign.videolistings.each do |videolisting| %>
    • <%= render 'videolisting', videolisting: videolisting %>
      • <% end %> - <% if @campaign.videolistings.empty? %> + <% if @campaign.videolistings.blank? %>

    • No Video Listings for this Campaign.

      • <% end %>
    diff --git a/config/routes.rb b/config/routes.rb index 69dcc55..3138303 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -11,8 +11,9 @@ Vidpush::Application.routes.draw do resources :campaigns, param: :listingcode do resources :videolistings, param: :videocode do member do - get 'publish',:defaults => { :format => 'json' } + get 'publish', defaults: { :format => 'json' } end end + end end diff --git a/db/migrate/20140425200716_change_field_types_videolisting.rb b/db/migrate/20140425200716_change_field_types_videolisting.rb index ef1c138..e171c83 100644 --- a/db/migrate/20140425200716_change_field_types_videolisting.rb +++ b/db/migrate/20140425200716_change_field_types_videolisting.rb @@ -2,6 +2,5 @@ class ChangeFieldTypesVideolisting < ActiveRecord::Migration def change change_column :videolistings, :notes, :text change_column :videolistings, :clientprovidedscript, :text - end end diff --git a/db/migrate/20140425201114_change_field_types_campaigns.rb b/db/migrate/20140425201114_change_field_types_campaigns.rb new file mode 100644 index 0000000..9e0996f --- /dev/null +++ b/db/migrate/20140425201114_change_field_types_campaigns.rb @@ -0,0 +1,5 @@ +class ChangeFieldTypesCampaigns < ActiveRecord::Migration + def change + change_column :campaigns, :description, :text + end +end diff --git a/db/schema.rb b/db/schema.rb index 0006e0a..59e74e8 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140425200716) do +ActiveRecord::Schema.define(version: 20140425201114) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -57,7 +57,7 @@ ActiveRecord::Schema.define(version: 20140425200716) do t.string "background" t.string "categories" t.string "companycolors" - t.string "description" + t.text "description" t.string "facebookurl" t.string "productsandservices" t.string "targetaudience"