WIP: Feature/mobility

Gemfile

@@ -2,48 +2,48 @@ source "https://rubygems.org"
 
 gemspec
 
-git "https://github.com/refinery/refinerycms", branch: "master" do
-  gem "refinerycms"
+# TODO: use master branch before merging this PR
+# git "https://github.com/refinery/refinerycms", branch: "master" do
+git 'https://github.com/refinery/refinerycms', branch: 'feature/mobility' do
+
+  gem 'refinerycms'
 
   group :test do
-    gem "refinerycms-testing"
+    gem 'refinerycms-testing'
   end
 end
 
+# TODO: remove refinerycms-i18n and mobility from this Gemfile before merging
+gem 'refinerycms-i18n', git: 'https://github.com/refinery/refinerycms-i18n', branch: 'feature/mobility'
+
+group :development do
+  gem 'listen'
+end
+
 # Database Configuration
 unless ENV["TRAVIS"]
-  gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby
-  gem "sqlite3", :platform => :ruby
+  gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
+  gem "sqlite3", platform: :ruby
 end
 
 if !ENV["TRAVIS"] || ENV["DB"] == "mysql"
-  gem "activerecord-jdbcmysql-adapter", :platform => :jruby
-  gem "jdbc-mysql", "= 5.1.13", :platform => :jruby
-  gem "mysql2", :platform => :ruby
+  gem "activerecord-jdbcmysql-adapter", platform: :jruby
+  gem "jdbc-mysql", "= 5.1.13", platform: :jruby
+  gem "mysql2", platform: :ruby
 end
 
 if !ENV["TRAVIS"] || ENV["DB"] == "postgresql"
-  gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-  gem "pg", :platform => :ruby
+  gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
+  gem "pg", platform: :ruby
 end
 
-gem "jruby-openssl", :platform => :jruby
-
 # Refinery/rails should pull in the proper versions of these
 group :assets do
   gem "sass-rails"
   gem "coffee-rails"
   gem "uglifier"
 end
 
-group :development do
-  gem 'quiet_assets'
-end
-
-group :test do
-  gem "launchy"
-end
-
 # Load local gems according to Refinery developer preference.
 if File.exist? local_gemfile = File.expand_path("../.gemfile", __FILE__)
   eval File.read(local_gemfile)

app/controllers/refinery/image_slideshows/admin/image_slides_controller.rb

@@ -7,9 +7,9 @@ class ImageSlidesController < ::Refinery::AdminController
                 :sortable => true,
                 :include => [:translations]
 
-        before_filter :find_image_slideshow
-        before_filter :find_image_slides, only: :index
-        before_filter :find_image_slide, :except => [:index, :new]
+        before_action :find_image_slideshow
+        before_action :find_image_slides, only: :index
+        before_action :find_image_slide, except: %i( index new )
 
         def create
           if Refinery::ImageSlideshows::ImageSlide.any?
@@ -48,16 +48,7 @@ def image_slide_params
         private
 
           def permitted_image_slide_params
-            [
-              :id,
-              :title,
-              :image_id,
-              :caption,
-              :link_url,
-              :body,
-              :position,
-              :image_slideshow_id
-            ]
+            %i( id active title image_id caption link_url body position image_slideshow_id )
           end
 
         def image_slides_path

app/controllers/refinery/image_slideshows/admin/image_slideshows_controller.rb

@@ -9,6 +9,7 @@ class ImageSlideshowsController < ::Refinery::AdminController
 
           def image_slideshow_params
             params.require(:image_slideshow).permit(
+              :active,
               :title,
               :position,
               :js_config,

app/models/refinery/image_slideshows/image_slide.rb

@@ -3,17 +3,27 @@ module ImageSlideshows
     class ImageSlide < Refinery::Core::BaseModel
       self.table_name = 'refinery_image_slides'
 
+      extend Mobility
       translates :title, :caption, :link_url, :body
 
-      acts_as_indexed :fields => [:title]
+      acts_as_indexed fields: [:title]
 
-      validates :title, :presence => true
-      validates :image_id, :presence => true
+      validates :title, presence: true
+      validates :image_id, presence: true
 
       belongs_to :image_slideshow
-      belongs_to :image, :class_name => '::Refinery::Image'
+      belongs_to :image, class_name: '::Refinery::Image'
+
+      delegate :height, :width, to: :image_slideshow
+
+      class << self
+
+        def active
+          where active: true
+        end
+
+      end
 
-      delegate :height, :width, :to => :image_slideshow
     end
   end
 end

app/models/refinery/image_slideshows/image_slideshow.rb

@@ -5,9 +5,26 @@ class ImageSlideshow < Refinery::Core::BaseModel
 
       acts_as_indexed :fields => [:title]
 
-      validates :title, :presence => true, :uniqueness => true
+      validates :title, presence: true, uniqueness: true
+
+      has_many :image_slides, dependent: :destroy
+
+      class << self
+
+        def active
+          where active: true
+        end
+
+        def with_active_slides
+          includes(:image_slides).where( refinery_image_slides: { active: true } )
+        end
+
+        def slideshow_by_title(title)
+          active.with_active_slides.find_by_title(title)
+        end
+
+      end
 
-      has_many :image_slides, :dependent => :destroy
     end
   end
 end

app/views/refinery/image_slideshows/admin/image_slides/_form.html.erb

@@ -4,10 +4,15 @@
               :include_object_name => true %>
 
   <%= render '/refinery/admin/locale_picker',
-              :current_locale => Globalize.locale %>
+              :current_locale => Mobility.locale %>
 
   <%= f.hidden_field :image_slideshow_id, :value => @image_slideshow.id  %>
 
+  <div class='field'>
+    <%= f.check_box :active %>
+    <%= f.label :active, :class => 'stripped' %>
+  </div>
+
   <div class='field'>
     <%= f.label :title %>
     <%= f.text_field :title, :class => 'larger widest'  %>

app/views/refinery/image_slideshows/admin/image_slides/_image_slide.html.erb

@@ -1,22 +1,35 @@
+<%
+  # setup params for various action links
+  edit_url = refinery.edit_image_slideshows_admin_image_slideshow_image_slide_path(@image_slideshow, image_slide)
+  delete_url = refinery.image_slideshows_admin_image_slideshow_image_slide_path(@image_slideshow, image_slide)
+  delete_options = {
+      class: "cancel confirm-delete",
+      data: {confirm: t('message',  scope: 'refinery.admin.delete', title: image_slide.title)}
+  }
+%>
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(image_slide) -%>" style="background-color: #EAEAEA; margin-bottom: 10px;">
   <%= image_fu image_slide.image, '128x128', :style => 'padding: 1em 1em 0 1em;' %>
+
   <span class="preview">
     <% image_slide.translations.each do |translation| %>
       <% if translation.title.present? %>
-        <%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
-            refinery.edit_image_slideshows_admin_image_slideshow_image_slide_path(@image_slideshow, image_slide, :switch_locale => translation.locale),
-            :class => 'locale' %>
+        <%= link_to refinery.edit_image_slideshows_admin_image_slideshow_image_slide_path(@image_slideshow, image_slide, :switch_locale => translation.locale),
+                    class: 'locale', title: translation.locale.upcase do %>
+
+          <div class="<%=translation.locale %> locale_marker">
+            <%= locale_text_icon(translation.locale.upcase) %>
+          </div>
         <% end %>
+      <% end %>
     <% end %>
   </span>
 
+  <%= content_tag :span, class: "#{image_slide.active? ? :success_icon : :failure_icon} less-important" do %>
+    <strong><%== t(image_slide.active? ? 'active' : 'inactive', scope: 'refinery.image_slideshows.admin.states' ).titleize %></strong>
+  <% end %>
+
   <span class='actions'>
-    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_image_slideshows_admin_image_slideshow_image_slide_path(@image_slideshow, image_slide),
-         :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), refinery.image_slideshows_admin_image_slideshow_image_slide_path(@image_slideshow, image_slide),
-        :class => "cancel confirm-delete",
-        :title => t('.delete'),
-        :confirm => t('message', :scope => 'refinery.admin.delete', :title => image_slide.title),
-        :method => :delete %>
+    <%= action_icon(:edit,    edit_url ,  t('edit',   scope: 'refinery.image_slideshows.admin.image_slides.image_slide' ) ) %>
+    <%= action_icon(:delete,  delete_url, t('delete', scope: 'refinery.image_slideshows.admin.image_slides.image_slide' ), delete_options ) %>
   </span>
-</li>
+</li>

app/views/refinery/image_slideshows/admin/image_slideshows/_form.html.erb

@@ -3,6 +3,10 @@
               :object => @image_slideshow,
               :include_object_name => true %>
 
+  <div class='field'>
+    <%= f.check_box :active %>
+    <%= f.label :active, :class => 'stripped' %>
+  </div>
 
   <div class='field'>
     <%= f.label :title %>

app/views/refinery/image_slideshows/admin/image_slideshows/_image_slideshow.html.erb

@@ -1,18 +1,27 @@
+<%
+  # setup params for various action links
+  manage_url = refinery.image_slideshows_admin_image_slideshow_image_slides_path(image_slideshow)
+  edit_url = refinery.edit_image_slideshows_admin_image_slideshow_path(image_slideshow)
+  delete_url = refinery.image_slideshows_admin_image_slideshow_path(image_slideshow)
+  delete_options = {
+      class: "cancel confirm-delete",
+      data: {confirm: t('message',  scope: 'refinery.admin.delete', title: image_slideshow.title)}
+  }
+%>
 <li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(image_slideshow) -%>">
   <span class='title'>
     <%= link_to refinery.image_slideshows_admin_image_slideshow_image_slides_path(image_slideshow) do %>
       <%= image_slideshow.title %>
     <% end %>
   </span>
+
+  <%= content_tag :span, class: "#{image_slideshow.active? ? :success_icon : :failure_icon} less-important" do %>
+    <strong><%== t(image_slideshow.active? ? 'active' : 'inactive', scope: 'refinery.image_slideshows.admin.states' ).titleize %></strong>
+  <% end %>
+
   <span class='actions'>
-    <%= link_to refinery_icon_tag("img.png"), refinery.image_slideshows_admin_image_slideshow_image_slides_path(image_slideshow),
-         :title => t('.manage_image_slides') %>
-    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_image_slideshows_admin_image_slideshow_path(image_slideshow),
-         :title => t('.edit') %>
-    <%= link_to refinery_icon_tag("delete.png"), refinery.image_slideshows_admin_image_slideshow_path(image_slideshow),
-        :class => "cancel confirm-delete",
-        :title => t('.delete'),
-        :confirm => t('message', :scope => 'refinery.admin.delete', :title => image_slideshow.title),
-        :method => :delete %>
+    <%= action_icon(:switch_view_list,  manage_url,  t('.manage_image_slides') ) %>
+    <%= action_icon(:edit,    edit_url ,  t('.edit') ) %>
+    <%= action_icon(:delete,  delete_url, t('.delete'), delete_options ) %>
   </span>
-</li>
+</li>

bin/rails

@@ -1,5 +1,11 @@
 #!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
 
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)
+begin
+  load File.join(File.expand_path('../../',  __FILE__), 'spec/dummy/bin/rails')
+rescue LoadError => load_error
+  warn "No dummy Rails application found! \n" \
+       "To create one in spec/dummy, please run: \n\n" \
+       "    rake refinery:testing:dummy_app"
+end

config/locales/en.yml

@@ -5,6 +5,9 @@ en:
         title: Image Slideshows
     image_slideshows:
       admin:
+        states:
+          active: active
+          inactive: inactive
         image_slideshows:
           actions:
             create_new: Add New Image Slideshow
@@ -41,12 +44,14 @@ en:
   activerecord:
     attributes:
       refinery/image_slideshows/image_slide:
+        active: Active
         title: Title
         image: Image
         caption: Caption
         link_url: Link
         body: Text body
       refinery/image_slideshows/image_slideshow:
+        active: Active
         title: Title
         height: Height
         width: Width

config/locales/fr.yml

@@ -5,6 +5,9 @@ fr:
         title: Diaporamas
     image_slideshows:
       admin:
+        states:
+          active: actif
+          inactive: inactif
         image_slideshows:
           actions:
             create_new: Créer un nouveau diaporama
@@ -42,12 +45,14 @@ fr:
   activerecord:
     attributes:
       refinery/image_slideshows/image_slide:
+        active: Actif
         title: Titre
         image: Image
         caption: Légende
         link_url: Lien
         body: Corps du texte
       refinery/image_slideshows/image_slideshow:
+        active: Actif
         title: Titre
         height: Hauteur
         width: Largeur

config/routes.rb

@@ -1,4 +1,5 @@
-Refinery::Core::Engine.routes.append do
+# frozen_string_literal: true
+Refinery::Core::Engine.routes.draw do
 
   # Admin routes
   namespace :image_slideshows, :path => '' do

db/migrate/1_create_image_slideshows_image_slideshows.rb

@@ -1,4 +1,5 @@
-class CreateImageSlideshowsImageSlideshows < ActiveRecord::Migration
+# frozen_string_literal: true
+class CreateImageSlideshowsImageSlideshows < ActiveRecord::Migration[5.1]
 
   def up
     create_table :refinery_image_slideshows do |t|

db/migrate/2_create_image_slides_image_slides.rb

@@ -1,4 +1,5 @@
-class CreateImageSlidesImageSlides < ActiveRecord::Migration
+# frozen_string_literal: true
+class CreateImageSlidesImageSlides < ActiveRecord::Migration[5.1]
 
   def up
     create_table :refinery_image_slides do |t|

db/migrate/3_add_image_and_caption_to_image_slides.rb

@@ -1,4 +1,5 @@
-class AddImageAndCaptionToImageSlides < ActiveRecord::Migration
+# frozen_string_literal: true
+class AddImageAndCaptionToImageSlides < ActiveRecord::Migration[5.1]
   def change
     add_column :refinery_image_slides, :image_id, :integer
     add_column :refinery_image_slides, :caption, :string

db/migrate/4_add_js_config_to_image_slideshows.rb

@@ -1,4 +1,5 @@
-class AddJsConfigToImageSlideshows < ActiveRecord::Migration
+# frozen_string_literal: true
+class AddJsConfigToImageSlideshows < ActiveRecord::Migration[5.1]
   def change
     add_column :refinery_image_slideshows, :js_config, :text
   end

db/migrate/5_add_link_url_to_image_slides.rb

@@ -1,4 +1,5 @@
-class AddLinkUrlToImageSlides < ActiveRecord::Migration
+# frozen_string_literal: true
+class AddLinkUrlToImageSlides < ActiveRecord::Migration[5.1]
   def change
     add_column :refinery_image_slides, :link_url, :string
   end