activeadmin-reform 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b57cf76087dee6fbc7ec42507e0b62f28205a1a
-  data.tar.gz: 30b6c7abf2867fa0e0159bdc8c33e71d02e647c4
+  metadata.gz: 0a305e245d1e8f6ac3758c1bf7ea2322d7c8a660
+  data.tar.gz: e846405d5c62de356d0ba89f229d3c55b62575e4
 SHA512:
-  metadata.gz: 0b50e20d28f8a443e83796f0ec92f8586105d1d1faee899a31b2f40976655c4058d197fdecfad25fdd1d63107ef4e61e8464469299d9d569e1e670b921fb37a0
-  data.tar.gz: f39944434946235702a6d7da515c860051aa5c7a3b4335230e85b9b5dad54b4929c3335febc3c5452c97e681c8c8600bd1b65e79b5efc12543636407426c8820
+  metadata.gz: 6562a54f864439d160273ae06d9cf4d5cf57a1afa12cd5156f024df015e99be65143a17c8d2369da642283325115dbb24383f767b65d7bc8ce6e0adba21e60b4
+  data.tar.gz: 1a1834ae1d33b0b6568ff450aaec0e97502f28d5bf2d69b27bcc26012a17aa6e65423fbc065c54ec02ce56336e24d81bd3e8c191fb491164588836b8d60ca4cc

data/.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,15 @@
+### Expected behavior
+
+### Actual behavior
+
+### Steps to reproduce behavior
+
+### Reform version
+
+### ActiveAdmin version
+
+### ActiveAdmin::Reform version
+
+### Environment info
+
+### Screenshots (if relevant)

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+### What does this PR do?
+
+### If this is related to an existing issue, include a link to it as well.
+
+### Screenshots (if relevant)

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.1
+
+* Copy validation errors from ActiveRocord model to Reform, thus in case of such errors they are shown on edit/new pages.
+
 # 0.2.0
 
 * Update reform dependency to 2.2.1

data/activeadmin-reform.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'activeadmin-reform'
-  spec.version       = '0.2.0'
+  spec.version       = '0.2.1'
   spec.authors       = ['Artyom Bolshakov']
   spec.email         = ['abolshakov@spbtv.com']
 

data/lib/active_admin/reform/active_record.rb

@@ -10,6 +10,12 @@ module ActiveAdmin
 
       delegate :new_record?, to: :model
 
+      def save_model
+        super.tap do
+          errors.merge!(model.errors, [])
+        end
+      end
+
       included do
         include ::Reform::Form::ModelReflections
         include ::Reform::Form::ActiveRecord

data/lib/active_admin/reform/resource_controller/data_access.rb

@@ -11,11 +11,10 @@ module ActiveAdmin
       module DataAccess
         extend ActiveSupport::Concern
 
-        # @param resource [ActiveRecord::Base]
+        # @param _resource [ActiveRecord::Base]
         # @return [ActiveRecord::Base, Reform::Form]
-        def apply_decorations(resource)
-          resource = super(resource)
-          apply_form(resource)
+        def apply_decorations(_resource)
+          apply_form(super)
         end
 
         # @param resource [ActiveRecord::Base, Reform::Form]
@@ -23,10 +22,10 @@ module ActiveAdmin
         # @return [ActiveRecord::Base, Reform::Form]
         def assign_attributes(resource, attributes)
           if resource.is_a?(::Reform::Form)
-            resource.validate(*attributes) unless action_name == 'new'
+            resource.validate(*attributes) unless %w(new edit).include?(action_name)
             resource
           else
-            super(resource, attributes)
+            super
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-reform
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Artyom Bolshakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/ISSUE_TEMPLATE.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".hound.yml"
 - ".rspec"