ファイル名を変更

hidenba · Feb 16, 2012 · 9c3d70d · 9c3d70d
1 parent 5e3ecb7
commit 9c3d70d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/millionaire/base.rb → lib/millionaire/csv.rb b/lib/millionaire/base.rb → lib/millionaire/csv.rb
@@ -3,7 +3,7 @@
 require 'millionaire/column'
 require 'millionaire/validations/csv_uniqness'
 
-module Millionaire::Base
+module Millionaire::Csv
   extend ActiveSupport::Concern
   include ActiveModel::Validations
 
@@ -24,7 +24,7 @@ def column(name, option={})
       self.columns << column
       option.each do |k,v|
         case k
-        when :null; validates name, presence: true unless v
+        when :null; validates name, presence: v unless v
         when :length; validates name, length: {maximum: v}
         when :value; validates name, inclusion: {in: v}
         when :constraint; validates name, v
@@ -49,7 +49,6 @@ def load(io)
         self.csv_data << self.new(row.to_hash.slice(*self.column_names))
       end
 
-      self.indexes[uniqness] = [] if uniqness.present?
       self.indexes.keys.each do |k|
         self.indexes[k] = self.csv_data.group_by{|v| v.send(k) }
       end

diff --git a/spec/millionaire/base_spec.rb → spec/millionaire/csv_spec.rb b/spec/millionaire/base_spec.rb → spec/millionaire/csv_spec.rb
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
-require 'millionaire/base'
+require 'millionaire/csv'
 
-describe Millionaire::Base do
+describe Millionaire::Csv do
   describe '.column' do
     class CsvLoad
-      include Millionaire::Base
+      include Millionaire::Csv
       column :index , index: true
       column :presence, null: false, index: true
       column :length, length: 20
@@ -39,7 +39,7 @@ class CsvLoad
 
   describe '.index' do
     class Index
-      include Millionaire::Base
+      include Millionaire::Csv
       column :index_a
       column :index_b
       index :index_a, :index_b
@@ -52,7 +52,7 @@ class Index
 
   describe '.all' do
     class AllLoad
-      include Millionaire::Base
+      include Millionaire::Csv
       column :str, index: true
     end