perfecta 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46ddcaccb8c6c33dbf919009621b431d3cbd9df7
-  data.tar.gz: 36f0ecbd458731641ff6161fd53403d5eacd79e0
+  metadata.gz: 5064f0473a8cb2bdc68704d73284a177bf99e320
+  data.tar.gz: 0711e0118eeeec92b47a9937b2fde0260e75825f
 SHA512:
-  metadata.gz: acde9279ce53006f813da63a8dc86342c200cac4d727b1afdcf2fd78d9d14dc1403f12d6d87d3bec0c418727c4df99c9131492719d6cbcd3779fe03feef6d4ec
-  data.tar.gz: f87634944a373b41dc12e4527dad78e894a5ffd65444d3bf0fa02b15a5e10a711e084e2c486f5e371ddd7fcdafe41a4bc3c2378036bebf17db47215c308ad37c
+  metadata.gz: 09a5838c1210ecab5b7617a42b636d7b99cefb127f69ec30116a3fefe0c1fe32ab67c68acff83216e24ac9c99c60473785d3af1cf848a594d6ab35751ac82eb7
+  data.tar.gz: 6970c48e715430f9229ce854969edc72c24b1eafa8266e4b2b6ef0ace6335ff4955fb7daeb9de7d19a3f9f5627f4b12b21d61996368afb8c75dd91fb46d252d2

data/.travis.yml

@@ -1,5 +1,7 @@
+before_install:
+  - gem install bundler
+bundler: cache
 language: ruby
 rvm:
   - "2.1"
   - "2.2"
-  - "2.3"

data/Gemfile

@@ -2,7 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-group :development, :test do
-  gem 'minitest' 
-  gem 'coveralls', :require => false
-end
+gem 'coveralls', require: false

data/Rakefile

@@ -1,5 +1,4 @@
 require "bundler/gem_tasks"
-Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 

data/lib/perfecta.rb

@@ -64,32 +64,32 @@ module Perfecta
       get_one 'site', id
     end
 
-    def campaigns
-      get_many 'campaigns'
+    def campaigns params = {}
+      get_many 'campaigns', params
     end
 
     def campaign id
       get_one 'campaign', id
     end
 
-    def ads
-      get_many 'ads'
+    def ads params = {}
+      get_many 'ads', params
     end
 
     def ad id
       get_one 'ad', id
     end
 
-    def conversions
-      get_many 'conversions'
+    def conversions params = {}
+      get_many 'conversions', params
     end
 
     def conversion id
       get_one 'conversion', id
     end
 
-    def segments
-      get_many 'segments'
+    def segments params = {}
+      get_many 'segments', params
     end
 
     def segment id
@@ -104,7 +104,7 @@ module Perfecta
 
     def authenticate
       url = "#{BASE_API_PATH}/auth"
-      data = {:email => @email, :password => @password}
+      data = {email: @email, password: @password}
 
       resp = RestClient.post(url, data)
 
@@ -126,7 +126,7 @@ module Perfecta
     def get_one type, id
       url = "#{BASE_API_PATH}/#{type.pluralize}/#{id}"
 
-      resp = make_request url, "Authorization".to_sym => @token
+      resp = make_request url, Authorization: @token
 
       klass_name = type.capitalize
       klass = Perfecta.const_get(klass_name.to_sym)
@@ -136,10 +136,14 @@ module Perfecta
       obj
     end
 
-    def get_many type
+    def get_many type, params = {}
       url = "#{BASE_API_PATH}/#{type}"
 
-      resp = make_request url, "Authorization".to_sym => @token
+      params.delete_if {|p| ![:site_id].include? p}
+
+      params = {params: params}.merge! Authorization: @token
+
+      resp = make_request url, params
 
       klass_name = type.capitalize.singularize
       klass = Perfecta.const_get(klass_name.to_sym)
@@ -152,9 +156,9 @@ module Perfecta
     def build_report_url_and_params_for type, params
       url = "#{BASE_API_PATH}/reports/#{type}_report"
 
-      params.delete_if {|p| !ALLOWED_REPORT_PARAMS.include? p}
+      params.keep_if {|p| ALLOWED_REPORT_PARAMS.include? p}
 
-      params = {:params => params}.merge! "Authorization".to_sym => @token
+      params = {params: params}.merge! Authorization: @token
 
       [url, params]
     end

data/lib/perfecta/api_resource.rb

@@ -1,18 +1,12 @@
 module Perfecta
   class ApiResource
-
-    def meta_class
-      class << self; self end
-    end
-
     def initialize attrs
       attrs.each do |name, val|
         instance_variable_set "@#{name}", val
 
-        meta_class.send(:define_method, name) do
+        define_singleton_method name.to_sym do
           instance_variable_get "@#{name}"
         end
-
       end
     end
   end

data/lib/perfecta/version.rb

@@ -1,3 +1,3 @@
 module Perfecta
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/perfecta.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "mime-types", "~> 1.25.1"
+  gem.add_dependency "mime-types", ">= 1.25.1"
   gem.add_dependency "rest-client"
-  gem.add_dependency "activesupport", "~> 3"
-  gem.add_dependency "rake", "~> 0.9.2"
+  gem.add_dependency "activesupport", ">= 3"
+  gem.add_dependency "rake", ">= 0.9.2"
   gem.add_dependency "json"
   gem.add_development_dependency "mocha"
 end

data/test/ad_report_test.rb

@@ -1,11 +1,11 @@
-require './test/test_helper.rb'
+require_relative 'test_helper'
 
-class AdReportTest < Minitest::Test
+class AdReportTest < MiniTest::Test
 
   describe 'AdReport' do
 
     before do
-      @attrs = {:ad_name => 'Ad 1', :ad_id => 123}
+      @attrs = {ad_name: 'Ad 1', ad_id: 123}
       @report = Perfecta::AdReport.new @attrs
     end
 

data/test/campaign_report_test.rb

@@ -1,11 +1,11 @@
-require './test/test_helper.rb'
+require_relative 'test_helper'
 
-class CampaignReportTest < Minitest::Test
+class CampaignReportTest < MiniTest::Test
 
   describe 'CampaignReport' do
 
     before do
-      @attrs = {:name => 'Report 1', :campaign_id => 123}
+      @attrs = {name: 'Report 1', campaign_id: 123}
       @report = Perfecta::CampaignReport.new @attrs
     end
 

data/test/campaign_test.rb

@@ -1,11 +1,11 @@
-require './test/test_helper.rb'
+require_relative 'test_helper'
 
-class CampaignTest < Minitest::Test
+class CampaignTest < MiniTest::Test
 
   describe 'Campaign' do
 
     before do
-      @attrs = {:name => 'Campaign 1'}
+      @attrs = {name: 'Campaign 1'}
       @report = Perfecta::Campaign.new @attrs
     end
 

data/test/conversion_report_test.rb

@@ -1,11 +1,11 @@
-require './test/test_helper.rb'
+require_relative 'test_helper'
 
-class ConversionReportTest < Minitest::Test
+class ConversionReportTest < MiniTest::Test
 
   describe 'ConversionReport' do
 
     before do
-      @attrs = {:conversion_name => 'Conversion 1', :conversion_id => 123}
+      @attrs = {conversion_name: 'Conversion 1', conversion_id: 123}
       @report = Perfecta::ConversionReport.new @attrs
     end
 

data/test/perfecta_test.rb

@@ -1,11 +1,14 @@
-require './test/test_helper.rb'
+require_relative 'test_helper'
 
-class PerfectaTest < Minitest::Test
+class PerfectaTest < MiniTest::Test
 
   describe 'Perfecta client' do
 
     before do
-      Perfecta::Client.any_instance.stubs(:exchange_credentials_for_token).returns('token')
+      Perfecta::Client
+        .any_instance
+        .stubs(:exchange_credentials_for_token)
+        .returns('token')
 
       @client = Perfecta::Client.new do |c|
         c.email = 'email@ddress'

data/test/site_test.rb

@@ -1,11 +1,11 @@
-require './test/test_helper.rb'
+require_relative 'test_helper'
 
-class SiteTest < Minitest::Test
+class SiteTest < MiniTest::Test
 
   describe 'Site' do
 
     before do
-      @attrs = {:name => 'Site 1'}
+      @attrs = {name: 'Site 1'}
       @report = Perfecta::Site.new @attrs
     end
 

data/test/test_helper.rb

@@ -1,8 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__),'..','lib'))
 
-require 'rubygems'
-require 'minitest/autorun'
 require 'minitest/spec'
+require 'minitest/autorun'
 require 'mocha/setup'
 require 'perfecta'
 

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: perfecta
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Gary Rafferty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-17 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.25.1
 - !ruby/object:Gem::Dependency
@@ -42,28 +42,28 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency