bloom-ad_gear_client 0.3.5 → 0.3.6

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.5
+0.3.6

data/ad_gear_client.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ad_gear_client}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   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-23}
+  s.date = %q{2009-09-25}
   s.email = %q{francois@teksol.info}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -90,16 +90,19 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
       s.add_runtime_dependency(%q<activeresource>, ["> 2.0"])
       s.add_runtime_dependency(%q<francois-rest-client>, ["~> 1"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
     else
       s.add_dependency(%q<lsegal-yard>, [">= 0.2.3"])
       s.add_dependency(%q<mocha>, [">= 0.9.5"])
       s.add_dependency(%q<activeresource>, ["> 2.0"])
       s.add_dependency(%q<francois-rest-client>, ["~> 1"])
+      s.add_dependency(%q<nokogiri>, [">= 0"])
     end
   else
     s.add_dependency(%q<lsegal-yard>, [">= 0.2.3"])
     s.add_dependency(%q<mocha>, [">= 0.9.5"])
     s.add_dependency(%q<activeresource>, ["> 2.0"])
     s.add_dependency(%q<francois-rest-client>, ["~> 1"])
+    s.add_dependency(%q<nokogiri>, [">= 0"])
   end
 end

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/lib/ad_gear/ad_unit.rb

@@ -1,7 +1,9 @@
 module AdGear
   class AdUnit < AdGear::Base
     has_many :ad_unit_files, :ad_unit_clicks, :ad_unit_interactions, :ad_unit_variables
-    belongs_to :campaign, :format
+    has_many :placement_memberships
+    belongs_to :web_campaign, :as => :campaign
+    belongs_to :format
 
     def active?
       state == "active"

data/lib/ad_gear/base.rb

@@ -13,16 +13,17 @@ module AdGear
     #   class AdGear::AdSpot < AdGear::Base
     #     belongs_to :format
     #     belongs_to :bookable, :polymorphic => true
+    #     belongs_to :web_campaign, :as => :campaign
     #   end
     #
     #   include AdGear
-    #   AdSpot.new(:format => Format.find(1), :bookable => Publisher.find(2)).attributes
-    #     #=> {"format_id" => 1, "bookable_id" => 2, "bookable_type" => "Publisher"}
+    #   AdSpot.new(:format => Format.find(1), :bookable => Publisher.find(2), :web_campaign => WebCampaign.find(3)).attributes
+    #     #=> {"format_id" => 1, "bookable_id" => 2, "bookable_type" => "Publisher", "campaign_id" => 3}
     def self.belongs_to(*attributes)
       options = attributes.extract_options!
       attributes.each do |attribute|
         attribute_name = attribute.to_s
-        belongs_to_associations[attribute_name] = options
+        belongs_to_associations[attribute_name] = options.reverse_merge(:as => attribute_name)
 
         if options[:polymorphic] then
           polymorphic_belongs_to_attribute_writer_for(attribute_name)
@@ -138,8 +139,8 @@ module AdGear
 
     def self.polymorphic_belongs_to_attribute_reader_for(attribute_name) #:nodoc:
       define_method(attribute_name) do
-        klass = @attributes[belongs_to_attribute_name_for_class(attribute_name)]
-        id    = @attributes[belongs_to_attribute_name_for_id(attribute_name)]
+        klass = @attributes[self.class.belongs_to_attribute_name_for_class(attribute_name)]
+        id    = @attributes[self.class.belongs_to_attribute_name_for_id(attribute_name)]
         id.blank? ? nil : AdGear.const_get(AdGear.const_get(klass)).find(id)
       end
     end
@@ -152,17 +153,17 @@ module AdGear
 
     def self.belongs_to_attribute_reader_for(attribute_name) #:nodoc:
       define_method(attribute_name) do
-        id = @attributes[belongs_to_attribute_name_for_id(attribute_name)]
+        id = @attributes[self.class.belongs_to_attribute_name_for_id(attribute_name)]
         id.blank? ? nil : AdGear.const_get(attribute_name.classify).find(id)
       end
     end
 
     def self.belongs_to_attribute_name_for_class(association_name)
-      "#{association_name}_type"
+      "%s_type" % belongs_to_associations[association_name][:as]
     end
 
     def self.belongs_to_attribute_name_for_id(association_name)
-      "#{association_name}_id"
+      "%s_id" % belongs_to_associations[association_name][:as]
     end
   end
 end

data/lib/ad_gear/core_ext.rb

@@ -8,7 +8,7 @@
 #
 class Array
   def to_xml_with_module_prefixing(options = {})
-    raise "Not all elements respond to to_xml" unless all? { |e| e.respond_to? :to_xml }
+    raise "Not all elements respond to to_xml in #{self.inspect}" unless all? { |e| e.respond_to? :to_xml }
     root = all? { |e| e.is_a?(first.class) && first.class.to_s != "Hash" } ?
       ActiveSupport::Inflector.pluralize(ActiveSupport::Inflector.underscore(first.class.to_s.split("::").last)) : "records"
     to_xml_without_module_prefixing({ :root => root }.merge(options))

data/lib/ad_gear/has_many_array.rb

@@ -14,9 +14,14 @@ module AdGear
 
     def <<(object)
       root = if object.kind_of?(Hash) then
-               # Instantiate an object from the Hash, which will obviously be a new object
-               object = @klass.new(object)
-               @new
+               if object.has_key?("id") || object.has_key?(:id) then
+                 object = @klass.new(object)
+                 @saved
+               else
+                 # Instantiate an object from the Hash, which will obviously be a new object
+                 object = @klass.new(object)
+                 @new
+               end
              elsif object.respond_to?(:new_record?) && object.new_record?
                @new
              else
@@ -36,6 +41,22 @@ module AdGear
 
     alias_method :size, :length
 
+    def empty?
+      combined.empty?
+    end
+
+    def [](*args)
+      combined[*args]
+    end
+
+    def first
+      combined.first
+    end
+
+    def last
+      combined.last
+    end
+
     def to_xml(options={})
       xml = options[:builder] || Builder::XmlMarkup.new
       xml.__send__(@name) do
@@ -54,5 +75,10 @@ module AdGear
         end
       end
     end
+
+    private
+    def combined
+      @new + @saved
+    end
   end
 end

data/lib/ad_gear/web_campaign.rb

@@ -1,4 +1,5 @@
 module AdGear
   class WebCampaign < AdGear::Base
+    has_many :web_placements
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bloom-ad_gear_client
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-23 00:00:00 -07:00
+date: 2009-09-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: francois@teksol.info
 executables: []