epom 0.8.5 → 0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d70eceeb6af7f147e126872b515530f8f92965
-  data.tar.gz: 411f5af5df623efb9441922fbe5fbf0e77ef42e5
+  metadata.gz: ce37fe9a3f11f93ba8706f60270a9b047c18e0bd
+  data.tar.gz: 89bd4e659ea2b2308139bd6c1a6b9f8f0c20b67e
 SHA512:
-  metadata.gz: 2e425d08441227c6726223680ffe8523529f3a948934e64bb40e81c43ad17cde8fc6b8feff4875ef9a8b33344e05fdc7f904be44c06791f8c96addca8f98de9d
-  data.tar.gz: a97e1e7fe209f8c61cf2bf186bafaa390fd00d9062c177239b3af0776df087caef8faf77193f5ecef1493bad5f2959063e440e9f633d6fe27a006c56fac5cb8d
+  metadata.gz: f8d5cb4a87081dae73fe4c6f93d7a0adce064859dd33efe882e2117d44bb6c33164b2cc225d17f209eee729000058aa98d06ac3380cc879bea34cc3a44840fc9
+  data.tar.gz: 8b2856197f2a32b3fd4d1d48469f8054787c4f342dd7edf2abcf64fafb46582144123a7eea19fd79de0ac25f52c5df930780c62ab56a2ab56aa1d760552114f3

data/lib/epom.rb

@@ -13,6 +13,8 @@ require 'epom/publisher'
 require 'epom/site'
 require 'epom/zone'
 
+require 'epom/config'
+
 module Epom
 
   def self.create_hash(*args)

data/lib/epom/campaign.rb

@@ -397,13 +397,13 @@ module Epom
               :method => :put
           },
           :adjusted_cpm_country_trigger => {
-              :url => '/rest-api/campaign/CAMPAIGN_ID/adjustedCpm/value.do',
+              :url => '/rest-api/campaign/CAMPAIGN_ID/adjustedCpm.do',
               :url_parameters => [:campaignId],
               :body_parameters => [:enable, :hash, :timestamp, :username],
               :method => :post
           },
           :adjusted_cpm_list => {
-              :url => '/rest-api/campaign/CAMPAIGN_ID/adjustedCpm/value.do',
+              :url => '/rest-api/campaign/CAMPAIGN_ID/adjustedCpm/values.do',
               :url_parameters => [:campaignId],
               :body_parameters => [:hash, :timestamp, :username],
               :method => :get

data/lib/epom/config.rb

@@ -0,0 +1,38 @@
+require 'active_support/configurable'
+
+module Epom
+  # Configures global settings for Epom
+  #   Epom.configure do |config|
+  #     config.epom_server = 'https://n29.epom.com/'
+  #   end
+  def self.configure(&block)
+    yield @config ||= Epom::Configuration.new
+  end
+
+  # Global settings for Epom
+  def self.config
+    @config
+  end
+
+  # need a Class for 3.0
+  class Configuration #:nodoc:
+    include ActiveSupport::Configurable
+    config_accessor :public_key
+    config_accessor :private_key
+    config_accessor :epom_server
+
+    def param_name
+      config.param_name.respond_to?(:call) ? config.param_name.call : config.param_name
+    end
+
+    # define param_name writer (copied from AS::Configurable)
+    writer, line = 'def param_name=(value); config.param_name = value; end', __LINE__
+    singleton_class.class_eval writer, __FILE__, line
+    class_eval writer, __FILE__, line
+  end
+
+  # this is ugly. why can't we pass the default value to config_accessor...?
+  configure do |config|
+    config.epom_server = 'https://n29.epom.com/'
+  end
+end

data/lib/epom/epom_element.rb

@@ -2,7 +2,6 @@ module Epom
   class EpomElement
 
     include HTTMultiParty
-      base_uri 'https://n29.epom.com/'
       default_params :output => 'json'
       debug_output $stderr
 
@@ -59,6 +58,7 @@ module Epom
 
       if params_validation(url_params, url_params_signature) and params_validation(body_params, body_params_signature)
         http_proxy ENV['proxy_address'], ENV['proxy_port'], ENV['proxy_user'], ENV['proxy_password']
+        base_uri Epom.config.epom_server
         response = send(method, url, :query => body_params)
         if response.success?
           return response.parsed_response

data/lib/epom/site.rb

@@ -33,6 +33,11 @@ module Epom
               :body_parameters => [:publishingCategories, :hash, :timestamp, :username],
               :method => :get
           },
+          :get_sites_tree => {
+              :url => '/rest-api/sites-tree.do',
+              :body_parameters => [:publishingCategories, :hash, :timestamp, :username],
+              :method => :get
+            },
           :get_sites_zones => {
               :url => '/rest-api/sites/SITE_ID/zones.do',
               :url_parameters => [:siteId],
@@ -59,6 +64,12 @@ module Epom
               :method => :post,
               :headers => {'Content-type' => 'application/json'}
           },
+          :update_country_pricing => {
+              :url => '/rest-api/sites/SITE_ID/pricing/COUNTRY_CODE.do',
+              :url_parameters => [:siteId, :countryCode],
+              :body_parameters => [:price, :actionId, :hash, :timestamp, :username ],
+              :method => :post
+          },
           :update_site => {
               :url => '/rest-api/sites/update.do',
               :body_parameters => [:id, :createDefaultZone, :name, :url, :description, :email, :allowPlacementBannersLinkingChange, :categoryId, :revenueShare, :impressionsByMonth, :visitorsByMonth, :hash, :timestamp, :username ],
@@ -78,6 +89,7 @@ module Epom
       url.gsub!('HASH', url_params[:hash].to_s) if url.include?('HASH')
       url.gsub!('SITE_ID', url_params[:siteId].to_s) if url.include?('SITE_ID')
       url.gsub!('PLACEMENT_ID', url_params[:placementId].to_s) if url.include?('PLACEMENT_ID')
+      url.gsub!('COUNTRY_CODE', url_params[:countryCode].to_s) if url.include?('COUNTRY_CODE')
       url
     end
   end

data/lib/epom/version.rb

@@ -1,3 +1,3 @@
 module Epom
-  VERSION = '0.8.5'
-end
+  VERSION = '0.9'
+end

data/lib/generators/epom/config/config_generator.rb

@@ -0,0 +1,9 @@
+module Epom
+	class ConfigGenerator < Rails::Generators::Base
+	  source_root File.expand_path('../templates', __FILE__)
+
+	  	def copy_epom_file
+	        template 'epom.rb', 'config/initializers/epom.rb'
+	   	end
+	end
+end

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

@@ -0,0 +1,5 @@
+Epom.configure do |config|
+	config.public_key = 'public_key'
+	config.private_key = 'private_key'
+	config.epom_server = 'https://n29.epom.com/'
+end

data/test/dummy/config/initializers/epom.rb

@@ -0,0 +1,5 @@
+Epom.configure do |config|
+	config.public_key = 'public_key'
+	config.private_key = 'private_key'
+	config.epom_server = 'https://n29.epom.com/'
+end

data/test/epom/analytic_test.rb

@@ -18,6 +18,7 @@ class AnalyticTest < ActiveSupport::TestCase
       :displayIds => true,
       :range => 'CURRENT_MONTH',
       :groupBy => 'ADVERTISER,CAMPAIGN,BANNER,SITE,ZONE,PLACEMENT',
+      # :eqLong => {'ADVERTISER' => ENV['advertiser_id'], 'SITE' => ENV['site_id']}
     }
 
     response = Epom::Analytic.analytics(url_params, body_params)

data/test/epom/banner_test.rb

@@ -500,5 +500,16 @@ class BannerTest < ActiveSupport::TestCase
     end
   end  
 
+  test "get_device_values" do
+    timestamp = Time.now.to_i * 1000
+    url_params = {
+      :bannerId => ENV['banner_id'],
+    }
+    body_params = {}
+
+    response = Epom::Banner.get_device_values(url_params, body_params)
+    # assert_not_instance_of Fixnum, response
+  end  
+
   define_get_tests_auto(Epom::Banner)
 end

data/test/epom/campaign_test.rb

@@ -343,8 +343,14 @@ class CampaignTest < ActiveSupport::TestCase
       :username => ENV['username'],
     }
       
-    # PENDING
-    # response = Epom::Campaign.adjusted_cpm_list(url_params, body_params)
+    response = Epom::Campaign.adjusted_cpm_list(url_params, body_params)
+    assert_instance_of Array, response
+    if response.count > 0
+      first = response[0]
+      assert_instance_of Fixnum, first['id']
+      assert_instance_of Float, first['value']
+      assert_instance_of String, first['country']
+    end
   end
 
   ##########################
@@ -424,5 +430,16 @@ class CampaignTest < ActiveSupport::TestCase
     assert_equal 2.9, body_params[:price]
   end  
 
+  test "get_device_values" do
+    timestamp = Time.now.to_i * 1000
+    url_params = {
+      :campaignId => ENV['campaign_id'],
+    }
+    body_params = {}
+
+    response = Epom::Campaign.get_device_values(url_params, body_params)
+    # assert_not_instance_of Fixnum, response
+  end  
+
   define_get_tests_auto(Epom::Campaign)
 end

data/test/epom/site_test.rb

@@ -41,7 +41,6 @@ class SiteTest < ActiveSupport::TestCase
     if response.count > 0
       first = response.first
       assert_instance_of Hash, first
-      assert_instance_of Float, first['cpmThreshold']
     end
   end
 
@@ -111,6 +110,34 @@ class SiteTest < ActiveSupport::TestCase
     assert response['success']
   end
 
+  test "get_sites_tree" do
+    timestamp = Time.now.to_i * 1000
+    url_params = {}
+    body_params = {}
+
+    response = Epom::Site.get_sites_tree(url_params, body_params)
+    assert_instance_of Array, response
+    if response.count > 0
+      first = response[0]
+      assert_instance_of Hash, first
+      assert_instance_of Fixnum, first['id']
+      assert_instance_of String, first['name']
+      assert_instance_of Array, first['zones']
+      if first['zones'].count > 0
+        first = first['zones'][0]
+        assert_instance_of Hash, first
+        assert_instance_of Fixnum, first['id']
+        assert_instance_of Array, first['placements']
+        if first['placements'].count > 0
+          first = first['placements'][0]
+          assert_instance_of Hash, first
+          assert_instance_of Fixnum, first['id']
+          assert_instance_of String, first['name']
+        end
+      end
+    end
+  end
+
   test "get_sites_zones" do
     timestamp = Time.now.to_i * 1000
     body_params = {
@@ -131,5 +158,19 @@ class SiteTest < ActiveSupport::TestCase
     end
   end
 
+  # ***** INCOMPATIBLE WITH set_site_pricing TEST *****
+  # test 'update_country_pricing' do
+  #   url_params = {
+  #     :siteId => ENV['site_id'],
+  #     :countryCode => ENV['country_code']
+  #   }
+  #   body_params = {
+  #     :price => 2.33
+  #   }
+
+  #   response = Epom::Site.update_country_pricing(url_params, body_params)
+  #   assert_not_instance_of Fixnum, response
+  # end
+
   define_get_tests_auto(Epom::Site)
 end

data/test/test_helper.rb

@@ -56,3 +56,11 @@ def define_get_tests_auto(klass)
     end
 	end
 end
+
+Epom.configure do |config|
+  config.public_key = ENV['public_key']
+  config.private_key = ENV['private_key']
+  config.epom_server = ENV['epom_server']
+end
+
+Epom::EpomElement.login(ENV['username'], ENV['password'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epom
 version: !ruby/object:Gem::Version
-  version: 0.8.5
+  version: '0.9'
 platform: ruby
 authors:
 - Pedro Quintero
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,6 +114,7 @@ files:
 - lib/epom/banner_type.rb
 - lib/epom/campaign.rb
 - lib/epom/category.rb
+- lib/epom/config.rb
 - lib/epom/day_of_week.rb
 - lib/epom/epom_element.rb
 - lib/epom/limit_counters.rb
@@ -126,8 +127,10 @@ files:
 - lib/epom/site.rb
 - lib/epom/version.rb
 - lib/epom/zone.rb
+- lib/generators/epom/config/USAGE
+- lib/generators/epom/config/config_generator.rb
+- lib/generators/epom/config/templates/epom.rb
 - lib/tasks/epom_tasks.rake
-- test/IMG_5457-128x128.JPG
 - test/dummy/README.rdoc
 - test/dummy/Rakefile
 - test/dummy/app/assets/javascripts/application.js
@@ -150,6 +153,7 @@ files:
 - test/dummy/config/initializers/assets.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/cookies_serializer.rb
+- test/dummy/config/initializers/epom.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/mime_types.rb
@@ -173,9 +177,6 @@ files:
 - test/epom/site_test.rb
 - test/epom/zone_test.rb
 - test/epom_test.rb
-- test/logo-128x128.png
-- test/test.php
-- test/test.rb
 - test/test_helper.rb
 homepage: https://github.com/kewelta/epom
 licenses:
@@ -203,11 +204,7 @@ specification_version: 4
 summary: Epom gem.
 test_files:
 - test/test_helper.rb
-- test/test.rb
-- test/test.php
-- test/logo-128x128.png
 - test/epom_test.rb
-- test/IMG_5457-128x128.JPG
 - test/epom/zone_test.rb
 - test/epom/site_test.rb
 - test/epom/placement_test.rb
@@ -237,6 +234,7 @@ test_files:
 - test/dummy/config/initializers/mime_types.rb
 - test/dummy/config/initializers/inflections.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
+- test/dummy/config/initializers/epom.rb
 - test/dummy/config/initializers/cookies_serializer.rb
 - test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/assets.rb

data/test/test.php

@@ -1,51 +0,0 @@
-<?php
-	define("DEBUG",false);
-	
-	$username = "kewelta";
-	$password = "kewelta";	
-	$timestamp  = round(microtime(true) * 1000);
-	$hash = md5(md5($password).$timestamp);
-		
-	$url = "https://n29.epom.com/rest-api/banner/create.do";	
-	/*Getting the full path to your file*/
-	$file_name_with_full_path = realpath('300x250.gif');
-	/*Specifying MIME type of the file*/
-	$filetype = "image/gif";
-	
-	$post_data = array(
-		"hash" => $hash,
-		"timestamp" => $timestamp,
-		"username" => $username,
-		"placementType" => "SITE_PLACEMENT",
-		"campaignId" => "1261",
-		"active" => "true",
-		"name" => "test_banner_1",
-		"weight" => "1",
-		"bannerType" => "LOCAL_FILE",
-		"imageBannerLink" => "http://qwe.com",
-		"imageFile" => "@$file_name_with_full_path;type=$filetype",
-		"url" => "http://qwe.com",
-		"adUnitId" => "1"
-	);
-	
-	$options = array(
-		CURLOPT_URL => $url,
-		CURLOPT_SSL_VERIFYPEER => false,
-		CURLOPT_POST => true,		
-		CURLOPT_POSTFIELDS => $post_data, 
-		CURLOPT_HTTPHEADER => array("Content-type: multipart/form-data"),		
-		CURLOPT_RETURNTRANSFER => true
-	);
-	
-	$curl = curl_init();
-	
-	curl_setopt_array($curl,$options);	
-
-	echo curl_exec($curl);
-	
-	if(DEBUG){
-		echo "\n\n";
-		echo $url;
-		print_r($post_data);
-	}		
-?>

data/test/test.rb

@@ -1,21 +0,0 @@
-require 'pathname'
-require 'yaml'
-
-env_file = File.join(Pathname.new(__FILE__).parent.parent, 'config', 'application.yml')
-YAML.load(File.open(env_file)).each do |key, value|
-  ENV[key.to_s] = value.to_s
-end if File.exists?(env_file)
-
-require 'epom'
-
-timestamp = Time.now.to_i * 1000
-body_params = {
-	:hash => Epom.create_hash(Epom.create_hash(ENV['password']), timestamp),
-	:timestamp => timestamp, 
-	:username => ENV['username'],
-}
-url_params = {}
-
-response = Epom::Site.get_sites(url_params, body_params)
-
-puts response