francois-ad_gear_client 0.3.4 → 0.3.5

data/Rakefile

@@ -20,6 +20,7 @@ begin
 
     gem.add_dependency "activeresource", "> 2.0"
     gem.add_dependency "francois-rest-client", "~> 1"
+    gem.add_dependency "nokogiri"
   end
 
   Jeweler::RubyforgeTasks.new

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

data/ad_gear_client.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ad_gear_client}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]

data/lib/ad_gear/config.rb

@@ -48,7 +48,7 @@ module AdGear
                elsif obj.respond_to?(:read) then
                  YAML.load(ERB.new(obj.read).result)
                else
-                 YAML.load_file(ERB.new(obj).result)
+                 YAML.load(ERB.new(IO.read(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)

data/lib/ad_gear.rb

@@ -33,6 +33,7 @@ module AdGear
   autoload :Base, "ad_gear/base"
 
   # AdGear models themselves
+  autoload :Advertiser, "ad_gear/advertiser"
   autoload :Site, "ad_gear/site"
   autoload :AdSpot, "ad_gear/ad_spot"
   autoload :AdSpotMembership, "ad_gear/ad_spot_membership"
@@ -89,6 +90,7 @@ module AdGear
       AdGear::Base.use_digest_authentication = config.use_digest_authentication
     end
 
+    # TODO: Programatically determine if we can use Nokogiri
     ActiveSupport::XmlMini.backend = "Nokogiri"
 
     # Can't require before now, because our own method is overwritten

data/test/ad_gear/config_test.rb

@@ -14,6 +14,18 @@ class AdGear::ConfigTest < Test::Unit::TestCase
     end
   end
 
+  should "pass a file's content through ERB before evaluating configuration" do
+    conf = {"user" => "<%= :whoami %>"}
+    econf = {"user" => "whoami"}
+    Tempfile.open("config") do |io|
+      io.write conf.to_yaml
+      io.close
+
+      aconf = AdGear::Config.new(io.path)
+      assert_equal econf, aconf.to_hash
+    end
+  end
+
   should "read a stream" do
     econf = {"site" => "http://whatever.com/", "user" => "francois", "password" => "many"}
     Tempfile.open("config") do |io|
@@ -58,8 +70,8 @@ class AdGear::ConfigTest < Test::Unit::TestCase
   end
 
   should "instantiate a Logger for the file named 'log/adgear.log' when the key is 'log/adgear.log'" do
-    Logger.expects(:new).with("log/adgear.log").returns(mock("Logger"))
-    AdGear::Config.new(StringIO.new({"logger" => "log/adgear.log"}.to_yaml))
+    Logger.expects(:new).with(File.join(Dir.pwd, "log/adgear.log")).returns(mock("Logger"))
+    AdGear::Config.new(StringIO.new({"logger" => File.join(Dir.pwd, "log/adgear.log")}.to_yaml))
   end
 
   should "pass the config file through ERB before using the values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: francois-ad_gear_client
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"