ihunter-whatcounts 0.3.7 → 0.4.0

data/lib/whatcounts.rb

@@ -6,7 +6,7 @@ require 'cgi'
 # require 'fastercsv'
 
 module WhatCounts
-  VERSION = '0.3.7'
+  VERSION = '0.4.0'
   class WhatCountsError < StandardError; end
 
   class CreationError < WhatCountsError; end

data/lib/whatcounts/http_client.rb

@@ -26,7 +26,8 @@ module WhatCounts
 
       def execute(command,requestable)
         raise InvalidConfiguration,"Invalid WhatCounts configuration, are you sure it was configured?" unless @config
-        url = [@config.api_url,"?","c=#{command}&",@config.to_param_string,"&",requestable.to_param_string].join
+        request_string = requestable.kind_of?(String) ? requestable : requestable.to_param_string
+        url = [@config.api_url,"?","c=#{command}&",@config.to_param_string,"&",request_string].join
         res = Curl::Easy.perform(url) do |easy|
           easy.connect_timeout = 10
           easy.timeout = 30

data/lib/whatcounts/list.rb

@@ -38,6 +38,15 @@ module WhatCounts
       end
     end
     
+    def id; @id end
+    def to_param_string
+      @param_string ||= OPTIONS_TO_HTTP_PARAMS_MAP.keys.inject([]) do |acc,k|
+        val = self.send :"#{k}"
+        acc << "#{OPTIONS_TO_HTTP_PARAMS_MAP[k]}=#{CGI.escape(val.to_s)}" unless val.nil?
+        acc
+      end.join("&")
+    end
+    
     class << self
       def create!(options)
         o = self.new options
@@ -45,25 +54,59 @@ module WhatCounts
       end
     end
     
-    DEPLOY_OPTIONS_TO_HTTP_PARAMS_MAP = {:list => :list_id, :template => :template_id,
+    SUBSCRIBE_OPTIONS_TO_HTTP_PARAMS_MAP = {:list => :list_id, :format => :format,
+                                            :force_subscribe => :force_sub, :data => :data }
+    SUBSCRIBE_REQUIRED_OPTIONS = [:list]
+    SUBSCRIBE_IRREGULAR_OPTIONS = [:data]
+    def add_recipients!(recipient_ary)
+      options = {:list => @id, :format => 99, :force_subscribe => 1}
+      options[:data] = (['email']+recipient_ary).join('^')
+      res = WhatCounts::HttpClient.execute('sub',convert_to_whatcounts_parameters(options,SUBSCRIBE_OPTIONS_TO_HTTP_PARAMS_MAP,SUBSCRIBE_IRREGULAR_OPTIONS))
+    end
+    
+    LAUNCH_OPTIONS_TO_HTTP_PARAMS_MAP = {:list => :list_id, :template => :template_id,
                                          :subject => :subject, :format => :format,
                                          :segmentation_id => :segmentation_id, :campaign_alias => :campaign_alias, 
                                          :send_rss => :target_rss, :virtual_mta => :vmta, 
                                          :goodmail_token => :gm_token_type, :notification_email => :notify_email }
-    DEPLOY_REQUIRED_OPTIONS = []                                     
-    def deploy!(options)
-      options.each_key {|o| raise UnknownListOptionError,"Unknown option #{o}" unless VALID_OPTIONS.include? o}
-      res = WhatCounts::HttpClient.execute('excreatelist',o)
-    end
-    
-    def id; @id end
-    def to_param_string
-      @param_string ||= OPTIONS_TO_HTTP_PARAMS_MAP.keys.inject([]) do |acc,k|
-        val = self.send :"#{k}"
-        acc << "#{OPTIONS_TO_HTTP_PARAMS_MAP[k]}=#{CGI.escape(val.to_s)}" unless val.nil?
-        acc
-      end.join("&")
+    LAUNCH_REQUIRED_OPTIONS = [:list]                        
+    def launch!(options={})
+      # options.each_key {|o| raise UnknownListOptionError,"Unknown option #{o}" unless VALID_OPTIONS.include? o}
+      options = {:list => @id, :format => 99}.merge(options)
+      res = WhatCounts::HttpClient.execute('launch',convert_to_whatcounts_parameters(options,LAUNCH_OPTIONS_TO_HTTP_PARAMS_MAP))
+      if res.success?
+        return res
+      else
+        puts res.url
+        raise DeployError, res.body
+      end
     end
     
+    private
+      #TODO move into baseclass
+      def convert_to_whatcounts_parameters(params,lookup,irregular_options=[])
+        begin
+          pairs = (lookup.keys-irregular_options).inject([]) do |acc,k|
+            val = params[k]
+            acc << "#{lookup[k]}=#{CGI.escape(val.to_s)}" unless val.nil?
+            acc
+          end
+          unless params[:data].nil?
+            if params[:data].kind_of? String
+              pairs << "data=#{params[:data]}"
+            elsif params[:data].kind_of? Hash
+              data_pairs = params[:data].inject([[],[]]) do |acc,(k,v)|
+                acc[0] << CGI.escape(k)
+                acc[1] << CGI.escape(v)
+                acc
+              end
+              pairs << "data=#{data_pairs[0].join(',')}^#{data_pairs[1].join(',')}"
+            else 
+              # TODO i duno what to do here, probably error?  Maybe not since the param isn't required
+            end
+          end
+          pairs
+        end.join("&")
+      end
   end
 end

data/lib/whatcounts/response.rb

@@ -4,13 +4,13 @@ module WhatCounts
     SUCCESS = true
     FAILURE = false
     
-    attr_reader :result, :body
+    attr_reader :result, :body, :url
     private
-      attr_writer :result, :body
-    
+      attr_writer :result, :body, :url
     public 
     
     def initialize(url,document)
+      self.url = url
       if document =~ /^(SUCCESS|FAILURE):?(.*)/
         # simple response
         self.body = $2.strip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ihunter-whatcounts
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ian Hunter