activeadmin-reform 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a305e245d1e8f6ac3758c1bf7ea2322d7c8a660
-  data.tar.gz: e846405d5c62de356d0ba89f229d3c55b62575e4
+  metadata.gz: 9fb5f1cb1e6a8849bfe291cb6cf6ae4677ad0b84
+  data.tar.gz: 1d26346817eae70a0132331bae9ef65f914225c7
 SHA512:
-  metadata.gz: 6562a54f864439d160273ae06d9cf4d5cf57a1afa12cd5156f024df015e99be65143a17c8d2369da642283325115dbb24383f767b65d7bc8ce6e0adba21e60b4
-  data.tar.gz: 1a1834ae1d33b0b6568ff450aaec0e97502f28d5bf2d69b27bcc26012a17aa6e65423fbc065c54ec02ce56336e24d81bd3e8c191fb491164588836b8d60ca4cc
+  metadata.gz: b54c9baa7fa35c78ff9649a6ad4f209e1185695e1b1816a2a6c7335ec191cca72f487a8070c3ce490eccd565c0ecee03630343e7880eb65ba05f27fb9037f31e
+  data.tar.gz: 2a3423e2ce7058c30652915c1299c42c22e560484f22f0815a22e53d252b82cd064a240cc878b0564f98f48a34a370b06d716f3da8968cbb1462db1a1663b471

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.3.0
+
+* Form pre-population from URL parameters in ActiveAdmin controllers
+
 # 0.2.1
 
 * Copy validation errors from ActiveRocord model to Reform, thus in case of such errors they are shown on edit/new pages.

data/README.md

@@ -30,12 +30,16 @@ Or install it yourself as:
 
 ## Usage
 
-Define your from object
+Define your form object and include our mixin (`ActiveAdmin::Reform::ActiveRecord`) into it:
  
 ```ruby
 require 'reform'
 
 class AuthorForm < Reform::Form
+  include ActiveAdmin::Reform::ActiveRecord
+
+  model :author
+
   property :last_name, validates: { presence: true }
   property :name
 end

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.1'
+  spec.version       = '0.3.0'
   spec.authors       = ['Artyom Bolshakov']
   spec.email         = ['abolshakov@spbtv.com']
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails', '>= 3.2'
   spec.add_dependency 'disposable', '>= 0.2.0'
   spec.add_dependency 'reform', '~> 2.2.1'
-  spec.add_dependency 'reform-rails'
+  spec.add_dependency 'reform-rails', '~> 0.1.7'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.4'

data/lib/active_admin/reform/active_record.rb

@@ -10,12 +10,20 @@ module ActiveAdmin
 
       delegate :new_record?, to: :model
 
-      def save_model
-        super.tap do
+      # @return [Boolean]
+      # Used here - https://github.com/activeadmin/activeadmin/blob/487f976/lib/active_admin/resource_controller/data_access.rb#L160
+      def save
+        validate({}) && super.tap do
           errors.merge!(model.errors, [])
         end
       end
 
+      # @param attributes [Hash]
+      # Used here - https://github.com/activeadmin/activeadmin/blob/487f976/lib/active_admin/resource_controller/data_access.rb#L301
+      def assign_attributes(attributes)
+        deserialize(attributes)
+      end
+
       included do
         include ::Reform::Form::ModelReflections
         include ::Reform::Form::ActiveRecord

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

@@ -16,31 +16,6 @@ module ActiveAdmin
         def apply_decorations(_resource)
           apply_form(super)
         end
-
-        # @param resource [ActiveRecord::Base, Reform::Form]
-        # @param attributes [(Hash)]
-        # @return [ActiveRecord::Base, Reform::Form]
-        def assign_attributes(resource, attributes)
-          if resource.is_a?(::Reform::Form)
-            resource.validate(*attributes) unless %w(new edit).include?(action_name)
-            resource
-          else
-            super
-          end
-        end
-
-        # Calls all the appropriate callbacks and then saves the new resource.
-        #
-        # @param [ActiveRecord::Base] object The new resource to save
-        #
-        # @return [void]
-        def save_resource(object)
-          if resource.is_a?(::Reform::Form)
-            super unless object.errors.any?
-          else
-            super
-          end
-        end
       end
 
       ::ActiveAdmin::ResourceController.send(:include, DataAccess)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-reform
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Artyom Bolshakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-04 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -56,16 +56,16 @@ dependencies:
   name: reform-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Integrates ActiveAdmin with Reform