eac_rails_utils 0.1.15 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2bba119f4803e55e20c3a9bf915965ae821847d
-  data.tar.gz: 1493145cd715c349b3f9debbccb1cf18e2cb34cf
+  metadata.gz: 48317e9de4d255c8f419eb298030496144d85a93
+  data.tar.gz: bba8b002895dcca4c34af057f612b34199226ade
 SHA512:
-  metadata.gz: d97cbae07e0d8c6101324db441377322cebe01d6e191b38b9bc6a6d8a7b14b8175b61f716f7d5c060a753109101a0892adccf25c81478fcf64d9442061c0d19f
-  data.tar.gz: 8cc81ac1dfc2f727b0dcb80fe64400bef7c573d9aa329a9d90d2ec26b0ff440529290bea53364b94a4ad90cf1d365c37561d961c679ab06c0df270b7914c2278
+  metadata.gz: f609cacab57ddc7427a207d419008678b8fe6e7efcf050f415ba461bd0e3c37c78b6ea162b25cbff58dc3074f6ddaeac2dea3b025fba8e295ea2899cc27195bf
+  data.tar.gz: 3598abd778ff91d1101dabe8a350f7afc240b41d47128a32f5cc28a78a44a6db3f2b3297408b692fefc7ab8becc955f75546a0f254f04f7cdce02180871f0ad9

data/lib/eac/common_form_helper/form_builder.rb

@@ -9,6 +9,7 @@ module Eac
       include RadioSelectField
       include FieldsFor
       include SelectField
+      include TimeField
       include YearMonthField
 
       attr_reader :form, :helper, :field_errors_showed

data/lib/eac/common_form_helper/form_builder/time_field.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+module Eac
+  module CommonFormHelper
+    class FormBuilder
+      module TimeField
+        def time_field(field_name, options = {})
+          field_options = options.extract!(:use_month_numbers, :use_two_digit_numbers,
+                                           :use_short_month, :add_month_numbers, :use_month_names,
+                                           :month_format_string, :date_separator, :start_year,
+                                           :end_year, :discard_day, :discard_month, :discard_year,
+                                           :order, :include_blank, :default, :selected, :disabled,
+                                           :prompt, :with_css_classes)
+          field(field_name, options) do
+            @helper.content_tag(:div, @form.time_select(field_name, field_options),
+                                class: 'form-control-complex')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/eac_rails_utils.rb

@@ -5,9 +5,11 @@ module EacRailsUtils
   require 'ofx-parser'
   require 'virtus'
 
+  require 'eac_rails_utils/patches/action_controller_base'
   require 'eac_rails_utils/patches/model_attribute_required'
   require 'eac_rails_utils/patches/ofx_parser'
   require 'eac_rails_utils/rails/engine'
+  require 'eac_rails_utils/tableless_model'
   require 'eac/cpf_validator'
   require 'eac/formatter_helper'
   require 'eac/common_form_helper/form_builder/association_select_field'
@@ -18,6 +20,7 @@ module EacRailsUtils
   require 'eac/common_form_helper/form_builder/radio_select_field'
   require 'eac/common_form_helper/form_builder/searchable_association_field'
   require 'eac/common_form_helper/form_builder/select_field'
+  require 'eac/common_form_helper/form_builder/time_field'
   require 'eac/common_form_helper/form_builder/year_month_field'
   require 'eac/common_form_helper/form_builder'
   require 'eac/common_form_helper'
@@ -37,7 +40,6 @@ module EacRailsUtils
   require 'eac/parsers/ofx'
   require 'eac/simple_cache'
   require 'eac/source_target_fixtures'
-  require 'eac/tableless_model'
   require 'eac/test_utils'
 
   ActionView::Base.send :include, Eac::CommonFormHelper

data/lib/eac_rails_utils/patches/action_controller_base.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+module EacRailsUtils
+  module Patches
+    module ActionControllerBasePatch
+      def self.included(base)
+        base.include InstanceMethods
+      end
+
+      module InstanceMethods
+        def redirect_back(default_path, options = {})
+          redirect_to :back, options
+        rescue ActionController::RedirectBackError
+          redirect_to default_path, options
+        end
+      end
+    end
+  end
+end
+
+patch = ::EacRailsUtils::Patches::ActionControllerBasePatch
+target = ::ActionController::Base
+target.send(:include, patch) unless target.included_modules.include?(patch)

data/lib/eac_rails_utils/tableless_model.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+module EacRailsUtils
+  class TablelessModel
+    include ActiveModel::Model
+    include Virtus.model
+    include ActiveModel::Associations
+
+    def initialize(values = {})
+      super(build_attributes(values))
+    end
+
+    def attributes=(values)
+      super(build_attributes(values))
+    end
+
+    # need hash like accessor, used internal Rails
+    def [](attr)
+      send(attr)
+    end
+
+    # need hash like accessor, used internal Rails
+    def []=(attr, value)
+      send("#{attr}=", value)
+    end
+
+    def save!
+      save || raise("#{self.class}.save failed: #{errors.messages}")
+    end
+
+    private
+
+    def build_attributes(values)
+      AttributesBuilder.new(self.class, values).to_attributes
+    end
+
+    class AttributesBuilder
+      DATE_TIME_FIELDS = %i(year month day hour min sec).freeze
+
+      def initialize(model_class, values)
+        @model_class = model_class
+        @values = {}
+        values.each { |k, v| add(k, v) }
+      end
+
+      def to_attributes
+        @values
+      end
+
+      private
+
+      def add(key, value)
+        array_attr = parse_array_attr_key(key)
+        if array_attr
+          array_value_set(array_attr, value)
+        else
+          @values[key] = value
+        end
+      end
+
+      def parse_array_attr_key(key)
+        m = /\A(.+)\(([0-9]+)(.)\)\z/.match(key)
+        if m
+          ::OpenStruct.new(key: m[1], index: m[2].to_i - 1, converter: array_value_converter(m[3]))
+        end
+      end
+
+      def array_value_set(array_attr, value)
+        @values[array_attr.key] ||= {}
+        @values[array_attr.key].merge!(
+          DATE_TIME_FIELDS[array_attr.index] => value.send(array_attr.converter)
+        )
+      end
+
+      def array_value_converter(str_type)
+        case str_type
+        when 'i'
+          'to_i'
+        else
+          raise "Unknown array type: \"#{str_type}\""
+        end
+      end
+
+      def date_time_attribute?(key)
+        attr = @model_class.attributes[key]
+        return false unless attr
+        raise attr.to_s
+      end
+    end
+  end
+end

data/lib/eac_rails_utils/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module EacRailsUtils
-  VERSION = '0.1.15'
+  VERSION = '0.2.0'
 end

data/test/lib/eac_rails_utils/tableless_model_test.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+# frozen_string_literal: true
+require 'test_helper'
+
+module EacRailsUtils
+  class TablelessModelTest < ActiveSupport::TestCase
+    class Stub < ::EacRailsUtils::TablelessModel
+      attribute :tempo, DateTime
+    end
+
+    test 'date time array values' do
+      stub = Stub.new('tempo(1i)' => '9', 'tempo(2i)' => '10', 'tempo(3i)' => '11',
+                      'tempo(4i)' => '12', 'tempo(5i)' => '13', 'tempo(6i)' => '14')
+      assert stub.tempo.is_a?(DateTime), "Class: |#{stub.tempo.class}|, Value: |#{stub.tempo}|"
+      assert_equal 9, stub.tempo.year, 'Year'
+      assert_equal 10, stub.tempo.month, 'Month'
+      assert_equal 11, stub.tempo.day, 'Day'
+      assert_equal 12, stub.tempo.hour, 'Hour'
+      assert_equal 13, stub.tempo.minute, 'Minute'
+      assert_equal 14, stub.tempo.second, 'Second'
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_rails_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.2.0
 platform: ruby
 authors:
 - E.A.C.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-27 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel-associations
@@ -150,6 +150,7 @@ files:
 - lib/eac/common_form_helper/form_builder/radio_select_field.rb
 - lib/eac/common_form_helper/form_builder/searchable_association_field.rb
 - lib/eac/common_form_helper/form_builder/select_field.rb
+- lib/eac/common_form_helper/form_builder/time_field.rb
 - lib/eac/common_form_helper/form_builder/year_month_field.rb
 - lib/eac/cpf_validator.rb
 - lib/eac/data_table_helper.rb
@@ -172,12 +173,13 @@ files:
 - lib/eac/parsers/ofx.rb
 - lib/eac/simple_cache.rb
 - lib/eac/source_target_fixtures.rb
-- lib/eac/tableless_model.rb
 - lib/eac/test_utils.rb
 - lib/eac_rails_utils.rb
+- lib/eac_rails_utils/patches/action_controller_base.rb
 - lib/eac_rails_utils/patches/model_attribute_required.rb
 - lib/eac_rails_utils/patches/ofx_parser.rb
 - lib/eac_rails_utils/rails/engine.rb
+- lib/eac_rails_utils/tableless_model.rb
 - lib/eac_rails_utils/version.rb
 - lib/tasks/eac_rails_utils.rake
 - test/dummy/Rakefile
@@ -214,6 +216,7 @@ files:
 - test/lib/eac/source_target_fixtures_test_files/b.source.html
 - test/lib/eac/source_target_fixtures_test_files/c.target.yaml
 - test/lib/eac_rails_utils/patches/model_attribute_required_test.rb
+- test/lib/eac_rails_utils/tableless_model_test.rb
 - test/test_helper.rb
 homepage: 
 licenses: []
@@ -257,6 +260,7 @@ test_files:
 - test/dummy/app/models/user.rb
 - test/test_helper.rb
 - test/lib/eac_rails_utils/patches/model_attribute_required_test.rb
+- test/lib/eac_rails_utils/tableless_model_test.rb
 - test/lib/eac/common_form_helper_test.rb
 - test/lib/eac/source_target_fixtures_test.rb
 - test/lib/eac/parsers/files_test_test.rb

data/lib/eac/tableless_model.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-module Eac
-  class TablelessModel
-    include ActiveModel::Model
-    include Virtus.model
-    include ActiveModel::Associations
-
-    # need hash like accessor, used internal Rails
-    def [](attr)
-      send(attr)
-    end
-
-    # need hash like accessor, used internal Rails
-    def []=(attr, value)
-      send("#{attr}=", value)
-    end
-
-    def save!
-      save || raise("#{self.class}.save failed: #{errors.messages}")
-    end
-  end
-end