tramway-core 1.13.1 → 1.13.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f17da8e39166fb8bf4ed6efd78f50c7b2424e4c296b59a547614b1ee2eb5c8d
-  data.tar.gz: afe057eca20f716dd777be50de34edbc2ace1d301507a6d0e6345581338a25dd
+  metadata.gz: 98fc3b4eb72607b71692a66f9984842cc63cd135f7c498090b5a89ec22d25648
+  data.tar.gz: 955159d6eb34fc36e753a3aba3167846a788a7ce37e9e5d3d657fb542c0d6312
 SHA512:
-  metadata.gz: 1baf5692c4e9d0b6cf6471974ff2ea3b95fb673907bd890b081aca651f3685fa6e049a2641bf90d4578b45e5d90c7907956845ec2b179aae795fec53d5f6db0c
-  data.tar.gz: de8110872ce9bcae012fa705104c1d30a1474fa41919810d15831baf9fe39177d1b0e3a688e59f2216f06d1f3c60489bb0369822307793c2c78e9043bee7d1b3
+  metadata.gz: 8901bf8f3c13d43b4bc750dfef901e079bc351eae922674883066ffffaca448c7ba5c3913ef96bf7caed2f52d1872358780295d3dd46c07178f758b6e5ab35b5
+  data.tar.gz: ceb839ae0aa3d97d75a0e7c98c212bd8502ad21f8f411d20871bce24f608fd7818d67284ed271a0ffa22515d8c47b0403422f9aa0aa559b0b66f9e174c0cf2c5

data/app/decorators/tramway/core/application_decorator.rb

@@ -111,8 +111,17 @@ class Tramway::Core::ApplicationDecorator
 
   include Tramway::Core::Concerns::AttributesDecoratorHelper
 
+  RESERVED_WORDS = [ 'fields' ]
+
   def attributes
     object.attributes.reduce({}) do |hash, attribute|
+      if attribute[0].in? RESERVED_WORDS
+        error = Tramway::Error.new(
+          plugin: :core,
+          method: :attributes,
+          message: ("Method `#{attribute[0]}` is reserved word. Please, create or delegate method in #{self.class.name} with another name."))
+        raise error.message
+      end
       value = try(attribute[0]) ? send(attribute[0]) : object.send(attribute[0])
       if attribute[0].to_s.in? object.class.state_machines.keys.map(&:to_s)
         hash.merge! attribute[0] => state_machine_view(object, attribute[0])

data/app/forms/tramway/core/extended_application_form.rb

@@ -3,19 +3,19 @@ class Tramway::Core::ExtendedApplicationForm < Tramway::Core::ApplicationForm
     def properties(*args)
       @@extendable_properties ||= []
       @@extendable_properties += args
-      super *args
+      super(*args)
     end
   end
 
-    def initialize(model)
-      @@extendable_properties.each do |prop|
-        unless model.respond_to? prop
-          model.class.define_method prop do
-          end
-          model.class.define_method "#{prop}=" do |value|
-          end
+  def initialize(model)
+    @@extendable_properties.each do |prop|
+      unless model.respond_to? prop
+        model.class.define_method prop do
+        end
+        model.class.define_method "#{prop}=" do |value|
         end
       end
-      super
     end
+    super
+  end
 end

data/lib/tramway/core/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Core
-    VERSION = '1.13.1'
+    VERSION = '1.13.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-core
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.1.1
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-05 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reform-rails