Rename to ActiveAdmin::Globalize

Matteo Giaccone · Matteo Giaccone · commit b35b3c704a0e · 2014-01-20T10:24:39.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,3 @@
-coverage/
 .bundle/
-log/*.log
-pkg/
-spec/dummy/db/*.sqlite3
-spec/dummy/log/*.log
-spec/dummy/tmp/
-spec/dummy/.sass-cache
-spec/dummy/public/uploads/*
+.bin
+
diff --git a/Gemfile b/Gemfile
@@ -1,13 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-gem 'activeadmin', github: 'gregbell/active_admin'
 gemspec
 
-group :development, :test do
-  gem 'simplecov', require: false
-  gem 'sqlite3'
-  gem 'rspec-rails', '~> 2.8.1'
-  gem 'webrat'
-  gem 'friendly_id'
-end
+gem 'activeadmin', github: 'gregbell/active_admin', branch: 'master'
 
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,7 @@
 GIT
   remote: git://github.com/gregbell/active_admin.git
-  revision: 5ba39c0c85920ddfc5be9985a8c0c9310da1f878
+  revision: f21cff30e7212706a39710e2c70ad0af8087ccea
+  branch: master
   specs:
     activeadmin (1.0.0.pre)
       arbre (~> 1.0)
@@ -11,19 +12,20 @@ GIT
       inherited_resources (~> 1.3)
       jquery-rails
       jquery-ui-rails
-      kaminari (~> 0.14, != 0.15.0)
+      kaminari (~> 0.15)
       rails (>= 3.2, < 4.1)
       ransack (~> 1.0)
       sass-rails
 
 PATH
   remote: .
   specs:
-    activeadmin-globalize3 (0.0.2)
+    activeadmin-globalize (1.0.0)
+      activeadmin
       globalize (~> 4.0.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     actionmailer (4.0.2)
       actionpack (= 4.0.2)
@@ -71,14 +73,10 @@ GEM
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    diff-lcs (1.1.3)
-    docile (1.1.2)
     erubis (2.7.0)
     execjs (2.0.2)
     formtastic (2.3.0.rc2)
       actionpack (>= 3.0)
-    friendly_id (5.0.2)
-      activerecord (~> 4.0.0)
     globalize (4.0.0)
       activemodel (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
@@ -95,18 +93,15 @@ GEM
       thor (>= 0.14, < 2.0)
     jquery-ui-rails (4.1.1)
       railties (>= 3.1.0)
-    kaminari (0.14.1)
+    kaminari (0.15.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.8.4)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
     orm_adapter (0.5.0)
     polyamorous (0.6.4)
       activerecord (>= 3.0)
@@ -134,29 +129,11 @@ GEM
       polyamorous (~> 0.6.0)
     responders (1.0.0)
       railties (>= 3.2, < 5)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    rspec-rails (2.8.1)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec (~> 2.8.0)
     sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
     sprockets (2.10.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -166,7 +143,6 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
-    sqlite3 (1.3.8)
     thor (0.18.1)
     thread_safe (0.1.3)
       atomic
@@ -177,19 +153,10 @@ GEM
     tzinfo (0.3.38)
     warden (1.2.3)
       rack (>= 1.0)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activeadmin!
-  activeadmin-globalize3!
-  friendly_id
-  rspec-rails (~> 2.8.1)
-  simplecov
-  sqlite3
-  webrat
+  activeadmin-globalize!
diff --git a/README.md b/README.md
@@ -1,11 +1,15 @@
-# ActiveAdmin::Globalize3
+# ActiveAdmin::Globalize
 Makes it easy to translate your resource fields.
 
 ## Installation
 
 ```ruby
-gem "activeadmin-globalize3"
+gem "activeadmin-globalize", github: 'cantierecreativo/activeadmin-globalize',
+branch: 'master'
 ```
+We still need to use GitHub because ActiveAdmin is still in active development
+and there's no released gem compatible with Rails 4.
+
 ## Your model
 
 ```ruby
@@ -36,12 +40,13 @@ If `switch_locale` is set, each tab will be rendered switching locale.
 
 ## Friendly ID
 
-If you want to use Friendly ID together with Globalize3, please take a look
+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)
+To use the dashed locale keys as 'pt-BR' or 'pt-PT' you need to convert a string
+to symbol (in application.rb)
 
   config.i18n.available_locales = [:en, :it, :de, :es, :"pt-BR"]
 
diff --git a/Rakefile b/Rakefile
diff --git a/activeadmin-globalize.gemspec b/activeadmin-globalize.gemspec
@@ -1,19 +1,19 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 # Maintain your gem's version:
-require "active_admin/globalize3/version"
+require "active_admin/globalize/version"
 
 # Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
-  s.name        = "activeadmin-globalize3"
-  s.version     = ActiveAdmin::Globalize3::VERSION
+  s.name        = "activeadmin-globalize"
+  s.version     = ActiveAdmin::Globalize::VERSION
   s.authors     = ["Stefano Verna"]
   s.email       = ["stefano.verna@gmail.com"]
-  s.homepage    = "http://github.com/cantierecreativo/activeadmin-globalize3"
-  s.summary     = "Handles globalize3 translations"
-  s.description = "Handles globalize3 translations"
+  s.homepage    = "http://github.com/cantierecreativo/activeadmin-globalize"
+  s.summary     = "Handles globalize translations"
+  s.description = "Handles globalize translations"
 
-  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.md"]
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "README.md"]
 
   s.add_dependency "activeadmin"
   s.add_dependency "globalize", '~> 4.0.0'
diff --git a/app/assets/javascripts/active_admin/active_admin_globalize.js.coffee b/app/assets/javascripts/active_admin/active_admin_globalize.js.coffee
diff --git a/app/assets/stylesheets/active_admin/active_admin_globalize.css.sass b/app/assets/stylesheets/active_admin/active_admin_globalize.css.sass
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -1,6 +1,6 @@
 en:
   active_admin:
-    globalize3:
+    globalize:
       translations: "Translations"
       language:
         it: "Italian"
@@ -9,3 +9,4 @@ en:
         de: "German"
         pt-BR: "Portuguese"
         pt-PT: "Portuguese (Portugal)"
+
diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -1,6 +1,6 @@
 it:
   active_admin:
-    globalize3:
+    globalize:
       translations: "Traduzioni"
       language:
         it: "Italiano"
@@ -9,3 +9,4 @@ it:
         de: "Tedesco"
         pt-BR: "Portoghese"
         pt-PT: "Portoghese (Portogallo)"
+
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
@@ -1,6 +1,6 @@
 pt-BR:
  active_admin:
-    globalize3:
+    globalize:
       translations: "Traduções"
       language:
         it: "Italiano"
@@ -9,3 +9,4 @@ pt-BR:
         de: "Alemão"
         pt-BR: "Português"
         pt-PT: "Português (Portugal)"
+
diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
@@ -1,6 +1,6 @@
 pt-PT:
  active_admin:
-    globalize3:
+    globalize:
       translations: "Traduções"
       language:
         it: "Italiano"
@@ -9,3 +9,4 @@ pt-PT:
         de: "Alemão"
         pt-BR: "Português"
         pt-PT: "Português (Portugal)"
+
diff --git a/lib/active_admin/globalize.rb b/lib/active_admin/globalize.rb
@@ -2,12 +2,13 @@
 require 'activeadmin'
 
 require 'active_admin/views/index_as_table'
-require 'active_admin/globalize3/engine'
-require 'active_admin/globalize3/form_builder_extension'
-require 'active_admin/globalize3/active_record_extension'
-require 'active_admin/globalize3/index_table_for_extension'
+require 'active_admin/globalize/engine'
+require 'active_admin/globalize/form_builder_extension'
+require 'active_admin/globalize/active_record_extension'
+require 'active_admin/globalize/index_table_for_extension'
 
-ActiveRecord::Base.send :extend, ActiveAdmin::Globalize3::ActiveRecordExtension
+ActiveRecord::Base.send :extend, ActiveAdmin::Globalize::ActiveRecordExtension
+
+ActiveAdmin::FormBuilder.send :include, ActiveAdmin::Globalize::FormBuilderExtension
+ActiveAdmin::Views::IndexAsTable::IndexTableFor.send :include, ActiveAdmin::Globalize::IndexTableFor
 
-ActiveAdmin::FormBuilder.send :include, ActiveAdmin::Globalize3::FormBuilderExtension
-ActiveAdmin::Views::IndexAsTable::IndexTableFor.send :include, ActiveAdmin::Globalize3::IndexTableFor
diff --git a/lib/active_admin/globalize/active_record_extension.rb b/lib/active_admin/globalize/active_record_extension.rb
@@ -1,10 +1,10 @@
-module ActiveAdmin::Globalize3
+module ActiveAdmin::Globalize
   module ActiveRecordExtension
 
     module Methods
       def translation_names
         self.translations.map(&:locale).map do |locale|
-          I18n.t("active_admin.globalize3.language.#{locale}")
+          I18n.t("active_admin.globalize.language.#{locale}")
         end.uniq.sort
       end
     end
diff --git a/lib/active_admin/globalize/engine.rb b/lib/active_admin/globalize/engine.rb
@@ -1,16 +1,16 @@
 module ActiveAdmin
-  module Globalize3
+  module Globalize
     class Engine < ::Rails::Engine
       initializer "Active Admin precompile hook", group: :assets do |app|
         app.config.assets.precompile += [
-          "active_admin/active_admin_globalize3.css",
-          "active_admin/active_admin_globalize3.js"
+          "active_admin/active_admin_globalize.css",
+          "active_admin/active_admin_globalize.js"
         ]
       end
 
       initializer "add assets" do
-        ActiveAdmin.application.register_stylesheet "active_admin/active_admin_globalize3.css", :media => :screen
-        ActiveAdmin.application.register_javascript "active_admin/active_admin_globalize3.js"
+        ActiveAdmin.application.register_stylesheet "active_admin/active_admin_globalize.css", :media => :screen
+        ActiveAdmin.application.register_javascript "active_admin/active_admin_globalize.js"
       end
 
     end
diff --git a/lib/active_admin/globalize/form_builder_extension.rb b/lib/active_admin/globalize/form_builder_extension.rb
@@ -1,5 +1,5 @@
 module ActiveAdmin
-  module Globalize3
+  module Globalize
     module FormBuilderExtension
       extend ActiveSupport::Concern
 
@@ -12,7 +12,7 @@ def translated_inputs(name = "Translations", options = {}, &block)
             (auto_sort ? I18n.available_locales.sort : I18n.available_locales).map do |locale|
               template.content_tag(:li) do
                 I18n.with_locale(switch_locale ? locale : I18n.locale) do
-                  template.content_tag(:a, I18n.t(:"active_admin.globalize3.language.#{locale}"), href:".locale-#{locale}")
+                  template.content_tag(:a, I18n.t(:"active_admin.globalize.language.#{locale}"), href:".locale-#{locale}")
                 end
               end
             end.join.html_safe
@@ -41,3 +41,4 @@ module ClassMethods
     end
   end
 end
+
diff --git a/lib/active_admin/globalize/index_table_for_extension.rb b/lib/active_admin/globalize/index_table_for_extension.rb
@@ -1,10 +1,10 @@
 require 'active_admin/views/components/status_tag'
 
 module ActiveAdmin
-  module Globalize3
+  module Globalize
     module IndexTableFor
       def translation_status
-        column I18n.t("active_admin.globalize3.translations") do |obj|
+        column I18n.t("active_admin.globalize.translations") do |obj|
           obj.translation_names.map do |t|
             '<span class="status_tag">%s</span>' % t
           end.join(" ").html_safe
diff --git a/lib/active_admin/globalize/version.rb b/lib/active_admin/globalize/version.rb
@@ -0,0 +1,6 @@
+module ActiveAdmin
+  module Globalize
+    VERSION = "1.0.0"
+  end
+end
+
diff --git a/lib/active_admin/globalize3/version.rb b/lib/active_admin/globalize3/version.rb
diff --git a/lib/activeadmin-globalize.rb b/lib/activeadmin-globalize.rb
