rails_adserver 1.0.1 → 1.0.2

data/Rakefile

@@ -20,21 +20,16 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../test/rails_app/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
 end
 
-
 task :default => :test

data/app/controllers/rails_adserver/advertisements_controller.rb

@@ -4,7 +4,11 @@ module RailsAdserver
     require 'carrierwave'
     def ad_param
       id = RailsAdserver::Advertisement.ad_with_parameter(params[:adspace_id],params[:id],request.remote_ip)
-      @advertisement = RailsAdserver::Advertisement.find(id)
+      if id == nil
+        @advertisement = nil
+      else
+        @advertisement = RailsAdserver::Advertisement.find(id)
+      end
       respond_to do |format|
         format.html {render :partial => 'advertisement', :layout => false}
       end
@@ -12,7 +16,11 @@ module RailsAdserver
     
     def ad_space
       id = RailsAdserver::Advertisement.ad(params[:adspace_id],request.remote_ip)
-      @advertisement = RailsAdserver::Advertisement.find(id)
+      if id == nil
+        @advertisement = nil
+      else
+        @advertisement = RailsAdserver::Advertisement.find(id)
+      end
       respond_to do |format|
         format.html {render :partial => 'advertisement', :layout => false}
       end
@@ -71,6 +79,15 @@ module RailsAdserver
       @advertisement = Advertisement.new(params[:advertisement])
       geo = Geokit::Geocoders::MultiGeocoder.geocode(@advertisement.geolocation_location)
       @advertisement.update_attributes(:city_name => geo.city, :state_name => geo.state, :country_name => geo.country)
+      
+      if @advertisement.parameter_restriction_boolean == nil
+        @advertisement.update_attributes(:parameter_restriction_boolean => false)
+      end
+      
+      if @advertisement.geolocation_boolean == nil
+        @advertisement.update_attributes(:geolocation_boolean => false)
+      end
+      
       respond_to do |format|
         if @advertisement.save
           format.html { redirect_to @advertisement, notice: 'Advertisement was successfully created.' }

data/app/views/rails_adserver/advertisements/show.html.haml

@@ -1,3 +1,4 @@
+%h1= @advertisement.title
 - if @advertisement.ad_type == 'ad_service'
   = @advertisement.ad_text.html_safe
 - if @advertisement.ad_type == 'image_link'

data/lib/rails_adserver/version.rb

@@ -1,3 +1,3 @@
 module RailsAdserver
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/factories.rb

@@ -0,0 +1,7 @@
+FactoryGirl.define do
+  factory :user do
+    sequence(:email) { |n| "foo#{n}@bar.com" }
+    password "foobar"
+    can_manage_ads true
+  end
+end

data/test/integration/adspaces_test.rb

@@ -0,0 +1,19 @@
+require "minitest_helper"
+
+describe "Adspace integration" do
+  before do
+    User.destroy_all
+    RailsAdserver::Adspace.destroy_all
+    RailsAdserver::Advertisement.destroy_all
+    @user = FactoryGirl.create(:user)
+  end
+  it "Creates an Adspace" do
+    login_as(@user, :scope => :user)
+    visit '/rails_adserver/'
+    click_link 'Ad-Spaces'
+    click_link "New Adspace"
+    fill_in 'adspace_name', :with => "Foo Bar"
+    click_button "Submit"
+    page.text.must_include "Foo Bar"
+  end
+end

data/test/integration/advertisements_test.rb

@@ -0,0 +1,48 @@
+require "minitest_helper"
+
+describe "Advertisements integration" do
+  before do
+    User.destroy_all
+    RailsAdserver::Adspace.destroy_all
+    RailsAdserver::Advertisement.destroy_all
+    @adspace = RailsAdserver::Adspace.create(:name => 'foo bar')
+    @user = FactoryGirl.create(:user)
+  end
+  it "Creates an Adevertisement" do
+    login_as(@user, :scope => :user)
+    visit '/rails_adserver/'
+    click_link 'New Advertisement'
+    fill_in 'advertisement_title', :with => "Foo Bar"
+    select(@adspace.name, :from => 'advertisement_adspace_id')
+    click_button "Submit"
+    page.text.must_include "Foo Bar"
+    RailsAdserver::Advertisement.find(:last).destroy
+  end
+  it "should not display a non active ad" do
+    login_as(@user, :scope => :user)
+    visit '/rails_adserver/'
+    click_link "New Advertisement"
+    fill_in 'advertisement_title', :with => "Foo Bar"
+    select(@adspace.name, :from => 'advertisement_adspace_id')
+    choose('advertisement_ad_type_ad_service')
+    fill_in 'advertisement_ad_text', :with => "Text"
+    click_button "Submit"
+    visit "/rails_adserver/ad/space/#{@adspace.id}"
+    page.text.wont_include "Text"
+    RailsAdserver::Advertisement.find(:last).destroy
+  end
+  it "should display an active ad" do
+    login_as(@user, :scope => :user)
+    visit '/rails_adserver/'
+    click_link "New Advertisement"
+    fill_in 'advertisement_title', :with => "Foo Bar"
+    select(@adspace.name, :from => 'advertisement_adspace_id')
+    choose('advertisement_ad_type_ad_service')
+    fill_in 'advertisement_ad_text', :with => "Text"
+    check('advertisement_is_active')
+    click_button "Submit"
+    visit "/rails_adserver/ad/space/#{@adspace.id}"
+    page.text.must_include "Text"
+    RailsAdserver::Advertisement.find(:last).destroy
+  end
+end

data/test/integration/application_test.rb

@@ -0,0 +1,20 @@
+require "minitest_helper"
+
+describe "Application integration" do
+  before do
+    User.destroy_all
+    @user = FactoryGirl.create(:user)
+    @nonvalid_user = FactoryGirl.create(:user, :can_manage_ads => false)
+  end
+  it "allows a valid signed in user to go to adserver root" do
+    login_as(@user, :scope => :user)
+    visit '/rails_adserver/'
+    page.text.must_include "Adserver"
+    # The text adserver exists in the footer.
+  end
+  it "does not allow a non-valid signed in user to go to adserver root" do
+    login_as(@nonvalid_user, :scope => :user)
+    visit '/rails_adserver/'
+    page.text.must_include "404"
+  end
+end

data/test/minitest_helper.rb

@@ -0,0 +1,27 @@
+ENV["RAILS_ENV"] = "test"
+require "rails_app/config/environment"
+require "rails/test_help"
+require "minitest/autorun"
+require "capybara/rails"
+require "active_support/testing/setup_and_teardown"
+require 'factory_girl_rails' 
+
+class IntegrationTest < MiniTest::Spec
+  include Rails.application.routes.url_helpers
+  include Capybara::DSL
+  include Factory::Syntax::Methods
+  include Devise::TestHelpers
+  include Warden::Test::Helpers
+  Warden.test_mode!
+  register_spec_type(/integration$/, self)
+end
+
+class HelperTest < MiniTest::Spec
+  include ActiveSupport::Testing::SetupAndTeardown
+  include ActionView::TestCase::Behavior
+  include Factory::Syntax::Methods
+  include Devise::TestHelpers
+  include Warden::Test::Helpers
+  Warden.test_mode!
+  register_spec_type(/Helper$/, self)
+end

data/test/rails_app/db/migrate/20120330222236_create_rails_adserver_advertisements.rails_adserver.rb

@@ -0,0 +1,14 @@
+# This migration comes from rails_adserver (originally 20120227014859)
+class CreateRailsAdserverAdvertisements < ActiveRecord::Migration
+  def change
+    create_table :rails_adserver_advertisements do |t|
+      t.string :title
+      t.text :content
+      t.integer :width
+      t.integer :height
+      t.boolean :is_active
+
+      t.timestamps
+    end
+  end
+end

data/test/rails_app/db/migrate/20120330222237_create_rails_adserver_clicks.rails_adserver.rb

@@ -0,0 +1,10 @@
+# This migration comes from rails_adserver (originally 20120227014945)
+class CreateRailsAdserverClicks < ActiveRecord::Migration
+  def change
+    create_table :rails_adserver_clicks do |t|
+      t.string :ip_address
+
+      t.timestamps
+    end
+  end
+end

data/test/rails_app/db/migrate/20120330222238_add_param_restriction_to_advertisement.rails_adserver.rb

@@ -0,0 +1,6 @@
+# This migration comes from rails_adserver (originally 20120228000410)
+class AddParamRestrictionToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :param_restriction, :string
+  end
+end

data/test/rails_app/db/migrate/20120330222239_add_name_of_param_restriction_to_advertisement.rails_adserver.rb

@@ -0,0 +1,6 @@
+# This migration comes from rails_adserver (originally 20120228000647)
+class AddNameOfParamRestrictionToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :param_restriction_name, :string
+  end
+end

data/test/rails_app/db/migrate/20120330222240_create_rails_adserver_adspaces.rails_adserver.rb

@@ -0,0 +1,9 @@
+# This migration comes from rails_adserver (originally 20120228010151)
+class CreateRailsAdserverAdspaces < ActiveRecord::Migration
+  def change
+    create_table :rails_adserver_adspaces do |t|
+
+      t.timestamps
+    end
+  end
+end

data/test/rails_app/db/migrate/20120330222241_add_name_to_adspace.rails_adserver.rb

@@ -0,0 +1,6 @@
+# This migration comes from rails_adserver (originally 20120228010315)
+class AddNameToAdspace < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_adspaces, :name, :string
+  end
+end

data/test/rails_app/db/migrate/20120330222242_add_adspace_id_to_advertisement.rails_adserver.rb

@@ -0,0 +1,7 @@
+# This migration comes from rails_adserver (originally 20120228043946)
+class AddAdspaceIdToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :adspace_id, :integer
+    add_index :rails_adserver_advertisements, :adspace_id
+  end
+end

data/test/rails_app/db/migrate/20120330222243_add_ad_type_to_advertisement.rails_adserver.rb

@@ -0,0 +1,7 @@
+# This migration comes from rails_adserver (originally 20120305034458)
+class AddAdTypeToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :ad_type, :string
+
+  end
+end

data/test/rails_app/db/migrate/20120330222244_add_parameter_restriction_boolean_to_advertisement.rails_adserver.rb

@@ -0,0 +1,7 @@
+# This migration comes from rails_adserver (originally 20120305040026)
+class AddParameterRestrictionBooleanToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :parameter_restriction_boolean, :boolean
+
+  end
+end

data/test/rails_app/db/migrate/20120330222245_add_more_options_to_advertisement.rails_adserver.rb

@@ -0,0 +1,8 @@
+# This migration comes from rails_adserver (originally 20120305044238)
+class AddMoreOptionsToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :ad_text, :text
+    add_column :rails_adserver_advertisements, :url, :string
+    add_column :rails_adserver_advertisements, :geolocation_boolean, :boolean
+  end
+end

data/test/rails_app/db/migrate/20120330222246_add_image_to_advertisement.rails_adserver.rb

@@ -0,0 +1,6 @@
+# This migration comes from rails_adserver (originally 20120305054319)
+class AddImageToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :image, :string
+  end
+end

data/test/rails_app/db/migrate/20120330222247_add_max_clicks_to_advertisement.rails_adserver.rb

@@ -0,0 +1,7 @@
+# This migration comes from rails_adserver (originally 20120305195421)
+class AddMaxClicksToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :max_clicks, :integer
+    add_column :rails_adserver_advertisements, :clicks, :integer
+  end
+end

data/test/rails_app/db/migrate/20120330222248_add_indexes.rails_adserver.rb

@@ -0,0 +1,9 @@
+# This migration comes from rails_adserver (originally 20120305203049)
+class AddIndexes < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_clicks, :rails_adserver_advertisement_id, :integer
+    add_index :rails_adserver_clicks, :rails_adserver_advertisement_id, :name => 'rails_adserver_clicks_ad_id_index'
+    add_column :rails_adserver_advertisements, :rails_adserver_adspace_id, :integer
+    add_index :rails_adserver_advertisements, :rails_adserver_adspace_id, :name => 'rails_adserver_clicks_adspace_id_index'
+  end
+end

data/test/rails_app/db/migrate/20120330222249_change_indexes.rails_adserver.rb

@@ -0,0 +1,12 @@
+# This migration comes from rails_adserver (originally 20120305212451)
+class ChangeIndexes < ActiveRecord::Migration
+  def change
+    remove_index :rails_adserver_clicks,  :name => 'rails_adserver_clicks_ad_id_index'
+    remove_index :rails_adserver_advertisements, :name => 'rails_adserver_clicks_adspace_id_index'
+    remove_column :rails_adserver_clicks, :rails_adserver_advertisement_id
+    remove_column :rails_adserver_advertisements, :rails_adserver_adspace_id
+    
+    add_column :rails_adserver_clicks, :advertisement_id, :integer
+    add_index :rails_adserver_clicks, :advertisement_id
+  end
+end

data/test/rails_app/db/migrate/20120330222250_add_click_count_to_advertisement.rails_adserver.rb

@@ -0,0 +1,7 @@
+# This migration comes from rails_adserver (originally 20120305214753)
+class AddClickCountToAdvertisement < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :click_count, :integer
+    remove_column :rails_adserver_advertisements, :clicks
+  end
+end

data/test/rails_app/db/migrate/20120330222251_geolocation.rails_adserver.rb

@@ -0,0 +1,6 @@
+# This migration comes from rails_adserver (originally 20120306023105)
+class Geolocation < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :geolocation_location, :string
+  end
+end

data/test/rails_app/db/migrate/20120330222252_add_geolocation_names_to_advertisements.rails_adserver.rb

@@ -0,0 +1,8 @@
+# This migration comes from rails_adserver (originally 20120306052705)
+class AddGeolocationNamesToAdvertisements < ActiveRecord::Migration
+  def change
+    add_column :rails_adserver_advertisements, :city_name, :string
+    add_column :rails_adserver_advertisements, :state_name, :string
+    add_column :rails_adserver_advertisements, :country_name, :string
+  end
+end