Merge branch 'feature/rails4-only' into develop

Author: fabn

Gemfile

@@ -14,19 +14,21 @@ 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 'rails', '~> 4.0.0'
+gem 'sass-rails', '~> 4.0.2'
+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'
 
+# Fetch activeadmin from github until is released
+gem 'activeadmin', github: 'activeadmin'
+gem 'devise'
+
 group :test do
   gem 'sqlite3', '~> 1.3.5'
   gem 'rspec-rails', '~> 2.14.0'

README.md

@@ -1,13 +1,22 @@
 # 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)
+
 ## Installation
 
+This version targets Rails 4 and greater and ActiveAdmin >= 1.0.0.pre.
+
 ```ruby
-gem 'activeadmin-globalize', '~> 0.6.3'
+gem 'activeadmin-globalize', '~> 1.0.0.pre', github: 'fabn/activeadmin-globalize', branch: 'develop'
 ```
 
-This version targets Rails 3.2.x only and ActiveAdmin ~> 0.6.3.
+As soon as ActiveAdmin 1.x is released to rubygems, I'll release the gem with no need for github dependency. See
+[this issue](https://github.com/activeadmin/activeadmin/issues/3448) for more details.
+
+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)
 
 ## Your model
 
@@ -19,6 +28,10 @@ end
 ## Editor configuration
 
 ```ruby
+
+# For usage with strong parameters you'll need to permit them
+permit_params translations_attributes: [:id, :locale, :title, :content, :_destroy]
+
 index do
   # textual translation status
   translation_status
@@ -39,19 +52,17 @@ 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.

activeadmin-globalize.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 
   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.0.pre'
+  s.add_dependency 'globalize', '~> 4.0'
 
   # development dependencies
   s.add_development_dependency 'bundler', '>= 1.6.1'

app/assets/stylesheets/active_admin/active_admin_globalize_flags.css.sass

@@ -6,7 +6,7 @@
   width: 16px
   height: 11px
   vertical-align: middle
-  background: url(active_admin_image_path('flags.png')) no-repeat
+  background: image-url('active_admin/flags.png') no-repeat
   &.flag-ar // originally flag-ae
     background-position: -16px 0
   &.flag-br

lib/active_admin/globalize/attributes_table_extension.rb

@@ -74,8 +74,8 @@ def translated_row(*args, &block)
 
       # @return [Boolean] true iff the field is translatable
       def translatable?(field)
-        @record.class.translates? &&
-            @record.class.translated_attribute_names.include?(field.to_sym)
+        @resource_class.translates? &&
+            @resource_class.translated_attribute_names.include?(field.to_sym)
       end
 
       # Build a tag for each field translation with appropriate css classes to make javascript working
@@ -131,7 +131,7 @@ def inline_locale_selectors
       end
 
       def available_translations
-        @record_translations ||= @record.translations.order(:locale)
+        @record_translations ||= @collection.first.translations.order(:locale)
       end
 
     end

lib/active_admin/globalize/version.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
   module Globalize
-    VERSION = '0.6.3'
+    VERSION = '1.0.0.pre'
   end
 end
 

spec/dummy/app/admin/articles.rb

@@ -1,5 +1,7 @@
 ActiveAdmin.register Article do
 
+  permit_params :title, :body
+
   index do
     id_column
     column :title

spec/dummy/app/admin/dashboard.rb

@@ -1,10 +1,10 @@
 ActiveAdmin.register_page "Dashboard" do
 
-  menu :priority => 1, :label => proc{ I18n.t("active_admin.dashboard") }
+  menu priority: 1, label: proc{ I18n.t("active_admin.dashboard") }
 
-  content :title => proc{ I18n.t("active_admin.dashboard") } do
-    div :class => "blank_slate_container", :id => "dashboard_default_message" do
-      span :class => "blank_slate" do
+  content title: proc{ I18n.t("active_admin.dashboard") } do
+    div class: "blank_slate_container", id: "dashboard_default_message" do
+      span class: "blank_slate" do
         span I18n.t("active_admin.dashboard_welcome.welcome")
         small I18n.t("active_admin.dashboard_welcome.call_to_action")
       end

spec/dummy/app/assets/javascripts/active_admin.js.coffee

@@ -0,0 +1 @@
+#= require active_admin/base

spec/dummy/app/models/admin_user.rb

@@ -3,8 +3,4 @@ class AdminUser < ActiveRecord::Base
   # :confirmable, :lockable, :timeoutable and :omniauthable
   devise :database_authenticatable, 
          :recoverable, :rememberable, :trackable, :validatable
-
-  # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me
-  # attr_accessible :title, :body
 end