apsis-on-steroids 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/apsis-on-steroids.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "apsis-on-steroids"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kaspernj"]
-  s.date = "2013-07-25"
+  s.date = "2013-07-26"
   s.description = "A Ruby API for the Apsis mail service. "
   s.email = "k@spernj.org"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "apsis-on-steroids.gemspec",
+    "include/errors.rb",
     "include/mailing_list.rb",
     "include/sub_base.rb",
     "include/subscriber.rb",

data/include/errors.rb

@@ -0,0 +1,3 @@
+class ApsisOnSteroids::Errors
+  class SubscriberNotFound < RuntimeError; end
+end

data/include/mailing_list.rb

@@ -28,6 +28,7 @@ class ApsisOnSteroids::MailingList < ApsisOnSteroids::SubBase
     data_subscribers
   end
   
+  # Returns the subscribers of the mailing list.
   def subscribers
     res = aos.req_json("v1/mailinglists/#{data(:id)}/subscribers/all", :post, :json => {
       "AllDemographics" => false,
@@ -53,15 +54,22 @@ class ApsisOnSteroids::MailingList < ApsisOnSteroids::SubBase
         end
       end
     end
-
+    
+    ret = []
     data_subscribers.each do |sub_data|
       sub = ApsisOnSteroids::Subscriber.new(
         :aos => self.aos,
         :data => aos.parse_obj(sub_data)
       )
       
-      yield sub
+      if block_given?
+        yield sub
+      else
+        ret << sub
+      end
     end
+    
+    return ret
   end
   
   # Adds the given email as a new subscriber and subscribes the created subscriber to the mailing list.

data/include/subscriber.rb

@@ -1,14 +1,31 @@
 class ApsisOnSteroids::Subscriber < ApsisOnSteroids::SubBase
   # Fetches the details from the server and returns them.
   def details
-    res = aos.req_json("v1/subscribers/id/#{data(:id)}")
+    if !@details
+      res = aos.req_json("v1/subscribers/id/#{data(:id)}")
+      
+      ret = {}
+      res["Result"].each do |key, val|
+        ret[key.to_sym] = val
+      end
+      
+      @details = ret
+    end
+    
+    return @details
+  end
+  
+  # Returns the DemDataField by the given key.
+  def dem_data(key)
+    key = key.to_s.downcase
     
-    ret = {}
-    res["Result"].each do |key, val|
-      ret[key.to_sym] = val
+    self.details[:DemDataFields].each do |dem_data|
+      if dem_data["Key"].to_s.downcase == key
+        return dem_data["Value"]
+      end
     end
     
-    return ret
+    return nil
   end
   
   # Returns true if the subscriber is active.
@@ -42,6 +59,7 @@ class ApsisOnSteroids::Subscriber < ApsisOnSteroids::SubBase
     end
     
     raise data["FailedUpdatedSubscribers"].to_s if data["FailedUpdatedSubscribers"] && data["FailedUpdatedSubscribers"].any?
+    @details = nil
     return nil
   end
   

data/lib/apsis-on-steroids.rb

@@ -82,12 +82,12 @@ class ApsisOnSteroids
     
     raise "Could not find mailing list by that name: '#{name}'."
   end
-    
+  
   def subscriber_by_email(email)
     begin
       res = req_json("v1/subscribers/email/lookup/#{CGI.escape(email)}")
     rescue
-      raise "Could not find subscriber by that email in the system"
+      raise ApsisOnSteroids::Errors::SubscriberNotFound, "Could not find subscriber by that email in the system: '#{email}'."
     end
   
     sub = ApsisOnSteroids::Subscriber.new(

data/spec/apsis-on-steroids_spec.rb

@@ -51,7 +51,7 @@ describe "ApsisOnSteroids" do
     it "can create subscribers" do
       sub
     end
-
+    
     it "can get subscribers and their details" do
       details = sub.details
       details.is_a?(Hash).should eql(true)
@@ -91,7 +91,7 @@ describe "ApsisOnSteroids" do
         #puts "Subscriber: #{sub_i}"
       end
       
-      raise "Expected more than one." if count <= 1
+      raise "Expected more than one." if count < 1
     end
 
     it "can remove subscribers from lists" do
@@ -118,5 +118,11 @@ describe "ApsisOnSteroids" do
       mlist.opt_out_remove_subscriber(sub)
       mlist.opt_out?(sub).should eql(false)
     end
+    
+    it "trying to an email that does not exist should raise the correct error" do
+      expect{
+        aos.subscriber_by_email("asd@asd.com")
+      }.to raise_error(ApsisOnSteroids::Errors::SubscriberNotFound)
+    end
   end
 end

metadata

@@ -2,14 +2,14 @@
 name: apsis-on-steroids
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,6 +124,7 @@ files:
 - Rakefile
 - VERSION
 - apsis-on-steroids.gemspec
+- include/errors.rb
 - include/mailing_list.rb
 - include/sub_base.rb
 - include/subscriber.rb
@@ -144,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: -3749909533048990827
+      hash: 2611720975442987225
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false