sifiapi 0.11.0 → 0.12.0

data/lib/sifi_api/resource.rb

@@ -72,8 +72,8 @@ class SifiApi::Resource
         resource = self.new(record, connection, user_key)
         a << resource
       end
+      SifiApi::ResourceCollection.new(resource_name, a, response.body["paging"], connection, user_key)
     end
-    SifiApi::ResourceCollection.new(resource_name, a, response.body["paging"], connection, user_key)
   end
 
   def method_missing(sym, *args, &block)
@@ -90,13 +90,13 @@ class SifiApi::Resource
     end
   end
 
-
   def do_action(action)
     execute_with_rescue do
       response = @connection.send(action["method"].downcase, @user_key, action["href"])
       if response && response.status == 200
-        if response[:content_type] == "application/json"
+        if response[:content_type].include?("application/json")
           @json = response.body[resource_name].first
+          return self
         elsif ["text/csv", "application/zip"].include?(response[:content_type])
           filename = response.headers[:content_disposition].match(/filename="(.+)"/)[1]
           file = Tempfile.new(filename)

data/lib/sifi_api/version.rb

@@ -1,7 +1,7 @@
 module SifiApi
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 11
+    MINOR = 12
     PATCH = 0
     PRE   = nil
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/sifi_api.rb

@@ -11,7 +11,6 @@ module SifiApi
   autoload :AdFileType, "sifi_api/ad_file_type"
   autoload :AdSize, "sifi_api/ad_size"
   autoload :BidType, "sifi_api/bid_type"
-  autoload :BrandedDatum, "sifi_api/branded_datum"
   autoload :Browser, "sifi_api/browser"
   autoload :Campaign, "sifi_api/campaign"
   autoload :CampaignStat, "sifi_api/campaign_stat"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sifiapi
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000Z
+date: 2012-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2152988800 !ruby/object:Gem::Requirement
+  requirement: &2154035060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152988800
+  version_requirements: *2154035060
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2152986920 !ruby/object:Gem::Requirement
+  requirement: &2154034300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152986920
+  version_requirements: *2154034300
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152985560 !ruby/object:Gem::Requirement
+  requirement: &2154033680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *2152985560
+  version_requirements: *2154033680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152983920 !ruby/object:Gem::Requirement
+  requirement: &2154032760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152983920
+  version_requirements: *2154032760
 description: ''
 email:
 - brandon@simpli.fi
@@ -77,7 +77,6 @@ files:
 - lib/sifi_api/ad_file_type.rb
 - lib/sifi_api/ad_size.rb
 - lib/sifi_api/bid_type.rb
-- lib/sifi_api/branded_datum.rb
 - lib/sifi_api/browser.rb
 - lib/sifi_api/campaign.rb
 - lib/sifi_api/campaign_stat.rb
@@ -112,7 +111,6 @@ files:
 - spec/sifi_api/ad_size_spec.rb
 - spec/sifi_api/ad_spec.rb
 - spec/sifi_api/bid_type_spec.rb
-- spec/sifi_api/branded_datum_spec.rb
 - spec/sifi_api/browser_spec.rb
 - spec/sifi_api/campaign_spec.rb
 - spec/sifi_api/campaign_stat_spec.rb
@@ -121,7 +119,6 @@ files:
 - spec/sifi_api/client_spec.rb
 - spec/sifi_api/company_spec.rb
 - spec/sifi_api/context_spec.rb
-- spec/sifi_api/dayparting_spec.rb
 - spec/sifi_api/device_spec.rb
 - spec/sifi_api/dma_spec.rb
 - spec/sifi_api/domain_spec.rb
@@ -168,7 +165,6 @@ test_files:
 - spec/sifi_api/ad_size_spec.rb
 - spec/sifi_api/ad_spec.rb
 - spec/sifi_api/bid_type_spec.rb
-- spec/sifi_api/branded_datum_spec.rb
 - spec/sifi_api/browser_spec.rb
 - spec/sifi_api/campaign_spec.rb
 - spec/sifi_api/campaign_stat_spec.rb
@@ -177,7 +173,6 @@ test_files:
 - spec/sifi_api/client_spec.rb
 - spec/sifi_api/company_spec.rb
 - spec/sifi_api/context_spec.rb
-- spec/sifi_api/dayparting_spec.rb
 - spec/sifi_api/device_spec.rb
 - spec/sifi_api/dma_spec.rb
 - spec/sifi_api/domain_spec.rb

data/lib/sifi_api/branded_datum.rb

@@ -1,2 +0,0 @@
-class SifiApi::BrandedDatum < SifiApi::Resource
-end

data/spec/sifi_api/branded_datum_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe SifiApi::BrandedDatum do
-
-  it_should_behave_like "SifiApi::Resource", SifiApi::BrandedDatum
-
-end

data/spec/sifi_api/dayparting_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-describe SifiApi::Dayparting do
-
-  it_should_behave_like "SifiApi::Resource", SifiApi::Dayparting
-
-end