punctual_date_select 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be7786f84046998c4c418f1502b479b8c1d8fbff
-  data.tar.gz: 5c935f40d868f2152b43ad994bb8b7ac7695585c
+  metadata.gz: 0deb7f39a8a4b4a36251e069ddc28e1cd9826f4c
+  data.tar.gz: abb398567b48a4d67bafde2789bcbf5705b83bba
 SHA512:
-  metadata.gz: 761c62adfe4be8f82644561c6685024ab57a3493b881142d2440b422df54a0826de6b8b5d89eccbfee193e547b2045a4cfdeb2116cf89c9c49584185bb54e7a3
-  data.tar.gz: 04b41241496b48987d8c40dbe270804345fdeeb0d25bb536e44a08516c8075a730bd2aee332407d96de09ee1b19a420e6349707b3aa8c81c57018d370c38efbf
+  metadata.gz: c29796d52199eb24c75d825e1cd02cb6fd7e96ced0a8a1e82f8f13690939fba39172d4a4d5df28b3ede0d5bb22221a17e6278366d393c4fbe2e92e5a0566c952
+  data.tar.gz: de3a9c14268ec9a4a7179c74f9ea4dbc900fe6dc9dcf13bb0b65040866920eaa8b19ea72cf90c6fe426cb22c9d15566406607e4bc7a0c707794b608318144caa

data/README.md

@@ -8,8 +8,6 @@ This may cause a human error in some use cases.
 With PunctualDateSelect, you can hold invalid date as they are specified by an user and show the invalid error message.
 Therefore users can notice the mistakes they've made.
 
-This gem is for Rails 4 currently.
-
 ## Key concept
 
 Using PunctualDateSelect, your date column value won't have Date object while it is non-existing date.
@@ -20,6 +18,13 @@ If the specified date from punctual_date_select fields is collect, it will be ca
 
 Note that you need to run validation before you save it not to send those parameters holding invalid date data to DB.
 
+## Supported Versions
+
+* Ruby
+  * 2.0 or higher
+* Rails
+  * 4.2, 5.0, 5.1
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/punctual_date_select/model.rb

@@ -36,14 +36,6 @@ module PunctualDateSelect
     module ClassMethods
       def punctual_date_column(*args)
         args.each do |column_name|
-          cast_method = :"cast_#{column_name}_if_possible"
-          before_validation cast_method
-
-          define_method cast_method do
-            casted_date = send(column_name).try(:to_date)
-            send("#{column_name}=", casted_date) if casted_date
-          end
-
           validation_method = :"validate_#{column_name}_is_casted"
           validate validation_method
 
@@ -52,16 +44,15 @@ module PunctualDateSelect
           end
 
           define_method "#{column_name}=" do |value|
-            self[column_name] = (value.kind_of?(Hash) && !value.values.any?{|t| !t.blank?}) ? nil : value
-            if value.kind_of?(Hash) && !value.kind_of?(PunctualDateSelect::DateHash)
+            if value.kind_of?(Hash) && !value.kind_of?(PunctualDateSelect::DateHash) && (value.keys & %i[year month day]).any?
               class << value
                 include PunctualDateSelect::DateHash
               end
             end
-            self[column_name]
+            self[column_name] = (value.kind_of?(Hash) && value.values.any?{|t| t.blank?}) ? nil : value
           end
 
-          private cast_method, validation_method
+          private validation_method
         end
       end
     end
@@ -70,5 +61,23 @@ module PunctualDateSelect
       base.extend(ClassMethods)
     end
   end
+
+  module Type
+    cast_method = defined?(ActiveModel::Type) ? :value_from_multiparameter_assignment : :cast_value
+    define_method cast_method do |value|
+      if value.kind_of?(PunctualDateSelect::DateHash)
+        value.try(:to_date) || value
+      else
+        super(value)
+      end
+    end
+  end
 end
 ActiveRecord::Base.send(:include, PunctualDateSelect::Model)
+if defined?(ActiveModel::Type)
+  ActiveModel::Type::Date.send(:prepend, PunctualDateSelect::Type)
+  ActiveModel::Type::DateTime.send(:prepend, PunctualDateSelect::Type)
+else
+  ActiveRecord::Type::Date.send(:prepend, PunctualDateSelect::Type)
+  ActiveRecord::Type::DateTime.send(:prepend, PunctualDateSelect::Type)
+end

data/lib/punctual_date_select/version.rb

@@ -1,3 +1,3 @@
 module PunctualDateSelect
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: punctual_date_select
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - nay3
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler