easy_model 1.0.5 → 2.0.0

data/test/easy_model/{test_column.rb → test_column_for_active_record.rb}

@@ -2,11 +2,89 @@
 
 require File.join(File.dirname(__FILE__), '..', 'helper')
 
-class EasyModel::TestColumn < Test::Unit::TestCase
+class EasyModel::TestColumnForActiveRecord < Test::Unit::TestCase
+
+  def setup
+    Time.zone = 'Hawaii'
+    I18n.load_path = [File.join(File.dirname(__FILE__), 'ja.yml')]
+    I18n.default_locale = :ja
+    ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: 'test.sqlite3')
+    ActiveRecord::Base.connection.execute('BEGIN')
+    ActiveRecord::Base.connection.execute('DROP TABLE IF EXISTS users')
+    ActiveRecord::Base.connection.execute('CREATE TABLE users (id INTEGER PRIMARY KEY)')
+  end
+
+  def teardown
+    ActiveRecord::Base.connection.execute('ROLLBACK')
+  end
+
+  def new_model
+    Class.new(ActiveRecord::Base) do
+      self.table_name = 'users'
+      include EasyModel::Column
+      column :name, :string
+      column :email, :string
+      column :age, :integer
+      def self.name; 'User'; end
+    end
+  end
+
+  def test_initialize
+    user = new_model.new(:name => 'taro', :email => 'taro@example.com', :age => 20)
+    assert_equal 'taro', user.name
+    assert_equal 'taro@example.com', user.email
+    assert_equal 20, user.age
+  end
+
+  def test_easy_model_attribute_names_class_method
+    assert_equal %w(name email age), new_model.easy_model_attribute_names
+  end
+
+  def test_easy_model_attribute_names_instance_method
+    assert_equal %w(name email age), new_model.new.easy_model_attribute_names
+  end
+
+  def test_attribute_names_class_method
+    assert_equal %w(id), new_model.attribute_names
+  end
+
+  def test_attribute_names_instance_method
+    assert_equal %w(id), new_model.new.attribute_names
+  end
+
+  def test_easy_model_attributes
+    attributes = {:name => 'taro', :email => 'taro@example.com', :age => 20}
+    assert_equal attributes.stringify_keys, new_model.new(attributes).easy_model_attributes
+  end
+
+  def test_attributes
+    attributes = {:name => 'taro', :email => 'taro@example.com', :age => 20}
+    assert_equal({'id' => nil}, new_model.new(attributes).attributes)
+  end
+
+  def test_attributes=
+    object = new_model.new
+    object.attributes = {:name => 'taro', :email => 'taro@example.com', :age => 20}
+    assert_equal 'taro', object.name
+    assert_equal 'taro@example.com', object.email
+    assert_equal 20, object.age
+  end
+
+  def test_i18n_scope
+    model = new_model
+    assert_equal :easy_model, model.i18n_scope
+    assert_equal 'ユーザ', model.model_name.human
+    assert_equal '名前', model.human_attribute_name(:name)
+    assert_equal 'メールアドレス', model.human_attribute_name(:email)
+    assert_equal '年齢', model.human_attribute_name(:age)
+  end
+
+  def test_persisted?
+    assert_equal false, new_model.new.persisted?
+  end
 
   def test_has_column_method
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :integer_column, :integer)
     assert model.protected_methods.include?(:column)
 
@@ -17,8 +95,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_before_type_cast
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :integer_column, :integer)
     object = model.new
 
@@ -40,8 +117,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_string_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :string, :default => 'default value')
     model.send(:column, :column_without_default, :string)
     object = model.new
@@ -56,8 +132,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_text_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :text, :default => 'default value')
     model.send(:column, :column_without_default, :text)
     object = model.new
@@ -72,8 +147,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_integer_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :integer, :default => 777)
     model.send(:column, :column_without_default, :integer)
     object = model.new
@@ -92,8 +166,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_float_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :float, :default => 1.5)
     model.send(:column, :column_without_default, :float)
     object = model.new
@@ -114,8 +187,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_decimal_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :decimal, :default => 1.5)
     model.send(:column, :column_without_default, :decimal)
     object = model.new
@@ -136,49 +208,46 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_datetime_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
-    model.send(:column, :column_with_default, :datetime, :default => Time.parse('2000-01-01 10:20:30'))
+    model = new_model
+    model.send(:column, :column_with_default, :datetime, :default => Time.zone.parse('2000-01-01 10:20:30'))
     model.send(:column, :column_without_default, :datetime)
     object = model.new
 
     # 未代入の場合にデフォルト値が取得できること.
     assert_nil object.column_without_default
-    assert_equal Time.parse('2000-01-01 10:20:30'), object.column_with_default
+    assert_equal Time.zone.parse('2000-01-01 10:20:30'), object.column_with_default
 
     # 代入した値が取得できること.
-    object.column_with_default = Time.parse('2000-02-01 10:20:30')
-    assert_equal Time.parse('2000-02-01 10:20:30'), object.column_with_default
+    object.column_with_default = Time.zone.parse('2000-02-01 10:20:30')
+    assert_equal Time.zone.parse('2000-02-01 10:20:30'), object.column_with_default
 
     # 値の変換が行われること.
-    object.column_with_default = '2000-03-01 10:20:30'
-    assert_equal Time.parse('2000-03-01 10:20:30'), object.column_with_default
+    object.column_with_default = Time.zone.parse('2000-03-01 10:20:30')
+    assert_equal Time.zone.parse('2000-03-01 10:20:30'), object.column_with_default
   end
 
   def test_timestamp_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
-    model.send(:column, :column_with_default, :timestamp, :default => Time.parse('2000-01-01 10:20:30'))
+    model = new_model
+    model.send(:column, :column_with_default, :timestamp, :default => Time.zone.parse('2000-01-01 10:20:30'))
     model.send(:column, :column_without_default, :timestamp)
     object = model.new
 
     # 未代入の場合にデフォルト値が取得できること.
     assert_nil object.column_without_default
-    assert_equal Time.parse('2000-01-01 10:20:30'), object.column_with_default
+    assert_equal Time.zone.parse('2000-01-01 10:20:30'), object.column_with_default
 
     # 代入した値が取得できること.
-    object.column_with_default = Time.parse('2000-02-01 10:20:30')
-    assert_equal Time.parse('2000-02-01 10:20:30'), object.column_with_default
+    object.column_with_default = Time.zone.parse('2000-02-01 10:20:30')
+    assert_equal Time.zone.parse('2000-02-01 10:20:30'), object.column_with_default
 
     # 値の変換が行われること.
-    object.column_with_default = '2000-03-01 10:20:30'
-    assert_equal Time.parse('2000-03-01 10:20:30'), object.column_with_default
+    object.column_with_default = Time.zone.parse('2000-03-01 10:20:30')
+    assert_equal Time.zone.parse('2000-03-01 10:20:30'), object.column_with_default
   end
 
   def test_time_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
-    model.send(:column, :column_with_default, :time, :default => Time.parse('2000-01-01 10:20:30'))
+    model = new_model
+    model.send(:column, :column_with_default, :time, :default => Time.zone.parse('2000-01-01 10:20:30'))
     model.send(:column, :column_without_default, :time)
     object = model.new
 
@@ -189,15 +258,14 @@ class EasyModel::TestColumn < Test::Unit::TestCase
     assert_equal 30, object.column_with_default.sec
 
     # 代入した値が取得できること.
-    object.column_with_default = Time.parse('2000-02-01 20:30:40')
+    object.column_with_default = Time.zone.parse('2000-02-01 20:30:40')
     assert_equal 20, object.column_with_default.hour
     assert_equal 30, object.column_with_default.min
     assert_equal 40, object.column_with_default.sec
   end
 
   def test_date_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :date, :default => Date.parse('2000-01-01'))
     model.send(:column, :column_without_default, :date)
     object = model.new
@@ -216,8 +284,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_binary_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :binary, :default => 'default value')
     model.send(:column, :column_without_default, :binary)
     object = model.new
@@ -232,8 +299,7 @@ class EasyModel::TestColumn < Test::Unit::TestCase
   end
 
   def test_boolean_column
-    model = Class.new
-    model.send(:include, EasyModel::Column)
+    model = new_model
     model.send(:column, :column_with_default, :boolean, :default => true)
     model.send(:column, :column_without_default, :boolean)
     object = model.new

data/test/easy_model/test_search_form.rb

@@ -23,5 +23,11 @@ class EasyModel::TestSearchForm < Test::Unit::TestCase
     assert_equal 'to_xml called', object.to_xml
   end
 
+  def test_scoped
+    assert_raise(NotImplementedError) do
+      Class.new(EasyModel::SearchForm).new.scoped
+    end
+  end
+
 end
 

data/test/helper.rb

@@ -2,7 +2,7 @@
 
 if ENV['COVERAGE']
   require 'simplecov'
-  SimpleCov.start do
+  SimpleCov.start('rails') do
     coverage_dir File.join('coverage')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_model
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - SUZUKI Kei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: データベースに依存しないモデルの基本クラスや, ActiveRecord と同じ型変換を行う属性定義メソッドを提供します.
 email: info-techscore@synergy101.jp
 executables: []
@@ -101,20 +87,24 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
+- README_ja.rdoc
 files:
 - Gemfile
 - LICENSE.txt
 - README.rdoc
+- README_ja.rdoc
 - Rakefile
 - VERSION
 - easy_model.gemspec
 - lib/easy_model.rb
 - lib/easy_model/base.rb
 - lib/easy_model/column.rb
+- lib/easy_model/column_for_active_model.rb
+- lib/easy_model/column_for_active_record.rb
 - lib/easy_model/search_form.rb
 - test/easy_model/ja.yml
-- test/easy_model/test_base.rb
-- test/easy_model/test_column.rb
+- test/easy_model/test_column_for_active_model.rb
+- test/easy_model/test_column_for_active_record.rb
 - test/easy_model/test_search_form.rb
 - test/helper.rb
 homepage: http://github.com/techscore/easy_model

data/test/easy_model/test_base.rb

@@ -1,47 +0,0 @@
-# coding: utf-8
-
-require File.join(File.dirname(__FILE__), '..', 'helper')
-
-class User < EasyModel::Base
-  column :name, :string
-  column :email, :string
-  column :age, :integer
-end
-
-class EasyModel::TestBase < Test::Unit::TestCase
-
-  def setup
-    I18n.load_path = [File.join(File.dirname(__FILE__), 'ja.yml')]
-    I18n.default_locale = :ja
-  end
-
-  def test_initialize
-    user = User.new(:name => 'taro', :email => 'taro@example.com', :age => 20)
-    assert_equal 'taro', user.name
-    assert_equal 'taro@example.com', user.email
-    assert_equal 20, user.age
-  end
-
-  def test_attributes=
-    user = User.new
-    user.attributes = {:name => 'taro', :email => 'taro@example.com', :age => 20}
-    assert_equal 'taro', user.name
-    assert_equal 'taro@example.com', user.email
-    assert_equal 20, user.age
-  end
-
-  def test_i18n_scope
-    assert_equal :easy_model, User.i18n_scope
-    assert_equal 'ユーザ', User.model_name.human
-    assert_equal '名前', User.human_attribute_name(:name)
-    assert_equal 'メールアドレス', User.human_attribute_name(:email)
-    assert_equal '年齢', User.human_attribute_name(:age)
-  end
-
-  def test_persisted?
-    user = User.new
-    assert_equal false, user.persisted?
-  end
-
-end
-