[STORE] Refactor the Rails' forms date conversions into a module method

Also, added tests.

Note, this doesn't solve the problem with updating the model, added a pending test.

Author: karmi

elasticsearch-persistence/lib/elasticsearch/persistence/model/rails.rb

@@ -8,30 +8,38 @@ module Rails
         def self.included(base)
           base.class_eval do
 
-            # Decorates the passed in `attributes` so they extract the date & time values from Rails forms
-            #
-            # @example Correctly combine the date and time to a datetime string
-            #
-            #     params = { "published_on(1i)"=>"2014",
-            #                      "published_on(2i)"=>"1",
-            #                      "published_on(3i)"=>"1",
-            #                      "published_on(4i)"=>"12",
-            #                      "published_on(5i)"=>"00"
-            #                     }
-            #     MyRailsModel.new(params).published_on.iso8601
-            #     # => "2014-01-01T12:00:00+00:00"
-            #
             def initialize(attributes={})
-              day = attributes.select { |p| p =~ /\([1-3]/ }.reduce({}) { |sum, item| (sum[item.first.gsub(/\(.+\)/, '')] ||= '' )<< item.last+'-'; sum  }
-              time = attributes.select { |p| p =~ /\([4-6]/ }.reduce({}) { |sum, item| (sum[item.first.gsub(/\(.+\)/, '')] ||= '' )<< item.last+':'; sum  }
-              unless day.empty?
-                attributes.update day.reduce({}) { |sum, item| sum[item.first] = item.last; sum[item.first] += ' ' + time[item.first] unless time.empty?; sum }
-              end
+              super(__convert_rails_dates(attributes))
+            end
 
-              super(attributes)
+            def update(attributes={}, options={})
+              super(__convert_rails_dates(attributes))
             end
           end
         end
+
+        # Decorates the passed in `attributes` so they extract the date & time values from Rails forms
+        #
+        # @example Correctly combine the date and time to a datetime string
+        #
+        #     params = { "published_on(1i)"=>"2014",
+        #                      "published_on(2i)"=>"1",
+        #                      "published_on(3i)"=>"1",
+        #                      "published_on(4i)"=>"12",
+        #                      "published_on(5i)"=>"00"
+        #                     }
+        #     MyRailsModel.new(params).published_on.iso8601
+        #     # => "2014-01-01T12:00:00+00:00"
+        #
+        def __convert_rails_dates(attributes={})
+          day = attributes.select { |p| p =~ /\([1-3]/ }.reduce({}) { |sum, item| (sum[item.first.gsub(/\(.+\)/, '')] ||= '' )<< item.last+'-'; sum  }
+          time = attributes.select { |p| p =~ /\([4-6]/ }.reduce({}) { |sum, item| (sum[item.first.gsub(/\(.+\)/, '')] ||= '' )<< item.last+':'; sum  }
+          unless day.empty?
+            attributes.update day.reduce({}) { |sum, item| sum[item.first] = item.last; sum[item.first] += ' ' + time[item.first] unless time.empty?; sum }
+          end
+
+          return attributes
+        end; module_function :__convert_rails_dates
       end
 
     end

elasticsearch-persistence/test/integration/model/model_basic_test.rb

@@ -1,13 +1,15 @@
 require 'test_helper'
 
 require 'elasticsearch/persistence/model'
+require 'elasticsearch/persistence/model/rails'
 
 module Elasticsearch
   module Persistence
     class PersistenceModelBasicIntegrationTest < Elasticsearch::Test::IntegrationTestCase
 
       class ::Person
         include Elasticsearch::Persistence::Model
+        include Elasticsearch::Persistence::Model::Rails
 
         settings index: { number_of_shards: 1 }
 
@@ -81,6 +83,30 @@ class ::Person
           assert_equal 'UPDATED', Person.find(person.id).name
         end
 
+        should "create the model with correct Date form Rails' form attributes" do
+          params = { "birthday(1i)"=>"2014",
+                     "birthday(2i)"=>"1",
+                     "birthday(3i)"=>"1"
+                   }
+          person = Person.create params.merge(name: 'TEST')
+
+          assert_equal Date.parse('2014-01-01'), person.birthday
+          assert_equal Date.parse('2014-01-01'), Person.find(person.id).birthday
+        end
+
+        should_eventually "update the model with correct Date form Rails' form attributes" do
+          params = { "birthday(1i)"=>"2014",
+                     "birthday(2i)"=>"1",
+                     "birthday(3i)"=>"1"
+                   }
+          person = Person.create params.merge(name: 'TEST')
+
+          person.update params.merge('birthday(1i)' => '2015')
+
+          assert_equal Date.parse('2015-01-01'), person.birthday
+          assert_equal Date.parse('2015-01-01'), Person.find(person.id).birthday
+        end
+
         should "increment an object attribute" do
           person = Person.create name: 'John Smith', salary: 1_000
 

elasticsearch-persistence/test/unit/model_rails_test.rb

@@ -70,6 +70,9 @@ class MyView; include ActionView::Helpers::UrlHelper; end
                  "published_at(5i)"=>"00"
                 }
 
+      assert_equal '2014-1-1- 12:00:',
+                   Elasticsearch::Persistence::Model::Rails.__convert_rails_dates(params)['published_at']
+
       m = MyRailsModel.new params
       assert_equal "2014-01-01T12:00:00+00:00", m.published_at.iso8601
     end
@@ -80,6 +83,10 @@ class MyView; include ActionView::Helpers::UrlHelper; end
                  "published_on(3i)"=>"1"
                 }
 
+      assert_equal '2014-1-1-',
+             Elasticsearch::Persistence::Model::Rails.__convert_rails_dates(params)['published_on']
+
+
       m = MyRailsModel.new params
       assert_equal "2014-01-01", m.published_on.iso8601
     end