epom_rails 0.4.9 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9487c632ee64b76623635a73c7ea0fa1ebc24142
-  data.tar.gz: 91b9485e01854440b99cbe9f7a029588f58ec1c6
+  metadata.gz: 4962f4fd1ba3541d9bef5d8636abd40adf73b026
+  data.tar.gz: f3357980470748efd86a47a01433253fe263cc86
 SHA512:
-  metadata.gz: ce6449077d706236c930d7566723159184ce90c42ff81ead03d8dfa94e8432f0afd8f63f1ed4ce4861640a442a7062f40994244ceabc02257bc0e7fe64ef01d4
-  data.tar.gz: 44efb423e734bd84f3f4ba87585af8bdfff2f5c9a70f59f24095315d77e3b9e284f031de862d3dd16d363cbb89c5cc87de4db455ff522a96c620f6770413085f
+  metadata.gz: c7ad76795810c969c0bfd976c0e8b4a1a6742f08f400f9ad6e29a97865322ed7b4454e3a34d3bda7125df6ef899172a0488cdf4d32a071002023dad3f2754de1
+  data.tar.gz: 7034623022877440f796d849336c92d1caf17d780e298d669000525dbe63c344532bdbe9f91eebb7c602534f49fe501d5e0eb593765705c479dffd8c3cd60699

data/lib/epom_rails/acts_as.rb

@@ -1,48 +1,38 @@
 class ActiveRecord::Base 
 
-  def self.acts_as_advertiser(fields = {})
-    acts_as(Epom::Advertiser, fields)
-  end
-
-  def self.acts_as_campaign(fields = {})
-    acts_as(Epom::Campaign, fields)
-  end
+  private
 
-  def self.acts_as_banner(fields = {})
-    acts_as(Epom::Banner, fields)
+  def self.acts_as(klass, params)
+    extend EpomRails
+    
+    override_config(klass, params)
+    define_before_save(klass)
+    define_before_destroy(klass)
   end
 
-  def self.acts_as_site(fields = {})
-    acts_as(Epom::Site, fields)
+  def self.get_klass_name(klass)
+    klass.name.include?('::') ? klass.name.split('::').last : klass.name
   end
 
-  def self.acts_as_zone(fields = {})
-    acts_as(Epom::Zone, fields)
+  def self.get_config(klass)
+    klass_name = get_klass_name(klass)
+    EpomRails.config.send(klass_name.downcase)
   end
 
-  def self.acts_as_placement(fields = {})
-    acts_as(Epom::Placement, fields)
+  def self.override_config(klass, params)
+    fields ||= {}
+    config = get_config(klass)
+    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
 
-  private
-
-  def self.acts_as(klass, fields = {})
-    extend EpomRails
-
-    self.epom_klass = klass
-    self.epom_fields = fields
-    
-    define_before_save
-    define_before_destroy
-  end
-
-  def self.define_before_save
+  def self.define_before_save(klass)
     unless EpomRails.config.offline
-    	klass = self.epom_klass
-    	fields = self.epom_fields
-    	before_save do 
-    		klass_name = klass.name.include?('::') ? klass.name.split('::').last : klass.name
+    	klass_name = get_klass_name(klass)
+    	fields = get_config(klass)[:fields]
 
+    	before_save do 
         method = if self.send fields.key('id') then "update_#{klass_name.downcase}" else "create_#{klass_name.downcase}" end
         
         url_params = {}
@@ -68,7 +58,7 @@ class ActiveRecord::Base
         epom_response = klass.send method, url_params, body_params
     		
         unless self.send fields.key('id')
-    			# save id value returned from Epom in an Advertiser column
+    			# save id value returned from Epom
     			self.send "#{fields.key('id')}=", epom_response['id']
     		end
     		epom_response['success']
@@ -76,13 +66,12 @@ class ActiveRecord::Base
     end  
   end
 
-  def self.define_before_destroy
+  def self.define_before_destroy(klass)
     unless EpomRails.config.offline
-      klass = self.epom_klass
-      fields = self.epom_fields
+      klass_name = get_klass_name(klass)
+      fields = get_config(klass)[:fields]
       before_destroy do
-        if self.send fields.key('id')
-          klass_name = klass.name.include?('::') ? klass.name.split('::').last : klass.name
+        if self.send fields.key('id')          
           epom_response = klass.send "delete_#{klass_name.downcase}", {"#{klass_name.downcase}Id" => self.send(fields.key('id'))}, {}
           epom_response['success'] if epom_response
         end

data/lib/epom_rails/acts_as_advertiser.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base 
+
+  def self.acts_as_advertiser(params = {})
+    EpomRails.config.advertiser[:model] = self
+    acts_as(Epom::Advertiser, params)
+  end
+
+end

data/lib/epom_rails/acts_as_banner.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base 
+
+  def self.acts_as_banner(params = {})
+  	EpomRails.config.banner[:model] = self
+    acts_as(Epom::Banner, params)
+  end
+
+end

data/lib/epom_rails/acts_as_campaign.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base 
+
+  def self.acts_as_campaign(params = {})
+  	EpomRails.config.campaign[:model] = self
+    acts_as(Epom::Campaign, params)
+  end
+
+end

data/lib/epom_rails/acts_as_placement.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base 
+
+  def self.acts_as_placement(params = {})
+  	EpomRails.config.placement[:model] = self
+    acts_as(Epom::Placement, params)
+  end
+
+end

data/lib/epom_rails/acts_as_site.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base 
+
+  def self.acts_as_site(params = {})
+  	EpomRails.config.site[:model] = self
+    acts_as(Epom::Site, params)
+  end
+
+end

data/lib/epom_rails/acts_as_zone.rb

@@ -0,0 +1,8 @@
+class ActiveRecord::Base 
+
+  def self.acts_as_zone(params = {})
+  	EpomRails.config.zone[:model] = self
+    acts_as(Epom::Zone, params)
+  end
+
+end

data/lib/epom_rails/config.rb

@@ -17,7 +17,7 @@ module EpomRails
   # need a Class for 3.0
   class Configuration #:nodoc:
     include ActiveSupport::Configurable
-    config_accessor :offline
+    config_accessor :offline, :advertiser, :campaign, :banner, :site, :zone, :placement
 
     def param_name
       config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name
@@ -32,5 +32,33 @@ module EpomRails
   # this is ugly. why can't we pass the default value to config_accessor...?
   EpomRails.configure do |config|
     config.offline = false
+
+    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', advertiser_id: 'advertiserId', weight: 'weight'}
+    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[: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_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_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'}]
   end
 end

data/lib/epom_rails/version.rb

@@ -1,3 +1,3 @@
 module EpomRails
-  VERSION = "0.4.9"
+  VERSION = "1.0.0"
 end

data/lib/epom_rails.rb

@@ -1,18 +1,31 @@
 require 'epom'
 require 'epom_rails/acts_as'
+require 'epom_rails/acts_as_advertiser'
+require 'epom_rails/acts_as_campaign'
+require 'epom_rails/acts_as_banner'
+require 'epom_rails/acts_as_site'
+require 'epom_rails/acts_as_zone'
+require 'epom_rails/acts_as_placement'
 
 require 'epom_rails/config'
 
 module EpomRails
-	attr_accessor :epom_klass, :epom_fields
-
-	Epom::EpomElement.login(ENV['username'], ENV['password'])
-
 	def method_missing(method_name, *args)
-		if not EpomRails.config.offline and epom_klass.respond_to?(method_name)
-			epom_klass.send(method_name, args[0], args[1])
+		if not EpomRails.config.offline and epom_class.respond_to?(method_name)
+			epom_class.send(method_name, args[0], args[1])
 		else
 			super
 		end
 	end
+
+	private
+
+	def epom_class
+		return Epom::Advertiser if EpomRails.config.advertiser[:model] == self
+		return Epom::Campaign if EpomRails.config.campaign[:model] == self
+		return Epom::Banner if EpomRails.config.banner[:model] == self
+		return Epom::Site if EpomRails.config.site[:model] == self
+		return Epom::Zone if EpomRails.config.zone[:model] == self
+		return Epom::Placement if EpomRails.config.placement[:model] == self
+	end
 end

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

@@ -1,3 +1,31 @@
 EpomRails.configure do |config|
-	config.offline = false
+  config.offline = false
+
+  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', advertiser_id: 'advertiserId', weight: 'weight'}
+  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[: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_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_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'}]
 end

data/test/dummy/app/controllers/publishers_controller.rb

@@ -0,0 +1,58 @@
+class PublishersController < ApplicationController
+  before_action :set_publisher, only: [:show, :edit, :update, :destroy]
+
+  # GET /publishers
+  def index
+    @publishers = Publisher.all
+  end
+
+  # GET /publishers/1
+  def show
+  end
+
+  # GET /publishers/new
+  def new
+    @publisher = Publisher.new
+  end
+
+  # GET /publishers/1/edit
+  def edit
+  end
+
+  # POST /publishers
+  def create
+    @publisher = Publisher.new(publisher_params)
+
+    if @publisher.save
+      redirect_to @publisher, notice: 'Publisher was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /publishers/1
+  def update
+    if @publisher.update(publisher_params)
+      redirect_to @publisher, notice: 'Publisher was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /publishers/1
+  def destroy
+    @publisher.destroy
+    redirect_to publishers_url, notice: 'Publisher was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_publisher
+      @publisher = Publisher.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def publisher_params
+      params.require(:publisher).permit(:name, :url, :description, :email, :category_id, :epom_id)
+    end
+end

data/test/dummy/app/helpers/publishers_helper.rb

@@ -0,0 +1,2 @@
+module PublishersHelper
+end

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

@@ -1,3 +1,3 @@
 class Advertiser < ActiveRecord::Base
-	acts_as_advertiser epom_id: 'id', name: 'name', contact_name: 'contactName', contact_email: 'contactEmail', description: 'description'
+	acts_as_advertiser
 end

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

@@ -1,3 +1,3 @@
 class Banner < ActiveRecord::Base
-	acts_as_banner 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'
+	acts_as_banner
 end

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

@@ -1,3 +1,3 @@
 class Campaign < ActiveRecord::Base
-	acts_as_campaign epom_id: 'id', name: 'name', description: 'description', advertiser_id: 'advertiserId', weight: 'weight'
+	acts_as_campaign
 end

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

@@ -1,3 +1,3 @@
 class Placement < ActiveRecord::Base
-	acts_as_placement epom_id: 'id', zone_id: 'zoneId', placement_type: 'type', name: 'name', ad_unit_id: 'adUnitId', size_height: 'size.height', size_width: 'size.width'
+	acts_as_placement
 end

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

@@ -0,0 +1,3 @@
+class Publisher < ActiveRecord::Base
+	acts_as_site
+end

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

@@ -1,3 +1,3 @@
 class Zone < ActiveRecord::Base
-	acts_as_zone epom_id: 'id', name: 'name', description: 'description', site_id: 'siteId'
+	acts_as_zone belongs_to: [{:name => 'publisher', :epom_element => 'Site', :model => 'Publisher'}]
 end

data/test/dummy/app/views/{sites → publishers}/_form.html.erb

@@ -1,20 +1,16 @@
-<%= form_for(@site) do |f| %>
-  <% if @site.errors.any? %>
+<%= form_for(@publisher) do |f| %>
+  <% if @publisher.errors.any? %>
     <div id="error_explanation">
-      <h2><%= pluralize(@site.errors.count, "error") %> prohibited this site from being saved:</h2>
+      <h2><%= pluralize(@publisher.errors.count, "error") %> prohibited this publisher from being saved:</h2>
 
       <ul>
-      <% @site.errors.full_messages.each do |message| %>
+      <% @publisher.errors.full_messages.each do |message| %>
         <li><%= message %></li>
       <% end %>
       </ul>
     </div>
   <% end %>
 
-  <div class="field">
-    <%= f.label :epom_id %><br>
-    <%= f.number_field :epom_id %>
-  </div>
   <div class="field">
     <%= f.label :name %><br>
     <%= f.text_field :name %>
@@ -35,6 +31,10 @@
     <%= f.label :category_id %><br>
     <%= f.number_field :category_id %>
   </div>
+  <div class="field">
+    <%= f.label :epom_id %><br>
+    <%= f.number_field :epom_id %>
+  </div>
   <div class="actions">
     <%= f.submit %>
   </div>

data/test/dummy/app/views/publishers/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing Publisher</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @publisher %> |
+<%= link_to 'Back', publishers_path %>

data/test/dummy/app/views/publishers/index.html.erb

@@ -0,0 +1,37 @@
+<p id="notice"><%= notice %></p>
+
+<h1>Listing Publishers</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th>Name</th>
+      <th>Url</th>
+      <th>Description</th>
+      <th>Email</th>
+      <th>Category</th>
+      <th>Epom</th>
+      <th colspan="3"></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @publishers.each do |publisher| %>
+      <tr>
+        <td><%= publisher.name %></td>
+        <td><%= publisher.url %></td>
+        <td><%= publisher.description %></td>
+        <td><%= publisher.email %></td>
+        <td><%= publisher.category_id %></td>
+        <td><%= publisher.epom_id %></td>
+        <td><%= link_to 'Show', publisher %></td>
+        <td><%= link_to 'Edit', edit_publisher_path(publisher) %></td>
+        <td><%= link_to 'Destroy', publisher, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New Publisher', new_publisher_path %>

data/test/dummy/app/views/publishers/new.html.erb

@@ -0,0 +1,5 @@
+<h1>New Publisher</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', publishers_path %>

data/test/dummy/app/views/publishers/show.html.erb

@@ -0,0 +1,34 @@
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong>Name:</strong>
+  <%= @publisher.name %>
+</p>
+
+<p>
+  <strong>Url:</strong>
+  <%= @publisher.url %>
+</p>
+
+<p>
+  <strong>Description:</strong>
+  <%= @publisher.description %>
+</p>
+
+<p>
+  <strong>Email:</strong>
+  <%= @publisher.email %>
+</p>
+
+<p>
+  <strong>Category:</strong>
+  <%= @publisher.category_id %>
+</p>
+
+<p>
+  <strong>Epom:</strong>
+  <%= @publisher.epom_id %>
+</p>
+
+<%= link_to 'Edit', edit_publisher_path(@publisher) %> |
+<%= link_to 'Back', publishers_path %>

data/test/dummy/config/routes.rb

@@ -1,9 +1,9 @@
 Rails.application.routes.draw do
+  resources :publishers
   resources :placements
   resources :placements
   resources :zones
   resources :sites
-  resources :sites
   resources :banners
   resources :campaigns
   resources :campaigns

data/test/dummy/db/migrate/{20150619174544_create_sites.rb → 20150731161340_create_publishers.rb}

@@ -1,12 +1,12 @@
-class CreateSites < ActiveRecord::Migration
+class CreatePublishers < ActiveRecord::Migration
   def change
-    create_table :sites do |t|
-      t.integer :epom_id
+    create_table :publishers do |t|
       t.string :name
       t.string :url
       t.text :description
       t.string :email
       t.integer :category_id
+      t.integer :epom_id
 
       t.timestamps null: false
     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: 20150622181754) do
+ActiveRecord::Schema.define(version: 20150731161340) do
 
   create_table "advertisers", force: :cascade do |t|
     t.string   "name"
@@ -61,13 +61,13 @@ ActiveRecord::Schema.define(version: 20150622181754) do
     t.datetime "updated_at",     null: false
   end
 
-  create_table "sites", force: :cascade do |t|
-    t.integer  "epom_id"
+  create_table "publishers", force: :cascade do |t|
     t.string   "name"
     t.string   "url"
     t.text     "description"
     t.string   "email"
     t.integer  "category_id"
+    t.integer  "epom_id"
     t.datetime "created_at",  null: false
     t.datetime "updated_at",  null: false
   end

data/test/dummy/test/controllers/publishers_controller_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+
+class PublishersControllerTest < ActionController::TestCase
+  setup do
+    @publisher = publishers(:one)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:publishers)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create publisher" do
+    assert_difference('Publisher.count') do
+      post :create, publisher: { category_id: @publisher.category_id, description: @publisher.description, email: @publisher.email, epom_id: @publisher.epom_id, name: @publisher.name, url: @publisher.url }
+    end
+
+    assert_redirected_to publisher_path(assigns(:publisher))
+  end
+
+  test "should show publisher" do
+    get :show, id: @publisher
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @publisher
+    assert_response :success
+  end
+
+  test "should update publisher" do
+    patch :update, id: @publisher, publisher: { category_id: @publisher.category_id, description: @publisher.description, email: @publisher.email, epom_id: @publisher.epom_id, name: @publisher.name, url: @publisher.url }
+    assert_redirected_to publisher_path(assigns(:publisher))
+  end
+
+  test "should destroy publisher" do
+    assert_difference('Publisher.count', -1) do
+      delete :destroy, id: @publisher
+    end
+
+    assert_redirected_to publishers_path
+  end
+end

data/test/dummy/test/fixtures/{sites.yml → publishers.yml}

@@ -5,11 +5,11 @@ one:
   url: http://www.example.com
   description: MyText
   email: user@example.com
-  category_id: 2
+  category_id: 1
 
 two:
   name: MyString
   url: http://www.example.com
   description: MyText
   email: user@example.com
-  category_id: 2
+  category_id: 1

data/test/dummy/test/models/{site_test.rb → publisher_test.rb}

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class SiteTest < ActiveSupport::TestCase
+class PublisherTest < ActiveSupport::TestCase
   # test "the truth" do
   #   assert true
   # end

data/test/epom_rails/acts_as_advertiser_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ActsAsAdvertiserTest < ActiveSupport::TestCase
 	def epom_field(field)
-		Advertiser.epom_fields.key(field)
+		EpomRails.config.advertiser[:fields].key(field)
 	end
 
 	test 'fancy_method' do

data/test/epom_rails/acts_as_banner_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ActsAsBannerTest < ActiveSupport::TestCase
 	def epom_field(field)
-		Banner.epom_fields.key(field)
+		EpomRails.config.banner[:fields].key(field)
 	end
 
 	test 'fancy_method' do

data/test/epom_rails/acts_as_campaign_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ActsAsCampaignTest < ActiveSupport::TestCase
 	def epom_field(field)
-		Campaign.epom_fields.key(field)
+		EpomRails.config.campaign[:fields].key(field)
 	end
 
 	test 'fancy_method' do

data/test/epom_rails/acts_as_placement_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ActsAsPlacementTest < ActiveSupport::TestCase
 	def epom_field(field)
-		Placement.epom_fields.key(field)
+		EpomRails.config.placement[:fields].key(field)
 	end
 
 	test 'fancy_method' do

data/test/epom_rails/acts_as_site_test.rb

@@ -2,16 +2,16 @@ require 'test_helper'
 
 class ActsAsSiteTest < ActiveSupport::TestCase
 	def epom_field(field)
-		Site.epom_fields.key(field)
+		EpomRails.config.site[:fields].key(field)
 	end
 
 	test 'fancy_method' do
-	  	assert_raises NoMethodError do Site.fancy_method end
+	  	assert_raises NoMethodError do Publisher.fancy_method end
 	end
 
 	test 'save an site' do
 		unless EpomRails.config.offline
-			site = sites(:one)	  	
+			site = publishers(:one)	  	
 
 	  	assert	site.save
 	  	assert_instance_of Fixnum, site.send(epom_field('id'))
@@ -33,7 +33,7 @@ class ActsAsSiteTest < ActiveSupport::TestCase
 
 	test 'delete an site' do
 		unless EpomRails.config.offline
-			site = sites(:one)	  	
+			site = publishers(:one)	  	
 
 	  	assert	site.save
 	  	assert_instance_of Fixnum, site.send(epom_field('id'))
@@ -45,12 +45,12 @@ class ActsAsSiteTest < ActiveSupport::TestCase
 
 	test 'epom methods' do
 		unless EpomRails.config.offline
-			site = sites(:one)	  	
+			site = publishers(:one)	  	
 
 		  	assert	site.save
 		  	assert_instance_of Fixnum, site.send(epom_field('id'))
 
-			response = Site.get_sites_zones({:siteId => site.send(epom_field('id'))}, {})
+			response = Publisher.get_sites_zones({:siteId => site.send(epom_field('id'))}, {})
 			assert_instance_of Array, response	
 		end
 	end

data/test/epom_rails/acts_as_zone_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ActsAsZoneTest < ActiveSupport::TestCase
 	def epom_field(field)
-		Zone.epom_fields.key(field)
+		EpomRails.config.zone[:fields].key(field)
 	end
 
 	test 'fancy_method' do
@@ -44,4 +44,8 @@ class ActsAsZoneTest < ActiveSupport::TestCase
 			assert_instance_of Array, response	
 		end
 	end
+
+	test 'belongs_to config' do
+		assert [{:name => 'publisher', :epom_element => 'Site', :model => 'Publisher'}], EpomRails.config.zone[:belongs_to]
+	end
 end

data/test/test_helper.rb

@@ -36,5 +36,33 @@ Epom.configure do |config|
 end
 
 EpomRails.configure do |config|
-	config.offline = false
+  config.offline = false
+
+  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', advertiser_id: 'advertiserId', weight: 'weight'}
+  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[: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_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_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'}]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epom_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 1.0.0
 platform: ruby
 authors:
 - Adrian Chang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,6 +64,12 @@ files:
 - Rakefile
 - lib/epom_rails.rb
 - lib/epom_rails/acts_as.rb
+- lib/epom_rails/acts_as_advertiser.rb
+- lib/epom_rails/acts_as_banner.rb
+- lib/epom_rails/acts_as_campaign.rb
+- lib/epom_rails/acts_as_placement.rb
+- lib/epom_rails/acts_as_site.rb
+- lib/epom_rails/acts_as_zone.rb
 - lib/epom_rails/config.rb
 - lib/epom_rails/version.rb
 - lib/generators/epom_rails/config/USAGE
@@ -77,35 +83,35 @@ files:
 - test/dummy/app/assets/javascripts/banners.js
 - test/dummy/app/assets/javascripts/campaigns.js
 - test/dummy/app/assets/javascripts/placements.js
-- test/dummy/app/assets/javascripts/sites.js
+- 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/application.css
 - test/dummy/app/assets/stylesheets/banners.css
 - test/dummy/app/assets/stylesheets/campaigns.css
 - test/dummy/app/assets/stylesheets/placements.css
+- test/dummy/app/assets/stylesheets/publishers.css
 - test/dummy/app/assets/stylesheets/scaffold.css
-- test/dummy/app/assets/stylesheets/sites.css
 - test/dummy/app/assets/stylesheets/zones.css
 - test/dummy/app/controllers/advertisers_controller.rb
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/banners_controller.rb
 - test/dummy/app/controllers/campaigns_controller.rb
 - test/dummy/app/controllers/placements_controller.rb
-- test/dummy/app/controllers/sites_controller.rb
+- 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/application_helper.rb
 - test/dummy/app/helpers/banners_helper.rb
 - test/dummy/app/helpers/campaigns_helper.rb
 - test/dummy/app/helpers/placements_helper.rb
-- test/dummy/app/helpers/sites_helper.rb
+- test/dummy/app/helpers/publishers_helper.rb
 - test/dummy/app/helpers/zones_helper.rb
 - test/dummy/app/models/advertiser.rb
 - test/dummy/app/models/banner.rb
 - test/dummy/app/models/campaign.rb
 - test/dummy/app/models/placement.rb
-- test/dummy/app/models/site.rb
+- test/dummy/app/models/publisher.rb
 - test/dummy/app/models/zone.rb
 - test/dummy/app/views/advertisers/_form.html.erb
 - test/dummy/app/views/advertisers/edit.html.erb
@@ -128,11 +134,11 @@ files:
 - test/dummy/app/views/placements/index.html.erb
 - test/dummy/app/views/placements/new.html.erb
 - test/dummy/app/views/placements/show.html.erb
-- test/dummy/app/views/sites/_form.html.erb
-- test/dummy/app/views/sites/edit.html.erb
-- test/dummy/app/views/sites/index.html.erb
-- test/dummy/app/views/sites/new.html.erb
-- test/dummy/app/views/sites/show.html.erb
+- test/dummy/app/views/publishers/_form.html.erb
+- test/dummy/app/views/publishers/edit.html.erb
+- test/dummy/app/views/publishers/index.html.erb
+- test/dummy/app/views/publishers/new.html.erb
+- test/dummy/app/views/publishers/show.html.erb
 - test/dummy/app/views/zones/_form.html.erb
 - test/dummy/app/views/zones/edit.html.erb
 - test/dummy/app/views/zones/index.html.erb
@@ -166,9 +172,9 @@ 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/20150619174544_create_sites.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/schema.rb
 - test/dummy/public/404.html
 - test/dummy/public/422.html
@@ -178,19 +184,19 @@ files:
 - 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/sites_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/banners.yml
 - test/dummy/test/fixtures/campaigns.yml
 - test/dummy/test/fixtures/placements.yml
-- test/dummy/test/fixtures/sites.yml
+- test/dummy/test/fixtures/publishers.yml
 - test/dummy/test/fixtures/zones.yml
 - test/dummy/test/models/advertiser_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/site_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_banner_test.rb
@@ -237,19 +243,19 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/test/models/zone_test.rb
-- test/dummy/test/models/site_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/advertiser_test.rb
 - test/dummy/test/fixtures/zones.yml
-- test/dummy/test/fixtures/sites.yml
+- test/dummy/test/fixtures/publishers.yml
 - test/dummy/test/fixtures/placements.yml
 - test/dummy/test/fixtures/campaigns.yml
 - test/dummy/test/fixtures/banners.yml
 - test/dummy/test/fixtures/advertisers.yml
 - test/dummy/test/controllers/zones_controller_test.rb
-- test/dummy/test/controllers/sites_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
@@ -259,9 +265,9 @@ test_files:
 - test/dummy/public/422.html
 - test/dummy/public/404.html
 - test/dummy/db/schema.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/20150619174544_create_sites.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
@@ -294,11 +300,11 @@ test_files:
 - 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/sites/show.html.erb
-- test/dummy/app/views/sites/new.html.erb
-- test/dummy/app/views/sites/index.html.erb
-- test/dummy/app/views/sites/edit.html.erb
-- test/dummy/app/views/sites/_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
+- test/dummy/app/views/publishers/edit.html.erb
+- test/dummy/app/views/publishers/_form.html.erb
 - test/dummy/app/views/placements/show.html.erb
 - test/dummy/app/views/placements/new.html.erb
 - test/dummy/app/views/placements/index.html.erb
@@ -321,35 +327,35 @@ test_files:
 - 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/site.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/advertiser.rb
 - test/dummy/app/helpers/zones_helper.rb
-- test/dummy/app/helpers/sites_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/advertisers_helper.rb
 - test/dummy/app/controllers/zones_controller.rb
-- test/dummy/app/controllers/sites_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/zones.css
-- test/dummy/app/assets/stylesheets/sites.css
 - test/dummy/app/assets/stylesheets/scaffold.css
+- test/dummy/app/assets/stylesheets/publishers.css
 - test/dummy/app/assets/stylesheets/placements.css
 - 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/advertisers.css
 - test/dummy/app/assets/javascripts/zones.js
-- test/dummy/app/assets/javascripts/sites.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

data/test/dummy/app/controllers/sites_controller.rb

@@ -1,58 +0,0 @@
-class SitesController < ApplicationController
-  before_action :set_site, only: [:show, :edit, :update, :destroy]
-
-  # GET /sites
-  def index
-    @sites = Site.all
-  end
-
-  # GET /sites/1
-  def show
-  end
-
-  # GET /sites/new
-  def new
-    @site = Site.new
-  end
-
-  # GET /sites/1/edit
-  def edit
-  end
-
-  # POST /sites
-  def create
-    @site = Site.new(site_params)
-
-    if @site.save
-      redirect_to @site, notice: 'Site was successfully created.'
-    else
-      render :new
-    end
-  end
-
-  # PATCH/PUT /sites/1
-  def update
-    if @site.update(site_params)
-      redirect_to @site, notice: 'Site was successfully updated.'
-    else
-      render :edit
-    end
-  end
-
-  # DELETE /sites/1
-  def destroy
-    @site.destroy
-    redirect_to sites_url, notice: 'Site was successfully destroyed.'
-  end
-
-  private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_site
-      @site = Site.find(params[:id])
-    end
-
-    # Only allow a trusted parameter "white list" through.
-    def site_params
-      params.require(:site).permit(:epom_id, :name, :url, :description, :email, :category_id)
-    end
-end

data/test/dummy/app/helpers/sites_helper.rb

@@ -1,2 +0,0 @@
-module SitesHelper
-end

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

@@ -1,3 +0,0 @@
-class Site < ActiveRecord::Base
-	acts_as_site epom_id: 'id', name: 'name', url: 'url', description: 'description', email: 'email', category_id: 'categoryId'
-end

data/test/dummy/app/views/sites/edit.html.erb

@@ -1,6 +0,0 @@
-<h1>Editing Site</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @site %> |
-<%= link_to 'Back', sites_path %>

data/test/dummy/app/views/sites/index.html.erb

@@ -1,37 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<h1>Listing Sites</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th>Epom</th>
-      <th>Name</th>
-      <th>Url</th>
-      <th>Description</th>
-      <th>Email</th>
-      <th>Category</th>
-      <th colspan="3"></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @sites.each do |site| %>
-      <tr>
-        <td><%= site.epom_id %></td>
-        <td><%= site.name %></td>
-        <td><%= site.url %></td>
-        <td><%= site.description %></td>
-        <td><%= site.email %></td>
-        <td><%= site.category_id %></td>
-        <td><%= link_to 'Show', site %></td>
-        <td><%= link_to 'Edit', edit_site_path(site) %></td>
-        <td><%= link_to 'Destroy', site, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Site', new_site_path %>

data/test/dummy/app/views/sites/new.html.erb

@@ -1,5 +0,0 @@
-<h1>New Site</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Back', sites_path %>

data/test/dummy/app/views/sites/show.html.erb

@@ -1,34 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Epom:</strong>
-  <%= @site.epom_id %>
-</p>
-
-<p>
-  <strong>Name:</strong>
-  <%= @site.name %>
-</p>
-
-<p>
-  <strong>Url:</strong>
-  <%= @site.url %>
-</p>
-
-<p>
-  <strong>Description:</strong>
-  <%= @site.description %>
-</p>
-
-<p>
-  <strong>Email:</strong>
-  <%= @site.email %>
-</p>
-
-<p>
-  <strong>Category:</strong>
-  <%= @site.category_id %>
-</p>
-
-<%= link_to 'Edit', edit_site_path(@site) %> |
-<%= link_to 'Back', sites_path %>

data/test/dummy/test/controllers/sites_controller_test.rb

@@ -1,49 +0,0 @@
-require 'test_helper'
-
-class SitesControllerTest < ActionController::TestCase
-  setup do
-    @site = sites(:one)
-  end
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:sites)
-  end
-
-  test "should get new" do
-    get :new
-    assert_response :success
-  end
-
-  test "should create site" do
-    assert_difference('Site.count') do
-      post :create, site: { category_id: @site.category_id, description: @site.description, email: @site.email, epom_id: @site.epom_id, name: @site.name, url: @site.url }
-    end
-
-    assert_redirected_to site_path(assigns(:site))
-  end
-
-  test "should show site" do
-    get :show, id: @site
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @site
-    assert_response :success
-  end
-
-  test "should update site" do
-    patch :update, id: @site, site: { category_id: @site.category_id, description: @site.description, email: @site.email, epom_id: @site.epom_id, name: @site.name, url: @site.url }
-    assert_redirected_to site_path(assigns(:site))
-  end
-
-  test "should destroy site" do
-    assert_difference('Site.count', -1) do
-      delete :destroy, id: @site
-    end
-
-    assert_redirected_to sites_path
-  end
-end