activeadmin-reform 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fb5f1cb1e6a8849bfe291cb6cf6ae4677ad0b84
-  data.tar.gz: 1d26346817eae70a0132331bae9ef65f914225c7
+  metadata.gz: 8b2545bc177dc4826dabe211d5576f05e73d01f2
+  data.tar.gz: 2c5617517929323af7f300e7530b9e42fb6cf932
 SHA512:
-  metadata.gz: b54c9baa7fa35c78ff9649a6ad4f209e1185695e1b1816a2a6c7335ec191cca72f487a8070c3ce490eccd565c0ecee03630343e7880eb65ba05f27fb9037f31e
-  data.tar.gz: 2a3423e2ce7058c30652915c1299c42c22e560484f22f0815a22e53d252b82cd064a240cc878b0564f98f48a34a370b06d716f3da8968cbb1462db1a1663b471
+  metadata.gz: 0eb184257154729d4de672a81cb0c24fffba0baff550ae49719f7edb67bbe04f74a6481ffe991c18aecc6611b8295bbe1c16883488462a7554bfc893bc94dc14
+  data.tar.gz: 344759c4d353e38ad8e687bc7b852ef7d1862567fc60ad151bd5dc9cbdc5cd34d2a847dd3df9646d72c856f45d22c9ff00d951f43a08ce8f72ba882309457e3a

data/.travis.yml

@@ -4,12 +4,12 @@ rvm:
   - ruby-head
 env:
   matrix:
-    - RAILS_VERSION=3.2
-    - RAILS_VERSION=4.2.4
-    - RAILS_VERSION=master
+    - RAILS_VERSION=3.2 ACTIVEADMIN_VERSION=1.0.0.pre3
+    - RAILS_VERSION=4.2.4 ACTIVEADMIN_VERSION=1.2.0
+    - RAILS_VERSION=master ACTIVEADMIN_VERSION=1.2.0
 matrix:
   allow_failures:
-    - env: RAILS_VERSION=master
+    - env: RAILS_VERSION=master ACTIVEADMIN_VERSION=1.2.0
     - rvm: ruby-head
 before_install: gem install bundler -v 1.10.6
 install:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.0
+
+* Support ActiveAdmin 1.2.0
+
 # 0.3.0
 
 * Form pre-population from URL parameters in ActiveAdmin controllers

data/Gemfile

@@ -5,9 +5,10 @@ require File.expand_path 'spec/support/detect_rails_version', File.dirname(__FIL
 gemspec
 group :test do
   gem 'rails', detect_rails_version
-  gem 'activeadmin', github: 'activeadmin', ref: 'ba285ea2fc23ade108ed582134cae8c641f910a4'
+  gem 'activeadmin', ENV['ACTIVEADMIN_VERSION']
+  gem 'jquery-ui-rails', '5.0.5'
   gem 'sqlite3', '~> 1.3.11'
-  gem 'rspec-rails', '~> 3.4.0'
+  gem 'rspec-rails'
   gem 'test-unit', '~> 3.0' # Rails 3.2 support
 
   gem 'launchy', '~> 2.4.3'

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.3.0'
+  spec.version       = '0.4.0'
   spec.authors       = ['Artyom Bolshakov']
   spec.email         = ['abolshakov@spbtv.com']
 

data/lib/active_admin/reform.rb

@@ -6,6 +6,6 @@ module ActiveAdmin
   module Reform
     require_relative 'reform/engine'
     require_relative 'reform/active_record'
-    require_relative 'reform/form_builder'
+    require_relative 'reform/reflection'
   end
 end

data/lib/active_admin/reform/active_record.rb

@@ -27,6 +27,12 @@ module ActiveAdmin
       included do
         include ::Reform::Form::ModelReflections
         include ::Reform::Form::ActiveRecord
+
+        def self.reflect_on_association(name)
+          reflection = model_class.reflect_on_association(name) || return
+          property = definitions[name.to_s]
+          (@reflections ||= {})[name] ||= Reflection.new(reflection, (property[:nested] if property))
+        end
       end
 
       # Those methods are being used by activeadmin and are proxied to an inferred from name model

data/lib/active_admin/reform/engine.rb

@@ -10,8 +10,6 @@ module ActiveAdmin
         require 'active_admin'
         require_relative 'dsl'
         require_relative 'forms'
-
-        ActiveAdmin::FormBuilder.prepend FormBuilder
       end
     end
   end

data/lib/active_admin/reform/reflection.rb

@@ -0,0 +1,39 @@
+module ActiveAdmin
+  module Reform
+    # Decorates `ActiveRecord::Reflection` instances.
+    # `ActiveAdmin::FormBuilder#has_many(name)` uses `object.class.reflect_on_association(name).klass.new`
+    # to build nested records.
+    class Reflection < SimpleDelegator
+      # @param reflection [ActiveRecord::Reflection]
+      # @param form_class [Class<ActiveAdmin::Reform::ActiveRecord>, nil]
+      def initialize(reflection, form_class)
+        super(reflection)
+        @form_class = form_class
+      end
+
+      # @return [Klass]
+      def klass
+        Klass.new(super, @form_class)
+      end
+
+      # Decorates `ActiveRecord::Base` subclasses.
+      class Klass < SimpleDelegator
+        # @param klass [Class<ActiveRecord::Base>]
+        # @param form_class [Class<ActiveAdmin::Reform::ActiveRecord>, nil]
+        def initialize(klass, form_class)
+          super(klass)
+          @form_klass = form_class
+        end
+
+        # @return [ActiveAdmin::Reform::ActiveRecord]
+        def new(*)
+          if @form_klass
+            @form_klass.new(super).tap(&:prepopulate!)
+          else
+            super
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-reform
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Artyom Bolshakov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-27 00:00:00.000000000 Z
+date: 2017-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -150,8 +150,8 @@ files:
 - lib/active_admin/reform/active_record.rb
 - lib/active_admin/reform/dsl.rb
 - lib/active_admin/reform/engine.rb
-- lib/active_admin/reform/form_builder.rb
 - lib/active_admin/reform/forms.rb
+- lib/active_admin/reform/reflection.rb
 - lib/active_admin/reform/resource.rb
 - lib/active_admin/reform/resource_controller/data_access.rb
 - lib/activeadmin-reform.rb
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Integrates ActiveAdmin with Reform

data/lib/active_admin/reform/form_builder.rb

@@ -1,47 +0,0 @@
-require 'reform/form/active_model/model_reflections'
-
-module ActiveAdmin
-  module Reform
-    # Patching ActiveAdmin::FormBuilder#js_for_has_many to provide nested forms support
-    # https://github.com/activeadmin/activeadmin/blob/539fa4b/lib/active_admin/form_builder.rb#L123
-    module FormBuilder
-      private
-
-      # Capture the ADD JS
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      def js_for_has_many(assoc, form_block, template, new_record, class_string)
-        assoc_reflection = object.class.reflect_on_association assoc
-        assoc_name       = assoc_reflection.klass.model_name
-        placeholder      = "NEW_#{assoc_name.to_s.underscore.upcase.gsub(%r{/}, '_')}_RECORD"
-        opts = {
-          for: [assoc, nested_object(assoc)],
-          class: class_string,
-          for_options: { child_index: placeholder },
-        }
-        html = template.capture { inputs_for_nested_attributes opts, &form_block }
-        text = new_record.is_a?(String) ? new_record : I18n.t('active_admin.has_many_new', model: assoc_name.human)
-
-        template.link_to text, '#', class: 'button has_many_add', data: {
-          html: CGI.escapeHTML(html).html_safe, placeholder: placeholder
-        }
-      end
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
-
-      def nested_form_class(assoc)
-        if object.is_a?(::Reform::Form) && (property = object.class.definitions[assoc.to_s]) &&
-           (nested_form = property[:nested]) < ::Reform::Form
-          nested_form
-        end
-      end
-
-      def nested_object(assoc)
-        assoc_reflection = object.class.reflect_on_association assoc
-        if (nested_form = nested_form_class(assoc))
-          nested_form.new(assoc_reflection.klass.new).tap(&:prepopulate!)
-        else
-          assoc_reflection.klass.new
-        end
-      end
-    end
-  end
-end