has_many_emails 0.2.11 → 0.2.16

data/VERSION

@@ -1 +1 @@
-0.2.11
+0.2.16

data/has_many_emails.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_many_emails}
-  s.version = "0.2.11"
+  s.version = "0.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danil Pismenny"]
@@ -21,7 +21,6 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
-     "app/models/email_address.rb",
      "has_many_emails.gemspec",
      "init.rb",
      "install.rb",
@@ -30,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/generators/templates/create_email_address.rb",
      "lib/has_many_emails.rb",
      "lib/has_many_emails/class_methods.rb",
+     "lib/has_many_emails/email_address.rb",
      "lib/has_many_emails/instance_methods.rb",
      "spec/db/create_db.rb",
      "spec/db/database.yml",

data/lib/generators/templates/create_email_address.rb

@@ -4,7 +4,7 @@ class <%= migration_name %> < ActiveRecord::Migration
     create_table :<%= email_address_table_name %> do |t|
       t.integer :user_id, :null => false
       t.string :email, :null => false
-      t.boolean :is_main, :null => false, :default=>false
+      # t.boolean :is_main, :null => false, :default=>false
 
       t.timestamps
     end
@@ -25,9 +25,7 @@ class <%= migration_name %> < ActiveRecord::Migration
   end
 
   def self.down
-
     drop_table :<%= email_address_table_name %>
-     
   end
 
 end

data/lib/has_many_emails/class_methods.rb

@@ -4,7 +4,7 @@ module HasManyEmails
   module ClassMethods
     
     def find_by_email( email )
-      address = email_addresses.find_by_email( email.downcase ) and address.user 
+      address = HasManyEmails::EmailAddress.find_by_email( email.downcase ) and address.user 
     end
 
   end

data/{app/models → lib/has_many_emails}/email_address.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class EmailAddress < ActiveRecord::Base
+class HasManyEmails::EmailAddress < ActiveRecord::Base
   belongs_to :user
 
   normalize_attributes :email

data/lib/has_many_emails/instance_methods.rb

@@ -58,7 +58,7 @@ module HasManyEmails
     end
 
     def add_email( value )
-      value = value.email if value.is_a? ::EmailAddress
+      value = value.email if value.is_a? HasManyEmails::EmailAddress
       value.downcase!
       return nil if value.blank? || has_email?( value )
 

data/lib/has_many_emails.rb

@@ -4,6 +4,7 @@ require 'validate_email'
 
 require 'has_many_emails/class_methods'
 require 'has_many_emails/instance_methods'
+require 'has_many_emails/email_address'
 
 module HasManyEmails
   
@@ -12,7 +13,7 @@ module HasManyEmails
   def has_many_emails
     class_eval <<-EOV
 
-    has_many :email_addresses, :dependent=>:destroy
+    has_many :email_addresses, :dependent=>:destroy, :class_name => 'HasManyEmails::EmailAddress'
 
     validate :validate_email_addresses
 

data/spec/models/email_spec.rb

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
+EmailAddress = HasManyEmails::EmailAddress
+
 describe EmailAddress do 
 
   #fixtures :users

data/spec/models/user_spec.rb

@@ -106,6 +106,10 @@ describe User do
         before(:all) { @user = User.create!(:email=>EMAIL) }
         it_should_behave_like "valid and have an email"
 
+        specify do
+          User.find_by_email( EMAIL.upcase ).email.should == EMAIL
+        end
+
         context "and unset email" do
           before(:all) { @user.email = '' }
           specify { @user.emails.should be_empty }

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@
 require 'active_record'
 require 'remarkable/active_record'
 
-require 'rails/init'
+require 'init'
 
 RSpec.configure do |config|
   config.include AttributeNormalizer::RSpecMatcher # Models group type is missing at this time rspec-rails 2.0.0.beta.11
@@ -16,7 +16,7 @@ SPEC='./spec'
 require 'db/create_db'
 
 # Load the model
-load "#{SPEC}/../app/models/email_address.rb"
+# load "#{SPEC}/../app/models/has_many_emails/email_address.rb"
 load "#{SPEC}/db/models/user.rb"
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_many_emails
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 2
-  - 11
-  version: 0.2.11
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - Danil Pismenny
@@ -102,7 +102,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- app/models/email_address.rb
 - has_many_emails.gemspec
 - init.rb
 - install.rb
@@ -111,6 +110,7 @@ files:
 - lib/generators/templates/create_email_address.rb
 - lib/has_many_emails.rb
 - lib/has_many_emails/class_methods.rb
+- lib/has_many_emails/email_address.rb
 - lib/has_many_emails/instance_methods.rb
 - spec/db/create_db.rb
 - spec/db/database.yml