WIP: Feature/mobility

Gemfile

@@ -2,14 +2,20 @@ source "https://rubygems.org"
 
 gemspec
 
-git "https://github.com/refinery/refinerycms", branch: "master" do
+# 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"
   end
 end
 
+# TODO: remove refinerycms-i18n and mobility from this Gemfile before merging this PR
+gem 'refinerycms-i18n', git: "https://github.com/refinery/refinerycms-i18n", branch: 'feature/mobility'
+
 # Database Configuration
 unless ENV["TRAVIS"]
   gem "activerecord-jdbcsqlite3-adapter", :platform => :jruby

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 => [:index, :new]
 
         def create
           if Refinery::ImageSlideshows::ImageSlide.any?

app/models/refinery/image_slideshows/image_slide.rb

@@ -3,17 +3,18 @@ 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
+      delegate :height, :width, to: :image_slideshow
     end
   end
 end

app/models/refinery/image_slideshows/image_slideshow.rb

@@ -5,9 +5,9 @@ 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
+      has_many :image_slides, dependent: :destroy
     end
   end
 end

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

@@ -4,7 +4,7 @@
               :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  %>
 

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

@@ -1,22 +1,30 @@
+<%
+  # 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>
 
   <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/_image_slideshow.html.erb

@@ -1,18 +1,22 @@
+<%
+  # 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>
   <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>

config/routes.rb

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

db/migrate/1_create_image_slideshows_image_slideshows.rb

@@ -1,4 +1,4 @@
-class CreateImageSlideshowsImageSlideshows < ActiveRecord::Migration
+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,4 @@
-class CreateImageSlidesImageSlides < ActiveRecord::Migration
+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,4 @@
-class AddImageAndCaptionToImageSlides < ActiveRecord::Migration
+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,4 @@
-class AddJsConfigToImageSlideshows < ActiveRecord::Migration
+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,4 @@
-class AddLinkUrlToImageSlides < ActiveRecord::Migration
+class AddLinkUrlToImageSlides < ActiveRecord::Migration[5.1]
   def change
     add_column :refinery_image_slides, :link_url, :string
   end

db/migrate/6_add_height_and_width_to_image_slideshows.rb

@@ -1,4 +1,4 @@
-class AddHeightAndWidthToImageSlideshows < ActiveRecord::Migration
+class AddHeightAndWidthToImageSlideshows < ActiveRecord::Migration[5.1]
   def change
     add_column :refinery_image_slideshows, :height, :string
     add_column :refinery_image_slideshows, :width, :string

db/migrate/7_create_image_slides_translations.rb

@@ -1,15 +1,20 @@
-class CreateImageSlidesTranslations < ActiveRecord::Migration
-  def up
-    Refinery::ImageSlideshows::ImageSlide.create_translation_table!({
-      :title => :string,
-      :caption => :string,
-      :link_url => :string
-    }, {
-      :migrate_data => true
-    })
-  end
+class CreateImageSlidesTranslations < ActiveRecord::Migration[5.1]
+  def change
+    create_table :refinery_image_slide_translations do |t|
+
+      # Translated attribute(s)
+      t.string :title
+      t.string :caption
+      t.string :link_url
+
+      t.string  :locale, null: false
+      t.integer :refinery_image_slide_id, null: false
+
+      t.timestamps null: false
+    end
+
+    add_index :refinery_image_slide_translations, :locale, name: :index_8a4a2e1ce2c2f55f4778012dc82b5ec014fac0f5
+    add_index :refinery_image_slide_translations, [:refinery_image_slide_id, :locale], name: :index_299ee7f96d4de207d5ce93e99727d66ae68c25f2, unique: true
 
-  def down
-    Refinery::ImageSlideshows::ImageSlide.drop_translation_table! :migrate_data => true
   end
 end

db/migrate/8_add_body_to_image_slides.rb

@@ -1,8 +1,5 @@
-class AddBodyToImageSlides < ActiveRecord::Migration
-  def up
-    Refinery::ImageSlideshows::ImageSlide.add_translation_fields! body: :text
-  end
-  def down
-    remove_column :refinery_image_slide_translations, :body
+class AddBodyToImageSlides < ActiveRecord::Migration[5.1]
+  def change
+    add_column :refinery_image_slide_translations, :body, :text
   end
 end

db/seeds.rb

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

refinerycms-image_slideshows.gemspec

@@ -5,18 +5,17 @@ Gem::Specification.new do |s|
   s.name              = 'refinerycms-image_slideshows'
   s.authors           = ['Jim Pruetting', 'Brice Sanchez']
   s.homepage          = 'http://www.refinerycms.com'
-  s.version           = '3.0.0'
+  s.version           = '4.0.0'
   s.description       = 'Ruby on Rails Image Slideshows extension for Refinery CMS'
   s.date              = '2012-12-12'
   s.summary           = 'Image Slideshows extension for Refinery CMS'
   s.require_paths     = %w(lib)
   s.files             = Dir["{app,config,db,lib}/**/*"] + ["readme.md"]
 
   # Runtime dependencies
-  s.add_dependency 'refinerycms-core', '~> 3.0.0'
-  s.add_dependency 'refinerycms-images', '~> 3.0.0'
+  s.add_dependency 'refinerycms-core', '~> 4.0.0'
+  s.add_dependency 'refinerycms-images', '~> 4.0.0'
   s.add_dependency 'acts_as_indexed', '~> 0.8.0'
-  s.add_dependency 'globalize', ['>= 4.0.0', '< 5.2']
 
   # Development dependencies (usually used for testing)
   s.add_development_dependency 'refinerycms-testing', '~> 3.0.0'