easy_model 2.1.0 → 2.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NjM0YjExM2QwNzQ4NjcyM2VjNGZmZjM1Yzc1OWM2NTc0ZTY5ZjE1ZQ==
-  data.tar.gz: !binary |-
-    YTZkMDc0NTk4NjA1ZjM2NGRmNGJiODk2ZTZlNDUwNjEzYzYzNTRmYQ==
+SHA1:
+  metadata.gz: 8bddfb8931b1b9a7f22b5e8c5806a21d04aa77d1
+  data.tar.gz: 5bce9b606406c713d321028442700ff8648a63f5
 SHA512:
-  metadata.gz: !binary |-
-    NDFkMjlmM2FjZDllY2RmNzQ2MzRhNmY4YjU2YmQwYzQ3N2RiYmQ3MmE4MTNh
-    NjYxNTNiZDEwYWM5YjcyNjMyODk3OGNjYTc5NWVjNjVjMzQ1ZWNlMmY4M2Y3
-    YWJkNzAyMTJhMjc0Mjk4YzBiMmMwOWRmZTcwZDI2N2VlMjMwNTM=
-  data.tar.gz: !binary |-
-    NjBiMDFlNTkwYzg2NDMzZTYzMWVhMzAzNGUyMGIzNmQ4NDAzMWY5MDQ1MTBj
-    NmIyNzM0OTlkZDM4ZDhhOWE5ZWY4MWFmYTkzYjhkNGZlODI3YzFiYjVkMjli
-    YWQzZjlkOTFmYmZjMDIwNTU3NDEwMTg2ZDVjYjZiZDZhMTI4Nzk=
+  metadata.gz: 122b6cf89a442dff48203803821659e57b45502e1df4fa6a8e6199d7b105c4f4212fa927c83ab27bf8ff140758e0e3883ea9110f0c8dcf382daf0ec831fd40e2
+  data.tar.gz: 9ac907994a1d7c4308f9bfb5cf503c251d7d454f5577d6aea08362476a0f43a40b5556f303c27f04ecb8e5316f8e88e83c36dd8a21eb5209533cee971ae85b85

data/Gemfile

@@ -12,5 +12,6 @@ end
 group :test do
   gem 'simplecov', '>= 0'
   gem 'sqlite3'
+  gem 'test-unit'
 end
 

data/VERSION

@@ -1 +1 @@
-2.1.0
+2.2.0

data/easy_model.gemspec

@@ -2,15 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: easy_model 2.1.0 ruby lib
+# stub: easy_model 2.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "easy_model"
-  s.version = "2.1.0"
+  s.version = "2.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["SUZUKI Kei"]
-  s.date = "2013-12-12"
+  s.date = "2015-05-12"
   s.description = "    EasyModel provides features of database independent attribute.\n    You can define the attribute like ActiveRecord that perform data conversion during assignment.\n    \u{30c7}\u{30fc}\u{30bf}\u{30d9}\u{30fc}\u{30b9}\u{306b}\u{95a2}\u{9023}\u{4ed8}\u{304b}\u{306a}\u{3044}\u{5c5e}\u{6027}\u{3092}\u{5b9a}\u{7fa9}\u{3059}\u{308b}\u{6a5f}\u{80fd}\u{3092}\u{63d0}\u{4f9b}\u{3057}\u{307e}\u{3059}.\n    \u{4ee3}\u{5165}\u{6642}\u{306b} ActiveRecord \u{3068}\u{540c}\u{69d8}\u{306e}\u{578b}\u{5909}\u{63db}\u{304c}\u{884c}\u{308f}\u{308c}\u{308b}\u{5c5e}\u{6027}\u{3092}\u{5b9a}\u{7fa9}\u{3059}\u{308b}\u{3053}\u{3068}\u{304c}\u{3067}\u{304d}\u{307e}\u{3059}.\n"
   s.email = "info-techscore@synergy101.jp"
   s.extra_rdoc_files = [
@@ -40,8 +41,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/techscore/easy_model"
   s.licenses = ["BSD"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.11"
+  s.rubygems_version = "2.4.5"
   s.summary = "EasyModel provides features of database independent attribute. \u{30c7}\u{30fc}\u{30bf}\u{30d9}\u{30fc}\u{30b9}\u{306b}\u{95a2}\u{9023}\u{4ed8}\u{304b}\u{306a}\u{3044}\u{5c5e}\u{6027}\u{3092}\u{5b9a}\u{7fa9}\u{3059}\u{308b}\u{6a5f}\u{80fd}\u{3092}\u{63d0}\u{4f9b}\u{3057}\u{307e}\u{3059}."
 
   if s.respond_to? :specification_version then

data/lib/easy_model/column_for_active_model.rb

@@ -90,16 +90,20 @@ module EasyModel::ColumnForActiveModel::ClassMethods
   # 定義したカラムを表す ActiveRecord::ConnectionAdapters::Column オブジェクト.
   #
   def column(name, type, options={})
+    cast_type = "ActiveRecord::Type::#{type.to_s.capitalize}"
+    cast_type = "ActiveRecord::Type::DateTime" if type.to_s == "datetime"
+    cast_type = "ActiveRecord::Type::Time" if type.to_s == "timestamp"
+
     define_attribute_method(name)
     (@easy_model_attribute_names ||= []) << name.to_s
 
-    ActiveRecord::ConnectionAdapters::Column.new(name, options[:default], type, true).tap do |column|
+    ActiveRecord::ConnectionAdapters::Column.new(name, options[:default], cast_type.classify.constantize.new, type, true).tap do |column|
       define_method("#{name}=") do |value|
         value = nil if column.number? and value.kind_of?(String) and value.blank?
         return if value == send(name)
         send("#{name}_will_change!")
         instance_variable_set("@#{name}_before_type_cast", value)
-        instance_variable_set("@#{name}", column.type_cast(value))
+        instance_variable_set("@#{name}", column.cast_type.type_cast_from_user(value))
       end
       define_method("#{name}_before_type_cast") do
         instance_variable_set("@#{name}_before_type_cast", column.default) unless instance_variable_defined?("@#{name}_before_type_cast")

data/lib/easy_model/column_for_active_record.rb

@@ -64,14 +64,18 @@ module EasyModel::ColumnForActiveRecord::ClassMethods
   # 定義したカラムを表す ActiveRecord::ConnectionAdapters::Column オブジェクト.
   #
   def column(name, type, options={})
+    cast_type = "ActiveRecord::Type::#{type.to_s.capitalize}"
+    cast_type = "ActiveRecord::Type::DateTime" if type.to_s == "datetime"
+    cast_type = "ActiveRecord::Type::Time" if type.to_s == "timestamp"
+
     (@easy_model_attribute_names ||= []) << name.to_s
 
-    ActiveRecord::ConnectionAdapters::Column.new(name, options[:default], type, true).tap do |column|
+    ActiveRecord::ConnectionAdapters::Column.new(name, options[:default], cast_type.classify.constantize.new, type, true).tap do |column|
       define_method("#{name}=") do |value|
         value = nil if column.number? and value.kind_of?(String) and value.blank?
         return if value == send(name)
         instance_variable_set("@#{name}_before_type_cast", value)
-        instance_variable_set("@#{name}", column.type_cast(value))
+        instance_variable_set("@#{name}", column.cast_type.type_cast_from_user(value))
       end
       define_method("#{name}_before_type_cast") do
         instance_variable_set("@#{name}_before_type_cast", column.default) unless instance_variable_defined?("@#{name}_before_type_cast")

data/test/easy_model/ja.yml

@@ -7,4 +7,12 @@ ja:
         name: 名前
         email: メールアドレス
         age: 年齢
+  activerecord:
+    models:
+      user: ゆーざー
+    attributes:
+      user:
+        name: なまえ
+        email: めーるあどれす
+        age: ねんれい
 

data/test/easy_model/test_column_for_active_model.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.join(Dir::pwd, 'test', 'helper.rb')
+# require File.join(File.dirname(__FILE__), '..', 'helper')
 
 class EasyModel::TestColumnForActiveModel < Test::Unit::TestCase
 
@@ -82,7 +82,7 @@ class EasyModel::TestColumnForActiveModel < Test::Unit::TestCase
     assert_equal nil, object.age_was
     assert_equal [nil, 20], object.age_change
 
-    object.reset_changes
+    object.send(:clear_changes_information)
     assert_equal false, object.changed?
 
     object.age = 21

data/test/easy_model/test_column_for_active_record.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.join(Dir::pwd, 'test', 'helper.rb')
+# require File.join(File.dirname(__FILE__), '..', 'helper')
 
 class EasyModel::TestColumnForActiveRecord < Test::Unit::TestCase
 
@@ -72,11 +72,11 @@ class EasyModel::TestColumnForActiveRecord < Test::Unit::TestCase
 
   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)
+    assert_equal :activerecord, 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?

data/test/easy_model/test_search_form.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-
-require File.join(File.dirname(__FILE__), '..', 'helper')
+require File.join(Dir::pwd, 'test', 'helper.rb')
+# require File.join(File.dirname(__FILE__), '..', 'helper')
 
 class EasyModel::TestSearchForm < Test::Unit::TestCase
 

data/test/helper.rb

@@ -9,6 +9,7 @@ end
 
 require 'rubygems'
 require 'bundler'
+require "minitest/autorun"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

metadata

@@ -1,98 +1,90 @@
 --- !ruby/object:Gem::Specification
 name: easy_model
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - SUZUKI Kei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC4w
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC4w
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC4w
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: !binary |-
-          NC4w
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4xMg==
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4xMg==
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4wLjA=
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS4wLjA=
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS44LjQ=
+        version: 1.8.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MS44LjQ=
-description: ! "    EasyModel provides features of database independent attribute.\n
-  \   You can define the attribute like ActiveRecord that perform data conversion
-  during assignment.\n    データベースに関連付かない属性を定義する機能を提供します.\n    代入時に ActiveRecord と同様の型変換が行われる属性を定義することができます.\n"
+        version: 1.8.4
+description: |2
+      EasyModel provides features of database independent attribute.
+      You can define the attribute like ActiveRecord that perform data conversion during assignment.
+      データベースに関連付かない属性を定義する機能を提供します.
+      代入時に ActiveRecord と同様の型変換が行われる属性を定義することができます.
 email: info-techscore@synergy101.jp
 executables: []
 extensions: []
@@ -129,17 +121,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: EasyModel provides features of database independent attribute. データベースに関連付かない属性を定義する機能を提供します.