contactology 0.1.0 → 0.1.1

data/Changelog.markdown

@@ -1,3 +1,10 @@
+### 0.1.1 / 2011-08-25
+
+[full changelog](http://github.com/nbibler/contactology/compare/v0.1.0...v0.1.1)
+
+* Bug fixes
+  * Return the correct campaign class from Campaign#find and Campaign#find_by_name
+
 ### 0.1.0 / 2011-08-25
 
 [full changelog](http://github.com/nbibler/contactology/compare/v0.0.2...v0.1.0)

data/lib/contactology/campaign.rb

@@ -65,9 +65,7 @@ module Contactology
     def self.find(id, options = {})
       query('Campaign_Get_Info', options.merge({
         'campaignId' => id,
-        :on_success => Proc.new { |response|
-          Campaign.new(response) if response.kind_of?(Hash)
-        }
+        :on_success => Proc.new { |r| new_campaign_from_response(r) }
       }))
     end
 
@@ -76,8 +74,8 @@ module Contactology
         'searchParameters' => {
           'campaignName' => name
         },
-        :on_success => Proc.new { |response|
-          Campaign.new(response.values.first) unless response.nil?
+        :on_success => Proc.new { |r|
+          new_campaign_from_response(r.values.first) unless r.nil?
         }
       }))
     end
@@ -125,5 +123,20 @@ module Contactology
         :on_success => Proc.new { |response| Preview.new(response) }
       }))
     end
+
+
+    private
+
+
+    def self.new_campaign_from_response(response)
+      case response['type']
+      when 'transactional'
+        Campaigns::Transactional.new(response)
+      when 'standard'
+        Campaigns::Standard.new(response)
+      else
+        Campaign.new(response)
+      end
+    end
   end
 end

data/lib/contactology/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Contactology
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/models/contactology/campaign_spec.rb

@@ -17,7 +17,7 @@ describe Contactology::Campaign do
       subject { Contactology::Campaign.find campaign.id }
       after(:each) { list.destroy; campaign.destroy }
 
-      it { should be_instance_of Contactology::Campaign }
+      it { should be_a Contactology::Campaign }
     end
 
     context 'for an unknown campaign' do
@@ -36,7 +36,7 @@ describe Contactology::Campaign do
       after(:each) { list.destroy; campaign.destroy }
       subject { Contactology::Campaign.find_by_name campaign.name }
 
-      it { should be_instance_of Contactology::Campaign }
+      it { should be_a Contactology::Campaign }
       its(:name) { should == campaign.name }
     end
 

metadata

@@ -2,7 +2,7 @@
 name: contactology
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Nathaniel Bibler