cabbage 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/cabbage.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cabbage"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Lauer"]

data/lib/cabbage/email/email.rb

@@ -26,8 +26,10 @@ module Cabbage
     attr_reader :raw_source, :raw_parsed, :header, :original_keys, :parts, :multipart
 
     def method_missing(m, *args, &block)
-      if @header.keys.include?(m.intern)
-        @header[m.intern]
+      if self.keys.include?(m)
+        self[m]
+      elsif self.key.include?(m.intern)
+        self[m.intern]
       else
         raise "undefined method in Cabbage::Email"
       end
@@ -53,13 +55,9 @@ module Cabbage
       @original_keys = @raw_parsed[:original_keys]
       if header[:content_type].include?("multipart")
         @multipart = true
-        make_flat(@raw_parsed).each do |raw_part|
-          @parts << MimePart.new(raw_part)
-        end
-      else
-        make_flat(@raw_parsed).each do |raw_part|
-          @parts << MimePart.new(raw_part)
-        end    
+      end
+      make_flat(@raw_parsed).each do |raw_part|
+        @parts << MimePart.new(raw_part)
       end
       return true
     end
@@ -71,19 +69,29 @@ module Cabbage
     def [](key)
       if @header.has_key?(key)
         @header[key]
-      elsif key == :body
-        self.body
       elsif self.mime_types.include?(key)
         @parts[self.mime_types.index(key)].body
-      elsif key.class == FixNum
-
+      elsif key.class == String && self.keys.include?(key.intern)
+        self[key.intern]
+      elsif key == :body
+        self.body
+      elsif key == :plaintext && self.mime_types.include?("text/plain")
+        @parts[self.mime_types.index("text/plain")].body
+      elsif key == :html && self.mime_types.include?("text/html")
+        @parts[self.mime_types.index("text/html")].body
+      elsif key == :attachments
+        self.attachments
+      elsif key.class == Fixnum
+        # to be implemented
+        nil
       else
+        # perhaps raise exception here?
         nil
       end
     end
 
     def keys
-      @header.keys + [:body] + self.mime_types 
+      @header.keys + [:body, :html, :plaintext, :attachments] + self.mime_types 
     end
 
     def attachments
@@ -122,12 +130,11 @@ module Cabbage
     ########################## PRIVATE METHODS ##########################
     #####################################################################
 
-    private
+    #private
 
     def make_flat(tree)
       results = []
-
-      if tree[:body].class == Hash
+      if tree[:body].class == Array
         tree[:body].each do |this_part|
           if this_part[:header][:content_type] =~ /^multipart/
             results << make_flat(this_part)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cabbage
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &12429820 !ruby/object:Gem::Requirement
+  requirement: &12777640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12429820
+  version_requirements: *12777640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &12425540 !ruby/object:Gem::Requirement
+  requirement: &12760460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *12425540
+  version_requirements: *12760460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &12420200 !ruby/object:Gem::Requirement
+  requirement: &12736820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *12420200
+  version_requirements: *12736820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &12400380 !ruby/object:Gem::Requirement
+  requirement: &12733280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12400380
+  version_requirements: *12733280
 description: More to come.
 email: josh.lauer75@gmail.com
 executables: []
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 634790544501283345
+      hash: -3456766712988366960
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: