Merge branch 'release/0.9.9', closes #16 and #21

Author: fabn

.travis.yml

@@ -1,6 +1,14 @@
+sudo: false
 language: ruby
+# Limit ruby versions to currently supported versions to avoid a big build matrix
 rvm:
-  - 1.9.3
-  - 2.0.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 # Load database schema before rake
-before_script: bundle exec rake db:schema:load
+before_script: bundle exec rake db:schema:load
+# Test on all supported rails versions
+gemfile:
+  - gemfiles/rails4_2.gemfile
+  - gemfiles/rails5_0.gemfile
+  - gemfiles/rails5_1.gemfile

Appraisals

@@ -0,0 +1,15 @@
+appraise 'rails4_2' do
+  gem 'rails', '~> 4.2.9'
+  gem 'globalize', '~> 5.0.0'
+end
+
+appraise 'rails5_0' do
+  gem 'rails', '~> 4.2.9'
+  gem 'globalize', '~> 5.0.0'
+end
+
+appraise 'rails5_1' do
+  gem 'devise', '~> 4.3'
+  gem 'rails', '~> 5.1.3'
+  gem 'globalize', '~> 5.1.0.beta2'
+end

Gemfile

@@ -14,31 +14,31 @@ gemspec
 # gem 'debugger'
 
 # Gems used by the dummy application
-group :assets do
-  gem 'sass-rails', '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+gem 'sass-rails'
+gem 'coffee-rails'
 
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  gem 'therubyracer', platforms: :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
+# See https://github.com/sstephenson/execjs#readme for more supported runtimes
+gem 'therubyracer', platforms: :ruby
+gem 'uglifier'
 
 # jquery-rails is
 gem 'jquery-rails'
 
+# ActiveAdmin requires devise < 4.0
+gem 'devise', '~> 3.2'
+
 group :test do
   gem 'sqlite3', '~> 1.3.5'
-  gem 'rspec-rails', '~> 2.14.0'
+  gem 'rspec-rails', '~> 3.6.1'
   gem 'factory_girl_rails', '~> 4.2.1'
   gem 'database_cleaner', '~> 1.0.1'
-  gem 'guard-rspec', require: false
   gem 'spring', require: false
   gem 'spring-commands-rspec', require: false
-  gem 'capybara', '~> 2.1.0'
+  gem 'capybara', '~> 2.15'
   gem 'capybara-screenshot'
   gem 'poltergeist'
-  gem 'fuubar'
+  gem 'fuubar', '~> 2.2'
+  gem 'appraisal'
   # Useful to debug tests
   gem 'awesome_print'
   gem 'pry'

Guardfile

@@ -1,13 +1,32 @@
 # ActiveAdmin::Globalize
+
 Makes it easy to translate your resource fields.
 
+[![Gem Version](https://badge.fury.io/rb/activeadmin-globalize.svg)](http://badge.fury.io/rb/activeadmin-globalize)
+[![Build Status](https://travis-ci.org/fabn/activeadmin-globalize.svg?branch=develop)](https://travis-ci.org/fabn/activeadmin-globalize)
+
+## Help Needed
+
+Looking for maintainers. See https://github.com/fabn/activeadmin-globalize/issues/26
+
 ## Installation
 
+Current released version on rubygems is `1.0.0.pre`, I won't call it 1.0.0 until some issues has been solved, 
+but, as reported in [this PR](https://github.com/fabn/activeadmin-globalize/pull/25) it should work with both
+AA 1.0.0 and AA 1.1.0. 
+
+Current version targets Rails 4 and greater and ActiveAdmin >= 1.0.0.
+
 ```ruby
-gem 'activeadmin-globalize', '~> 0.6.3'
+gem 'activeadmin-globalize', '~> 1.0.0.pre'
 ```
 
-This version targets Rails 3.2.x only and ActiveAdmin ~> 0.6.3.
+Previous version with support for Rails 3 is maintained in branch [support/0.6.x](https://github.com/fabn/activeadmin-globalize/tree/support/0.6.x)
+
+## Require Assets
+
+- active_admin.js: `//= require active_admin/active_admin_globalize.js`
+- active_admin.css: `*= require active_admin/active_admin_globalize`
 
 ## Your model
 
@@ -16,42 +35,93 @@ active_admin_translates :title, :description do
   validates_presence_of :title
 end
 ```
-## Editor configuration
+## In your Active Admin resource definition
+
+**Important note:** I'm working on a fix for #4 because after AA deprecated and then removed [#form_buffers](https://github.com/activeadmin/activeadmin/pull/3486) the
+syntax shown below for form declaration doesn't work as is. See comments in code and [discussion](#4) to fix it until I found a solution.
 
 ```ruby
+
+# For usage with strong parameters you'll need to permit them
+permit_params translations_attributes: [:id, :locale, :title, :description, :_destroy]
+
 index do
   # textual translation status
   translation_status
   # or with flag icons
   translation_status_flags
   # ...
-  default_actions
+  actions
 end
 
+# This was the original syntax proposed in this gem, however currently it doesn't work
 form do |f|
   # ...
   f.translated_inputs "Translated fields", switch_locale: false do |t|
     t.input :title
-    t.input :content
+    t.input :description
+  end
+  # ...
+end
+
+# Instead you have to nest the block inside an #inputs block and the title
+# should be passed to the inputs method
+form do |f|
+  # ...
+  f.inputs "Translated fields" do
+    f.translated_inputs 'ignored title', switch_locale: false do |t|
+      t.input :title
+      t.input :description
+    end
   end
   # ...
 end
+
+# You can also set locales to show in tabs
+# For example we want to show English translation fields without tab, and want to show other languages within tabs
+form do |f|
+  # ...
+  f.inputs do
+    Globalize.with_locale(:en) do
+      f.input :title
+    end
+  end
+  f.inputs "Translated fields" do
+    f.translated_inputs 'ignored title', switch_locale: false, available_locales: (I18n.available_locales - [:en]) do |t|
+      t.input :title
+      t.input :description
+    end
+  end
+  # ...
+end
+
+# You can also set default language tab
+# For example we want to make Bengali translation tab as default
+form do |f|
+  # ...
+  f.inputs "Translated fields" do
+    f.translated_inputs 'ignored title', switch_locale: false, default_locale: :bn do |t|
+      t.input :title
+      t.input :description
+    end
+  end
+  # ...
+end
+
 ```
 If `switch_locale` is set, each tab will be rendered switching locale.
 
-## Friendly ID
-
-If you want to use Friendly ID together with Globalize, please take a look
-at the `activeadmin-seo` gem.
 
 ## Hints
 
 To use the dashed locale keys as 'pt-BR' or 'pt-PT' you need to convert a string
 to symbol (in application.rb)
 
+```ruby
   config.i18n.available_locales = [:en, :it, :de, :es, :"pt-BR"]
+```
 
 ## Credits
 
 This work is based on original idea by [@stefanoverna](https://github.com/stefanoverna/activeadmin-globalize),
- I needed it for AA 0.6.x so I forked the original project.
+ I needed it for AA 0.6.x so I forked the original project and expanded it with more features.

README.md

@@ -0,0 +1 @@
+0.9.9

VERSION

@@ -11,17 +11,17 @@ Gem::Specification.new do |s|
   s.email       = ['stefano.verna@gmail.com', 'f.napoleoni@gmail.com']
   s.homepage    = 'http://github.com/fabn/activeadmin-globalize'
   s.summary     = 'Handles globalize translations'
-  s.description = 'Handles globalize translations in ActiveAdmin 0.6.3 and Rails 3.2.x'
+  s.description = 'Handles globalize translations in ActiveAdmin 1.0 and Rails 4.x-5.x'
 
   s.files = Dir['{app,config,db,lib}/**/*'] + %w(MIT-LICENSE README.md)
 
-  s.add_dependency 'activeadmin', '~> 0.6.3'
-  s.add_dependency 'globalize', '~> 3.0.4'
+  s.add_dependency 'activeadmin', '>= 1.0', '< 1.2'
+  # Try to support rails from 3.2 up to 4.2.x
+  s.add_dependency 'globalize', '>= 3.1.0', '< 6.0'
 
   # development dependencies
   s.add_development_dependency 'bundler', '>= 1.6.1'
   s.add_development_dependency 'rake'
   # Other development dependencies moved into Gemfile
 
 end
-

activeadmin-globalize.gemspec

@@ -148,7 +148,8 @@ $ ->
     $td = $(this).closest('td')
     $('.field-translation', $td).hide()
     $(".locale-#{$locale}", $td).show()
+    $(this).parent().children('a.ui-translation-trigger').removeClass('active')
+    $(this).addClass('active')
     e.preventDefault()
 
   translations()
-