has_addresses 0.0.2 → 0.5.0

data/db/migrate/001_create_countries.rb

@@ -1,14 +1,14 @@
 class CreateCountries < ActiveRecord::Migration
   def self.up
     create_table :countries do |t|
-      t.column :name, :string, :null => false, :limit => 80
-      t.column :official_name, :string, :limit => 80
-      t.column :alpha_2_code, :string, :null => false, :limit => 2
-      t.column :alpha_3_code, :string, :null => false, :limit => 3
+      t.string :name, :official_name, :null => false
+      t.string :alpha_2_code, :null => false, :limit => 2
+      t.string :alpha_3_code, :null => false, :limit => 3
+    end
+    
+    change_table :countries do |t|
+      t.index :alpha_2_code
     end
-    add_index :countries, :name, :unique => true
-    add_index :countries, :alpha_2_code, :unique => true
-    add_index :countries, :alpha_3_code, :unique => true
   end
   
   def self.down

data/db/migrate/002_create_regions.rb

@@ -1,12 +1,14 @@
 class CreateRegions < ActiveRecord::Migration
   def self.up
     create_table :regions do |t|
-      t.column :country_id, :integer, :null => false
-      t.column :name, :string, :null => false, :limit => 50
-      t.column :abbreviation, :string, :null => false, :limit => 5
+      t.references :country, :null => false
+      t.string :code, :name, :abbreviation, :null => false
+      t.string :group
+    end
+    
+    change_table :regions do |t|
+      t.index :code
     end
-    add_index :regions, [:name, :country_id], :unique => true
-    add_index :regions, [:abbreviation, :country_id], :unique => true
   end
   
   def self.down

data/db/migrate/003_create_addresses.rb

@@ -1,21 +1,19 @@
 class CreateAddresses < ActiveRecord::Migration
   def self.up
     create_table :addresses do |t|
-      t.column :addressable_id, :integer, :null => false, :references => nil
-      t.column :addressable_type, :string, :null => false
-      t.column :street_1, :string, :null => false, :limit => 100
-      t.column :street_2, :string, :limit => 100
-      t.column :city, :string, :null => false, :limit => 255
-      t.column :region_id, :integer
-      t.column :custom_region, :string, :limit => 50
-      t.column :postal_code, :string, :null => false, :limit => 5
-      t.column :country_id, :integer, :default => 223
-      t.column :created_at, :timestamp, :null => false
-      t.column :updated_at, :datetime, :null => false
+      t.references :addressable, :polymorphic => true, :null => false
+      t.string :street_1, :null => false
+      t.string :street_2
+      t.string :city, :null => false
+      t.references :region
+      t.string :custom_region
+      t.string :postal_code, :null => false
+      t.references :country
+      t.timestamps
     end
   end
   
   def self.down
     drop_table :addresses
   end
-end
+end

data/lib/has_addresses.rb

@@ -1,74 +1,15 @@
-module PluginAWeek #:nodoc:
-  module Has #:nodoc:
-    # Adds base models for interacting with addresses, including Country,
-    # Region, and Address.  These have the minimal attribute definitions needed
-    # to store addresses.
-    module Addresses
-      # Whether or not to use verbose output
-      mattr_accessor :verbose
-      @@verbose = true
-      
-      def self.included(base) #:nodoc:
-        base.extend(MacroMethods)
-      end
-      
-      module MacroMethods
-        # Creates a new association for having a single address.  This takes
-        # the same parameters as +has_one+.  By default, the following associations
-        # are the same:
-        # 
-        #   class Person < ActiveRecord::Base
-        #     has_address
-        #   end
-        # 
-        # and
-        # 
-        #   class Person < ActiveRecord::Base
-        #     has_one :address,
-        #               :class_name => 'Address',
-        #               :as => :addressable,
-        #               :dependent => :destroy
-        #   end
-        def has_address(*args, &extension)
-          create_address_association(:one, :address, *args, &extension)
-        end
-        
-        # Creates a new association for having a multiple addresses.  This takes
-        # the same parameters as +has_many+.  By default, the following associations
-        # are the same:
-        # 
-        #   class Person < ActiveRecord::Base
-        #     has_addresses
-        #   end
-        # 
-        # and
-        # 
-        #   class Person < ActiveRecord::Base
-        #     has_many  :addresses,
-        #                 :class_name => 'Address',
-        #                 :as => :addressable,
-        #                 :dependent => :destroy
-        #   end
-        def has_addresses(*args, &extension)
-          create_address_association(:many, :addresses, *args, &extension)
-        end
-        
-        private
-        def create_address_association(cardinality, association_id, *args, &extension)
-          options = extract_options_from_args!(args)
-          options.symbolize_keys!.reverse_merge!(
-            :class_name => 'Address',
-            :as => :addressable,
-            :dependent => :destroy
-          )
-          
-          send("has_#{cardinality}", args.first || association_id, options, &extension)
-        end
-      end
+# Adds a generic implementation for dealing with regions, countries, and
+# addresses
+module HasAddresses
+  module MacroMethods
+    # Creates the following association:
+    # * +addresses+ - All addresses associated with the current record
+    def has_addresses
+      has_many :addresses, :as => :addressable
     end
   end
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::Has::Addresses
+  extend HasAddresses::MacroMethods
 end

data/test/app_root/app/models/company.rb

@@ -1,7 +1,3 @@
 class Company < ActiveRecord::Base
-  has_address :headquarters_address,
-                :conditions => ['addresses.kind = ?', 'headquarters']
-  has_address :sales_address,
-                :conditions => ['addresses.kind = ?', 'sales']
   has_addresses
-end
+end

data/test/app_root/config/environment.rb

@@ -1,25 +1,12 @@
 require 'config/boot'
 
-$:.unshift("#{RAILS_ROOT}/../../../../../rails/plugin_dependencies/lib")
-begin
-  require 'plugin_dependencies'
-rescue Exception => e
-end
-
 Rails::Initializer.run do |config|
-  config.plugin_paths.concat([
-    "#{RAILS_ROOT}/../../..",
-    "#{RAILS_ROOT}/../../../../migrations",
-    "#{RAILS_ROOT}/../../../../../rails",
-    "#{RAILS_ROOT}/../../../../../test"
-  ])
-  config.plugins = [
-    'loaded_plugins',
-    'appable_plugins',
-    'plugin_migrations',
-    File.basename(File.expand_path("#{RAILS_ROOT}/../..")),
-    'dry_validity_assertions'
-  ]
+  config.plugin_paths << '..'
+  config.plugins = %w(enumerate_by has_addresses)
   config.cache_classes = false
   config.whiny_nils = true
+  config.action_controller.session = {:key => 'rails_session', :secret => 'd229e4d22437432705ab3985d4d246'}
+  config.after_initialize do
+    EnumerateBy.perform_caching = false
+  end
 end

data/test/app_root/db/migrate/001_create_companies.rb

@@ -1,7 +1,7 @@
 class CreateCompanies < ActiveRecord::Migration
   def self.up
     create_table :companies do |t|
-      t.column :name,   :string
+      t.string :name, :null => false
     end
   end
   

data/test/app_root/db/migrate/002_migrate_has_addresses_to_version_3.rb

@@ -0,0 +1,13 @@
+class MigrateHasAddressesToVersion3 < ActiveRecord::Migration
+  def self.up
+    ActiveRecord::Migrator.new(:up, "#{Rails.root}/../../db/migrate", 0).migrations.each do |migration|
+      migration.migrate(:up)
+    end
+  end
+  
+  def self.down
+    ActiveRecord::Migrator.new(:up, "#{Rails.root}/../../db/migrate", 0).migrations.each do |migration|
+      migration.migrate(:down)
+    end
+  end
+end

data/test/factory.rb

@@ -0,0 +1,68 @@
+module Factory
+  # Build actions for the model
+  def self.build(model, &block)
+    name = model.to_s.underscore
+    
+    define_method("#{name}_attributes", block)
+    define_method("valid_#{name}_attributes") {|*args| valid_attributes_for(model, *args)}
+    define_method("new_#{name}")              {|*args| new_record(model, *args)}
+    define_method("create_#{name}")           {|*args| create_record(model, *args)}
+  end
+  
+  # Get valid attributes for the model
+  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)
+    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
+  def create_record(model, *args)
+    record = new_record(model, *args)
+    record.save!
+    record.reload
+    record
+  end
+  
+  build Address do |attributes|
+    attributes[:addressable] = create_company unless attributes.include?(:addressable)
+    attributes[:region] = create_region(attributes.slice(:country)) unless attributes.include?(:region)
+    attributes.reverse_merge!(
+      :street_1 => '1600 Amphitheatre Parkway',
+      :city => 'Mountain View',
+      :postal_code => '94043'
+    )
+  end
+  
+  build Company do |attributes|
+    attributes.reverse_merge!(
+      :name => 'Google'
+    )
+  end
+  
+  build Country do |attributes|
+    attributes.reverse_merge!(
+      :name => 'United States',
+      :official_name => 'United States of America',
+      :alpha_2_code => 'US',
+      :alpha_3_code => 'USA'
+    )
+  end
+  
+  build Region do |attributes|
+    attributes[:country] = create_country unless attributes.include?(:country)
+    attributes.reverse_merge!(
+      :name => 'California',
+      :abbreviation => 'CA'
+    )
+  end
+end

data/test/functional/has_addresses_test.rb

@@ -0,0 +1,22 @@
+require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
+
+class CompanyByDefaultTest < ActiveRecord::TestCase
+  def setup
+    @company = create_company
+  end
+  
+  def test_should_not_have_any_addresses
+    assert @company.addresses.empty?
+  end
+end
+
+class CompanyWithAddressesTest < ActiveRecord::TestCase
+  def setup
+    @company = create_company
+    @address = create_address(:addressable => @company)
+  end
+  
+  def test_should_have_addresses
+    assert_equal [@address], @company.addresses
+  end
+end

data/test/test_helper.rb

@@ -1,11 +1,17 @@
 # Load the plugin testing framework
-$:.unshift("#{File.dirname(__FILE__)}/../../../../test/plugin_test_helper/lib")
+$:.unshift("#{File.dirname(__FILE__)}/../../plugin_test_helper/lib")
 require 'rubygems'
 require 'plugin_test_helper'
 
-PluginAWeek::Has::Addresses.verbose = false
+# Run the migrations
+ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
 
-PluginAWeek::PluginMigrations.migrate('has_addresses')
+# Mixin the factory helper
+require File.expand_path("#{File.dirname(__FILE__)}/factory")
+Test::Unit::TestCase.class_eval do
+  include Factory
+end
 
-# Run the migrations
-ActiveRecord::Migrator.migrate("#{RAILS_ROOT}/db/migrate")
+# Remove defaults for testing
+Region.delete_all
+Country.delete_all