Update gems, add uncommited files.

.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.3

Gemfile.lock

@@ -40,16 +40,18 @@ GEM
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
-    better_errors (1.1.0)
+    better_errors (2.0.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
+      rack (>= 0.9.0)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.0.4)
-    byebug (2.7.0)
-      columnize (~> 0.3)
+    byebug (3.5.1)
+      columnize (~> 0.8)
       debugger-linecache (~> 1.2)
-    capybara (2.4.1)
+      slop (~> 3.6)
+    capybara (2.4.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -69,10 +71,10 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.8.0)
     columnize (0.8.9)
     commonjs (0.2.7)
-    coveralls (0.7.0)
+    coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
@@ -95,7 +97,7 @@ GEM
     i18n-missing_translations (0.0.2)
       i18n (~> 0.6.0)
     journey (1.0.4)
-    jquery-rails (3.1.1)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -104,14 +106,14 @@ GEM
     less-rails (2.5.0)
       actionpack (>= 3.1)
       less (~> 2.5.0)
-    libv8 (3.16.14.3)
+    libv8 (3.16.14.7)
     log4r (1.1.10)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_magick (3.8.0)
+    mini_magick (3.8.1)
       subexec (~> 0.2.1)
     mini_portile (0.6.0)
     multi_json (1.10.1)
@@ -124,12 +126,12 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     polyglot (0.3.5)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-byebug (1.3.3)
-      byebug (~> 2.7)
+    pry-byebug (2.0.0)
+      byebug (~> 3.4)
       pry (~> 0.10)
     pry-doc (0.6.0)
       pry (~> 0.9)
@@ -174,7 +176,7 @@ GEM
       rspec-mocks (~> 2.99.0)
     rspec-collection_matchers (1.0.0)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (2.99.1)
+    rspec-core (2.99.2)
     rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.99.2)
@@ -188,17 +190,17 @@ GEM
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
     ruby-graphviz (1.0.9)
-    sass (3.3.11)
+    sass (3.4.5)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
     simple_form (2.1.1)
       actionpack (~> 3.0)
       activemodel (~> 3.0)
-    simplecov (0.9.0)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
@@ -217,13 +219,13 @@ GEM
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.19.1)
     tilt (1.4.1)
-    tins (1.3.0)
+    tins (1.3.3)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -232,11 +234,11 @@ GEM
       execjs
       rails (>= 3.1)
       railties (>= 3.1)
-    tzinfo (0.3.40)
+    tzinfo (0.3.41)
     uglifier (2.5.3)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    websocket-driver (0.3.4)
+    websocket-driver (0.3.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
     yard (0.8.7.4)

app/models/address.rb

@@ -0,0 +1,3 @@
+class Address < ActiveRecord::Base
+  has_many :addressings
+end

app/models/addressing.rb

@@ -0,0 +1,4 @@
+class Addressing < ActiveRecord::Base
+  belongs_to :add, :polymorphic => true
+  belongs_to :address
+end

app/models/xmail.rb

@@ -0,0 +1,4 @@
+class Xmail < ActiveRecord::Base
+  has_many :addressings, :as => :addr
+  has_many :addresses, :through => :addressings
+end

app/models/ymail.rb

@@ -0,0 +1,4 @@
+class Ymail < ActiveRecord::Base
+  has_many :addressings, :as => :adr
+  has_many :addresses, :through => :addressings
+end

db/migrate/20131118133736_create_addresses.rb

@@ -0,0 +1,9 @@
+class CreateAddresses < ActiveRecord::Migration
+  def change
+    create_table :addresses do |t|
+      t.string :kind,  :limit => 4  # 'from', 'to', 'cc', 'bcc'
+      t.string :val,   :limit => 256
+      t.timestamps
+    end
+  end
+end

db/migrate/20131118143736_create_xmails.rb

@@ -0,0 +1,9 @@
+class CreateXmails < ActiveRecord::Migration
+  def change
+    create_table :xmails do |t|
+      t.string :name,      :limit => 32
+      t.timestamps
+    end
+  end
+
+end

db/migrate/20131118153736_create_ymails.rb

@@ -0,0 +1,9 @@
+class CreateYmails < ActiveRecord::Migration
+  def change
+    create_table :ymails do |t|
+      t.string :name,      :limit => 32
+      t.timestamps
+    end
+  end
+
+end

db/migrate/20131118163736_create_addressings.rb

@@ -0,0 +1,9 @@
+class CreateAddressings < ActiveRecord::Migration
+  def change
+    create_table :addressings do |t|
+      t.belongs_to :adr, polymorphic: true
+      t.belongs_to :addrsess
+    end
+  end
+
+end

spec/acceptances/routes_spec.rb

@@ -6,11 +6,11 @@
   before do
     Capybara.current_driver = :poltergeist
   end
-  
+
   after do
     Capybara.current_driver = :rack_test
   end
-  
+
   scenario "can access" do
     sno = 0
 
@@ -19,18 +19,18 @@
     current_path.should == "/ideas"
     # ルート画面
     sno = my_screenshot(sno, "root")
-    
+
     click_on '新規登録'
     current_path.should == "/ideas/new"
     # アイデア登録フォーム
     sno = my_screenshot(sno, "index_form")
-    
+
     click_on '登録する'
     current_path.should == "/ideas"
     # アイデア登録フォーム 入力データ不足絵絵r−あ
     sno = my_screenshot(sno, "index_form_error")
-    
-    fill_in "名前",        with: :"アイデァ001" 
+
+    fill_in "名前",        with: :"アイデァ001"
     fill_in "本文",        with: :"アイデア001\n詳細\内容"
     sno = my_screenshot(sno, "index_form_fill_data")
 
@@ -39,7 +39,7 @@
     # アイデア登録フォーム 登録成功画面
     sno = my_screenshot(sno, "index_new_ok")
 
-    fill_in "名前", with: :"katoy" 
+    fill_in "名前", with: :"katoy"
     fill_in "本文", with: :"コメント内容"
     sno = my_screenshot(sno, "comment_form_filled")
 

spec/spec_helper.rb

@@ -39,6 +39,9 @@ def my_screenshot(sno, name)
 end
 
 RSpec.configure do |config|
+
+  config.infer_spec_type_from_file_location!  # for rspec 2 -> rspec 3
+
   # ## Mock Framework
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line: