has_emails 0.1.3 → 0.1.4

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 == master
 
+== 0.1.4 / 2008-10-26
+
+* Add compatibility with has_messages 0.2.0
+* Change how the base module is included to prevent namespacing conflicts
+
 == 0.1.3 / 2008-09-07
 
 * Add compatibility with state_machine 0.3.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'has_emails'
-  s.version           = '0.1.3'
+  s.version           = '0.1.4'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Demonstrates a reference implementation for sending emails with logging and asynchronous support.'
   
@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']
-  s.add_dependency    'has_messages', '>= 0.1.3'
+  s.add_dependency    'has_messages', '>= 0.2.0'
   s.add_dependency    'validates_as_email_address', '>= 0.0.2'
   
   s.author            = 'Aaron Pfeifer'

data/lib/has_emails/extensions/action_mailer.rb

@@ -91,8 +91,7 @@ module PluginAWeek #:nodoc:
           def queue
             Email.transaction do
               # Create the main email
-              email = Email.new(
-                :sender => EmailAddress.find_or_create_by_address(from),
+              email = EmailAddress.find_or_create_by_address(from).emails.build(
                 :subject => subject,
                 :body => body,
                 :to => email_addresses_for(:recipients),

data/lib/has_emails.rb

@@ -5,12 +5,6 @@ require 'has_emails/extensions/action_mailer'
 module PluginAWeek #:nodoc:
   # Adds a generic implementation for sending emails
   module HasEmails
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend PluginAWeek::HasEmails::MacroMethods
-      end
-    end
-    
     module MacroMethods
       # Creates the following email associations:
       # * +emails+ - Emails that were composed and are visible to the owner.  Emails may have been sent or unsent.
@@ -61,5 +55,5 @@ module PluginAWeek #:nodoc:
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::HasEmails
+  extend PluginAWeek::HasEmails::MacroMethods
 end

data/test/factory.rb

@@ -13,12 +13,16 @@ module Factory
   def valid_attributes_for(model, attributes = {})
     name = model.to_s.underscore
     send("#{name}_attributes", attributes)
+    attributes.stringify_keys!
     attributes
   end
   
   # Build an unsaved record
   def new_record(model, *args)
-    model.new(valid_attributes_for(model, *args))
+    attributes = valid_attributes_for(model, *args)
+    record = model.new(attributes)
+    attributes.each {|attr, value| record.send("#{attr}=", value) if model.accessible_attributes && !model.accessible_attributes.include?(attr) || model.protected_attributes && model.protected_attributes.include?(attr)}
+    record
   end
   
   # Build and save/reload a record

data/test/functional/has_emails_test.rb

@@ -22,7 +22,7 @@ class EmailAddressByDefaultFunctionalTest < Test::Unit::TestCase
   end
 end
 
-class EmailAddresFunctionalsTest < Test::Unit::TestCase
+class EmailAddressFunctionalTest < Test::Unit::TestCase
   def setup
     @email_address = create_email_address
   end

data/test/test_helper.rb

@@ -8,6 +8,6 @@ ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
 
 # Mixin the factory helper
 require File.expand_path("#{File.dirname(__FILE__)}/factory")
-class Test::Unit::TestCase #:nodoc:
+Test::Unit::TestCase.class_eval do
   include Factory
 end

data/test/unit/email_address_test.rb

@@ -65,6 +65,18 @@ class EmailAddressTest < Test::Unit::TestCase
     email_address = new_email_address(:name => nil)
     assert email_address.valid?
   end
+  
+  def test_should_protect_attributes_from_mass_assignment
+    email_address = EmailAddress.new(
+      :id => 1,
+      :name => 'John Smith',
+      :spec => 'john.smith@gmail.com'
+    )
+    
+    assert_nil email_address.id
+    assert_equal 'John Smith', email_address.name
+    assert_equal 'john.smith@gmail.com', email_address.spec
+  end
 end
 
 class EmailAddressFromAddressTest < Test::Unit::TestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: has_emails
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-07 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 0.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: validates_as_email_address