refinerycms-page-images 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6fc2bbd624edbc3cc8c6a79788d6dd8088cae31
-  data.tar.gz: 7dc2219f661feb71369a946280e1d795b298b4ab
+  metadata.gz: b72ed8ac7a3c5ba5dbf01e1bfd4fc8870d09da8a
+  data.tar.gz: 826b59b4d21371ec72c9d04eaaf84dd4700d6bc4
 SHA512:
-  metadata.gz: 815969fd574b909a7f13487dd8adfe6fff6a750971e13f12016add64cafea2ddc471573034932b41987c85e993f4866b9b76a83ef1b42ad422a655c384ca3874
-  data.tar.gz: 9b2067631165952b8925fd9f4aaf18b376cae84257f57ca045744896828f707df777dc03dd88008fc9cc79cc4387ac471ccc1fdf18beda590adb4b9929e23c43
+  metadata.gz: d1c3445b8c2d4ad216714df2cd6711ac5c781a024ba6551f57f2a8f2eff85c065c626e783f255b52f94c2043838e8394d83802668a234178cf2da956d85e2d6d
+  data.tar.gz: 496669b11429333ba1a3a5276ad8af71df969d7dddaa299063e0da611263f210c1dd7018838e0294e9fcbd1b860005cad465f1ff5cd7f4a436246723aea5d57d

data/.gitignore

@@ -1,2 +1,6 @@
 Gemfile.lock
 spec/dummy/
+
+.project
+
+*.log

data/.travis.yml

@@ -1,10 +1,9 @@
 language: ruby
+cache: bundler
+sudo: false
 bundler_args: --without development
-before_script:
-  - "sh -e /etc/init.d/xvfb start"
-  - "bundle exec rake refinery:testing:dummy_app"
-script:
-  - "DISPLAY=:99.0 bundle exec rspec spec"
+before_script: "bin/rake refinery:testing:dummy_app"
+script: "bin/rspec spec"
 notifications:
   email: true
   irc:
@@ -17,11 +16,11 @@ notifications:
     on_failure: always
     rooms:
       - secure: "X5X39BTgXacSdc32F8mIjJKPqm5dZzmgZfJ14qYpJeMETTdA5JfByt2uCfU8\njJkkxT+XGWta0bSSlRIHQJO6pK26U94A95VYDX0jNuneKEnsoAsqJ6U0VY6v\nH5oxXMAZ2perP/FH9ZsPNR+ulyFfbMQCeGPJw5AXKZQqzf6qPOI="
+  webhooks:
+    - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 env:
   - DB=postgresql
   - DB=mysql
 rvm:
-  - 2.0.0
-  - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
+ - 2.3.1
+ - 2.2.5

data/Gemfile

@@ -2,8 +2,19 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'refinerycms', '~> 2.1.0'
-gem 'refinerycms-testing', '~> 2.1.0', :group => :test
+git 'https://github.com/refinery/refinerycms', branch: '3-0-stable' do
+  gem 'refinerycms'
+
+  group :development, :test do
+    gem 'refinerycms-testing'
+  end
+end
+
+gem 'refinerycms-wymeditor', '~> 1.0.0'
+
+group :test do
+  gem 'poltergeist'
+end
 
 # Database Configuration
 unless ENV['TRAVIS']
@@ -22,18 +33,9 @@ if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
   gem 'pg', :platform => :ruby
 end
 
-gem 'jruby-openssl', :platform => :jruby
-
-group :test do
-  gem 'poltergeist'
-end
-
 # Refinery/rails should pull in the proper versions of these
-group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
-  gem 'uglifier'
-end
+gem 'sass-rails', '~> 4.0.0'
+gem 'coffee-rails', '~> 4.0.0'
 
 # Load local gems according to Refinery developer preference.
 if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)

data/Rakefile

@@ -13,7 +13,6 @@ if File.exists?(APP_RAKEFILE)
 end
 
 require "refinerycms-testing"
-Refinery::Testing::Railtie.load_tasks
 Refinery::Testing::Railtie.load_dummy_tasks(ENGINE_PATH)
 
 load File.expand_path('../tasks/rspec.rake', __FILE__)

data/app/decorators/controllers/refinery/admin/blogposts_controller_decorator.rb

@@ -0,0 +1,10 @@
+if defined?(Refinery::Blog)
+  Refinery::Blog::Admin::PostsController.prepend(
+    Module.new do
+      def permitted_post_params
+        params[:post][:images_attributes]={} if params[:post][:images_attributes].nil?
+        super <<  [images_attributes: [:id, :caption, :image_page_id]]
+      end
+    end
+  )
+end

data/app/decorators/controllers/refinery/admin/pages_controller_decorator.rb

@@ -0,0 +1,8 @@
+Refinery::Admin::PagesController.prepend(
+  Module.new do
+    def permitted_page_params
+      params[:page][:images_attributes]={} if params[:page][:images_attributes].nil?
+      super <<  [images_attributes: [:id, :caption, :image_page_id]]
+    end
+  end
+)

data/app/decorators/models/refinery/page_images_page_decorator.rb

@@ -0,0 +1,16 @@
+require 'ostruct'
+
+Refinery::Page.class_eval do
+  attr_accessor :images_with_captions
+
+  def images_with_captions
+    @images_with_captions = image_pages.map do |ref|
+      OpenStruct.new(
+        {
+          image: Refinery::Image.find(ref.image_id),
+          caption: ref.caption || ''
+        }
+      )
+    end
+  end
+end

data/app/models/refinery/image_page.rb

@@ -2,12 +2,8 @@ module Refinery
   class ImagePage < Refinery::Core::BaseModel
 
     belongs_to :image
-    belongs_to :page, :polymorphic => true
-
-    translates :caption if self.respond_to?(:translates)
-
-    attr_accessible :image_id, :position, :locale
-    self.translation_class.send :attr_accessible, :locale
+    belongs_to :page, polymorphic: true, touch: true
 
+    translates :caption
   end
 end

data/app/views/refinery/admin/pages/tabs/_images_field.html.erb

@@ -9,7 +9,6 @@
 <% modal_class = Refinery::PageImages.config.wysiwyg ? 'wym' : 'plain' %>
 
 <div class='wym_box field images_field'>
-  <%= hidden_field_tag "#{f.object_name.demodulize}[images_attributes][-1]", "" %>
   <ul id='page_images' class='clearfix'>
     <%= f.fields_for :images do |image_form| %>
       <li id='image_<%= image_form.object.id %>'>
@@ -30,17 +29,17 @@
       </li>
     <% end %>
     <li class='js-page-images-template'>
-      <%= hidden_field_tag "#{f.object_name.demodulize}[images_attributes][#{f.object.images.size}][id]" %>
+      <%= hidden_field_tag "#{f.object_name.demodulize}[images_attributes][#{f.object.images.length}][id]" %>
       <% if Refinery::PageImages.captions %>
         <div class='page-images-caption-modal <%= modal_class %>'>
-          <%= text_area_tag "#{f.object_name.demodulize}[images_attributes][#{f.object.images.size}][caption]",
+          <%= text_area_tag "#{f.object_name.demodulize}[images_attributes][#{f.object.images.length}][caption]",
                             '',
                             :style => 'display: none',
-                            :id => "page_captions_#{f.object.images.size}",
+                            :id => "page_captions_#{f.object.images.length}",
                             :class => 'page_caption' %>
           <%= raw form_actions %>
         </div>
       <% end %>
     </li>
   </ul>
-</div>
+</div>

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/config/locales/cs.yml

@@ -4,7 +4,7 @@ cs:
       refinery_page_images:
         tab_name: Obrázky stránek
         title: Obrázky stránek
-        description: Obrázky stránek vám dovoli připojit jeden či více obrázků ke stránce v Refinery. Umožní tak jednoduše vytvářet například galerie s lightboxem na frontendu.
+        description: Obrázky stránek vám dovolí připojit jeden či více obrázků ke stránce v Refinery. Umožní tak jednoduše vytvářet například galerie s lightboxem na frontendu.
     js:
       admin:
         page_images:

data/config/locales/da.yml

@@ -0,0 +1,17 @@
+da:
+  refinery:
+    plugins:
+      refinery_page_images:
+        title: Sidebilleder
+        tab_name: Billeder
+        description: Sidebilleder tillader dig at relatere et eller flere billeder til en hvilken som helst side i Refinery, der gør det nemt for dig at oprette simple gallerier med lightbox style popups på frontend siderne.
+    js:
+      admin:
+        page_images:
+          add_caption: Tilføj billedtekst
+          done: Færdig
+    admin:
+      pages:
+        tabs:
+          images_bar:
+            add: Tilføj billede

data/config/locales/en.yml

@@ -2,7 +2,6 @@ en:
   refinery:
     plugins:
       refinery_page_images:
-        tab_name: Page Images
         title: Page Images
         tab_name: Images
         description: Page Images allows you to relate one or more images to any page in Refinery which makes it really easy for you to create simple image galleries with lightbox style popups on the front end page views.

data/config/locales/it.yml

@@ -0,0 +1,17 @@
+it:
+  refinery:
+    plugins:
+      refinery_page_images:
+        title: Immagini delle Pagine
+        tab_name: Immagini
+        description: Immagini delle Pagine ti permette di associare una o più immagini ad ogni pagina di Refinery rendendo molto semplice creare semplici gallerie di immagini con diversi stili.
+    js:
+      admin:
+        page_images:
+          add_caption: Aggiungi Didascalia
+          done: Fatto
+    admin:
+      pages:
+        tabs:
+          images_bar:
+            add: Aggiungi Immagine

data/config/locales/ru.yml

@@ -5,6 +5,11 @@ ru:
         tab_name: Изображения страницы
         title: Изображения страницы
         description: Плагин работы с изображениями страницы "Page Images" позволяет связывать одно или несколько изображений с любой страницей в Refinery. С помощью плагина можно с легкостью создавать простые галереи изображений с поддержкой всплывающих полноразмерных изображений в стиле lightbox.
+    js:
+      admin:
+        page_images:
+          add_caption: Добавить подпись
+          done: Готово
     admin:
       pages:
         tabs:

data/config/locales/zh-CN.yml

@@ -0,0 +1,18 @@
+zh-CN:
+  refinery:
+    plugins:
+      refinery_page_images:
+        tab_name: 页面图片
+        title: 页面图片
+        tab_name: 图片
+        description: 页面图片让您关连一幅或多幅图片至系统中任何页面。让您能非常简易建立简单的图片库，并加上如lightbox 的跳出视窗。
+    js:
+      admin:
+        page_images:
+          add_caption: 新增说明
+          done: 完成
+    admin:
+      pages:
+        tabs:
+          images_bar:
+            add: 新增图片

data/config/locales/zh-TW.yml

@@ -0,0 +1,18 @@
+zh-TW:
+  refinery:
+    plugins:
+      refinery_page_images:
+        tab_name: 頁面圖片
+        title: 頁面圖片
+        tab_name: 圖片
+        description: 頁面圖片讓您關連一幅或多幅圖片至系統中任何頁面。讓您能非常簡易建立簡單的圖片庫，並加上如 lightbox 的跳出視窗。
+    js:
+      admin:
+        page_images:
+          add_caption: 新增說明
+          done: 完成
+    admin:
+      pages:
+        tabs:
+          images_bar:
+            add: 新增圖片

data/lib/refinery/page_images.rb

@@ -1,4 +1,5 @@
 require 'refinerycms-core'
+require 'globalize'
 
 module Refinery
   autoload :PageImagesGenerator, 'generators/refinery/page_images_generator'

data/lib/refinery/page_images/engine.rb

@@ -24,15 +24,17 @@ module Refinery
         end
       end
 
-      initializer "register refinery_page_images plugin" do
+      before_inclusion do
         Refinery::Plugin.register do |plugin|
-          plugin.name = "page_images"
+          plugin.name = 'page_images'
+          plugin.pathname = root
           plugin.hide_from_menu = true
         end
       end
 
       config.to_prepare do
         Refinery::PageImages.attach!
+        Rails.application.config.assets.precompile += %w(refinery/page-image-picker.js refinery/page-image-picker.css)
       end
 
       config.after_initialize do

data/lib/refinery/page_images/extension.rb

@@ -2,26 +2,23 @@ module Refinery
   module PageImages
     module Extension
       def has_many_page_images
-        has_many :image_pages, :as => :page, :class_name => 'Refinery::ImagePage', :order => 'position ASC'
-        has_many :images, :through => :image_pages, :class_name => 'Refinery::Image', :order => 'position ASC'
+        has_many :image_pages, proc { order('position ASC') }, :as => :page, :class_name => 'Refinery::ImagePage'
+        has_many :images, proc { order('position ASC') }, :through => :image_pages, :class_name => 'Refinery::Image'
         # accepts_nested_attributes_for MUST come before def images_attributes=
         # this is because images_attributes= overrides accepts_nested_attributes_for.
 
         accepts_nested_attributes_for :images, :allow_destroy => false
-
         # need to do it this way because of the way accepts_nested_attributes_for
         # deletes an already defined images_attributes
         module_eval do
           def images_attributes=(data)
-            data = data.reject {|key, data| data.blank?}
-            ids_to_keep = data.map{|i, d| d['image_page_id']}.compact
+            data = data.reject {|_, data| data.blank?}
+            ids_to_keep = data.map{|_, d| d['image_page_id']}.compact
 
             image_pages_to_delete = if ids_to_keep.empty?
               self.image_pages
             else
-              self.image_pages.where(
-                Refinery::ImagePage.arel_table[:id].not_in(ids_to_keep)
-              )
+              self.image_pages.where.not(:id => ids_to_keep)
             end
 
             image_pages_to_delete.destroy_all
@@ -46,8 +43,6 @@ module Refinery
         end
 
         include Refinery::PageImages::Extension::InstanceMethods
-
-        attr_accessible :images_attributes
       end
 
       module InstanceMethods

data/readme.md

@@ -1,25 +1,29 @@
 # Page Images Engine for Refinery CMS
 
+[![Build Status](https://travis-ci.org/refinery/refinerycms-page-images.svg?branch=master)](https://travis-ci.org/refinery/refinerycms-page-images)
+
 ## About
 
 Page Images allows you to relate one or more images to any page in Refinery which makes it really easy for you to create simple image galleries with lightbox style popups on the front end page views.
 
 ## Requirements
 
-* refinerycms >= 2.0.0
+* refinerycms >= 3.0.0
 
 ## Features
 
-* Ability to select one or more images from the image picker and relate them to a page
+* Ability to select one or more images from the image picker and assign them to a page
+* An image can be assigned to more than one page
 * Reordering support, simply drag into order
-* Optionally include captions with each image.
+* An image assigned to a page can have a caption.
+* An image's caption can be different for different pages
 
 ## Install
 
-Add this line to your applications `Gemfile`
+Add this line to your application's `Gemfile`
 
 ```ruby
-gem 'refinerycms-page-images', '~> 2.0.0'
+gem 'refinerycms-page-images', '~> 3.0.0', github: "refinery/refinerycms-page-images", branch: "master"
 ```
 
 Next run
@@ -34,7 +38,9 @@ Now when you start up your Refinery application, edit a page and there should be
 
 # Deploying to Heroku
 
-In order to properly precompile assets on Heroku, config vars be present in the environment during slug compilation. 
+Note: the following information about assets on Heroku might be out of date.
+
+In order to properly precompile assets on Heroku, config vars must be present in the environment during slug compilation.
 
 ```bash
 heroku labs:enable user-env-compile -a myapp
@@ -48,22 +54,29 @@ TCP/IP connections on port 5432?
 ```
 
 
-["More Details"](https://devcenter.heroku.com/articles/labs-user-env-compile)
+[More Details](https://devcenter.heroku.com/articles/labs-user-env-compile)
 
 ## Enable Captions
 
 You can enable captions using an initializer containing the following configuration:
 
 ```ruby
+# app/config/initializers/refinery/page-images.rb
 Refinery::PageImages.captions = true
 ```
 
-By default, captions are WYM editors. Prefer `textarea`s ? Gotcha :
+By default, captions are WYM editors. Prefer `textarea`s? Gotcha :
 
 ```ruby
 Refinery::PageImages.wysiwyg = false
 ```
 
+Note that WYMeditor support requires that you have the extension in your Gemfile:
+
+```ruby
+gem 'refinerycms-wymeditor', '~> 1.0.0'
+```
+
 ## Usage
 
 `app/views/refinery/pages/show.html.erb`
@@ -74,12 +87,19 @@ If you don't have this file then Refinery will be using its default. You can ove
 rake refinery:override view=refinery/pages/show
 ```
 
+If images have been assigned to a page several objects are available for showing on the page. They are
+
+* `@page.images`: A collection of images assigned to the page.
+* `@page.caption_for_image_index(i)` will return the caption (if any) for the i<sup>th</sup> image in @page.images
+* `@page.images_with_captions`: A collection of image_with_caption objects with the attributes image: and caption:
+
 ```erb
 <% content_for :body_content_right do %>
   <ul id='gallery'>
     <% @page.images.each do |image| %>
       <li>
-        <%= link_to image_tag(image.thumbnail("200x200#c").url), image.thumbnail("900x600").url %>
+        <%= link_to image_tag(image.thumbnail(geometry: "200x200#c").url),
+                    image.thumbnail(geometry: "900x600").url %>
       </li>
    <% end %>
   </ul>
@@ -91,11 +111,48 @@ If you have enabled captions, you can show them like this
 
 ```erb
 <% content_for :body_content_right do %>
-  <ul id='gallery'>
+  <section id='gallery'>
     <% @page.images.each_with_index do |image, index| %>
+      <figure>
+        <%= link_to image_tag(image.thumbnail(geometry: "200x200#c").url),
+                    image.thumbnail(geometry: "900x600").url %>
+        <figcaption><%=raw @page.caption_for_image_index(index) %></figcaption>
+      </figure>
+   <% end %>
+  </section>
+<% end %>
+<%= render :partial => "/refinery/content_page" %>
+```
+or like this
+```erb
+<% content_for :body_content_right do %>
+  <section id='gallery'>
+    <% @page.images_with_captions.each do |iwc| %>
+      <figure>
+        <%= link_to image_tag(iwc.image.thumbnail(geometry: "200x200#c").url),
+                    iwc.image.thumbnail(geometry: "900x600").url %>
+        <figcaption><%=raw iwc.caption %></figcaption>
+      </figure>
+   <% end %>
+  </section>
+<% end %>
+<%= render :partial => "/refinery/content_page" %>
+```
+## Refinerycms-blog support
+
+Contrary to its name, `refinerycms-page-images` also works with `refinerycms-blog` and adds the functionality to link images to blog posts.
+
+If `refinerycms-blog` is installed on your rails app, `refinerycms-page-images` will automatically detect it and perform the adequate initialization. PageImages are assigned to a polymorph "page" object, wich can be a `Refinery::Page` or a `Blog::Post`.
+
+Thus, once installed, you can simply call a blog post's images the same way you'd call them for a page, like this
+
+```erb
+<% @blog_posts.each do |blog_post| %>
+  <ul id='gallery'>
+    <% blog_post.images.each do |image| %>
       <li>
-        <%= link_to image_tag(image.thumbnail("200x200#c").url), image.thumbnail("900x600").url %>
-        <span class='caption'><%=raw @page.caption_for_image_index(index) %></span>
+        <%= link_to image_tag(image.thumbnail(geometry: "200x200#c").url),
+                    image.thumbnail(geometry: "900x600").url %>
       </li>
    <% end %>
   </ul>
@@ -103,6 +160,7 @@ If you have enabled captions, you can show them like this
 <%= render :partial => "/refinery/content_page" %>
 ```
 
+
 ## Screenshot
 
 ![Refinery CMS Page Images Screenshot](http://refinerycms.com/system/images/0000/1736/refinerycms-page-images.png)

data/refinerycms-page-images.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-page-images}
-  s.version           = %q{2.1.1}
-  s.description       = %q{Attach images to pages in Refinery CMS}
+  s.version           = %q{3.0.0}
+  s.description       = %q{Attach images to pages ins Refinery CMS}
   s.summary           = %q{Page Images extension for Refinery CMS}
   s.email             = %q{info@refinerycms.com}
-  s.homepage          = %q{https://github.com/refinery/refinerycms-page-images}
+  s.homepage          = %q{http://github.com/refinery/refinerycms-page-images}
   s.authors           = ['Philip Arndt', 'David Jones']
   s.require_paths     = %w(lib)
   s.license            = %q{MIT}
@@ -12,5 +12,7 @@ Gem::Specification.new do |s|
   s.files             = `git ls-files`.split("\n")
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
-  s.add_dependency    'refinerycms-pages', '~> 2.1.0'
+  s.add_dependency    'refinerycms-pages', '~> 3.0.0'
+  s.add_dependency    'decorators',        '~> 2.0.0'
+  s.add_dependency    'globalize',         '~> 5.0'
 end

data/script/rails

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
-#!/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.
 
 ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)

data/spec/factories/page-images.rb

@@ -1,9 +1,14 @@
 FactoryGirl.define do
-  factory :page_with_image, :parent => :page do
-    after(:create) { |p| p.images << FactoryGirl.create(:image) }
+  factory :page_with_image, :parent => :page_with_page_part do
+    after(:create) { |p| p.image_pages.create(image: FactoryGirl.create(:image)) }
   end
 
   factory :blog_post_with_image, :parent => :blog_post do
-    after(:create) { |b| b.images << FactoryGirl.create(:image) }
+    after(:create) { |b| b.image_pages.create(image: FactoryGirl.create(:image)) }
   end if defined? Refinery::Blog::Post
+
+  factory :image_page, class: Refinery::ImagePage do
+    image
+    page
+  end
 end

data/spec/features/admin/page_images_spec.rb

@@ -0,0 +1,76 @@
+require "spec_helper"
+
+describe "page images", type: :feature do
+  refinery_login
+
+  let(:configure) {}
+  let(:page_for_images) { FactoryGirl.create(:page_with_page_part) }
+  let(:image) { FactoryGirl.create(:image) }
+  let(:navigate_to_edit) { visit refinery.edit_admin_page_path(page_for_images) }
+  let(:page_images_tab_id) { "#custom_#{::I18n.t(:'refinery.plugins.refinery_page_images.tab_name')}_tab" }
+
+  let(:setup_and_visit) do
+    configure
+    page_for_images
+    navigate_to_edit
+  end
+
+  # Regression test for #100 and #102
+  it "can add a page image to the db", js: true do
+
+    image
+    setup_and_visit
+
+    expect(page_for_images.images.count).to eq 0
+
+    page.find("#{page_images_tab_id} a").click
+
+    # Add the first Image
+    click_link "Add Image"
+
+    expect(page).to have_selector 'iframe#dialog_iframe'
+    page.within_frame('dialog_iframe') do
+      find(:css, "#existing_image_area img#image_#{image.id}").click
+      click_button ::I18n.t('button_text', scope: 'refinery.admin.images.existing_image')
+    end
+
+    # image should be visable on the page
+    expect(page).to have_selector("#page_images li#image_#{image.id}")
+
+    click_button "Save"
+
+    # image should be in the db
+    expect(page_for_images.images.count).to eq 1
+
+  end
+
+  context "with images" do
+
+    let(:page_for_images) { FactoryGirl.create(:page_with_image) }
+
+    # Regression test for #100 and #102
+    it "can remove a page image to the db", js: true do
+
+      setup_and_visit
+
+      expect(page_for_images.images.count).to eq 1
+
+      page.find("#{page_images_tab_id} a").click
+
+      expect(page).to have_selector("#page_images li#image_#{page_for_images.images.first.id}")
+
+      image_li_tag = page.find("#page_images li:first-child")
+      image_li_tag.hover
+      within(image_li_tag) { page.find('img:first-child').click }
+
+      expect(page).not_to have_selector("#page_images li#image_#{page_for_images.images.first.id}")
+
+      click_button "Save"
+
+      expect(page_for_images.images.count).to eq 0
+
+    end
+  end
+
+end
+

data/spec/features/attach_page_images_spec.rb

@@ -1,11 +1,11 @@
 require "spec_helper"
 
-describe "attach page images" do
-  refinery_login_with :refinery_user
+describe "attach page images", type: :feature do
+  refinery_login
 
   # No-op block : use default configuration by default
   let(:configure) {}
-  let(:create_page) { FactoryGirl.create(:page) }
+  let(:create_page) { FactoryGirl.create(:page_with_page_part) }
   let(:navigate_to_edit)  { click_link "Edit this page" }
   let(:page_images_tab_id) { "#custom_#{::I18n.t(:'refinery.plugins.refinery_page_images.tab_name')}_tab"  }
 
@@ -19,7 +19,7 @@ describe "attach page images" do
   it "shows images tab" do
     setup_and_visit
     within page_images_tab_id do
-      page.should have_content("Images")
+      expect(page).to have_content("Images")
     end
   end
 
@@ -31,7 +31,7 @@ describe "attach page images" do
       click_link "Images"
     end
 
-    page.should have_content("Add Image")
+    expect(page).to have_content("Add Image")
   end
 
   context "with caption and WYSIWYG disabled" do
@@ -51,7 +51,7 @@ describe "attach page images" do
       image_li_tag.hover
       within(image_li_tag) { page.find('img.caption').click }
 
-      page.find('.ui-dialog textarea').should be_visible
+      expect(page.find('.ui-dialog textarea')).to be_visible
     end
   end
 

data/spec/lib/refinery/initializer_spec.rb

@@ -13,7 +13,7 @@ describe Refinery::PageImages::Engine do
   end
 
   before(:each) do
-    Refinery::PageImages.config.stub(:enable_for).and_return(enable_for_config)
+    allow(Refinery::PageImages.config).to receive(:enable_for).and_return(enable_for_config)
   end
 
   def enable_for_config
@@ -23,18 +23,18 @@ describe Refinery::PageImages::Engine do
 
   describe "attach initializer" do
     it "calls attach on all configured model" do
-      Refinery::PageImages.config.stub(:enable_for).and_return(enable_for_config)
+      allow(Refinery::PageImages.config).to receive(:enable_for).and_return(enable_for_config)
 
-      Refinery::PageImages::EnableForMock::Model.should_receive(:has_many_page_images).once
-      Refinery::Page.should_not_receive(:has_many_page_images)
+      expect(Refinery::PageImages::EnableForMock::Model).to receive(:has_many_page_images).once
+      expect(Refinery::Page).not_to receive(:has_many_page_images)
       ActionDispatch::Reloader.prepare!
     end
   end
 
   describe "attach_initialize_tabs!" do
     it "registers tabs for all configured engine" do
-      Refinery::PageImages::EnableForMock::Tab.should_receive(:register).once
-      Refinery::Pages::Tab.should_not_receive(:register)
+      expect(Refinery::PageImages::EnableForMock::Tab).to receive(:register).once
+      expect(Refinery::Pages::Tab).not_to receive(:register)
       Refinery::PageImages::Engine.initialize_tabs!
     end
   end

data/spec/models/refinery/blog_spec.rb

@@ -1,15 +1,17 @@
 require 'spec_helper'
 
 module Refinery
-  describe BlogPost do
-    it "should not have images" do
-      blog = FactoryGirl.create(:blog_post)
-      blog.images.count.should == 0
-    end
+  module Blog
+    describe Post, type: :model do
+      it "should not have images" do
+        blog = FactoryGirl.create(:blog_post)
+        expect(blog.images.count).to eq(0)
+      end
 
-    it "should have images" do
-      blog = FactoryGirl.create(:blog_post_with_image)
-      blog.images.count.should == 1
+      it "should have images" do
+        blog = FactoryGirl.create(:blog_post_with_image)
+        expect(blog.images.count).to eq(1)
+      end
     end
   end
 end if defined?(Refinery::Blog::Post)

data/spec/models/refinery/image_page_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module Refinery
+  describe ImagePage, type: :model do
+    let!(:image_page) { FactoryGirl.create(:image_page) }
+
+    describe "touching" do
+      let(:original_updated_at) { 1.day.ago }
+      let(:page) { image_page.page }
+
+      before { page.update_column(:updated_at, original_updated_at) }
+
+      it "updates a page" do
+        expect { image_page.touch }.to change { page.reload.updated_at }
+                                   .to be_within(3.seconds).of(Time.current)
+      end
+    end
+  end
+end

data/spec/models/refinery/page_spec.rb

@@ -1,78 +1,88 @@
 require 'spec_helper'
 
 module Refinery
-  describe Page do
+  describe Page, type: :model do
+    let!(:page) { FactoryGirl.create :page }
     it "can have images added" do
-      page = FactoryGirl.create(:page)
-      page.images.count.should eq(0)
+      expect {
+        page.image_pages.create(image: FactoryGirl.build(:image))
+      }.to change{page.images.count}.from(0).to(1)
+    end
+
+    describe '#images_with_captions' do
+      it 'returns an images_with_captions collection' do
+        expect {
+          page.image_pages.create(image: FactoryGirl.build(:image))
+        }.to change{page.images_with_captions.count}.from(0).to(1)
+      end
+
+      it 'returns an image and a caption' do
+        expect(page.images_with_captions.count).to eq(0)
+
+        page.image_pages.create(image: FactoryGirl.build(:image))
+        expect(page.images_with_captions.first[:image]).to be_a(Refinery::Image)
+        expect(page.images_with_captions.first[:caption]).to be_a(String)
+      end
 
-      page.images << FactoryGirl.create(:image)
-      page.images.count.should eq(1)
     end
 
     describe "#images_attributes=" do
       it "adds images" do
-        page = FactoryGirl.create(:page)
         image = FactoryGirl.create(:image)
 
-        page.images.count.should == 0
-        page.update_attributes({:images_attributes => {"0" => {"id" => image.id}}})
-
-        page.images.count.should == 1
+        expect {
+          page.update_attributes({:images_attributes => {"0" => {"id" => image.id}}})
+        }.to change { page.images.count }.from(0).to(1)
       end
 
-      it "deletes specific images" do
-        page = FactoryGirl.create(:page)
-        images = [FactoryGirl.create(:image), FactoryGirl.create(:image)]
-        page.images = images
-
-        page_image_to_keep = page.image_pages.find do |image_page|
-          image_page.image_id == images.first.id
+      context 'with images' do
+        let!(:images) { [FactoryGirl.create(:image), FactoryGirl.create(:image)] }
+        before do
+          images.each do |image|
+            page.image_pages.create(image: image)
+          end
         end
-        page.update_attributes(:images_attributes => {
-          "0" => {
-            "id" => page_image_to_keep.image_id.to_s,
-            "image_page_id" => page_image_to_keep.id
-          },
-        })
+        it "deletes specific images" do
+          page_image_to_keep = page.image_pages.find do |image_page|
+            image_page.image_id == images.first.id
+          end
+          page.update_attributes(:images_attributes => {
+            "0" => {
+              "id" => page_image_to_keep.image_id.to_s,
+              "image_page_id" => page_image_to_keep.id
+            },
+          })
 
-        page.images.should eq([images.first])
-      end
+          expect(page.images).to eq([images.first])
+        end
 
-      it "deletes all images" do
-        page = FactoryGirl.create(:page)
-        images = [FactoryGirl.create(:image), FactoryGirl.create(:image)]
-        page.images = images
+        it "deletes all images" do
+          page.update_attributes(:images_attributes => {"0" => {"id"=>""}})
 
-        page.update_attributes(:images_attributes => {"0" => {"id"=>""}})
+          expect(page.images).to be_empty
+        end
 
-        page.images.should be_empty
-      end
+        it "reorders images" do
+          first_page_image = page.image_pages.find do |image_page|
+            image_page.image_id == images.first.id
+          end
+          second_page_image = page.image_pages.find do |image_page|
+            image_page.image_id == images.second.id
+          end
 
-      it "reorders images" do
-        page = FactoryGirl.create(:page)
-        images = [FactoryGirl.create(:image), FactoryGirl.create(:image)]
-        page.images = images
+          page.update_attributes(:images_attributes => {
+            "0" => {
+              "id" => second_page_image.image_id,
+              "image_page_id" => second_page_image.id,
+            },
+            "1" => {
+              "id" => first_page_image.image_id,
+              "image_page_id" => first_page_image.id,
+            },
+          })
 
-        first_page_image = page.image_pages.find do |image_page|
-          image_page.image_id == images.first.id
+          expect(page.images).to eq([images.second, images.first])
         end
-        second_page_image = page.image_pages.find do |image_page|
-          image_page.image_id == images.second.id
-        end
-
-        page.update_attributes(:images_attributes => {
-          "0" => {
-            "id" => second_page_image.image_id,
-            "image_page_id" => second_page_image.id,
-          },
-          "1" => {
-            "id" => first_page_image.image_id,
-            "image_page_id" => first_page_image.id,
-          },
-        })
-
-        page.images.should eq([images.second, images.first])
       end
     end
   end

data/spec/spec_helper.rb

@@ -7,13 +7,11 @@ require File.expand_path("../dummy/config/environment", __FILE__)
 
 require 'rspec/rails'
 require 'capybara/rspec'
-require 'factory_girl_rails'
 
 Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-page-images
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-18 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-pages
@@ -17,15 +17,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
-description: Attach images to pages in Refinery CMS
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: decorators
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: globalize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+description: Attach images to pages ins Refinery CMS
 email: info@refinerycms.com
 executables: []
 extensions: []
@@ -36,22 +64,31 @@ files:
 - Gemfile
 - Rakefile
 - app/assets/javascripts/refinery/page-image-picker.js.erb
-- app/assets/stylesheets/refinery/page-image-picker.css.scss
+- app/assets/stylesheets/refinery/page-image-picker.scss
+- app/decorators/controllers/refinery/admin/blogposts_controller_decorator.rb
+- app/decorators/controllers/refinery/admin/pages_controller_decorator.rb
+- app/decorators/models/refinery/page_images_page_decorator.rb
 - app/models/refinery/image_page.rb
 - app/views/refinery/admin/pages/tabs/_images.html.erb
 - app/views/refinery/admin/pages/tabs/_images_bar.html.erb
 - app/views/refinery/admin/pages/tabs/_images_field.html.erb
+- bin/rake
+- bin/rspec
 - config/locales/bg.yml
 - config/locales/cs.yml
+- config/locales/da.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/ja.yml
 - config/locales/nl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml
 - config/locales/sk.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20101014230041_create_page_images.rb
 - db/migrate/20101014230042_add_caption_to_image_pages.rb
 - db/migrate/20110511215016_translate_page_image_captions.rb
@@ -67,13 +104,15 @@ files:
 - refinerycms-page-images.gemspec
 - script/rails
 - spec/factories/page-images.rb
+- spec/features/admin/page_images_spec.rb
 - spec/features/attach_page_images_spec.rb
 - spec/lib/refinery/initializer_spec.rb
 - spec/models/refinery/blog_spec.rb
+- spec/models/refinery/image_page_spec.rb
 - spec/models/refinery/page_spec.rb
 - spec/spec_helper.rb
 - tasks/rspec.rake
-homepage: https://github.com/refinery/refinerycms-page-images
+homepage: http://github.com/refinery/refinerycms-page-images
 licenses:
 - MIT
 metadata: {}
@@ -93,15 +132,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Page Images extension for Refinery CMS
 test_files:
 - spec/factories/page-images.rb
+- spec/features/admin/page_images_spec.rb
 - spec/features/attach_page_images_spec.rb
 - spec/lib/refinery/initializer_spec.rb
 - spec/models/refinery/blog_spec.rb
+- spec/models/refinery/image_page_spec.rb
 - spec/models/refinery/page_spec.rb
 - spec/spec_helper.rb
-has_rdoc: