ad_man 0.0.7 → 0.0.8

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 YOURNAME
+Copyright 2012 Kudelabs
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -78,16 +78,15 @@ Ad_man supports inserting an advertisement using jQuery.  It also uses jQuery in
 <%= javascript_include_tag "ad_man/advertisements.js" %>
 ```
 
-You can pass the keyword name through the showAd(); function.  
+You can pass a `<DIV>` id element, the keyword name, and size to show an advertisement using the showAd(); function.  Currently supported sizes are: `leaderboard` and `banner`.  
 ```erb
 <script>
-// showAd(keyword);
-showAd('<%= @keyword %>');  // inserts a value from ruby in erb
+AdMan.showAd('div_id', 'keyword', 'size');
 </script>
 ```
-Then ad a `<DIV>` element with the id 'advertisement' where you want the advertisement to show.  
+Then make sure you have a `<DIV>` element with the `div_id` you gave to the showAd function.  
 ```erb
-<div id="advertisement"></div>
+<div id="banner_ad"></div>
 ```
 
 ## Authors
@@ -97,7 +96,4 @@ Written by [David Strand](http://www.github.com/wspyder) and [Tyler Hu](http://w
 [Matenia Rossides](http://www.github.com/matenia)
 
 ## Copyright & Licensing
-
-Copyright (c) 2012 [Kudelabs](http://kudelabs.com)
-
-Released under MIT License. 
+This project is maintained by an intern team of developers and is freely available for commercial use under the terms of the MIT License. 

data/app/assets/javascripts/ad_man/advertisements.js

@@ -44,11 +44,13 @@ function showFormError(msg, form) {
   form.find('div.errors').remove();
   form.prepend(errorDiv);
 }
-
-function showAd(key) {
-		$.ajax({
-			url: "/ad_man/advertisements/get_ad/" + key, 
-			dataType: "script", 
-			success: function(data){}
-		});
+AdMan = {
+	//function showAd(div, key, size) {
+  showAd: function(div, key, size) {
+     $.ajax({
+	url: "/ad_man/advertisements/get_ad/" + div + "/" + key + "/" + size,
+	dataType: "script", 
+	success: function(data){}
+     });
+   }
 }

data/app/controllers/ad_man/advertisements_controller.rb

@@ -100,7 +100,9 @@ class AdMan::AdvertisementsController < ApplicationController
   end
   
   def get_ad()
-    keyword = params[:id]
+    keyword = params[:key]
+    @div = params[:div]
+    @size = params[:size]
     @ad = js_link_to_ad(keyword)
   end
   

data/app/controllers/ad_man/keywords_controller.rb

@@ -13,9 +13,9 @@ class AdMan::KeywordsController < ApplicationController
   # GET /keywords/1
   # GET /keywords/1.json
   def show
-	  @keyword = AdMan::Keyword.find(params[:id])
-	  @advertisements = AdMan::Advertisement.find_all_by_keyword_id(params[:id])
-	  @keywords = AdMan::Keyword.all
+    @keyword = AdMan::Keyword.find(params[:id])
+    @advertisements = AdMan::Advertisement.find_all_by_keyword_id(params[:id])
+    @keywords = AdMan::Keyword.all
   end
   
   # GET /keywords/new

data/app/helpers/ad_man/application_helper.rb

@@ -1,40 +1,45 @@
 module AdMan
   module ApplicationHelper
     def link_to_ad(keyword = nil, size = "leaderboard")
-      ad = ad_select(keyword, size)
-      link_to image_tag(ad.ad_banner.url(size)), { :controller => 'ad_man/advertisements', :action => 'click_through', :id => ad.id },
-      :target => '_blank', :method => :post
+#   def link_to_ad(hash = {:keyword => nil, :size => "leaderboard"})
+#     keyword = hash[:keyword]
+#     size = hash[:size]
+      ad = ad_select(keyword)
+      if ad 
+      	link_to image_tag(ad.ad_banner.url(size)), ad_man.click_through_advertisements_path(ad.id), :target => '_blank', :method => :post
+      end
     end
     
     def js_link_to_ad(keyword)
-      ad_select(keyword, size= "leaderboard")
+      ad_select(keyword)
     end
     
     protected
       #grab the keyword form request url
-      def get_keyword_from_url
-        if request.env["REQUEST_PATH"]
-          req_url = request.env["REQUEST_PATH"].split("/")
-          keyword_names = Keyword.all.map{ |keyword| keyword.name }
-          keyword = req_url & keyword_names
-        end
+    def get_keyword_from_url
+      if request.env["REQUEST_PATH"]
+        req_url = request.env["REQUEST_PATH"].split("/")
+        keyword_names = Keyword.all.map{ |keyword| keyword.name }
+        keyword = req_url & keyword_names
       end
+    end
     
 	  
-  	  def ad_select(keyword, size)
-    		keyword ||= get_keyword_from_url
-  			if keyword && !keyword.blank? && !Keyword.find_by_name(keyword).nil?
-    		  keyword_id = Keyword.find_by_name(keyword).id
-    			ad = Advertisement.render_random_ad(keyword_id)
-       	  #grab size? leaderboard or banner
-     	  elsif keyword.nil? || keyword.blank?
-     	    ad = Advertisement.render_random_ad
-  			end
-    		if !ad.nil?
-    			ad.display_count += 1 
-    			ad.save
-    			ad
-    		end
-    	end
-	end
+    def ad_select(keyword)
+      keyword ||= get_keyword_from_url
+      if keyword && !keyword.blank? && Keyword.find_by_name(keyword)
+    	keyword_id = Keyword.find_by_name(keyword).id
+    	ad = Advertisement.render_random_ad(keyword_id)
+       	#grab size? leaderboard or banner
+      elsif keyword.nil? || keyword.blank?
+     	ad = Advertisement.render_random_ad
+      end
+      if ad
+    	ad.display_count += 1 
+    	ad.save
+    	ad
+      end
+    end
+				
+  end
 end

data/app/models/ad_man/keyword.rb

@@ -1,23 +1,24 @@
 module AdMan
   class Keyword < ActiveRecord::Base
     attr_accessible :name
-		has_many :advertisements, :dependent => :destroy
+    has_many :advertisements, :dependent => :destroy
     validates :name, :presence => true, :uniqueness => true	
-  	MAX_COUNT = (AdMan.max_count)?(AdMan.max_count):5
+    MAX_COUNT = (AdMan.max_count)?(AdMan.max_count):5
 
-		def to_s
-			name
-		end
+    def to_s
+      name
+    end
 
-		def number_of_ads
-			self.advertisements.count
-		end
-	  def self.available
-			Keyword.all.select { |keyword| keyword.advertisements.count < MAX_COUNT}
-		end
+    def number_of_ads
+      self.advertisements.count
+    end
+    
+    def self.available
+      Keyword.all.select { |keyword| keyword.advertisements.count < MAX_COUNT}  
+    end
 
-		def self.unavailable 
-			Keyword.all.select { |keyword| keyword.advertisements.count >= MAX_COUNT}
-		end
+    def self.unavailable 
+       Keyword.all.select { |keyword| keyword.advertisements.count >= MAX_COUNT}
+    end
   end
 end

data/app/views/ad_man/advertisements/get_ad.js.erb

@@ -1,2 +1,4 @@
-$('div#advertisement').html('<%= link_to image_tag(@ad.ad_banner.url), 
-	click_through_path(@ad.id),  :target => "_blank", :method => :post %>');
+<% if @ad %>
+$(<%= @div %>).html('<%= link_to image_tag(@ad.ad_banner.url(@size)), 
+	ad_man.click_through_advertisements_path(@ad.id),  :target => "_blank", :method => :post %>');
+<% end %>

data/config/routes.rb

@@ -1,10 +1,12 @@
 AdMan::Engine.routes.draw do
   resources :keywords
-  resources :advertisements 
-  
-  match 'ad_man/advertisements/click_through/:id' => "advertisements#click_through", :as => :click_through
-  match 'ad_man/advertisements/get_ad/:id' => 'advertisements#get_ad' 
-  
+  resources :advertisements do
+    collection do
+      match 'click_through/:id' => "advertisements#click_through", :as => :click_through
+      match 'get_ad/:div/:key/:size' => 'advertisements#get_ad', :as => :get_ad
+    end
+  end
+
   root :to => "advertisements#index"
 
 end

data/lib/ad_man/version.rb

@@ -1,3 +1,3 @@
 module AdMan
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/generators/ad_man/install_generator.rb

@@ -7,7 +7,7 @@ module AdMan
     end
 
     def add_routes
-      route("mount AdMan::Engine, :at => '/ad_man'")
+      route("mount AdMan::Engine => "/ad_man")
     end
 
     def install_migrations

data/test/dummy/app/controllers/ad_man/advertisements_controller.rb

@@ -0,0 +1,4 @@
+require File.join(AdMan::Engine.config.root,'app','controllers','ad_man','advertisements_controller')
+AdMan::AdvertisementsController.class_eval do
+  # overrides go here
+end

data/test/dummy/app/controllers/ad_man/keywords_controller.rb

@@ -0,0 +1,4 @@
+require File.join(AdMan::Engine.config.root,'app','controllers','ad_man','keywords_controller')
+AdMan::KeywordsController.class_eval do
+  # overrides go here
+end

data/test/dummy/app/views/layouts/application.html.erb

@@ -5,11 +5,26 @@
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
 	<%= javascript_include_tag "ad_man/advertisements.js" %>
+	
+	<script>
+	// showAd(keyword)
+	<% if AdMan::Keyword.first %>
+		AdMan.showAd('<%= AdMan::Keyword.first.name %>', 'banner', 'advertisement1'); //
+		AdMan.showAd('<%= AdMan::Keyword.last.name %>', 'leaderboard', 'advertisement2');
+	<% end %>
+	</script>
+	
   <%= csrf_meta_tags %>
 </head>
 <body>
 
+<%= link_to_ad %>
+<hr/>
+
 <%= yield %>
 
+
+<div id="advertisement1"></div>
+<div id="advertisement2"></div>
 </body>
 </html>

data/test/dummy/db/migrate/20120817083909_create_ad_man_advertisements.ad_man.rb

@@ -0,0 +1,17 @@
+# This migration comes from ad_man (originally 20120808085322)
+class CreateAdManAdvertisements < ActiveRecord::Migration
+  def change
+    create_table :ad_man_advertisements do |t|
+      t.string :title
+      t.string :destination_url
+      t.has_attached_file :ad_banner
+      t.integer :display_count, :null => false, :default => 0
+      t.integer :priority, :null => false, :default => 1
+      t.date :start_date
+      t.date :end_date
+      t.integer :keyword_id
+      t.integer :click_count, :null => false, :default => 0
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/migrate/20120817083910_create_ad_man_keywords.ad_man.rb

@@ -0,0 +1,9 @@
+# This migration comes from ad_man (originally 20120808091446)
+class CreateAdManKeywords < ActiveRecord::Migration
+  def change
+    create_table :ad_man_keywords do |t|
+      t.string :name
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,10 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-<<<<<<< HEAD
-ActiveRecord::Schema.define(:version => 0) do
-=======
-ActiveRecord::Schema.define(:version => 20120812095547) do
+ActiveRecord::Schema.define(:version => 20120817083910) do
 
   create_table "ad_man_advertisements", :force => true do |t|
     t.string   "title"
@@ -38,6 +35,5 @@ ActiveRecord::Schema.define(:version => 20120812095547) do
     t.datetime "created_at", :null => false
     t.datetime "updated_at", :null => false
   end
->>>>>>> ebccd78bf25a122cf7949094b969681a8bd1a867
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_man
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -110,6 +110,8 @@ files:
 - test/ad_man_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/ad_man/advertisements_controller.rb
+- test/dummy/app/controllers/ad_man/keywords_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -130,17 +132,22 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/development.sqlite3
+- test/dummy/db/migrate/20120817083909_create_ad_man_advertisements.ad_man.rb
+- test/dummy/db/migrate/20120817083910_create_ad_man_keywords.ad_man.rb
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.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/1-NR-728x90-cool-b.gif
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/leaderboard/1-NR-728x90-cool-b.gif
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/original/1-NR-728x90-cool-b.gif
 - 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
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/banner/61f8516ab0e6471b99443e17bf7533d5.jpeg
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/leaderboard/61f8516ab0e6471b99443e17bf7533d5.jpeg
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/original/61f8516ab0e6471b99443e17bf7533d5.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/original/728x90_2MM.jpg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/original/d893babe671c41118c1fece177e0a21a.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/small/728x90_2MM.jpg
@@ -197,6 +204,8 @@ test_files:
 - test/ad_man_test.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/controllers/ad_man/advertisements_controller.rb
+- test/dummy/app/controllers/ad_man/keywords_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/views/layouts/application.html.erb
@@ -217,17 +226,22 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/db/development.sqlite3
+- test/dummy/db/migrate/20120817083909_create_ad_man_advertisements.ad_man.rb
+- test/dummy/db/migrate/20120817083910_create_ad_man_keywords.ad_man.rb
 - test/dummy/db/schema.rb
-- test/dummy/db/test.sqlite3
-- test/dummy/log/development.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/1-NR-728x90-cool-b.gif
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/leaderboard/1-NR-728x90-cool-b.gif
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/001/original/1-NR-728x90-cool-b.gif
 - 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
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/banner/61f8516ab0e6471b99443e17bf7533d5.jpeg
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/leaderboard/61f8516ab0e6471b99443e17bf7533d5.jpeg
+- test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/original/61f8516ab0e6471b99443e17bf7533d5.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/original/728x90_2MM.jpg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/original/d893babe671c41118c1fece177e0a21a.jpeg
 - test/dummy/public/system/ad_man/advertisements/ad_banners/000/000/002/small/728x90_2MM.jpg