refinerycms-admin-locales 1.0.1 → 2.0.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--drb

data/Gemfile

@@ -1,7 +1,28 @@
 source 'https://rubygems.org'
 
+gemspec
+
+gem 'refinerycms', '~> 2.0.0'
+gem 'refinerycms-i18n', '~> 2.0.0'
+gem 'refinerycms-settings', '~> 2.0.0'
+
 group :development, :test do
-  gem 'sqlite3'
-  gem 'mysql2'
-  gem 'pg'
+
+  gem 'therubyracer'
+  gem 'refinerycms-testing', '~> 2.0.0'
+
+  unless defined?(JRUBY_VERSION)
+    gem 'sqlite3'
+    gem 'mysql2'
+    gem 'pg'
+  end
 end
+
+# Refinery/rails should pull in the proper versions of these
+group :assets do
+  gem 'sass-rails'
+  gem 'coffee-rails'
+  gem 'uglifier'
+end
+
+gem 'jquery-rails'

data/Gemfile.lock

@@ -0,0 +1,249 @@
+PATH
+  remote: .
+  specs:
+    refinerycms-admin-locales (2.1.0.dev)
+      refinerycms-core (~> 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionmailer (3.2.8)
+      actionpack (= 3.2.8)
+      mail (~> 2.4.4)
+    actionpack (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.8)
+      activesupport (= 3.2.8)
+      builder (~> 3.0.0)
+    activerecord (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.8)
+      activemodel (= 3.2.8)
+      activesupport (= 3.2.8)
+    activesupport (3.2.8)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    acts_as_indexed (0.7.8)
+    arel (3.0.2)
+    awesome_nested_set (2.1.6)
+      activerecord (>= 3.0.0)
+    babosa (0.3.10)
+    bcrypt-ruby (3.0.1)
+    builder (3.0.0)
+    capybara (1.1.4)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    coffee-rails (3.2.2)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.2.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.3.3)
+    database_cleaner (0.7.2)
+    devise (2.0.5)
+      bcrypt-ruby (~> 3.0)
+      orm_adapter (~> 0.0.3)
+      railties (~> 3.1)
+      warden (~> 1.1.1)
+    diff-lcs (1.2.4)
+    dragonfly (0.9.15)
+      multi_json (~> 1.0)
+      rack
+    erubis (2.7.0)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
+    factory_girl (2.6.4)
+      activesupport (>= 2.3.9)
+    factory_girl_rails (1.7.0)
+      factory_girl (~> 2.6.0)
+      railties (>= 3.0.0)
+    ffi (1.8.1)
+    friendly_id (4.0.9)
+    globalize3 (0.2.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      paper_trail (~> 2)
+    hike (1.2.1)
+    i18n (0.6.0)
+    journey (1.0.4)
+    jquery-rails (2.0.2)
+      railties (>= 3.2.0, < 5.0)
+      thor (~> 0.14)
+    json (1.7.4)
+    libv8 (3.11.8.13)
+    mail (2.4.4)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.23)
+    multi_json (1.3.6)
+    mysql2 (0.3.11)
+    nokogiri (1.5.9)
+    orm_adapter (0.0.7)
+    paper_trail (2.7.2)
+      activerecord (~> 3.0)
+      railties (~> 3.0)
+    pg (0.15.1)
+    polyglot (0.3.3)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
+    rack-test (0.6.1)
+      rack (>= 1.0)
+    rails (3.2.8)
+      actionmailer (= 3.2.8)
+      actionpack (= 3.2.8)
+      activerecord (= 3.2.8)
+      activeresource (= 3.2.8)
+      activesupport (= 3.2.8)
+      bundler (~> 1.0)
+      railties (= 3.2.8)
+    railties (3.2.8)
+      actionpack (= 3.2.8)
+      activesupport (= 3.2.8)
+      rack-ssl (~> 1.3.2)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (>= 0.14.6, < 2.0)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    ref (1.0.2)
+    refinerycms (2.0.9)
+      bundler (~> 1.0)
+      refinerycms-authentication (= 2.0.9)
+      refinerycms-core (= 2.0.9)
+      refinerycms-dashboard (= 2.0.9)
+      refinerycms-images (= 2.0.9)
+      refinerycms-pages (= 2.0.9)
+      refinerycms-resources (= 2.0.9)
+    refinerycms-authentication (2.0.9)
+      devise (~> 2.0.0)
+      orm_adapter (~> 0.0.7)
+      refinerycms-core (= 2.0.9)
+    refinerycms-core (2.0.9)
+      acts_as_indexed (~> 0.7.7)
+      awesome_nested_set (~> 2.1.3)
+      coffee-rails (~> 3.2.1)
+      friendly_id (~> 4.0.1)
+      globalize3 (~> 0.2.0)
+      jquery-rails (~> 2.0.0)
+      rails (>= 3.1.3, < 3.3)
+      sass-rails (~> 3.2.3)
+      truncate_html (~> 0.5)
+      uglifier (>= 1.0.3)
+      will_paginate (~> 3.0.2)
+    refinerycms-dashboard (2.0.9)
+      refinerycms-core (= 2.0.9)
+    refinerycms-i18n (2.0.2)
+      refinerycms-core (~> 2.0.0)
+      routing-filter (>= 0.2.3)
+    refinerycms-images (2.0.9)
+      dragonfly (~> 0.9.8)
+      rack-cache (>= 0.5.3)
+      refinerycms-core (= 2.0.9)
+    refinerycms-pages (2.0.9)
+      awesome_nested_set (~> 2.1.3)
+      babosa (!= 0.3.6)
+      refinerycms-core (= 2.0.9)
+      seo_meta (~> 1.3.0)
+    refinerycms-resources (2.0.9)
+      dragonfly (~> 0.9.8)
+      rack-cache (>= 0.5.3)
+      refinerycms-core (= 2.0.9)
+    refinerycms-settings (2.0.2)
+      refinerycms-core (~> 2.0.1)
+    refinerycms-testing (2.0.9)
+      capybara (~> 1.1.2)
+      database_cleaner (~> 0.7.2)
+      factory_girl_rails (~> 1.7.0)
+      refinerycms-core (= 2.0.9)
+      rspec-rails (~> 2.11)
+    routing-filter (0.3.1)
+      actionpack
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    rspec-rails (2.13.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rubyzip (0.9.9)
+    sass (3.2.0)
+    sass-rails (3.2.5)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    selenium-webdriver (2.33.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    seo_meta (1.3.0)
+      railties (>= 3.0.0)
+    sprockets (2.1.3)
+      hike (~> 1.2)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.6)
+    therubyracer (0.11.2)
+      libv8 (~> 3.11.8.12)
+      ref
+    thor (0.15.4)
+    tilt (1.3.3)
+    treetop (1.4.12)
+      polyglot
+      polyglot (>= 0.3.1)
+    truncate_html (0.9.2)
+    tzinfo (0.3.37)
+    uglifier (1.2.7)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.3)
+    warden (1.1.1)
+      rack (>= 1.0)
+    websocket (1.0.7)
+    will_paginate (3.0.4)
+    xpath (0.1.4)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  coffee-rails
+  jquery-rails
+  mysql2
+  pg
+  refinerycms (~> 2.0.0)
+  refinerycms-admin-locales!
+  refinerycms-i18n (~> 2.0.0)
+  refinerycms-settings (~> 2.0.0)
+  refinerycms-testing (~> 2.0.1)
+  sass-rails
+  sqlite3
+  therubyracer
+  uglifier

data/Rakefile

@@ -8,11 +8,14 @@ end
 ENGINE_PATH = File.dirname(__FILE__)
 APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 
-load 'rails/tasks/engine.rake' if File.exists?(APP_RAKEFILE)
+if File.exists?(APP_RAKEFILE)
+  load 'rails/tasks/engine.rake'
+end
 
 require "refinerycms-testing"
 Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
-load File.expand_path('../tasks/testing.rake', __FILE__)
 load File.expand_path('../tasks/rspec.rake', __FILE__)
+
+task :default => :spec

data/app/controllers/refinery/admin_locales/admin/admin_locales_controller.rb

@@ -0,0 +1,24 @@
+module Refinery
+  module AdminLocales
+    module Admin
+      class AdminLocalesController < ::Refinery::AdminController
+
+        crudify :'refinery/user',
+              :order => 'username ASC',
+              :title_attribute => 'username',
+              :xhr_paging => true
+
+        def update
+          locale = params[:user][:locale]
+          @user.locale = locale if params[:user][:locale]
+          if locale && @user.save
+            redirect_to refinery.admin_locales_admin_admin_locales_path,
+                        :notice => t('updated', :what => @user.username, :scope => 'refinery.crudify')
+          else
+            render :edit
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/refinery/admin_locales/admin/admin_locales/_form.html.erb

@@ -0,0 +1,14 @@
+<%= form_for @user, :url => refinery.admin_locales_admin_admin_locale_path(@user), :method => :put do |f| %>
+
+  <%= render '/refinery/admin/error_messages', :object => @user, :include_object_name => true %>
+
+  <div class='field'>
+    <%= f.label :locale %>
+    <%= f.select :locale, options_for_select(Refinery::I18n.locales.map(&:reverse), @user.locale) %>
+  </div>
+
+
+  <%= render '/refinery/admin/form_actions', :f => f,
+             :continue_editing => false,
+             :hide_delete => true %>
+<% end %>

data/app/views/{admin → refinery/admin_locales/admin}/admin_locales/_user.html.erb

@@ -7,7 +7,7 @@
   </span>
   <span class='actions'>
     <%= link_to refinery_icon_tag('application_edit.png'),
-                edit_admin_admin_locale_path(user),
-                :title => t('.edit') %>
+                refinery.edit_admin_locales_admin_admin_locale_path(user),
+                :title => t('edit', :scope => 'refinery.admin.users') if current_refinery_user.can_edit?(user) %>
   </span>
 </li>

data/app/views/refinery/admin_locales/admin/admin_locales/edit.html.erb

@@ -0,0 +1,2 @@
+<h1><%= Refinery::User.model_name.human.capitalize %> <%= @user.username %></h1>
+<%= render 'form' %>

data/app/views/refinery/admin_locales/admin/admin_locales/index.html.erb

@@ -0,0 +1,3 @@
+<section id='records'>
+  <%= render 'records' %>
+</section>

data/config/locales/en.yml

@@ -1,18 +1,20 @@
 en:
-  plugins:
-    refinerycms_admin_locales:
-      title: User locales
-  admin:
-    admin_locales:
-      records:
+  refinery:
+    plugins:
+      admin_locales:
         title: User locales
-        sorry_no_results: No results, sorry.
-        no_items_yet: There are not users yet
-      user:
-        default: Default
-        edit: Edit locale
-        locale: Locale
+    admin_locales:
+      admin:
+        admin_locales:
+          records:
+            title: User locales
+            sorry_no_results: No results, sorry.
+            no_items_yet: There are not users yet
+          user:
+            default: Default
+            edit: Editar this locale
+            locale: Locale
   activerecord:
     attributes:
-      user:
+      'refinery/admin_locales/admin_locale':
         locale: Locale

data/config/locales/es.yml

@@ -1,18 +1,20 @@
 es:
-  plugins:
-    refinerycms_admin_locales:
-      title: Idiomas de usuario
-  admin:
-    admin_locales:
-      records:
+  refinery:
+    plugins:
+      admin_locales:
         title: Idiomas de usuario
-        sorry_no_results: Lo siento, no hay resultados
-        no_items_yet: No hay usuario todavía.
-      user:
-        default: Por defecto
-        edit: Editar este idioma
-        locale: Idioma
+    admin_locales:
+      admin:
+        admin_locales:
+          records:
+            title: Idiomas de usuario
+            sorry_no_results: Lo siento, no hay resultados
+            no_items_yet: No hay usuario todavía.
+          user:
+            default: Por defecto
+            edit: Editar este idioma
+            locale: Idioma
   activerecord:
     attributes:
-      user:
+      'refinery/admin_locales/admin_locale':
         locale: Idioma

data/config/routes.rb

@@ -1,5 +1,8 @@
-Refinery::Application.routes.draw do
-  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
-    resources :admin_locales, :only => [:index, :edit, :update]
+Refinery::Core::Engine.routes.draw do
+  namespace :admin_locales, :path => '' do
+    namespace :admin, :path => 'refinery' do
+      root :to => "admin_locales#index"
+      resources :admin_locales, :only => [:index, :edit, :update]
+    end
   end
 end

data/db/migrate/1_add_locale_to_user.rb

@@ -1,13 +1,11 @@
 class AddLocaleToUser < ActiveRecord::Migration
 
-  def self.up
-    add_column :users, :locale, :string
-
-    load(Rails.root.join('db', 'seeds', 'refinerycms_admin_locales.rb').to_s)
+  def up
+    add_column :refinery_users, :locale, :string
   end
 
-  def self.down
-    remove_column :users, :locale
+  def down
+    remove_column :refinery_users, :locale
   end
 
 end

data/db/seeds.rb

@@ -0,0 +1,8 @@
+if defined?(::Refinery::User)
+  ::Refinery::User.all.each do |user|
+    if user.plugins.where(:name => 'refinerycms_admin_locales').blank?
+      user.plugins.create(:name => 'refinerycms_admin_locales',
+                          :position => (user.plugins.maximum(:position) || -1) +1)
+    end
+  end
+end

data/lib/generators/refinery/admin_locales_generator.rb

@@ -0,0 +1,19 @@
+module Refinery
+  class AdminLocalesGenerator < Rails::Generators::Base
+
+    def rake_db
+      rake("refinery_admin_locales:install:migrations")
+    end
+
+    def append_load_seed_data
+      create_file 'db/seeds.rb' unless File.exists?(File.join(destination_root, 'db', 'seeds.rb'))
+      append_file 'db/seeds.rb', :verbose => true do
+        <<-EOH
+
+# Added by Refinery CMS Admin Locales extension
+Refinery::AdminLocales::Engine.load_seed
+        EOH
+      end
+    end
+  end
+end

data/lib/refinery/admin_locales.rb

@@ -0,0 +1,21 @@
+require 'refinerycms-core'
+
+module Refinery
+  autoload :AdminLocalesGenerator, 'generators/refinery/admin_locales_generator'
+
+  module AdminLocales
+    require 'refinery/admin_locales/engine'
+
+    class << self
+      attr_writer :root
+
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def factory_paths
+        @factory_paths ||= [ root.join('spec', 'factories').to_s ]
+      end
+    end
+  end
+end

data/lib/refinery/admin_locales/engine.rb

@@ -0,0 +1,36 @@
+module Refinery
+  module AdminLocales
+    class Engine < Rails::Engine
+      include Refinery::Engine
+      isolate_namespace Refinery::AdminLocales
+
+      engine_name :refinery_admin_locales
+
+      initializer "register refinerycms_admin_locales plugin" do
+        Refinery::Plugin.register do |plugin|
+          plugin.name = "admin_locales"
+          plugin.pathname = root
+          plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_locales_admin_admin_locales_path }
+          plugin.menu_match = /refinery\/admin_locales/
+        end
+      end
+
+      config.after_initialize do
+        Refinery.register_engine(Refinery::AdminLocales)
+
+        ::Refinery::AdminController.class_eval do
+          def find_or_set_locale_with_default
+            if current_refinery_user && current_refinery_user.locale
+              ::Refinery::I18n.current_locale = current_refinery_user.locale
+              ::I18n.locale = ::Refinery::I18n.current_locale
+            else
+              find_or_set_locale_without_default
+            end
+          end
+
+          alias_method_chain :find_or_set_locale, :default
+        end
+      end
+    end
+  end
+end

data/lib/refinery/admin_locales/version.rb

@@ -1,15 +1,16 @@
 module Refinery
   module AdminLocales
     class Version
-      @major = 1
+      @major = 2
       @minor = 0
-      @tiny  = 1
+      @tiny  = 0
+      @build = nil
 
       class << self
-        attr_reader :major, :minor, :tiny
+        attr_reader :major, :minor, :tiny, :build
 
         def to_s
-          [@major, @minor, @tiny].compact.join('.')
+          [@major, @minor, @tiny, @build].compact.join('.')
         end
       end
     end

data/lib/refinerycms-admin-locales.rb

@@ -1,44 +1 @@
-require 'refinery'
-
-module Refinery
-  module AdminLocales
-    class << self
-      attr_accessor :root
-
-      def root
-        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
-      end
-
-      def version
-        ::Refinery::AdminLocales::Version.to_s
-      end
-    end
-
-    class Engine < Rails::Engine
-
-     config.after_initialize do
-        Refinery::Plugin.register do |plugin|
-          plugin.name = "refinerycms_admin_locales"
-          plugin.pathname = root
-          plugin.url = { :controller => '/admin/admin_locales', :action => 'index' }
-          plugin.menu_match = /(admin|refinery)\/admin_locales$/
-        end
-      end
-
-      config.to_prepare do
-        ::Admin::BaseController.class_eval do
-          def find_or_set_locale_with_default
-            if current_user && current_user.locale
-              ::Refinery::I18n.current_locale = current_user.locale
-              ::I18n.locale = ::Refinery::I18n.current_locale
-            else
-              find_or_set_locale_without_default
-            end
-          end
-
-          alias_method_chain :find_or_set_locale, :default
-        end
-      end
-    end
-  end
-end
+require 'refinery/admin_locales'

data/lib/tasks/refinery/admin_locales.rake

@@ -0,0 +1,13 @@
+namespace :refinery do
+
+  namespace :admin_locales do
+
+    # call this task by running: rake refinery:admin_locales:my_task
+    # desc "Description of my task below"
+    # task :my_task => :environment do
+    #   # add your logic here
+    # end
+
+  end
+
+end

data/readme.md

@@ -14,15 +14,23 @@ users who need different locales at the same time.
 
 ## How to add this extension to your project
 
-### Refinery 2:
+### Refinery edge:
 
 #### Add gem to Gemfile
-    gem "refinerycms-admin-locales"
+    gem 'refinerycms-admin-locales', 'git: git://github.com/simplelogica/refinerycms-admin-locales.git'
 
 #### Install extension
     rake refinery_admin_locales:install:migrations
     rake db:migrate
 
+### Refinery 2.0.*:
+
+#### Add gem to Gemfile
+    gem 'refinerycms-admin-locales', "~> 2.0.0"
+
+#### Install extension
+    rake refinery_admin_locales:install:migrations
+    rake db:migrate
 
 ### Refinery 1:
 
@@ -33,4 +41,4 @@ users who need different locales at the same time.
     rails generate refinerycms_admin_locales
     rake db:migrate
 
-**WARNING: Refinary 1 version, is not test, but it should work**
+**WARNING: Refinary 1 version, is not tested, but it should works**

data/refinerycms-admin-locales.gemspec

@@ -11,16 +11,16 @@ Gem::Specification.new do |s|
   s.description       = %q{Manage locale for each user in the refinerycms admin.}
   s.summary           = %q{Admin Locales extension for Refinery CMS.}
   s.email             = %q{ruben@simplelogica.net}
+  s.homepage          = %q{http://simplelogica.net}
   s.authors           = ['Simplelógica','Rubén Sierra']
-  s.homepage          = %q{http://simplelogica.net/}
   s.require_paths     = %w(lib)
 
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   # Runtime dependencies
-  s.add_dependency    'refinerycms-core',     '~> 1.0.0'
+  s.add_dependency    'refinerycms-core',     '~> 2.0.0'
 
   # Development dependencies (usually used for testing)
-  s.add_development_dependency 'refinerycms-testing',     '~> 1.0.0'
+  s.add_development_dependency 'refinerycms-testing'
 end

data/spec/controllers/refinery/admin_locales/admin/admin_locales_spec.rb

@@ -0,0 +1,47 @@
+# encoding: utf-8
+require "spec_helper"
+
+module Refinery
+  module AdminLocales
+    module Admin
+      describe AdminLocalesController do
+        render_views
+        refinery_login_with_factory :refinery_user
+
+        before(:each) do
+          Refinery::User.first.update_attribute(:locale, locale)
+          get :index
+        end
+
+        context "without locale" do
+          let(:locale) { nil }
+
+          it { response.should be_success }
+          it { response.should render_template(:index) }
+          it { response.body.should match("Switch to your website") }
+          it { ::I18n.locale.should eq ::Refinery::I18n.current_locale }
+        end
+
+        context "with en locale" do
+          let(:locale) { :en }
+
+          it { response.should be_success }
+          it { response.should render_template(:index) }
+          it { response.body.should match("Switch to your website") }
+          it { ::Refinery::I18n.current_locale.should eq "en" }
+          it { ::I18n.locale.should eq :en }
+        end
+
+        context "with en locale" do
+          let(:locale) { :es }
+
+          it { response.should be_success }
+          it { response.should render_template(:index) }
+          it { response.body.should match("Ver tu web") }
+          it { ::Refinery::I18n.current_locale.should eq "es" }
+          it { ::I18n.locale.should eq :es }
+        end
+      end
+    end
+  end
+end

data/spec/factories/refinery/admin_locales.rb

@@ -0,0 +1,10 @@
+FactoryGirl.define do
+  factory :user_with_locale, :class => Refinery::User do
+    sequence(:username) { |n| "refinery_with_locale#{n}" }
+    sequence(:email) { |n| "refinery_with_locale#{n}@refinerycms.com" }
+    password  "refinerycms"
+    password_confirmation "refinerycms"
+    locale :en
+  end
+end
+

data/spec/requests/refinery/admin_locales/admin/admin_locales_spec.rb

@@ -1,101 +1,86 @@
 # encoding: utf-8
 require "spec_helper"
 
-describe Refinery do
-  describe "AdminLocales" do
-    describe "Admin" do
-      describe "admin_locales" do
-        login_refinery_user
-
-        describe "admin_locales list" do
-          before(:each) do
-            FactoryGirl.create(:admin_locale, :locale => "UniqueTitleOne")
-            FactoryGirl.create(:admin_locale, :locale => "UniqueTitleTwo")
-          end
-
-          it "shows two items" do
-            visit refinery.admin_locales_admin_admin_locales_path
-            page.should have_content("UniqueTitleOne")
-            page.should have_content("UniqueTitleTwo")
-          end
-        end
-
-        describe "create" do
-          before(:each) do
-            visit refinery.admin_locales_admin_admin_locales_path
-
-            click_link "Add New Admin Locale"
-          end
-
-          context "valid data" do
-            it "should succeed" do
-              fill_in "Locale", :with => "This is a test of the first string field"
-              click_button "Save"
-
-              page.should have_content("'This is a test of the first string field' was successfully added.")
-              Refinery::AdminLocales::AdminLocale.count.should == 1
-            end
-          end
-
-          context "invalid data" do
-            it "should fail" do
-              click_button "Save"
-
-              page.should have_content("Locale can't be blank")
-              Refinery::AdminLocales::AdminLocale.count.should == 0
-            end
-          end
-
-          context "duplicate" do
-            before(:each) { FactoryGirl.create(:admin_locale, :locale => "UniqueTitle") }
-
-            it "should fail" do
-              visit refinery.admin_locales_admin_admin_locales_path
-
-              click_link "Add New Admin Locale"
+describe "admin_locales" do
+  refinery_login_with :refinery_user
+
+  let(:locale) { 'en' }
+  let(:another_locale) { 'es' }
+  let(:user) { Refinery::User.first }
+  let(:user_with_another_locale) { FactoryGirl.create(:user_with_locale, :locale => another_locale) }
+  let(:user_without_locale) { FactoryGirl.create(:user) }
+  before(:each) do
+    user.update_attribute(:locale, locale)
+    user_with_another_locale
+    user_without_locale
+  end
 
-              fill_in "Locale", :with => "UniqueTitle"
-              click_button "Save"
+  context "list" do
+    before { visit refinery.admin_locales_admin_admin_locales_path }
 
-              page.should have_content("There were problems")
-              Refinery::AdminLocales::AdminLocale.count.should == 1
-            end
-          end
+    it "shows user with locale username" do
+      page.should have_xpath("//span[@class='title']//strong", :text => user.username)
+    end
 
-        end
+    it "shows user with locale locale" do
+      page.should have_xpath("//span[@class='title']//span[@class='preview']", :text => Refinery::I18n.locales[locale.to_sym])
+    end
 
-        describe "edit" do
-          before(:each) { FactoryGirl.create(:admin_locale, :locale => "A locale") }
+    it "shows user with another locale username" do
+      page.should have_xpath("//span[@class='title']//strong", :text => user_with_another_locale.username)
+    end
 
-          it "should succeed" do
-            visit refinery.admin_locales_admin_admin_locales_path
+    it "shows user with another locale locale" do
+      page.should have_xpath("//span[@class='title']//span[@class='preview']", :text => Refinery::I18n.locales[another_locale.to_sym])
+    end
 
-            within ".actions" do
-              click_link "Edit this admin locale"
-            end
+    it "shows user without locale username" do
+      page.should have_xpath("//span[@class='title']//strong", :text => user_without_locale.username)
+    end
 
-            fill_in "Locale", :with => "A different locale"
-            click_button "Save"
+    it "shows user with another locale locale" do
+      page.should have_xpath("//span[@class='title']//span[@class='preview']", :text => I18n.t('refinery.admin_locales.admin.admin_locales.user.default'))
+    end
+  end
 
-            page.should have_content("'A different locale' was successfully updated.")
-            page.should have_no_content("A locale")
-          end
-        end
+  describe "edit an user" do
 
-        describe "destroy" do
-          before(:each) { FactoryGirl.create(:admin_locale, :locale => "UniqueTitleOne") }
+    it "with locale shows a select with the locale selected" do
+      visit refinery.edit_admin_locales_admin_admin_locale_path(user)
+      page.should have_xpath("//div[@class='field']//option[@selected='selected' and @value='#{locale}']")
+    end
 
-          it "should succeed" do
-            visit refinery.admin_locales_admin_admin_locales_path
+    it "with another locale shows a select with the locale selected" do
+      visit refinery.edit_admin_locales_admin_admin_locale_path(user_with_another_locale)
+      page.should have_xpath("//div[@class='field']//option[@selected='selected' and @value='#{another_locale}']")
+    end
 
-            click_link "Remove this admin locale forever"
+    it "without locale shows a select without locale selected" do
+      visit refinery.edit_admin_locales_admin_admin_locale_path(user_without_locale)
+      page.should_not have_xpath("//div[@class='field']//option[@selected='selected']")
+    end
 
-            page.should have_content("'UniqueTitleOne' was successfully removed.")
-            Refinery::AdminLocales::AdminLocale.count.should == 0
-          end
-        end
+    context "and change locale" do
+      it "should render user list successfully" do
+        visit refinery.edit_admin_locales_admin_admin_locale_path(user)
+        select(Refinery::I18n.locales[another_locale.to_sym], :from => 'user_locale')
+        click_button 'submit_button'
+        # Flash message should be in previous locale, because locale is set acter the flash
+        page.should have_content("#{user.username} was successfully updated.")
+        # But content should be in new locale
+        page.should have_xpath("//span[@class='title']//span[@class='preview']", :text => 'Idioma: Español')
+      end
 
+      it "should change user locale" do
+        visit refinery.edit_admin_locales_admin_admin_locale_path(user)
+        expect{
+          select(Refinery::I18n.locales[another_locale.to_sym], :from => 'user_locale')
+          click_button 'submit_button'
+          user.reload
+        }.to change(user,:locale).from(locale).to(another_locale)
       end
     end
+
+
   end
 end

data/spec/spec_helper.rb

@@ -2,17 +2,11 @@ def setup_environment
   # Configure Rails Environment
   ENV["RAILS_ENV"] ||= 'test'
 
-  if File.exist?(dummy_path = File.expand_path('../spec/dummy/config/environment.rb', __FILE__))
-    require dummy_path
-  elsif File.dirname(__FILE__) =~ %r{vendor/extensions}
-    # Require the path to the refinerycms application this is vendored inside.
-    require File.expand_path('../../../../../config/environment', __FILE__)
-  else
-    raise "Could not find a config/environment.rb file to require. Please specify this in spec/spec_helper.rb"
-  end
+  require File.expand_path("../dummy/config/environment", __FILE__)
 
   require 'rspec/rails'
   require 'capybara/rspec'
+  require 'factory_girl_rails'
 
   Rails.backtrace_cleaner.remove_silencers!
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-admin-locales
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,30 +10,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000Z
+date: 2013-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
-  requirement: &2152124260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152124260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-testing
-  requirement: &2152123320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152123320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage locale for each user in the refinerycms admin.
 email: ruben@simplelogica.net
 executables: []
@@ -41,32 +51,38 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
+- Gemfile.lock
 - Rakefile
-- app/controllers/admin/admin_locales_controller.rb
-- app/views/admin/admin_locales/_form.html.erb
-- app/views/admin/admin_locales/_records.html.erb
-- app/views/admin/admin_locales/_user.html.erb
-- app/views/admin/admin_locales/_users.html.erb
-- app/views/admin/admin_locales/edit.html.erb
-- app/views/admin/admin_locales/index.html.erb
+- app/controllers/refinery/admin_locales/admin/admin_locales_controller.rb
+- app/views/refinery/admin_locales/admin/admin_locales/_form.html.erb
+- app/views/refinery/admin_locales/admin/admin_locales/_records.html.erb
+- app/views/refinery/admin_locales/admin/admin_locales/_user.html.erb
+- app/views/refinery/admin_locales/admin/admin_locales/_users.html.erb
+- app/views/refinery/admin_locales/admin/admin_locales/edit.html.erb
+- app/views/refinery/admin_locales/admin/admin_locales/index.html.erb
 - config/locales/en.yml
 - config/locales/es.yml
 - config/routes.rb
 - db/migrate/1_add_locale_to_user.rb
-- db/seeds/refinerycms_admin_locales.rb
-- lib/generators/refinerycms_admin_locales_generator.rb
+- db/seeds.rb
+- lib/generators/refinery/admin_locales_generator.rb
+- lib/refinery/admin_locales.rb
+- lib/refinery/admin_locales/engine.rb
 - lib/refinery/admin_locales/version.rb
 - lib/refinerycms-admin-locales.rb
+- lib/tasks/refinery/admin_locales.rake
 - readme.md
 - refinerycms-admin-locales.gemspec
 - script/rails
+- spec/controllers/refinery/admin_locales/admin/admin_locales_spec.rb
+- spec/factories/refinery/admin_locales.rb
 - spec/requests/refinery/admin_locales/admin/admin_locales_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories/refinery/admin_locales.rb
 - tasks/rspec.rake
 - tasks/testing.rake
-homepage: http://simplelogica.net/
+homepage: http://simplelogica.net
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -86,11 +102,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Admin Locales extension for Refinery CMS.
 test_files:
+- spec/controllers/refinery/admin_locales/admin/admin_locales_spec.rb
+- spec/factories/refinery/admin_locales.rb
 - spec/requests/refinery/admin_locales/admin/admin_locales_spec.rb
 - spec/spec_helper.rb
-- spec/support/factories/refinery/admin_locales.rb

data/app/controllers/admin/admin_locales_controller.rb

@@ -1,20 +0,0 @@
-module Admin
-  class AdminLocalesController < Admin::BaseController
-
-    crudify :user,
-          :order => 'username ASC',
-          :title_attribute => :username,
-          :xhr_paging => true
-
-    def update
-      locale = params[:user][:locale]
-      @user.locale = locale if params[:user][:locale]
-      if locale && @user.save
-        redirect_to admin_admin_locales_path,
-                    :notice => t('updated', :what => @user.username, :scope => 'refinery.crudify')
-      else
-        render :edit
-      end
-    end
-  end
-end

data/app/views/admin/admin_locales/_form.html.erb

@@ -1,20 +0,0 @@
-<%= form_for @user, :url => admin_admin_locale_path(@user), :method => :put do |f| %>
-
-  <%= render :partial => "/shared/admin/error_messages",
-             :locals => {
-               :object => @user,
-               :include_object_name => true
-             } %>
-
-  <div class='field'>
-    <%= f.label :locale %>
-    <%= f.select :locale, options_for_select(Refinery::I18n.locales.map(&:reverse), @user.locale) %>
-  </div>
-
-  <%= render :partial => "/shared/admin/form_actions",
-             :locals => {
-               :f => f,
-               :continue_editing => false,
-               :hide_delete => true
-             } %>
-<% end %>

data/app/views/admin/admin_locales/edit.html.erb

@@ -1,2 +0,0 @@
-<h1><%= User.model_name.human.capitalize %> <%= @user.username %></h1>
-<%= render :partial => 'form' %>

data/app/views/admin/admin_locales/index.html.erb

@@ -1,3 +0,0 @@
-<section id='records'>
-  <%= render :partial => 'records' %>
-</section>

data/db/seeds/refinerycms_admin_locales.rb

@@ -1,6 +0,0 @@
-::User.find(:all).each do |user|
-  if user.plugins.where(:name => 'refinerycms_admin_locales').blank?
-    user.plugins.create(:name => "refinerycms_admin_locales",
-                        :position => (user.plugins.maximum(:position) || -1) +1)
-  end
-end if defined?(::User)

data/lib/generators/refinerycms_admin_locales_generator.rb

@@ -1,8 +0,0 @@
-require 'refinery/generators'
-
-class RefinerycmsAdminLocalesGenerator < ::Refinery::Generators::EngineInstaller
-
-  source_root File.expand_path('../../../', __FILE__)
-  engine_name "admin_locales"
-
-end

data/spec/support/factories/refinery/admin_locales.rb

@@ -1,11 +0,0 @@
-
-FactoryGirl.define do
-  factory :user, :class => Refinery::User do
-    sequence(:username) { |n| "refinery#{n}" }
-    sequence(:email) { |n| "refinery#{n}@refinerycms.com" }
-    password  "refinerycms"
-    password_confirmation "refinerycms"
-    locale :en
-  end
-end
-