ad_man 0.0.5 → 0.0.6

data/test/fixtures/ad_man/keywords.yml

@@ -4,5 +4,8 @@ test_keyword:
   id: 1
   name: test
 
+one:
+  name: FirstKeyword
+
 two:
   name: MyString

data/test/functional/ad_man/advertisements_controller_test.rb

@@ -2,53 +2,72 @@ require 'test_helper'
 
 module AdMan
   class AdvertisementsControllerTest < ActionController::TestCase
+
     setup do
-      @advertisement = advertisements(:one)
+      @advertisement = ad_man_advertisements(:rubyonrails)
+      @routes = AdMan::Engine.routes
     end
-  
+
     test "should get index" do
       get :index
       assert_response :success
       assert_not_nil assigns(:advertisements)
       assert_not_nil assigns(:keywords)
     end
-  
+
     test "should get new" do
       get :new
       assert_response :success
     end
-  
+
     test "should create advertisement" do
       assert_difference('Advertisement.count') do
-        post :create, advertisement: { destination_url: @advertisement.destination_url, title: @advertisement.title }
-          #  ad_banner: @advertisement.ad_banner, :keyword_id, :start_date, :end_date
-          #  } 
+        post :create, advertisement: {
+          destination_url: "http://stackoverflow.com/",
+          title: "UniqueTitle",
+          ad_banner: fixture_file_upload("/test.jpeg","image/jpeg"),
+          display_count: 0,
+          click_count: 0,
+          priority: 1
+        }, keyword_id: 1
       end
-  
+
       assert_redirected_to advertisement_path(assigns(:advertisement))
     end
-  
+
     test "should show advertisement" do
       get :show, id: @advertisement
       assert_response :success
     end
-  
+
     test "should get edit" do
       get :edit, id: @advertisement
       assert_response :success
     end
-  
+
     test "should update advertisement" do
-      put :update, id: @advertisement, advertisement: { destination_url: @advertisement.destination_url, title: @advertisement.title }
+      put :update, id: @advertisement, advertisement: {
+        destination_url: "http://stackoverflow.com/",
+        title: "UniqueTitle",
+        ad_banner: fixture_file_upload("/test.jpeg","image/jpeg"),
+        display_count: 0,
+        click_count: 0,
+        priority: 1
+        }, keyword_id: 1
       assert_redirected_to advertisement_path(assigns(:advertisement))
     end
-  
+
     test "should destroy advertisement" do
       assert_difference('Advertisement.count', -1) do
         delete :destroy, id: @advertisement
       end
-  
+
       assert_redirected_to advertisements_path
     end
+
+    test "should redirect on click through" do
+      get :click_through, id: @advertisement.id
+      assert_redirected_to @advertisement.destination_url
+    end
   end
 end

data/test/functional/ad_man/keywords_controller_test.rb

@@ -3,49 +3,48 @@ require 'test_helper'
 module AdMan
   class KeywordsControllerTest < ActionController::TestCase
     setup do
-      @keyword = keywords(:one)
+      @keyword = ad_man_keywords(:one)
+      @routes = AdMan::Engine.routes
     end
-  
+
     test "should get index" do
       get :index
       assert_response :success
       assert_not_nil assigns(:keywords)
     end
-  
+
     test "should get new" do
       get :new
       assert_response :success
     end
-  
+
     test "should create keyword" do
       assert_difference('Keyword.count') do
-        post :create, keyword: { name: @keyword.name }
+        post :create, keyword: { name: 'RandomName' }
       end
-  
-      assert_redirected_to keyword_path(assigns(:keyword))
+      assert_redirected_to advertisements_path
     end
-  
+
     test "should show keyword" do
       get :show, id: @keyword
       assert_response :success
     end
-  
+
     test "should get edit" do
       get :edit, id: @keyword
       assert_response :success
     end
-  
+
     test "should update keyword" do
       put :update, id: @keyword, keyword: { name: @keyword.name }
-      assert_redirected_to keyword_path(assigns(:keyword))
+      assert_redirected_to advertisements_path
     end
-  
+
     test "should destroy keyword" do
       assert_difference('Keyword.count', -1) do
         delete :destroy, id: @keyword
       end
-  
-      assert_redirected_to keywords_path
+      assert_redirected_to advertisements_path
     end
   end
 end

data/test/test_helper.rb

@@ -1,6 +1,6 @@
+require 'rubygems'
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
-
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
@@ -9,11 +9,15 @@ Rails.backtrace_cleaner.remove_silencers!
 # Load support files
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-# Load fixtures from the engine
 if ActiveSupport::TestCase.method_defined?(:fixture_path=)
   ActiveSupport::TestCase.fixture_path = File.expand_path("../fixtures", __FILE__)
 end
 
 def sample_file(filename = "test.jpeg")
-  File.new("test/fixtures/#{filename}")
-end
+  File.new("#{AdMan::Engine.root}/test/fixtures/#{filename}")
+end
+
+class ActiveSupport::TestCase
+  fixtures :all
+end
+

data/test/unit/ad_man/keyword_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module AdMan
   class KeywordTest < ActiveSupport::TestCase
     test "should not save keyword without name" do
-      keyword = Keyword.new
+      keyword = AdMan::Keyword.new
       assert !keyword.save, "Saved the post without a keyword name"
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_man
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,6 +84,7 @@ files:
 - app/models/ad_man/keyword.rb
 - app/views/ad_man/advertisements/_form.html.erb
 - app/views/ad_man/advertisements/edit.html.erb
+- app/views/ad_man/advertisements/get_ad.js.erb
 - app/views/ad_man/advertisements/index.html.erb
 - app/views/ad_man/advertisements/new.html.erb
 - app/views/ad_man/advertisements/show.html.erb
@@ -100,10 +101,12 @@ files:
 - lib/ad_man/version.rb
 - lib/ad_man.rb
 - lib/generators/ad_man/install_generator.rb
+- lib/generators/ad_man/templates/advertisements_controller.rb
+- lib/generators/ad_man/templates/keywords_controller.rb
 - lib/tasks/ad_man_tasks.rake
 - MIT-LICENSE
 - Rakefile
-- README.rdoc
+- README.md
 - test/ad_man_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
@@ -131,13 +134,10 @@ files:
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/banner/test.jpeg
-- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/leaderboard/test.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/original/FabTable_01.jpg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/original/test.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/small/FabTable_01.jpg
@@ -157,23 +157,6 @@ files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
-- test/dummy/tmp/cache/assets/C02/0A0/sprockets%2F625bdc26802f8c498265353870490587
-- test/dummy/tmp/cache/assets/CC8/220/sprockets%2F234102a39a522cfab9195fd0d7c12640
-- test/dummy/tmp/cache/assets/CD6/A60/sprockets%2Fcca4c63026454615fd0a54b65b881d64
-- test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
-- test/dummy/tmp/cache/assets/CE4/9E0/sprockets%2F3f5956491fde7227a651e20e4d756b1a
-- test/dummy/tmp/cache/assets/D31/910/sprockets%2Fc1c18d3d756fe2777d18b236a0aea400
-- test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- test/dummy/tmp/cache/assets/D3A/220/sprockets%2Fce53c5b352a83645d36d96aff26020fb
-- test/dummy/tmp/cache/assets/D3E/AF0/sprockets%2F317881d54abbd5721deee7d204e70e66
-- test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
-- test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
-- test/dummy/tmp/cache/assets/D79/2D0/sprockets%2F0d684f7bbe7d675f000dff8821d90ae8
-- test/dummy/tmp/cache/assets/DBA/3C0/sprockets%2F9ca84f8118d29c3fd7bfd2876f83dc7e
-- test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
-- test/dummy/tmp/cache/assets/DF7/090/sprockets%2Fb3b1a32b0f923d6741fd5dacdf9f59ab
-- test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
-- test/dummy/tmp/cache/assets/E56/460/sprockets%2F5dde4d3dd93c8afa78eb0ba3fb55c20c
 - test/fixtures/ad_man/advertisements.yml
 - test/fixtures/ad_man/keywords.yml
 - test/fixtures/test.jpeg
@@ -186,7 +169,7 @@ files:
 - test/unit/ad_man/keyword_test.rb
 - test/unit/helpers/ad_man/advertisements_helper_test.rb
 - test/unit/helpers/ad_man/keywords_helper_test.rb
-homepage: http://github.com/wspyder/ad_man
+homepage: http://github.com/kudelabs/ad_man
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -238,13 +221,10 @@ test_files:
 - test/dummy/db/schema.rb
 - test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
-- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/banner/test.jpeg
-- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/leaderboard/test.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/original/FabTable_01.jpg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/original/test.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/small/FabTable_01.jpg
@@ -264,23 +244,6 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
-- test/dummy/tmp/cache/assets/C02/0A0/sprockets%2F625bdc26802f8c498265353870490587
-- test/dummy/tmp/cache/assets/CC8/220/sprockets%2F234102a39a522cfab9195fd0d7c12640
-- test/dummy/tmp/cache/assets/CD6/A60/sprockets%2Fcca4c63026454615fd0a54b65b881d64
-- test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
-- test/dummy/tmp/cache/assets/CE4/9E0/sprockets%2F3f5956491fde7227a651e20e4d756b1a
-- test/dummy/tmp/cache/assets/D31/910/sprockets%2Fc1c18d3d756fe2777d18b236a0aea400
-- test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- test/dummy/tmp/cache/assets/D3A/220/sprockets%2Fce53c5b352a83645d36d96aff26020fb
-- test/dummy/tmp/cache/assets/D3E/AF0/sprockets%2F317881d54abbd5721deee7d204e70e66
-- test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
-- test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
-- test/dummy/tmp/cache/assets/D79/2D0/sprockets%2F0d684f7bbe7d675f000dff8821d90ae8
-- test/dummy/tmp/cache/assets/DBA/3C0/sprockets%2F9ca84f8118d29c3fd7bfd2876f83dc7e
-- test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
-- test/dummy/tmp/cache/assets/DF7/090/sprockets%2Fb3b1a32b0f923d6741fd5dacdf9f59ab
-- test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
-- test/dummy/tmp/cache/assets/E56/460/sprockets%2F5dde4d3dd93c8afa78eb0ba3fb55c20c
 - test/fixtures/ad_man/advertisements.yml
 - test/fixtures/ad_man/keywords.yml
 - test/fixtures/test.jpeg

data/README.rdoc

@@ -1,61 +0,0 @@
-Ad_man
-Ad_man is an advertising manager mountable engine. It allows the user to upload and manage advertising banners, and provides an easy to use helper for inserting the banners on your website. Also counts the number of times an ad has shown, and the number of times an advertisement has been clicked on. The user must set a keyword for each ad.
-
-Currently supports two image sizes for advertising: Leaderboard 728 x 90 and Banner 468 x 60. TODO: Will implement 9 different sizes as mentioned by google's adwords requirements.
-
-Requires Paperclip 3.1, and requires ImageMagick be running on the server.
-
-Getting started
-Ad_man works with Rails 3.2 onwards. You can add it to your Gemfile with:
-
-gem 'ad_man'
-After you install Ad_man and add it to your Gemfile, you need to run the generator:
-
-rails generate ad_man:install
-Install the migrations, and rake the database:
-
-rake ad_man:install:migrations
-rake db:migrate
-See where Ad_man is located by running:
-
-rake routes
-In our case, we needed to move the line generated by the install in the routes file to our admin space. Then add any before_filters to the controllers that were generated.
-
-Make sure to change references to the application using the main_app helper:
-
-<%= link_to "Home", main_app.root_path %>
-<%= link_to "Advertising", main_app.ad_man_path %>
-One final change may be necessary in order to preview an image before saving, and that is to add this line to the admin view:
-
-<%= javascript_include_tag "ad_man/advertisements.js" %>
-Changing default values
-If you need to change the default values set by ad_man, you will need to create an ad_man.rb initializer in your config/initializers folder.
-
-# AdMan Default Values
-AdMan.leaderboard_size = "728x90"
-AdMan.banner_size = "468x60"
-AdMan.max_image_size = 50 # 50Kb maximum image size
-
-# These are configurable dimensions (currently leaderboard default)
-AdMan.image_dimensions_width = 728
-AdMan.image_dimensions_height = 90
-
-# Configurable content type for advertising
-AdMan.content_type = ["image/jpg", "image/bmp", "image/png", "image/gif", "image/jpeg"]
-
-# Configurable max advertising for keyword
-AdMan.max_count = 6
-Putting an advertisement in the view
-To put your advertisement in the view just add:
-
-<%= link_to_ad %>
-To call advertisements by keyword:
-
-<%= link_to_ad @keyword.name %>
-Authors
-Written by David Strand and Tyler Hu
-
-Copyright & Licensing
-Copyright (c) 2012 Kudelabs, Kudelabs on Github
-
-Released under MIT License.