epom_rails 1.3.2 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8477a4424a385f16a87257167587ec38126d35e
-  data.tar.gz: 4832ff15f4f780afd3cf64582ee06ec457c89c92
+  metadata.gz: 4308159e730d6ae58a3f618044c7a10753c1ef2c
+  data.tar.gz: 27350447fbc8f632fd3c98aa5df0d23c104a93f1
 SHA512:
-  metadata.gz: c369bfaebe40a96f527f6753875c4e960a8621a5e32643b46b2c6ba0094f0c3a38a12b86e12e0017ae7cb490e4b0ee595291e90e920503a707a666cd1cfaa988
-  data.tar.gz: a7c14a9c460452566fb512649a48a36b31343010572dee2da6b8f10b497cac4c590e1e274fdf74423cdcee8315e9afcfaa25fb1fcdccec1f57fa60e70e79b8e4
+  metadata.gz: 2534bf04d8756a7aea004916c841cfa051b282903510beb301eef246290b87f86c1e7d020d94b91151a6ea28e7249233a0b460fe9be4f1e0d8050b08e17adbcb
+  data.tar.gz: 2bb8a6e3344ce600dce39bb6a6bf1e42b0a8e026cb8a37a2f4348b109e0aa761aa6f69b461b240079b8c449e4369a25758eb2cb1b76e7bcf09e0fac759013a8b

data/lib/epom_rails/acts_as.rb

@@ -1,36 +1,12 @@
 class ActiveRecord::Base 
 
-  def method_missing(method_name, *args)
-    fields = self.class.get_config[:fields]
-
-    # shortcut for epom fields, instead of self.send(fields.key(epom_field))
-    # use self.send(epom_field)
-    if fields.values.include?(method_name.to_s)
-      real_method = fields.key(method_name.to_s)
-      return self.send(real_method)
-    # when self.send('advertiser.epom_id')
-    elsif method_name.to_s.include?('.')
-      methods = method_name.to_s.split('.')
-      target = self
-      methods.each do |method|
-        if method == methods.last
-          target = target.send(method, *args)
-        else
-          target = target.send(method)
-        end
-      end  
-      return target
-    else
-      super
-    end
-  end 
-
   private
 
   def self.acts_as(klass, params)
     extend EpomRails
     
     override_config(klass, params)
+    define_method_missing
     define_before_save(klass)
     define_before_destroy(klass)
   end
@@ -48,8 +24,35 @@ class ActiveRecord::Base
   def self.override_config(klass, params)
     config = get_config
     config[:fields] = params[:fields] if params[:fields]
-    config[:has_many] = params[:has_many] if params[:has_many]
-    config[:belongs_to] = params[:belongs_to] if params[:belongs_to]
+  end
+
+  def self.define_method_missing
+    self.class_eval do
+      def method_missing(method_name, *args)
+        fields = self.class.get_config[:fields]
+
+        # shortcut for epom fields, instead of self.send(fields.key(epom_field))
+        # use self.send(epom_field)
+        if fields.values.include?(method_name.to_s)
+          real_method = fields.key(method_name.to_s)
+          return self.send(real_method)
+        # when self.send('advertiser.epom_id')
+        elsif method_name.to_s.include?('.')
+          methods = method_name.to_s.split('.')
+          target = self
+          methods.each do |method|
+            if method == methods.last
+              target = target.send(method, *args)
+            else
+              target = target.send(method)
+            end
+          end  
+          return target
+        else
+          super
+        end
+      end 
+    end
   end
 
   def self.define_before_save(klass)

data/lib/epom_rails/acts_as_advertiser.rb

@@ -3,30 +3,6 @@ class ActiveRecord::Base
   def self.acts_as_advertiser(params = {})
     EpomRails.config.advertiser[:model] = self
     acts_as(Epom::Advertiser, params)
-
-    define_before_add_and_before_remove_for_campaigns
-  end
-
-  def self.define_before_add_and_before_remove_for_campaigns
-  	campaigns_association = EpomRails.config.advertiser[:has_many].find{|a| a[:epom_element]=="Campaign"}
-  	
-    if campaigns_association      
-			before_add_for_campaigns << proc do |callback, advertiser, campaign| 
-				puts callback
-        if campaign.advertiser_id and advertiser.id != campaign.advertiser_id
-          # remove in Epom this campaign from his older advertiser
-          Advertiser.find(campaign.advertiser_id).campaigns.delete(campaign)
-        end
-			end
-      before_remove_for_campaigns << proc do |callback, advertiser, campaign| 
-        puts callback
-        fields = EpomRails.config.campaign[:fields]
-        # delete this campaign in Epom
-        Campaign.delete_campaign({campaignId: campaign.send(fields.key('id'))})
-        # set nil epom_id field for this campaign
-        campaign.send "#{fields.key('id')}=", nil
-      end
-    end  
   end
-
+  
 end

data/lib/epom_rails/acts_as_analytic.rb

@@ -18,14 +18,13 @@ class ActiveRecord::Base
           :groupBy => 'ADVERTISER,CAMPAIGN,BANNER,SITE,ZONE,PLACEMENT,CHANNEL,COUNTRY',
           :groupRange => 'DAY',
         }
-        analytics = JSON.parse(self.analytics(default.merge(params)))
-        # analytics = [{"Date"=>"01/08/2015", "Advertiser"=>"Praneet Shrivastava", "Advertiser ID"=>"911", "Campaign"=>"Camoaign by Praneet", "Campaign ID"=>"1409", "Banner"=>"Banner1", "Banner ID"=>"2364", "Site"=>"CN Beauty", "Site ID"=>"687", "Zone"=>"Zone Malaysia", "Zone ID"=>"762", "Placement"=>"CN Beauty site", "Placement ID"=>"1308", "Channel"=>"", "Country"=>"Malaysia", "Impressions"=>"642", "Clicks"=>"0", "CTR"=>"0.0000%", "Conversions"=>"0", "I2C"=>"0.0000%", "CCR"=>"0.0000%", "Net"=>"0.000", "Gross"=>"0.000", "Profit"=>"0.000", "eCPM Net"=>"0.000", "eCPM Gross"=>"0.000", "eCPM Profit"=>"0.000", "Status"=>"Preliminary confirmed"}, {"Date"=>"01/08/2015", "Advertiser"=>"Praneet Shrivastava", "Advertiser ID"=>"911", "Campaign"=>"Camoaign by Praneet", "Campaign ID"=>"1409", "Banner"=>"Banner1", "Banner ID"=>"2364", "Site"=>"CN Beauty", "Site ID"=>"687", "Zone"=>"Zone Malaysia", "Zone ID"=>"762", "Placement"=>"CN Beauty site", "Placement ID"=>"1308", "Channel"=>"", "Country"=>"Indonesia", "Impressions"=>"33", "Clicks"=>"0", "CTR"=>"0.0000%", "Conversions"=>"0", "I2C"=>"0.0000%", "CCR"=>"0.0000%", "Net"=>"0.000", "Gross"=>"0.000", "Profit"=>"0.000", "eCPM Net"=>"0.000", "eCPM Gross"=>"0.000", "eCPM Profit"=>"0.000", "Status"=>"Preliminary confirmed"}, {"Date"=>"01/08/2015", "Advertiser"=>"Praneet Shrivastava", "Advertiser ID"=>"911", "Campaign"=>"Camoaign by Praneet", "Campaign ID"=>"1409", "Banner"=>"Banner1", "Banner ID"=>"2364", "Site"=>"CN Beauty", "Site ID"=>"687", "Zone"=>"Zone Malaysia", "Zone ID"=>"762", "Placement"=>"CN Beauty site", "Placement ID"=>"1308", "Channel"=>"", "Country"=>"Brunei Darussalam", "Impressions"=>"31", "Clicks"=>"0", "CTR"=>"0.0000%", "Conversions"=>"0", "I2C"=>"0.0000%", "CCR"=>"0.0000%", "Net"=>"0.000", "Gross"=>"0.000", "Profit"=>"0.000", "eCPM Net"=>"0.000", "eCPM Gross"=>"0.000", "eCPM Profit"=>"0.000", "Status"=>"Preliminary confirmed"}, {"Date"=>"01/08/2015", "Advertiser"=>"Praneet Shrivastava", "Advertiser ID"=>"911", "Campaign"=>"Camoaign by Praneet", "Campaign ID"=>"1409", "Banner"=>"Banner1", "Banner ID"=>"2364", "Site"=>"CN Beauty", "Site ID"=>"687", "Zone"=>"Zone Malaysia", "Zone ID"=>"762", "Placement"=>"CN Beauty site", "Placement ID"=>"1308", "Channel"=>"", "Country"=>"Singapore", "Impressions"=>"31", "Clicks"=>"0", "CTR"=>"0.0000%", "Conversions"=>"0", "I2C"=>"0.0000%", "CCR"=>"0.0000%", "Net"=>"0.000", "Gross"=>"0.000", "Profit"=>"0.000", "eCPM Net"=>"0.000", "eCPM Gross"=>"0.000", "eCPM Profit"=>"0.000", "Status"=>"Preliminary confirmed"}, {"Date"=>"01/08/2015", "Advertiser"=>"NetUy", "Advertiser ID"=>"1253", "Campaign"=>"Netuy Envios de Titulares Matinales Campaña 2015", "Campaign ID"=>"1661", "Banner"=>"NetUy envíos", "Banner ID"=>"2598", "Site"=>"El Observador", "Site ID"=>"1059", "Zone"=>"Newsletters", "Zone ID"=>"1211", "Placement"=>"Titulares_Matinal_Cabezal", "Placement ID"=>"1704", "Channel"=>"", "Country"=>"Uruguay", "Impressions"=>"8", "Clicks"=>"0", "CTR"=>"0.0000%", "Conversions"=>"0", "I2C"=>"0.0000%", "CCR"=>"0.0000%", "Net"=>"0.000", "Gross"=>"0.000", "Profit"=>"0.000", "eCPM Net"=>"0.000", "eCPM Gross"=>"0.000", "eCPM Profit"=>"0.000", "Status"=>"Preliminary confirmed"}]
+        analytics = JSON.parse(Epom::Analytic.analytics(default.merge(params)))
         fields = get_config[:fields]
         analytics.map do |analytic|
           data = {}
           fields.map {|key, value| data[key] = analytic[value]}
           data[:date] = Date.parse(data[:date]) if data[:date].is_a?(String)
-          Analytic.new(data)
+          self.new(data)
         end
       end
     end

data/lib/epom_rails/acts_as_campaign.rb

@@ -3,25 +3,6 @@ class ActiveRecord::Base
   def self.acts_as_campaign(params = {})
   	EpomRails.config.campaign[:model] = self
     acts_as(Epom::Campaign, params)
-
-    override_belongs_to_advertiser
-  end
-
-  def self.override_belongs_to_advertiser
-  	advertiser_association = EpomRails.config.campaign[:belongs_to].find{|a| a[:epom_element]=="Advertiser"}
-  	
-    if advertiser_association
-      # overriding belongs_to: advertiser
-    	define_method advertiser_association[:name] do
-    		fields = EpomRails.config.campaign[:fields]
-    		object = super()
-
-    		if object.respond_to?(fields.key('id')) and object.send(fields.key('id'))
-          # here, retrieve this advertiser from Epom
-        end
-        object
-    	end
-    end  
   end
 
 end  

data/lib/epom_rails/acts_as_zone.rb

@@ -3,25 +3,6 @@ class ActiveRecord::Base
   def self.acts_as_zone(params = {})
   	EpomRails.config.zone[:model] = self
     acts_as(Epom::Zone, params)
-
-    override_belongs_to_zone
-  end
-
-  def self.override_belongs_to_zone
-  	site_association = EpomRails.config.zone[:belongs_to].find{|a| a[:epom_element]=="Site"}
-  	
-  	if site_association
-	    # overriding belongs_to: site
-	  	define_method site_association[:name] do
-	  		fields = EpomRails.config.zone[:fields]
-	  		object = super()
-
-	  		if object.respond_to?(fields.key('id')) and object.send(fields.key('id'))
-	        # here, retrieve this site from Epom
-	      end
-        object
-	  	end
-	  end	
   end
 
 end

data/lib/epom_rails/version.rb

@@ -1,3 +1,3 @@
 module EpomRails
-  VERSION = "1.3.2"
+  VERSION = "1.3.5"
 end

data/lib/generators/epom_rails/config/templates/epom_rails.rb

@@ -3,31 +3,21 @@ EpomRails.configure do |config|
 
   config.advertiser = {}
   config.advertiser[:fields] = {epom_id: 'id', name: 'name', contact_name: 'contactName', contact_email: 'contactEmail', description: 'description'}
-  config.advertiser[:has_many] = [{:name => 'campaigns', :epom_element => 'Campaign', :model => 'Campaign'}]
 
   config.campaign = {}
   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.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'}]
 
   config.site = {}
   config.site[:fields] = {epom_id: 'id', name: 'name', url: 'url', description: 'description', email: 'email', category_id: 'categoryId'}
-  config.site[:has_many] = [{:name => 'zones', :epom_element => 'Zone', :model => 'Zone'}]
 
   config.zone = {}
   config.zone[:fields] = {epom_id: 'id', name: 'name', description: 'description', 'site.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.placement = {}
   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"}

data/test/dummy/app/models/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/test/dummy/db/migrate/20150927121727_create_users.rb

@@ -0,0 +1,9 @@
+class CreateUsers < ActiveRecord::Migration
+  def change
+    create_table :users do |t|
+      t.string :name
+
+      t.timestamps null: false
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150821041145) do
+ActiveRecord::Schema.define(version: 20150927121727) do
 
   create_table "advertisers", force: :cascade do |t|
     t.string   "name"
@@ -106,6 +106,12 @@ ActiveRecord::Schema.define(version: 20150821041145) do
     t.datetime "updated_at",  null: false
   end
 
+  create_table "users", force: :cascade do |t|
+    t.string   "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
   create_table "zones", force: :cascade do |t|
     t.integer  "epom_id"
     t.string   "name"

data/test/dummy/test/fixtures/banners.yml

@@ -24,5 +24,4 @@ two:
   ad_unit_id: 10
   ad_unit_width: 164
   ad_unit_height: 182
-  campaign: two
-  epom_id: 2
+  campaign: two

data/test/dummy/test/fixtures/users.yml

@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+  name: MyString
+
+two:
+  name: MyString

data/test/dummy/test/models/user_test.rb

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

data/test/epom_rails/acts_as_advertiser_test.rb

@@ -5,16 +5,6 @@ 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
 	end
@@ -79,46 +69,4 @@ class ActsAsAdvertiserTest < ActiveSupport::TestCase
 		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

@@ -2,8 +2,10 @@ 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
+		unless EpomRails.config.offline
+			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
 end

data/test/epom_rails/acts_as_banner_test.rb

@@ -23,12 +23,10 @@ class ActsAsBannerTest < ActiveSupport::TestCase
 		unless EpomRails.config.offline
 			banner = banners(:two)
 			banner.epom_id = nil
-			banner.save
 
 	  	assert	banner.save
 	  	assert_instance_of Fixnum, banner.send(epom_field('id'))
 
-	  	epom_id = banner.send(epom_field('id'))
 	  	assert banner.destroy
 	  end
 	end

data/test/epom_rails/acts_as_campaign_test.rb

@@ -51,14 +51,4 @@ class ActsAsCampaignTest < ActiveSupport::TestCase
 		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_zone_test.rb

@@ -48,17 +48,4 @@ class ActsAsZoneTest < ActiveSupport::TestCase
 		end
 	end
 
-	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

@@ -40,31 +40,21 @@ EpomRails.configure do |config|
 
   config.advertiser = {}
   config.advertiser[:fields] = {epom_id: 'id', name: 'name', contact_name: 'contactName', contact_email: 'contactEmail', description: 'description'}
-  config.advertiser[:has_many] = [{:name => 'campaigns', :epom_element => 'Campaign', :model => 'Campaign'}]
 
   config.campaign = {}
   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.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'}]
 
   config.site = {}
   config.site[:fields] = {epom_id: 'id', name: 'name', url: 'url', description: 'description', email: 'email', category_id: 'categoryId'}
-  config.site[:has_many] = [{:name => 'zones', :epom_element => 'Zone', :model => 'Zone'}]
 
   config.zone = {}
   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 => 'publisher', :epom_element => 'Site', :model => 'Publisher'}]
 
   config.placement = {}
   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"}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epom_rails
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.5
 platform: ruby
 authors:
 - Adrian Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,6 +118,7 @@ files:
 - test/dummy/app/models/campaign.rb
 - test/dummy/app/models/placement.rb
 - test/dummy/app/models/publisher.rb
+- test/dummy/app/models/user.rb
 - test/dummy/app/models/zone.rb
 - test/dummy/app/views/advertisers/_form.html.erb
 - test/dummy/app/views/advertisers/edit.html.erb
@@ -187,6 +188,7 @@ files:
 - 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/migrate/20150927121727_create_users.rb
 - test/dummy/db/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -205,6 +207,7 @@ files:
 - test/dummy/test/fixtures/campaigns.yml
 - test/dummy/test/fixtures/placements.yml
 - test/dummy/test/fixtures/publishers.yml
+- test/dummy/test/fixtures/users.yml
 - test/dummy/test/fixtures/zones.yml
 - test/dummy/test/models/advertiser_test.rb
 - test/dummy/test/models/analytic_test.rb
@@ -212,6 +215,7 @@ files:
 - 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/user_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
@@ -259,14 +263,16 @@ test_files:
 - 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/user_test.rb
 - test/dummy/test/models/publisher_test.rb
 - test/dummy/test/models/placement_test.rb
 - test/dummy/test/models/campaign_test.rb
 - test/dummy/test/models/banner_test.rb
+- test/dummy/test/models/analytic_test.rb
 - test/dummy/test/models/advertiser_test.rb
 - test/dummy/test/fixtures/zones.yml
+- test/dummy/test/fixtures/users.yml
 - test/dummy/test/fixtures/publishers.yml
 - test/dummy/test/fixtures/placements.yml
 - test/dummy/test/fixtures/campaigns.yml
@@ -285,6 +291,7 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/404.html
 - test/dummy/db/schema.rb
+- test/dummy/db/migrate/20150927121727_create_users.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
@@ -294,8 +301,8 @@ test_files:
 - 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/routes.rb
 - test/dummy/config/secrets.yml
+- test/dummy/config/routes.rb
 - test/dummy/config/environment.rb
 - test/dummy/config/database.yml
 - test/dummy/config/boot.rb
@@ -316,16 +323,11 @@ 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/index.html.erb
-- test/dummy/app/views/zones/_form.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/publishers/show.html.erb
 - test/dummy/app/views/publishers/new.html.erb
 - test/dummy/app/views/publishers/index.html.erb
@@ -347,35 +349,40 @@ test_files:
 - test/dummy/app/views/banners/index.html.erb
 - test/dummy/app/views/banners/edit.html.erb
 - test/dummy/app/views/banners/_form.html.erb
+- 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/advertisers/show.html.erb
 - test/dummy/app/views/advertisers/new.html.erb
 - test/dummy/app/views/advertisers/index.html.erb
 - test/dummy/app/views/advertisers/edit.html.erb
 - test/dummy/app/views/advertisers/_form.html.erb
 - test/dummy/app/models/zone.rb
+- test/dummy/app/models/user.rb
 - test/dummy/app/models/publisher.rb
 - 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
 - test/dummy/app/helpers/campaigns_helper.rb
 - test/dummy/app/helpers/banners_helper.rb
 - test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/helpers/analytics_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/analytics_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
@@ -383,12 +390,13 @@ test_files:
 - test/dummy/app/assets/stylesheets/campaigns.css
 - test/dummy/app/assets/stylesheets/banners.css
 - test/dummy/app/assets/stylesheets/application.css
+- test/dummy/app/assets/stylesheets/analytics.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
 - test/dummy/app/assets/javascripts/campaigns.js
 - test/dummy/app/assets/javascripts/banners.js
 - test/dummy/app/assets/javascripts/application.js
+- test/dummy/app/assets/javascripts/analytics.js
 - test/dummy/app/assets/javascripts/advertisers.js