refinerycms-page-images 3.0.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72ed8ac7a3c5ba5dbf01e1bfd4fc8870d09da8a
-  data.tar.gz: 826b59b4d21371ec72c9d04eaaf84dd4700d6bc4
+  metadata.gz: 2faa4005a2b29d241feae553db596df571099306
+  data.tar.gz: c7933eaaf2797f82b2806d8591d92caf04f343a8
 SHA512:
-  metadata.gz: d1c3445b8c2d4ad216714df2cd6711ac5c781a024ba6551f57f2a8f2eff85c065c626e783f255b52f94c2043838e8394d83802668a234178cf2da956d85e2d6d
-  data.tar.gz: 496669b11429333ba1a3a5276ad8af71df969d7dddaa299063e0da611263f210c1dd7018838e0294e9fcbd1b860005cad465f1ff5cd7f4a436246723aea5d57d
+  metadata.gz: 152c5286969ba3de73823a7a1bf9a044f89b860d744a354e538912ea39679dad4c7972cd52b858571add959d849aec376e754af5e382f9fb490c4cbfef98d3ee
+  data.tar.gz: 36c057c183bd38c996e981ab4f73f6dc3e29cc66959136b5eb30c086f4317e47fdc4bc0fd894e720614ba823f609e2f25cc1cea3a0fa1171cb7a64361dd59e91

data/.travis.yml

@@ -22,5 +22,6 @@ env:
   - DB=postgresql
   - DB=mysql
 rvm:
- - 2.3.1
- - 2.2.5
+  - 2.4.2
+  - 2.3.5
+  - 2.2.8

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-git 'https://github.com/refinery/refinerycms', branch: '3-0-stable' do
+git "https://github.com/refinery/refinerycms", branch: "master" do
   gem 'refinerycms'
 
   group :development, :test do
@@ -10,7 +10,11 @@ git 'https://github.com/refinery/refinerycms', branch: '3-0-stable' do
   end
 end
 
-gem 'refinerycms-wymeditor', '~> 1.0.0'
+gem 'refinerycms-wymeditor', ['~> 2.0', '>= 2.0.0']
+
+group :development do
+  gem 'listen'
+end
 
 group :test do
   gem 'poltergeist'
@@ -30,12 +34,14 @@ end
 
 if !ENV['TRAVIS'] || ENV['DB'] == 'postgresql'
   gem 'activerecord-jdbcpostgresql-adapter', :platform => :jruby
-  gem 'pg', :platform => :ruby
+  gem 'pg', '~> 0.21', platform: :ruby
 end
 
 # Refinery/rails should pull in the proper versions of these
-gem 'sass-rails', '~> 4.0.0'
-gem 'coffee-rails', '~> 4.0.0'
+group :assets do
+  gem "sass-rails"
+  gem "coffee-rails"
+end
 
 # Load local gems according to Refinery developer preference.
 if File.exist? local_gemfile = File.expand_path('../.gemfile', __FILE__)

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

@@ -1,16 +1,3 @@
-require 'ostruct'
+Refinery::Page.include RefineryPageImages::AddImagesWithCaptionsConcern
 
-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/concerns/refinery_page_images/add_images_with_captions_concern.rb

@@ -0,0 +1,24 @@
+require 'ostruct'
+
+module RefineryPageImages
+  module AddImagesWithCaptionsConcern
+    extend ActiveSupport::Concern
+    included do
+      attr_accessor :images_with_captions
+      prepend(InstanceMethods)
+    end
+
+    module InstanceMethods
+      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
+  end
+end

data/app/models/refinery/image_page.rb

@@ -5,5 +5,7 @@ module Refinery
     belongs_to :page, polymorphic: true, touch: true
 
     translates :caption
+
+    attribute :caption
   end
 end

data/bin/rails

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails gems
+# installed from the root of your application.
+
+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

data/certs/parndt.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
+MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
+CZImiZPyLGQBGRYCaW8wHhcNMTcwNzI1MTMxMjIwWhcNMTgwNzI1MTMxMjIwWjBN
+MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
+ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDrjwB8be48TFEvGweP7BwWFnmsL2IMU9Ts2UKKWK9GYr7Z
+5uNZFmO1yVBCrmUQHHDlpku6SN6HDO8ChDL7LNugz/4eapRTifHZl8jhPRsOLBcF
+1hANy/V2v5NNkL5Zvb+vsUa7lyjbIOoD5yYzSDl4/T0nOe6xYzxJgBuxZK/nWSOe
+Db8Uffc7B4yhA2kuayUiQUXPYAoPdfUSxoTKDohw17Sm6LKTpg8GkT0ttof1a/xu
+vdsTvZHIcTsYv16e+8SrwLRZ/iBVVsyZFkMYPMxemw7WHxmWElWIgW9S7pUK5Q7J
+oMS5uJVbtV2EmV+cOnhOWDz1A16P7QRFmGje5L+vAgMBAAGjcTBvMAkGA1UdEwQC
+MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ7G/yxuQIzgszkOkaZBgoKBJ1rozAa
+BgNVHREEEzARgQ9nZW1zQHAuYXJuZHQuaW8wGgYDVR0SBBMwEYEPZ2Vtc0BwLmFy
+bmR0LmlvMA0GCSqGSIb3DQEBBQUAA4IBAQB12WMsC+yuuIeM0Ib6HUYZ2IbhRnuW
+4uydNRvKDPdwzjChnOI0POGpcL8O1s1gh+19o/ITq6zRfTLhkwR2ir7XfwHJNppJ
+yg48wbdL5gpZwggKWggKX5G9pqv9LjRsSAew6r0WB+5KW+ArCl/iNo9+AdeR3nUx
+I+L/QiUxYU6XAXSrczL/i7kF5Xc3ZXQYuFsyGW9plA3i9faWUMvGKQc6pvUHIUZC
+jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
+5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
+-----END CERTIFICATE-----

data/db/migrate/20101014230041_create_page_images.rb

@@ -1,4 +1,4 @@
-class CreatePageImages < ActiveRecord::Migration
+class CreatePageImages < ActiveRecord::Migration[4.2]
   def change
     create_table Refinery::ImagePage.table_name, :id => false do |t|
       t.integer :image_id

data/db/migrate/20101014230042_add_caption_to_image_pages.rb

@@ -1,4 +1,4 @@
-class AddCaptionToImagePages < ActiveRecord::Migration
+class AddCaptionToImagePages < ActiveRecord::Migration[4.2]
   def change
     add_column Refinery::ImagePage.table_name, :caption, :text
   end

data/db/migrate/20110511215016_translate_page_image_captions.rb

@@ -1,4 +1,4 @@
-class TranslatePageImageCaptions < ActiveRecord::Migration
+class TranslatePageImageCaptions < ActiveRecord::Migration[4.2]
   def up
     add_column Refinery::ImagePage.table_name, :id, :primary_key
 

data/db/migrate/20110527052435_change_page_to_polymorphic.rb

@@ -1,4 +1,4 @@
-class ChangePageToPolymorphic < ActiveRecord::Migration
+class ChangePageToPolymorphic < ActiveRecord::Migration[4.2]
   def change
     add_column Refinery::ImagePage.table_name, :page_type, :string, :default => "page"
   end

data/readme.md

@@ -8,7 +8,7 @@ Page Images allows you to relate one or more images to any page in Refinery whic
 
 ## Requirements
 
-* refinerycms >= 3.0.0
+* refinerycms-pages ~> 4.0
 
 ## Features
 
@@ -23,7 +23,7 @@ Page Images allows you to relate one or more images to any page in Refinery whic
 Add this line to your application's `Gemfile`
 
 ```ruby
-gem 'refinerycms-page-images', '~> 3.0.0', github: "refinery/refinerycms-page-images", branch: "master"
+gem 'refinerycms-page-images', '~> 4.0.0', git: "https://github.com/refinery/refinerycms-page-images", branch: "master"
 ```
 
 Next run
@@ -74,7 +74,7 @@ Refinery::PageImages.wysiwyg = false
 Note that WYMeditor support requires that you have the extension in your Gemfile:
 
 ```ruby
-gem 'refinerycms-wymeditor', '~> 1.0.0'
+gem 'refinerycms-wymeditor', ['~> 2.0', '>= 2.0.0']
 ```
 
 ## Usage

data/refinerycms-page-images.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-page-images}
-  s.version           = %q{3.0.0}
+  s.version           = %q{4.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}
@@ -12,7 +12,12 @@ 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', '~> 3.0.0'
-  s.add_dependency    'decorators',        '~> 2.0.0'
-  s.add_dependency    'globalize',         '~> 5.0'
+  s.add_dependency    'refinerycms-pages', ['~> 4.0', '>= 4.0.0']
+  s.add_dependency    'decorators',        '~> 2.0'
+  s.add_dependency    'globalize',         '~> 5.1.0'
+
+  s.cert_chain  = [File.expand_path("../certs/parndt.pem", __FILE__)]
+  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  end
 end

data/spec/factories/page-images.rb

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

data/spec/features/admin/page_images_spec.rb

@@ -4,8 +4,8 @@ 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(:page_for_images) { FactoryBot.create(:page_with_page_part) }
+  let(:image) { FactoryBot.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" }
 
@@ -46,7 +46,7 @@ describe "page images", type: :feature do
 
   context "with images" do
 
-    let(:page_for_images) { FactoryGirl.create(:page_with_image) }
+    let(:page_for_images) { FactoryBot.create(:page_with_image) }
 
     # Regression test for #100 and #102
     it "can remove a page image to the db", js: true do

data/spec/features/attach_page_images_spec.rb

@@ -5,7 +5,7 @@ describe "attach page images", type: :feature do
 
   # No-op block : use default configuration by default
   let(:configure) {}
-  let(:create_page) { FactoryGirl.create(:page_with_page_part) }
+  let(:create_page) { FactoryBot.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"  }
 
@@ -40,7 +40,7 @@ describe "attach page images", type: :feature do
       Refinery::PageImages.config.captions = true
     end
 
-    let(:create_page) { FactoryGirl.create(:page_with_image) }
+    let(:create_page) { FactoryBot.create(:page_with_image) }
     let(:navigate_to_edit) { page.find('a[tooltip="Edit this page"]').click }
 
     it "shows a plain textarea when editing caption", js: true do

data/spec/lib/refinery/initializer_spec.rb

@@ -27,7 +27,7 @@ describe Refinery::PageImages::Engine do
 
       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!
+      Rails.application.reloader.prepare!
     end
   end
 

data/spec/models/refinery/blog_spec.rb

@@ -4,12 +4,12 @@ module Refinery
   module Blog
     describe Post, type: :model do
       it "should not have images" do
-        blog = FactoryGirl.create(:blog_post)
+        blog = FactoryBot.create(:blog_post)
         expect(blog.images.count).to eq(0)
       end
 
       it "should have images" do
-        blog = FactoryGirl.create(:blog_post_with_image)
+        blog = FactoryBot.create(:blog_post_with_image)
         expect(blog.images.count).to eq(1)
       end
     end

data/spec/models/refinery/image_page_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Refinery
   describe ImagePage, type: :model do
-    let!(:image_page) { FactoryGirl.create(:image_page) }
+    let!(:image_page) { FactoryBot.create(:image_page) }
 
     describe "touching" do
       let(:original_updated_at) { 1.day.ago }

data/spec/models/refinery/page_spec.rb

@@ -2,24 +2,24 @@ require 'spec_helper'
 
 module Refinery
   describe Page, type: :model do
-    let!(:page) { FactoryGirl.create :page }
+    let!(:page) { FactoryBot.create :page }
     it "can have images added" do
       expect {
-        page.image_pages.create(image: FactoryGirl.build(:image))
+        page.image_pages.create(image: FactoryBot.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))
+          page.image_pages.create(image: FactoryBot.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))
+        page.image_pages.create(image: FactoryBot.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
@@ -28,7 +28,7 @@ module Refinery
 
     describe "#images_attributes=" do
       it "adds images" do
-        image = FactoryGirl.create(:image)
+        image = FactoryBot.create(:image)
 
         expect {
           page.update_attributes({:images_attributes => {"0" => {"id" => image.id}}})
@@ -36,7 +36,7 @@ module Refinery
       end
 
       context 'with images' do
-        let!(:images) { [FactoryGirl.create(:image), FactoryGirl.create(:image)] }
+        let!(:images) { [FactoryBot.create(:image), FactoryBot.create(:image)] }
         before do
           images.each do |image|
             page.image_pages.create(image: image)

metadata

@@ -1,15 +1,37 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-page-images
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Philip Arndt
 - David Jones
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
+  MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
+  CZImiZPyLGQBGRYCaW8wHhcNMTcwNzI1MTMxMjIwWhcNMTgwNzI1MTMxMjIwWjBN
+  MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
+  ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQDrjwB8be48TFEvGweP7BwWFnmsL2IMU9Ts2UKKWK9GYr7Z
+  5uNZFmO1yVBCrmUQHHDlpku6SN6HDO8ChDL7LNugz/4eapRTifHZl8jhPRsOLBcF
+  1hANy/V2v5NNkL5Zvb+vsUa7lyjbIOoD5yYzSDl4/T0nOe6xYzxJgBuxZK/nWSOe
+  Db8Uffc7B4yhA2kuayUiQUXPYAoPdfUSxoTKDohw17Sm6LKTpg8GkT0ttof1a/xu
+  vdsTvZHIcTsYv16e+8SrwLRZ/iBVVsyZFkMYPMxemw7WHxmWElWIgW9S7pUK5Q7J
+  oMS5uJVbtV2EmV+cOnhOWDz1A16P7QRFmGje5L+vAgMBAAGjcTBvMAkGA1UdEwQC
+  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ7G/yxuQIzgszkOkaZBgoKBJ1rozAa
+  BgNVHREEEzARgQ9nZW1zQHAuYXJuZHQuaW8wGgYDVR0SBBMwEYEPZ2Vtc0BwLmFy
+  bmR0LmlvMA0GCSqGSIb3DQEBBQUAA4IBAQB12WMsC+yuuIeM0Ib6HUYZ2IbhRnuW
+  4uydNRvKDPdwzjChnOI0POGpcL8O1s1gh+19o/ITq6zRfTLhkwR2ir7XfwHJNppJ
+  yg48wbdL5gpZwggKWggKX5G9pqv9LjRsSAew6r0WB+5KW+ArCl/iNo9+AdeR3nUx
+  I+L/QiUxYU6XAXSrczL/i7kF5Xc3ZXQYuFsyGW9plA3i9faWUMvGKQc6pvUHIUZC
+  jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
+  5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
+  -----END CERTIFICATE-----
+date: 2018-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-pages
@@ -17,42 +39,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: decorators
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.1.0
 description: Attach images to pages ins Refinery CMS
 email: info@refinerycms.com
 executables: []
@@ -68,12 +96,15 @@ files:
 - 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/concerns/refinery_page_images/add_images_with_captions_concern.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/rails
 - bin/rake
 - bin/rspec
+- certs/parndt.pem
 - config/locales/bg.yml
 - config/locales/cs.yml
 - config/locales/da.yml
@@ -102,7 +133,6 @@ files:
 - lib/refinerycms-page-images.rb
 - readme.md
 - 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

metadata.gz.sig

@@ -0,0 +1,5 @@
+ou�!3/8�0s��f1��Ұig�eXb	霺�K������������X��M����LKGuH��c��<VY7r�CG)Qw{iPn��
+`��B��Wi8�<	�l5�v>�mz�7��Z<�٧�߯Ef�O�5�m�,ne
+I�&���3r=�d��3� �:A�~^G{�h��l�ɣvC�=�H�;kp��lZ�|��+��yD5&���
+�
+�b�bv��:�/3�fKn�	X�?��|9��	�^

data/script/rails

@@ -1,5 +0,0 @@
-#!/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/bin/rails',  __FILE__)