ad_man 0.0.2 → 0.0.3

data/app/controllers/ad_man/advertisements_controller.rb

@@ -47,7 +47,7 @@ class AdMan::AdvertisementsController < ApplicationController
   def create
     @advertisement = AdMan::Advertisement.new(params[:advertisement])
     @advertisement.keyword_id = params[:keyword_id]
-		@advertisement.priority = params[:priority]
+	#	@advertisement.priority = params[:priority]
     respond_to do |format|
       if @advertisement.save
         format.html { redirect_to @advertisement, notice: 'Advertisement was successfully created.' }

data/app/helpers/ad_man/application_helper.rb

@@ -22,7 +22,6 @@ module AdMan
   		 req_url = request.env["REQUEST_PATH"].split("/")
     	 keyword_names = Keyword.all.map{ |keyword| keyword.name }
     	 keyword = req_url & keyword_names
-		   #return (keyword)?(keyword):(Keyword.all[rand(Keyword.all.size)])
 	     end
   end
 end

data/app/models/ad_man/advertisement.rb

@@ -8,14 +8,19 @@ module AdMan
   	validates_attachment :ad_banner, :presence => true, 
   		:content_type => { :content_type => (AdMan.content_type)?(AdMan.content_type):
 				["image/jpg","image/bmp","image/png", "image/gif", "image/jpeg"] 	},
-  		:size => { :in => 0..AdMan.max_image_size.kilobytes } 
+  		:size => { :in => 0..((AdMan.max_image_size)?(AdMan.max_image_size):50).kilobytes } 
   	validates_presence_of :destination_url, :title, :keyword_id, :priority
 		validates_uniqueness_of :title
   	validate :image_dimensions, :on => :create
+		after_initialize :init_priority
 
-  	def Advertisement.render_random_ad(keyword_id)
+  	def Advertisement.render_random_ad(keyword_id = nil)
 #  		ads = Advertisement.find_all_by_keyword_id(keyword_id)
-			ads = Advertisement.where("keyword_id = ? AND start_date <= ? AND end_date >= ? ", keyword_id, Date.today, Date.today)
+			if keyword_id.nil?
+				ads = Advertisement.where("start_date <= ? AND end_date >= ?", Date.today, Date.today)
+		  else 
+				ads = Advertisement.where("keyword_id = ? AND start_date <= ? AND end_date >= ? ", keyword_id, Date.today, Date.today)
+			end
 			if !ads.blank?
 				total_times = 1.0
 				total_priority = 0.0
@@ -30,11 +35,6 @@ module AdMan
 				ad
 			end
 	  end
-    
-		def Advertisement.render_random_ad
-			ads = Advertisement.all
-			ad = ads[rand(ads.size)]
-		end
 
   	private
     def image_dimensions
@@ -47,6 +47,10 @@ module AdMan
 										"must be image size: #{max_width}X#{max_height}.")
       end
     end
+
+		def init_priority
+			self.priority ||= 1
+		end
 	
   end
 end

data/app/models/ad_man/keyword.rb

@@ -2,7 +2,8 @@ module AdMan
   class Keyword < ActiveRecord::Base
     attr_accessible :name
 		has_many :advertisements, :dependent => :destroy
-		MAX_COUNT = (AdMan.max_count)?(AdMan.max_count):5
+    validates :name, :presence => true, :uniqueness => true	
+  	MAX_COUNT = (AdMan.max_count)?(AdMan.max_count):5
 
 		def to_s
 			name

data/app/views/ad_man/advertisements/_form.html.erb

@@ -31,10 +31,12 @@
 	<p><b><%= AdMan::Keyword.unavailable.collect { |keyword| keyword.name } %></b> keyword has allready been used 5 times.</p>
 	<% end %>
   </div><br />
+	<!--
   <div class="field">
-		<%= f.label :priority %>
-		<%= select_tag :priority, options_for_select(1..10) %>
+		<#%= f.label :priority %>
+		<#%= select_tag :priority, options_for_select(1..10) %>
 	</div><br />
+	-->
 	<div class="field">
 		<%= f.label :start_date %><br />
 		<%= date_select("advertisement", "start_date") %>

data/app/views/ad_man/keywords/show.html.erb

@@ -32,8 +32,8 @@
 <br/>
 
 <div style="display:inline-block;">
-	<%= link_to 'Edit Keyword', edit_advertisement_path(@keyword), :method => :get %>
+	<%= link_to 'Edit Keyword', edit_keyword_path(@keyword), :method => :get %>
 	<%= link_to "Destroy", @keyword, :method => :delete,
 				:confirm => "Deleting Keyword, this cannot be undone.  WARNING: This will delete all advertisements connected with this keyword.  Please confirm.", :style => "color:#b94a48"%>
 	<%= link_to 'Back', advertisements_path, :method => :get %>
-</div>
+</div>

data/db/migrate/20120808095742_add_priority_to_ad_man_advertisements.rb

@@ -1,6 +1,6 @@
 class AddPriorityToAdManAdvertisements < ActiveRecord::Migration
   def change
-    add_column :ad_man_advertisements, :priority, :integer
+    add_column :ad_man_advertisements, :priority, :integer, :null => false, :default => 1
     AdMan::Advertisement.update_all ["priority = ? ", 1]
   end
 end

data/lib/ad_man/version.rb

@@ -1,3 +1,3 @@
 module AdMan
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/generators/ad_man/install_generator.rb

@@ -0,0 +1,20 @@
+module AdMan
+	class InstallGenerator < Rails::Generators::Base
+		def create_extended_controller_file
+			create_file "app/controllers/ad_man/advertisements_controller.rb",
+				%Q[require AdMan::Engine.config.root + 'app' + 'controllers' + 'ad_man' + 'advertisements_controller'
+					AdMan::AdvertisementsController.class_eval do 
+					end]
+
+			create_file "app/controllers/ad_man/keywords_controller.rb",
+				%Q[require AdMan::Engine.config.root + 'app' + 'controllers' + 'ad_man' + 'keywords_controller'
+					AdMan::KeywordsController.class_eval do
+					end]
+		end
+		
+		def add_routes
+			route("mount AdMan::Engine, :at => '/ad_man'")
+		end
+	end
+end
+