Merge branch 'develop' of https://github.com/ecleel/ads into develop

Author: d7om

Gemfile.lock

@@ -33,6 +33,7 @@ GEM
       tzinfo (~> 0.3.37)
     arel (4.0.0)
     atomic (1.1.10)
+    bcrypt-ruby (3.1.2)
     builder (3.1.4)
     carrierwave (0.8.0)
       activemodel (>= 3.2.0)
@@ -44,6 +45,12 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
+    devise (3.2.2)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.0.2)
     hike (1.2.3)
@@ -57,6 +64,7 @@ GEM
     mime-types (1.23)
     minitest (4.7.5)
     multi_json (1.7.7)
+    orm_adapter (0.5.0)
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -98,6 +106,8 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
+    warden (1.2.3)
+      rack (>= 1.0)
 
 PLATFORMS
   ruby
@@ -106,6 +116,7 @@ DEPENDENCIES
   ads!
   carrierwave
   coffee-rails (~> 4.0.0)
+  devise (~> 3.2.2)
   jquery-rails
   sass-rails (~> 4.0.0)
   sqlite3

README

@@ -0,0 +1,12 @@
+= Ads
+
+This project rocks and uses MIT-LICENSE.
+
+#To be continued ..
+
+#Todo
+<strike>1. Track every click of ad.</strike>
+2. Show some stat.
+3. Add Configuration table.
+4. Give ability to choose showing duplicate ad for one banner.
+5. Login requirment

README.rdoc

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'jquery-rails'
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency 'devise', '~> 3.2.2'
 end

ads.gemspec

@@ -1,2 +1,46 @@
-jQuery ->
-  # alert('hi')
+$ = jQuery
+
+$.fn.extend
+
+  ads: (options) ->
+    settings =
+      rotate: true
+      period: 10000
+      debug: false
+
+    settings = $.extend settings, options
+
+    log = (msg) ->
+      console?.log msg if settings.debug
+
+    get_ad = ->
+      log "#{this} get ad"
+      # each type of banner in the page
+      bt = []
+      bc = $('.banner').size()
+      $('.banner').each (i, elm) ->
+        bt.push $(elm).data('name')
+
+      banner_link = "/ads/ads?bc=#{bc}&bt=#{bt.toString()}"
+      log "Banner Link: #{banner_link}"
+      $.getJSON banner_link, (data)->
+        log "Date from server: #{data}"
+        for type, info of data
+          banner_div = $(".#{type}")
+          width  = banner_div.data 'width'
+          height = banner_div.data 'height'
+          banner_div.html "<a href='#{info[0].link}' target='_blank'><img src='#{info[0].image_path}' width='#{width}' height='#{height}' /></a>"
+          log "Type: #{type} info: #{info[0].link}"
+
+      #   get ads limit by number of banners and respect the banner name.
+      #   add image into the banner.
+
+    if settings.rotate      
+      setInterval(get_ad, settings.period)
+
+    get_ad()
+
+    return @each ()->
+      # log "Preparing magic show."
+      # You can use your settings in here now.
+      # log "Option 1 value: #{settings.rotate}"

app/assets/javascripts/ads/ads.js.coffee

@@ -3,7 +3,7 @@
 module Ads
   module Admin
 
-    class AdsController < ApplicationController
+    class AdsController < BaseController
       before_action :set_ad, only: [:show, :edit, :update, :destroy]
       before_action :set_campaign
       before_action :set_banner_list, only: [:new, :edit, :update, :create]

app/controllers/ads/admin/ads_controller.rb

@@ -3,7 +3,7 @@
 module Ads
   module Admin
 
-    class BannersController < ApplicationController
+    class BannersController < BaseController
       before_action :set_banner, only: [:show, :edit, :update, :destroy]
 
       # GET /banners

app/controllers/ads/admin/banners_controller.rb

@@ -0,0 +1,38 @@
+require_dependency "ads/application_controller"
+
+module Ads
+  module Admin
+    class BaseController < ApplicationController
+      # TODO use nested layout to use with what user have
+      layout :set_layout
+      before_filter :authenticate_ads_user
+  
+      private
+      
+      def set_layout
+        'ads/application'
+      end
+
+      def authenticate_ads_user
+        if !ads_user
+          session["user_return_to"] = request.fullpath
+          flash.alert = t("ads.errors.not_signed_in")
+          devise_route = "new_#{Ads.user_class.to_s.underscore}_session_path"
+          sign_in_path = Ads.sign_in_path ||
+            (main_app.respond_to?(devise_route) && main_app.send(devise_route)) ||
+            (main_app.respond_to?(:sign_in_path) && main_app.send(:sign_in_path))
+          if sign_in_path
+            redirect_to sign_in_path
+          else
+            raise "Ads could not determine the sign in path for your application. Please do one of these things:
+
+    1) Define sign_in_path in the config/routes.rb of your application like this:
+
+    or; 2) Set Ads.sign_in_path to a String value that represents the location of your sign in form, such as '/users/sign_in'."
+          end
+        end
+      end
+      
+    end
+  end
+end

app/controllers/ads/admin/base_controller.rb

@@ -3,7 +3,7 @@
 module Ads
   module Admin
 
-    class CampaignsController < ApplicationController
+    class CampaignsController < BaseController
       before_action :set_campaign, only: [:show, :edit, :update, :destroy]
 
       # GET /campaigns

app/controllers/ads/admin/campaigns_controller.rb

@@ -2,6 +2,7 @@
 
 module Ads
   class AdsController < ApplicationController
+    
     def index
       ads_types = params[:bt].split(',') if params[:bt]
       ads_count = params[:bc]
@@ -10,10 +11,22 @@ def index
         puts "ads_types: #{ads_types}"
         banner_ids = Banner.where(name: ads_types).pluck(:id)
         @ads = Ad.active.includes(:banner).where(banner_id: banner_ids)
-        render json: @ads.each_with_object( Hash.new {|h,k| h[k] = [] } ) {|ad, hsh| hsh[ad.banner.name] << {id: ad.id, link: ad.link, image_path: ad.file.url, banner_name: ad.banner.name} }
+        render json: @ads.each_with_object( Hash.new {|h,k| h[k] = [] } ) {|ad, hsh| hsh[ad.banner.name] << {id: ad.id, link: ad_path(ad), image_path: ad.file.url, banner_name: ad.banner.name, } }
       else
         render json: {error: "There is no Ads Types gived."}
       end
     end
+    
+    def show
+      # TODO check if there is ad before create state
+      ad = Ad.active.find params[:id]
+      if ad
+        ad.stats.create referer: request.referer, 
+                        session_hash: request.session_options[:id], 
+                        ip_address: request.remote_ip
+
+        redirect_to ad.link
+      end
+    end
   end
 end