epom_rails 1.0.0 → 1.3.2

data/test/dummy/test/fixtures/campaigns.yml

@@ -2,12 +2,13 @@
 
 one:
   name: MyString
-  advertiser_id: 1
+  advertiser: one
   description: MyText
   weight: 1
 
 two:
   name: MyString
-  advertiser_id: 1
+  advertiser: two
   description: MyText
   weight: 1
+  epom_id: 2

data/test/dummy/test/fixtures/placements.yml

@@ -1,7 +1,7 @@
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 
 one:
-  zone_id: 814
+  zone: one
   placement_type: SITE_PLACEMENT
   name: MyString
   ad_unit_id: 10
@@ -9,9 +9,10 @@ one:
   size_width: 350
 
 two:
-  zone_id: 814
+  zone: two
   placement_type: SITE_PLACEMENT
   name: MyString
   ad_unit_id: 10
   size_height: 200
-  size_width: 350
+  size_width: 350
+  epom_id: 2

data/test/dummy/test/fixtures/publishers.yml

@@ -12,4 +12,5 @@ two:
   url: http://www.example.com
   description: MyText
   email: user@example.com
-  category_id: 1
+  category_id: 1
+  epom_id: 2

data/test/dummy/test/fixtures/zones.yml

@@ -3,9 +3,10 @@
 one:
   name: MyString
   description: MyText
-  site_id: 1
+  publisher: one
 
 two:
   name: MyString
   description: MyText
-  site_id: 1
+  publisher: two
+  epom_id: 2

data/test/dummy/test/models/analytic_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class AnalyticTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/test/epom_rails/acts_as_advertiser_test.rb

@@ -5,8 +5,18 @@ class ActsAsAdvertiserTest < ActiveSupport::TestCase
 		EpomRails.config.advertiser[:fields].key(field)
 	end
 
+	def check_campaigns_list(campaigns1, campaigns2)
+		assert_equal campaigns1.count, campaigns2.count
+		campaigns1.each do |campaign|
+			epom_campaign = campaigns2.find{|c| c['id'] == campaign.send(epom_field('id'))}
+			assert epom_campaign
+			assert_instance_of Hash, epom_campaign
+			assert_equal campaign.name, epom_campaign['name']
+		end
+	end
+
 	test 'fancy_method' do
-	  	assert_raises NoMethodError do Advertiser.fancy_method end
+	  assert_raises NoMethodError do Advertiser.fancy_method end
 	end
 
 	test 'save an advertiser' do
@@ -68,4 +78,47 @@ class ActsAsAdvertiserTest < ActiveSupport::TestCase
 			end
 		end
 	end
+
+	test 'define_before_add_and_before_remove_for_campaigns' do
+		a1 = Advertiser.create(name: 'advertiser 1')
+		a2 = Advertiser.create(name: 'advertiser 2')
+		c = Campaign.create(name: 'campaign', advertiser_id: a2.id)
+		
+		puts 'a1.campaigns << c'
+		a1.campaigns << c
+		unless EpomRails.config.offline
+			# TODO: replace for a1.get_campaigns_for_advertiser
+			campaigns = Advertiser.get_campaigns_for_advertiser({advertiserId: a1.send(epom_field('id'))})
+			check_campaigns_list(a1.campaigns(true), campaigns)
+		end
+
+		puts 'a2.campaigns << c'
+		a2.campaigns << c
+		unless EpomRails.config.offline
+			# TODO: replace for a1.get_campaigns_for_advertiser
+			campaigns = Advertiser.get_campaigns_for_advertiser({advertiserId: a1.send(epom_field('id'))})
+			check_campaigns_list(a1.campaigns(true), campaigns)
+
+			# TODO: replace for a2.get_campaigns_for_advertiser
+			campaigns = Advertiser.get_campaigns_for_advertiser({advertiserId: a2.send(epom_field('id'))})
+			check_campaigns_list(a2.campaigns(true), campaigns)
+		end
+
+		puts 'a2.campaigns = [Campaign.create, Campaign.create]'
+		a2.campaigns = [Campaign.create(name: 'campaign 1', advertiser_id: a2.id), Campaign.create(name: 'campaign 2', advertiser_id: a2.id)]
+		assert_nil Campaign.find(c.id).advertiser
+		unless EpomRails.config.offline
+			# TODO: replace for a2.get_campaigns_for_advertiser
+			campaigns = Advertiser.get_campaigns_for_advertiser({advertiserId: a2.send(epom_field('id'))})
+			check_campaigns_list(a2.campaigns(true), campaigns)
+		end
+
+		puts 'a2.campaigns = []'
+		a2.campaigns = []
+		unless EpomRails.config.offline
+			# TODO: replace for a2.get_campaigns_for_advertiser
+			campaigns = Advertiser.get_campaigns_for_advertiser({advertiserId: a2.send(epom_field('id'))})
+			check_campaigns_list(a2.campaigns(true), campaigns)
+		end
+	end
 end

data/test/epom_rails/acts_as_analytic_test.rb

@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class ActsAsAnalyticTest < ActiveSupport::TestCase
+	test 'analytic_from_epom' do
+		analytics = Analytic.analytic_from_epom({range: 'CURRENT_MONTH'})
+		assert_instance_of Array, analytics
+		assert_instance_of Analytic, analytics[0] if analytics.count > 0
+	end
+end

data/test/epom_rails/acts_as_banner_test.rb

@@ -11,8 +11,9 @@ class ActsAsBannerTest < ActiveSupport::TestCase
 
 	test 'save an banner' do
 		unless EpomRails.config.offline
-			banner = banners(:one)	  	
-
+			banner = banners(:two)	 
+			banner.epom_id = nil
+			
 	  	assert	banner.save
 	  	assert_instance_of Fixnum, banner.send(epom_field('id'))
 	  end
@@ -20,7 +21,9 @@ class ActsAsBannerTest < ActiveSupport::TestCase
 
 	test 'delete an banner' do
 		unless EpomRails.config.offline
-			banner = banners(:one)	  	
+			banner = banners(:two)
+			banner.epom_id = nil
+			banner.save
 
 	  	assert	banner.save
 	  	assert_instance_of Fixnum, banner.send(epom_field('id'))
@@ -32,13 +35,13 @@ class ActsAsBannerTest < ActiveSupport::TestCase
 
 	test 'epom methods' do
 		unless EpomRails.config.offline
-			banner = banners(:one)	  	
-
+			banner = banners(:two)	 
+			banner.epom_id = nil
 	  	assert	banner.save
 	  	assert_instance_of Fixnum, banner.send(epom_field('id'))
 
 			response = Banner.get_banner({:bannerId => banner.send(epom_field('id'))}, {})
-			assert_equal banner.campaign_id, response['campaignId']
+			assert_equal banner.campaign.epom_id, response['campaignId']
 			assert_equal banner.weight, response['weight']
 			assert_equal banner.url, response['url']
 			assert_equal banner.name, response['name']

data/test/epom_rails/acts_as_campaign_test.rb

@@ -11,7 +11,8 @@ class ActsAsCampaignTest < ActiveSupport::TestCase
 
 	test 'save an campaign' do
 		unless EpomRails.config.offline
-			campaign = campaigns(:one)	  	
+			campaign = campaigns(:two)
+			campaign.epom_id = nil	  	
 
 	  	assert	campaign.save
 	  	assert_instance_of Fixnum, campaign.send(epom_field('id'))
@@ -20,7 +21,8 @@ class ActsAsCampaignTest < ActiveSupport::TestCase
 
 	test 'delete an campaign' do
 		unless EpomRails.config.offline
-			campaign = campaigns(:one)	  	
+			campaign = campaigns(:two)	 
+			campaign.epom_id = nil 	
 
 	  	assert	campaign.save
 	  	assert_instance_of Fixnum, campaign.send(epom_field('id'))
@@ -32,14 +34,31 @@ class ActsAsCampaignTest < ActiveSupport::TestCase
 
 	test 'epom methods' do
 		unless EpomRails.config.offline
-			campaign = campaigns(:one)	  	
+			campaign = campaigns(:two)
+			campaign.epom_id = nil	  	
 
-		  	assert	campaign.save
-		  	assert_instance_of Fixnum, campaign.send(epom_field('id'))
+	  	assert	campaign.save
+	  	assert_instance_of Fixnum, campaign.send(epom_field('id'))
 
 			response = Campaign.get_campaign({:campaignId => campaign.send(epom_field('id'))}, {})
 			assert_equal campaign.send(epom_field('id')), response['id']
 			assert_equal campaign.send(epom_field('name')), response['name']
 		end		
 	end
+
+	test 'method_missing' do
+		campaign = campaigns(:one)
+		assert campaign.advertiser_id, campaign.advertiserId
+	end
+
+	test 'belongs to advertiser' do
+		campaign = campaigns(:one)
+		advertiser = advertisers(:one)
+		campaign.advertiser = advertiser
+		# ensure epom id is setted
+		advertiser.save
+
+		assert Advertiser.find(campaign.advertiser_id), campaign.advertiser
+	end
+
 end

data/test/epom_rails/acts_as_placement_test.rb

@@ -11,7 +11,8 @@ class ActsAsPlacementTest < ActiveSupport::TestCase
 
 	test 'save an placement' do
 		unless EpomRails.config.offline
-			placement = placements(:one)	  	
+			placement = placements(:two)
+			placement.epom_id = nil
 
 	  	assert	placement.save
 	  	assert_instance_of Fixnum, placement.send(epom_field('id'))
@@ -33,7 +34,8 @@ class ActsAsPlacementTest < ActiveSupport::TestCase
 
 	test 'delete an placement' do
 		unless EpomRails.config.offline
-			placement = placements(:one)	  	
+			placement = placements(:two)
+			placement.epom_id = nil	  	
 
 	  	assert	placement.save
 	  	assert_instance_of Fixnum, placement.send(epom_field('id'))
@@ -45,7 +47,8 @@ class ActsAsPlacementTest < ActiveSupport::TestCase
 
 	test 'epom methods' do
 		unless EpomRails.config.offline
-			placement = placements(:one)	  	
+			placement = placements(:two)
+			placement.epom_id = nil	  	
 
 	  	assert	placement.save
 	  	assert_instance_of Fixnum, placement.send(epom_field('id'))

data/test/epom_rails/acts_as_site_test.rb

@@ -11,7 +11,8 @@ class ActsAsSiteTest < ActiveSupport::TestCase
 
 	test 'save an site' do
 		unless EpomRails.config.offline
-			site = publishers(:one)	  	
+			site = publishers(:two)
+			site.epom_id = nil	
 
 	  	assert	site.save
 	  	assert_instance_of Fixnum, site.send(epom_field('id'))
@@ -33,7 +34,8 @@ class ActsAsSiteTest < ActiveSupport::TestCase
 
 	test 'delete an site' do
 		unless EpomRails.config.offline
-			site = publishers(:one)	  	
+			site = publishers(:two)
+			site.epom_id = nil
 
 	  	assert	site.save
 	  	assert_instance_of Fixnum, site.send(epom_field('id'))
@@ -45,10 +47,11 @@ class ActsAsSiteTest < ActiveSupport::TestCase
 
 	test 'epom methods' do
 		unless EpomRails.config.offline
-			site = publishers(:one)	  	
+			site = publishers(:two)
+			site.epom_id = nil	
 
-		  	assert	site.save
-		  	assert_instance_of Fixnum, site.send(epom_field('id'))
+	  	assert	site.save
+	  	assert_instance_of Fixnum, site.send(epom_field('id'))
 
 			response = Publisher.get_sites_zones({:siteId => site.send(epom_field('id'))}, {})
 			assert_instance_of Array, response	

data/test/epom_rails/acts_as_zone_test.rb

@@ -11,7 +11,8 @@ class ActsAsZoneTest < ActiveSupport::TestCase
 
 	test 'save an zone' do
 		unless EpomRails.config.offline
-			zone = zones(:one)	  	
+			zone = zones(:two)
+			zone.epom_id = nil	  	
 
 	  	assert	zone.save
 	  	assert_instance_of Fixnum, zone.send(epom_field('id'))
@@ -23,7 +24,8 @@ class ActsAsZoneTest < ActiveSupport::TestCase
 
 	test 'delete an zone' do
 		unless EpomRails.config.offline
-			zone = zones(:one)	  	
+			zone = zones(:two)
+			zone.epom_id = nil		
 
 	  	assert	zone.save
 	  	assert_instance_of Fixnum, zone.send(epom_field('id'))
@@ -35,7 +37,8 @@ class ActsAsZoneTest < ActiveSupport::TestCase
 
 	test 'epom methods' do
 		unless EpomRails.config.offline
-			zone = zones(:one)	  	
+			zone = zones(:two)
+			zone.epom_id = nil	
 
 	  	assert	zone.save
 	  	assert_instance_of Fixnum, zone.send(epom_field('id'))
@@ -48,4 +51,14 @@ class ActsAsZoneTest < ActiveSupport::TestCase
 	test 'belongs_to config' do
 		assert [{:name => 'publisher', :epom_element => 'Site', :model => 'Publisher'}], EpomRails.config.zone[:belongs_to]
 	end
+
+	test 'belongs to publisher' do
+		zone = zones(:one)
+		publisher = publishers(:one)
+		zone.publisher = publisher
+		# ensure epom id is setted
+		publisher.save
+
+		assert Publisher.find(zone.publisher_id), zone.publisher
+	end
 end

data/test/test_helper.rb

@@ -43,12 +43,12 @@ EpomRails.configure do |config|
   config.advertiser[:has_many] = [{:name => 'campaigns', :epom_element => 'Campaign', :model => 'Campaign'}]
 
   config.campaign = {}
-  config.campaign[:fields] = {epom_id: 'id', name: 'name', description: 'description', advertiser_id: 'advertiserId', weight: 'weight'}
+  config.campaign[:fields] = {epom_id: 'id', name: 'name', description: 'description', weight: 'weight', 'advertiser.epom_id' => 'advertiserId'}
   config.campaign[:has_many] = [{:name => 'banners', :epom_element => 'Banner', :model => 'Banner'}]
   config.campaign[:belongs_to] = [{:name => 'advertiser', :epom_element => 'Advertiser', :model => 'Advertiser'}]
 
   config.banner = {}
-  config.banner[:fields] = {epom_id: 'id', placement_type: 'placementType', campaign_id: 'campaignId', weight: 'weight', image_banner_link: 'imageBannerLink', url: 'url', name: 'name', banner_type: 'bannerType', ad_unit_id: 'adUnitId', ad_unit_width: 'adUnitWidth', ad_unit_height: 'adUnitHeight'}
+  config.banner[:fields] = {epom_id: 'id', placement_type: 'placementType', 'campaign.epom_id' => 'campaignId', weight: 'weight', image_banner_link: 'imageBannerLink', url: 'url', name: 'name', banner_type: 'bannerType', ad_unit_id: 'adUnitId', ad_unit_width: 'adUnitWidth', ad_unit_height: 'adUnitHeight'}
   config.banner[:has_many] = [{:name => 'placements', :epom_element => 'Placement', :model => 'Placement'}]
   config.banner[:belongs_to] = [{:name => 'campaign', :epom_element => 'Campaign', :model => 'Campaign'}]
 
@@ -57,12 +57,15 @@ EpomRails.configure do |config|
   config.site[:has_many] = [{:name => 'zones', :epom_element => 'Zone', :model => 'Zone'}]
 
   config.zone = {}
-  config.zone[:fields] = {epom_id: 'id', name: 'name', description: 'description', site_id: 'siteId'}
+  config.zone[:fields] = {epom_id: 'id', name: 'name', description: 'description', 'publisher.epom_id' => 'siteId'}
   config.zone[:has_many] = [{:name => 'placements', :epom_element => 'Placement', :model => 'Placement'}]
-  config.zone[:belongs_to] = [{:name => 'site', :epom_element => 'Site', :model => 'Site'}]
+  config.zone[:belongs_to] = [{:name => 'publisher', :epom_element => 'Site', :model => 'Publisher'}]
 
   config.placement = {}
-  config.placement[:fields] = {epom_id: 'id', zone_id: 'zoneId', placement_type: 'type', name: 'name', ad_unit_id: 'adUnitId', size_height: 'size.height', size_width: 'size.width'}
+  config.placement[:fields] = {epom_id: 'id', 'zone.epom_id' => 'zoneId', placement_type: 'type', name: 'name', ad_unit_id: 'adUnitId', size_height: 'size.height', size_width: 'size.width'}
   config.placement[:has_many] = [{:name => 'banners', :epom_element => 'Banner', :model => 'Banner'}]
   config.placement[:belongs_to] = [{:name => 'zone', :epom_element => 'Zone', :model => 'Zone'}]
+
+  config.analytic = {}
+  config.analytic[:fields] = {date: "Date", hour: "Hour", advertiser: "Advertiser", advertiser_id: "Advertiser ID", campaign: "Campaign", campaign_id: "Campaign ID", banner: "Banner", banner_id: "Banner ID", site: "Site", site_id: "Site ID", zone: "Zone", zone_id: "Zone ID", placement: "Placement", placement_id: "Placement ID", channel: "Channel", country: "Country", impressions: "Impressions", clicks: "Clicks", ctr: "CTR", conversions: "Conversions", i2c: "I2C", ccr: "CCR", net: "Net", gross: "Gross", profit: "Profit", ecpm_net: "eCPM Net", ecpm_gross: "eCPM Gross", ecpm_profit: "eCPM Profit", status: "Status"}
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epom_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Adrian Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,16 @@ dependencies:
   name: epom
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -65,6 +65,7 @@ files:
 - lib/epom_rails.rb
 - lib/epom_rails/acts_as.rb
 - lib/epom_rails/acts_as_advertiser.rb
+- lib/epom_rails/acts_as_analytic.rb
 - lib/epom_rails/acts_as_banner.rb
 - lib/epom_rails/acts_as_campaign.rb
 - lib/epom_rails/acts_as_placement.rb
@@ -79,6 +80,7 @@ files:
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/advertisers.js
+- test/dummy/app/assets/javascripts/analytics.js
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/javascripts/banners.js
 - test/dummy/app/assets/javascripts/campaigns.js
@@ -86,6 +88,7 @@ files:
 - test/dummy/app/assets/javascripts/publishers.js
 - test/dummy/app/assets/javascripts/zones.js
 - test/dummy/app/assets/stylesheets/advertisers.css
+- test/dummy/app/assets/stylesheets/analytics.css
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/stylesheets/banners.css
 - test/dummy/app/assets/stylesheets/campaigns.css
@@ -94,6 +97,7 @@ files:
 - test/dummy/app/assets/stylesheets/scaffold.css
 - test/dummy/app/assets/stylesheets/zones.css
 - test/dummy/app/controllers/advertisers_controller.rb
+- test/dummy/app/controllers/analytics_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/banners_controller.rb
 - test/dummy/app/controllers/campaigns_controller.rb
@@ -101,6 +105,7 @@ files:
 - test/dummy/app/controllers/publishers_controller.rb
 - test/dummy/app/controllers/zones_controller.rb
 - test/dummy/app/helpers/advertisers_helper.rb
+- test/dummy/app/helpers/analytics_helper.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/banners_helper.rb
 - test/dummy/app/helpers/campaigns_helper.rb
@@ -108,6 +113,7 @@ files:
 - test/dummy/app/helpers/publishers_helper.rb
 - test/dummy/app/helpers/zones_helper.rb
 - test/dummy/app/models/advertiser.rb
+- test/dummy/app/models/analytic.rb
 - test/dummy/app/models/banner.rb
 - test/dummy/app/models/campaign.rb
 - test/dummy/app/models/placement.rb
@@ -118,6 +124,11 @@ files:
 - test/dummy/app/views/advertisers/index.html.erb
 - test/dummy/app/views/advertisers/new.html.erb
 - test/dummy/app/views/advertisers/show.html.erb
+- test/dummy/app/views/analytics/_form.html.erb
+- test/dummy/app/views/analytics/edit.html.erb
+- test/dummy/app/views/analytics/index.html.erb
+- test/dummy/app/views/analytics/new.html.erb
+- test/dummy/app/views/analytics/show.html.erb
 - test/dummy/app/views/banners/_form.html.erb
 - test/dummy/app/views/banners/edit.html.erb
 - test/dummy/app/views/banners/index.html.erb
@@ -172,33 +183,38 @@ files:
 - test/dummy/db/migrate/20150608194916_create_campaigns.rb
 - test/dummy/db/migrate/20150608195747_add_epom_id_to_campaigns.rb
 - test/dummy/db/migrate/20150609175407_create_banners.rb
-- test/dummy/db/migrate/20150622160449_create_zones.rb
 - test/dummy/db/migrate/20150622181754_create_placements.rb
 - test/dummy/db/migrate/20150731161340_create_publishers.rb
+- test/dummy/db/migrate/20150803195716_create_zones.rb
+- test/dummy/db/migrate/20150821041145_create_analytics.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/test/controllers/advertisers_controller_test.rb
+- test/dummy/test/controllers/analytics_controller_test.rb
 - test/dummy/test/controllers/banners_controller_test.rb
 - test/dummy/test/controllers/campaigns_controller_test.rb
 - test/dummy/test/controllers/placements_controller_test.rb
 - test/dummy/test/controllers/publishers_controller_test.rb
 - test/dummy/test/controllers/zones_controller_test.rb
 - test/dummy/test/fixtures/advertisers.yml
+- test/dummy/test/fixtures/analytics.yml
 - test/dummy/test/fixtures/banners.yml
 - test/dummy/test/fixtures/campaigns.yml
 - test/dummy/test/fixtures/placements.yml
 - test/dummy/test/fixtures/publishers.yml
 - test/dummy/test/fixtures/zones.yml
 - test/dummy/test/models/advertiser_test.rb
+- test/dummy/test/models/analytic_test.rb
 - test/dummy/test/models/banner_test.rb
 - test/dummy/test/models/campaign_test.rb
 - test/dummy/test/models/placement_test.rb
 - test/dummy/test/models/publisher_test.rb
 - test/dummy/test/models/zone_test.rb
 - test/epom_rails/acts_as_advertiser_test.rb
+- test/epom_rails/acts_as_analytic_test.rb
 - test/epom_rails/acts_as_banner_test.rb
 - test/epom_rails/acts_as_campaign_test.rb
 - test/epom_rails/acts_as_placement_test.rb
@@ -238,10 +254,12 @@ test_files:
 - test/epom_rails/acts_as_placement_test.rb
 - test/epom_rails/acts_as_campaign_test.rb
 - test/epom_rails/acts_as_banner_test.rb
+- test/epom_rails/acts_as_analytic_test.rb
 - test/epom_rails/acts_as_advertiser_test.rb
 - test/dummy/config.ru
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
+- test/dummy/test/models/analytic_test.rb
 - test/dummy/test/models/zone_test.rb
 - test/dummy/test/models/publisher_test.rb
 - test/dummy/test/models/placement_test.rb
@@ -253,28 +271,31 @@ test_files:
 - test/dummy/test/fixtures/placements.yml
 - test/dummy/test/fixtures/campaigns.yml
 - test/dummy/test/fixtures/banners.yml
+- test/dummy/test/fixtures/analytics.yml
 - test/dummy/test/fixtures/advertisers.yml
 - test/dummy/test/controllers/zones_controller_test.rb
 - test/dummy/test/controllers/publishers_controller_test.rb
 - test/dummy/test/controllers/placements_controller_test.rb
 - test/dummy/test/controllers/campaigns_controller_test.rb
 - test/dummy/test/controllers/banners_controller_test.rb
+- test/dummy/test/controllers/analytics_controller_test.rb
 - test/dummy/test/controllers/advertisers_controller_test.rb
 - test/dummy/public/favicon.ico
 - test/dummy/public/500.html
 - test/dummy/public/422.html
 - test/dummy/public/404.html
 - test/dummy/db/schema.rb
+- test/dummy/db/migrate/20150821041145_create_analytics.rb
+- test/dummy/db/migrate/20150803195716_create_zones.rb
 - test/dummy/db/migrate/20150731161340_create_publishers.rb
 - test/dummy/db/migrate/20150622181754_create_placements.rb
-- test/dummy/db/migrate/20150622160449_create_zones.rb
 - test/dummy/db/migrate/20150609175407_create_banners.rb
 - test/dummy/db/migrate/20150608195747_add_epom_id_to_campaigns.rb
 - test/dummy/db/migrate/20150608194916_create_campaigns.rb
 - test/dummy/db/migrate/20150604125603_add_epom_id_to_advertiser.rb
 - test/dummy/db/migrate/20150603151041_create_advertisers.rb
-- test/dummy/config/secrets.yml
 - test/dummy/config/routes.rb
+- test/dummy/config/secrets.yml
 - test/dummy/config/environment.rb
 - test/dummy/config/database.yml
 - test/dummy/config/boot.rb
@@ -295,11 +316,16 @@ test_files:
 - test/dummy/bin/rake
 - test/dummy/bin/rails
 - test/dummy/bin/bundle
+- test/dummy/app/views/analytics/show.html.erb
+- test/dummy/app/views/analytics/new.html.erb
+- test/dummy/app/views/analytics/index.html.erb
+- test/dummy/app/views/analytics/edit.html.erb
+- test/dummy/app/views/analytics/_form.html.erb
 - test/dummy/app/views/zones/show.html.erb
-- test/dummy/app/views/zones/new.html.erb
 - test/dummy/app/views/zones/index.html.erb
-- test/dummy/app/views/zones/edit.html.erb
 - test/dummy/app/views/zones/_form.html.erb
+- test/dummy/app/views/zones/new.html.erb
+- test/dummy/app/views/zones/edit.html.erb
 - test/dummy/app/views/publishers/show.html.erb
 - test/dummy/app/views/publishers/new.html.erb
 - test/dummy/app/views/publishers/index.html.erb
@@ -331,7 +357,9 @@ test_files:
 - test/dummy/app/models/placement.rb
 - test/dummy/app/models/campaign.rb
 - test/dummy/app/models/banner.rb
+- test/dummy/app/models/analytic.rb
 - test/dummy/app/models/advertiser.rb
+- test/dummy/app/helpers/analytics_helper.rb
 - test/dummy/app/helpers/zones_helper.rb
 - test/dummy/app/helpers/publishers_helper.rb
 - test/dummy/app/helpers/placements_helper.rb
@@ -340,12 +368,14 @@ test_files:
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/advertisers_helper.rb
 - test/dummy/app/controllers/zones_controller.rb
+- test/dummy/app/controllers/analytics_controller.rb
 - test/dummy/app/controllers/publishers_controller.rb
 - test/dummy/app/controllers/placements_controller.rb
 - test/dummy/app/controllers/campaigns_controller.rb
 - test/dummy/app/controllers/banners_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/advertisers_controller.rb
+- test/dummy/app/assets/stylesheets/analytics.css
 - test/dummy/app/assets/stylesheets/zones.css
 - test/dummy/app/assets/stylesheets/scaffold.css
 - test/dummy/app/assets/stylesheets/publishers.css
@@ -354,6 +384,7 @@ test_files:
 - test/dummy/app/assets/stylesheets/banners.css
 - test/dummy/app/assets/stylesheets/application.css
 - test/dummy/app/assets/stylesheets/advertisers.css
+- test/dummy/app/assets/javascripts/analytics.js
 - test/dummy/app/assets/javascripts/zones.js
 - test/dummy/app/assets/javascripts/publishers.js
 - test/dummy/app/assets/javascripts/placements.js