francois-ad_gear_client 0.3.1 → 0.3.4

data/Rakefile

@@ -6,13 +6,15 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "ad_gear_client"
-    gem.summary = %Q{A Ruby client for accessing AdGear http://bloomdigital.com/}
-    gem.email = "francois@teksol.info"
-    gem.homepage = "http://github.com/francois/ad_gear_client"
-    gem.authors = ["François Beausoleil"]
+    gem.name              = "ad_gear_client"
+    gem.summary           = %Q{A Ruby client for accessing AdGear http://bloomdigital.com/}
+    gem.email             = "francois@teksol.info"
+    gem.homepage          = "http://github.com/francois/ad_gear_client"
+    gem.authors           = ["François Beausoleil"]
     gem.rubyforge_project = "ad_gear_client"
 
+    gem.files.exclude ".document"
+
     gem.add_development_dependency "lsegal-yard", ">= 0.2.3"
     gem.add_development_dependency "mocha", ">= 0.9.5"
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.4

data/ad_gear_client.gemspec

@@ -2,19 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ad_gear_client}
-  s.version = "0.3.1"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]
-  s.date = %q{2009-09-15}
+  s.date = %q{2009-09-23}
   s.email = %q{francois@teksol.info}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
   ]
   s.files = [
-    ".document",
-     ".gitignore",
+    ".gitignore",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -28,6 +27,7 @@ Gem::Specification.new do |s|
      "examples/upload_file_to_ad_unit.rb",
      "lib/ad_gear.rb",
      "lib/ad_gear/ad_spot.rb",
+     "lib/ad_gear/ad_spot_membership.rb",
      "lib/ad_gear/ad_unit.rb",
      "lib/ad_gear/ad_unit_click.rb",
      "lib/ad_gear/ad_unit_file.rb",

data/lib/ad_gear/ad_spot.rb

@@ -2,5 +2,6 @@ module AdGear
   class AdSpot < AdGear::Base
     ignorable_attributes :embed_code
     belongs_to :format
+    has_many :ad_spot_memberships
   end
 end

data/lib/ad_gear/ad_spot_membership.rb

@@ -0,0 +1,5 @@
+module AdGear
+  class AdSpotMembership < AdGear::Base
+    belongs_to :ad_spot, :placement
+  end
+end

data/lib/ad_gear/ad_unit_click.rb

@@ -1,4 +1,5 @@
 module AdGear
   class AdUnitClick < AdGear::Base
+    belongs_to :ad_unit
   end
 end

data/lib/ad_gear/ad_unit_file.rb

@@ -1,5 +1,6 @@
 module AdGear
   class AdUnitFile < AdGear::Base
     belongs_to :upload
+    belongs_to :ad_unit
   end
 end

data/lib/ad_gear/ad_unit_interaction.rb

@@ -1,4 +1,5 @@
 module AdGear
   class AdUnitInteraction < AdGear::Base
+    belongs_to :ad_unit
   end
 end

data/lib/ad_gear/ad_unit_variable.rb

@@ -1,4 +1,5 @@
 module AdGear
   class AdUnitVariable < AdGear::Base
+    belongs_to :ad_unit
   end
 end

data/lib/ad_gear/config.rb

@@ -1,3 +1,6 @@
+require "erb"
+require "pathname"
+
 module AdGear
   class Config
     # Raised when the specified environment could not be found in the YAML configuration file.
@@ -13,12 +16,12 @@ module AdGear
     #     site:     http://localhost:3000/api
     #     user:     dummy
     #     password: whatever
-    #     logger:   path/to/log/file.log
+    #     logger:   <%= Rails.root %>/path/to/log/file.log
     #   production:
     #     site:     http://admin.adgear.com/api
     #     user:     your_real_login
     #     password: your_real_digest_password
-    #     logger:   path/to/log/file.log
+    #     logger:   /var/log/ad_gear.log
     #
     # @example Reading this sample file:
     #   AdGear.config = AdGear::Config.new("path/to/config/file", "development")
@@ -36,16 +39,16 @@ module AdGear
     #                                          be raised.
     #
     # @raise MissingEnvironmentSpecification When the +environment+ parameter specifies a missing environment declaration.
-    def initialize(obj, environment=nil)
+    def initialize(obj={}, environment=nil)
       @config = Hash.new
       @logger = nil
 
       config = if obj.kind_of?(Hash) then
                  obj
                elsif obj.respond_to?(:read) then
-                 YAML.load(obj.read)
+                 YAML.load(ERB.new(obj.read).result)
                else
-                 YAML.load_file(obj)
+                 YAML.load_file(ERB.new(obj).result)
                end
       if environment then
         raise MissingEnvironmentSpecification, "Could not find #{environment.to_s.inspect} in #{config.inspect} read from #{obj.inspect}.  Add the missing environment declaration, or change the parameter to this method." unless config.respond_to?(:has_key?) && config.has_key?(environment.to_s)
@@ -131,6 +134,7 @@ module AdGear
                   # Existing stream
                   Logger.new(Object.const_get(value.upcase))
                 else
+                  warn("WARNING: path to logger in AdGear::Client configuration is relative: CWD is #{Dir.pwd.inspect}") unless Pathname.new(value).absolute?
                   # Path to a file
                   Logger.new(value)
                 end

data/lib/ad_gear/upload.rb

@@ -2,7 +2,7 @@ begin
   gem "francois-rest-client", ">= 1.1.5"
 rescue
   # Ignored.  We hope we got what we wanted
-  warn "Could not ensure francois-rest-client 1.1.5 is loaded.  If you have problems uploading files, make sure you have that gem install and that the AdGear::Client uses that version."
+  warn "Could not ensure francois-rest-client 1.1.5 is loaded.  If you have problems uploading files, make sure you have that gem installed and that the AdGear::Client uses that version."
 end
 require "restclient"
 

data/lib/ad_gear.rb

@@ -35,6 +35,7 @@ module AdGear
   # AdGear models themselves
   autoload :Site, "ad_gear/site"
   autoload :AdSpot, "ad_gear/ad_spot"
+  autoload :AdSpotMembership, "ad_gear/ad_spot_membership"
   autoload :WebCampaign, "ad_gear/web_campaign"
   autoload :Format, "ad_gear/format"
   autoload :Upload, "ad_gear/upload"

data/test/ad_gear/config_test.rb

@@ -62,6 +62,17 @@ class AdGear::ConfigTest < Test::Unit::TestCase
     AdGear::Config.new(StringIO.new({"logger" => "log/adgear.log"}.to_yaml))
   end
 
+  should "pass the config file through ERB before using the values" do
+    conf = AdGear::Config.new(StringIO.new({"user" => "<%= :whoami %>"}.to_yaml))
+    assert_equal "whoami", conf.user
+  end
+
+  should "warn when the path to the logger is relative" do
+    config = AdGear::Config.new
+    config.expects(:warn)
+    config.logger = "development.log"
+  end
+
   context "Given a configured AdGear::Config" do
     setup do
       conf = {"site" => "http://whatever.com/", "user" => "francois", "password" => "many", "use_basic_authentication" => false, "use_digest_authentication" => true}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-ad_gear_client
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-15 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
 - .gitignore
 - LICENSE
 - README.rdoc
@@ -77,6 +76,7 @@ files:
 - examples/upload_file_to_ad_unit.rb
 - lib/ad_gear.rb
 - lib/ad_gear/ad_spot.rb
+- lib/ad_gear/ad_spot_membership.rb
 - lib/ad_gear/ad_unit.rb
 - lib/ad_gear/ad_unit_click.rb
 - lib/ad_gear/ad_unit_file.rb

data/.document

@@ -1 +0,0 @@
-lib/**/*.rb