refinerycms-page-images 1.0.4 → 2.0.0

data/lib/refinery/page_images/extension.rb

@@ -0,0 +1,66 @@
+module Refinery
+  module PageImages
+    module Extension
+      def has_many_page_images
+        has_many :image_pages, :as => :page, :order => 'position ASC'
+        has_many :images, :through => :image_pages, :order => 'position ASC'
+        # 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)
+            ids_to_keep = data.map{|i, 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)
+              )
+            end
+
+            image_pages_to_delete.destroy_all
+
+            data.each do |i, image_data|
+              image_page_id, image_id, caption =
+                image_data.values_at('image_page_id', 'id', 'caption')
+
+              next if image_id.blank?
+
+              image_page = if image_page_id.present?
+                self.image_pages.find(image_page_id)
+              else
+                self.image_pages.build(:image_id => image_id)
+              end
+
+              image_page.position = i
+              image_page.caption = caption if Refinery::PageImages.captions
+              image_page.save
+            end
+          end
+        end
+
+        include Refinery::PageImages::Extension::InstanceMethods
+
+        attr_accessible :images_attributes
+      end
+
+      module InstanceMethods
+
+        def caption_for_image_index(index)
+          self.image_pages[index].try(:caption).presence || ""
+        end
+
+        def image_page_id_for_image_index(index)
+          self.image_pages[index].try(:id)
+        end
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.send(:extend, Refinery::PageImages::Extension)

data/lib/refinery/page_images.rb

@@ -0,0 +1,22 @@
+require 'refinerycms-core'
+
+module Refinery
+  autoload :PageImagesGenerator, 'generators/refinery/page_images_generator'
+
+  module PageImages
+
+    class << self
+      def root
+        @root ||= Pathname.new(File.expand_path('../../../', __FILE__))
+      end
+
+      def factory_paths
+        @factory_paths ||= [ root.join('spec', 'factories').to_s ]
+      end
+    end
+
+    require 'refinery/page_images/configuration'
+    require 'refinery/page_images/engine'
+    require 'refinery/page_images/extension'
+  end
+end

data/lib/refinerycms-page-images.rb

@@ -1,54 +1 @@
-require 'refinery'
-
-module Refinery
-  module PageImages
-    class Engine < Rails::Engine
-      initializer "static assets" do |app|
-        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
-      end
-
-      config.to_prepare do
-        Page.module_eval do
-          has_many :image_pages
-          has_many :images, :through => :image_pages, :order => 'position ASC'
-          # 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
-
-          attr_accessible :images_attributes
-
-          def images_attributes=(data)
-            ImagePage.delete_all(:page_id => self.id)
-
-            (0..(data.length-1)).each do |i|
-              unless (image_data = data[i.to_s]).nil? or image_data['id'].blank?
-                image_page = self.image_pages.new(:image_id => image_data['id'].to_i, :position => i)
-                # Add caption if supported
-                if RefinerySetting.find_or_set(:page_images_captions, false)
-                  image_page.caption = image_data['caption']
-                end
-                self.image_pages << image_page
-              end
-            end
-          end
-
-          def caption_for_image_index(index)
-            self.image_pages[index].try(:caption).presence || ""
-          end
-        end
-      end
-
-      config.after_initialize do
-        ::Refinery::Pages::Tab.register do |tab|
-          tab.name = "images"
-          tab.partial = "/admin/pages/tabs/images"
-        end
-        ::Refinery::Plugin.register do |plugin|
-          plugin.name = "page_images"
-          plugin.hide_from_menu = true
-        end
-      end
-    end
-  end
-end
-
+require 'refinery/page_images'

data/readme.md

@@ -6,7 +6,7 @@ Page Images allows you to relate one or more images to any page in Refinery whic
 
 ## Requirements
 
-* refinerycms >= 0.9.9
+* refinerycms >= 2.0.0
 
 ## Features
 
@@ -18,51 +18,45 @@ Page Images allows you to relate one or more images to any page in Refinery whic
 
 Add this line to your applications `Gemfile`
 
-    gem 'refinerycms-page-images', '~> 1.0'
+```ruby
+gem 'refinerycms-page-images', '~> 2.0.0'
+```
 
 Next run
 
-    bundle install
-    rails g refinerycms_page_images
-    rake db:migrate
+```bash
+bundle install
+rails generate refinery:page_images
+rake db:migrate
+```
 
 Now when you start up your Refinery application, edit a page and there should be a new "Images" tab.
 
-If you get an error like
-
-    uninitialized constant Refinery::Pages::Tab
-
-It means your Refinery version isn't new enough. To fix that you need to update the Refinery CMS `Gemfile` line to this
-
-    gem 'refinerycms', '~> 0.9.9'
-
-Then run:
-
-    bundle install
-    rake refinery:update
-
-And then try again. Note that doing this will likely mean that you need to fix your application
-for any changes that have happened since the version of Refinery CMS that you were using.
-
 ## Enable Captions
 
-Change the setting "Page Images Captions" to "true" to enable captions.
+You can enable captions using an initializer containing the following configuration:
 
-## Usage
+```ruby
+Refinery::PageImages.captions = true
+```
 
-`app/views/pages/show.html.erb`
+## Usage
 
-    <% content_for :body_content_right do %>
-      <ul id='gallery'>
-        <% @page.images.each do |i| %>
-          <li>
-            <%= link_to image_tag(i.thumbnail("200x200#c").url), i.thumbnail("900x600").url %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-    <%= render :partial => "/shared/content_page" %>
+`app/views/refinery/pages/show.html.erb`
+
+```erb
+<% content_for :body_content_right do %>
+  <ul id='gallery'>
+    <% @page.images.each do |i| %>
+      <li>
+        <%= link_to image_tag(i.thumbnail("200x200#c").url), i.thumbnail("900x600").url %>
+      </li>
+   <% end %>
+  </ul>
+<% end %>
+<%= render :partial => "/refinery/content_page" %>
+```
 
 ## Screenshot
 
-![Refinery CMS Page Images Screenshot](http://refinerycms.com/system/images/0000/1736/refinerycms-page-images.png)
+![Refinery CMS Page Images Screenshot](http://refinerycms.com/system/images/0000/1736/refinerycms-page-images.png)

data/refinerycms-page-images.gemspec

@@ -0,0 +1,17 @@
+Gem::Specification.new do |s|
+  s.name              = %q{refinerycms-page-images}
+  s.version           = %q{2.0.0}
+  s.description       = %q{Page Images Engine for Refinery CMS}
+  s.date              = Date.today.strftime("%Y-%m-%d")
+  s.summary           = %q{Page Images Engine for Refinery CMS}
+  s.email             = %q{dave@resolvedigital.com}
+  s.homepage          = %q{http://github.com/resolve/refinerycms-page-images}
+  s.authors           = ['Philip Arndt', 'David Jones']
+  s.require_paths     = %w(lib)
+
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- spec/*`.split("\n")
+
+  s.add_dependency    'refinerycms-pages', '~> 2.0.0'
+  s.add_development_dependency 'refinerycms-testing', '~> 2.0.0'
+end

data/spec/factories/page-images.rb

@@ -0,0 +1,9 @@
+FactoryGirl.define do
+  factory :page_with_image, :parent => :page do
+    after_create { |p| p.images << Factory(:image) }
+  end
+
+  factory :blog_post_with_image, :parent => :blog_post do
+    after_create { |b| b.images << Factory(:image) }
+  end if defined? Refinery::Blog::Post
+end

data/spec/models/refinery/blog_spec.rb

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

data/spec/models/refinery/page_spec.rb

@@ -0,0 +1,69 @@
+require 'spec_helper'
+
+module Refinery
+  describe Page do
+    it "can have images added" do
+      page = Factory(:page)
+      page.images.count.should eq(0)
+
+      page.images << Factory(:image)
+      page.images.count.should eq(1)
+    end
+
+    describe "#images_attributes=" do
+      it "adds images" do
+        page = Factory(:page)
+        image = Factory(:image)
+
+        page.images.count.should == 0
+        page.update_attributes({:images_attributes => {"0" => {"id" => image.id}}})
+
+        page.images.count.should == 1
+      end
+
+      it "deletes specific images" do
+        page = Factory(:page)
+        images = [Factory(:image), Factory(:image)]
+        page.images = images
+
+        page.update_attributes(:images_attributes => {
+          "0" => {
+            "id" => images.first.id.to_s,
+            "image_page_id" => page.image_pages.first.id,
+          },
+        })
+
+        page.images.should eq([images.first])
+      end
+
+      it "deletes all images" do
+        page = Factory(:page)
+        images = [Factory(:image), Factory(:image)]
+        page.images = images
+
+        page.update_attributes(:images_attributes => {"0" => {"id"=>""}})
+
+        page.images.should be_empty
+      end
+
+      it "reorders images" do
+        page = Factory(:page)
+        images = [Factory(:image), Factory(:image)]
+        page.images = images
+
+        page.update_attributes(:images_attributes => {
+          "0" => {
+            "id" => images.second.id,
+            "image_page_id" => page.image_pages.second.id,
+          },
+          "1" => {
+            "id" => images.first.id,
+            "image_page_id" => page.image_pages.first.id,
+          },
+        })
+
+        page.images.should eq([images.second, images.first])
+      end
+    end
+  end
+end

data/spec/requests/attach_page_images_spec.rb

@@ -0,0 +1,29 @@
+require "spec_helper"
+
+describe "attach page images" do
+  login_refinery_user
+
+  before(:each) do
+    Factory(:page)
+
+    visit refinery.admin_pages_path
+
+    click_link "Edit this page"
+  end
+
+  it "shows images tab" do
+    within "#custom_images_tab" do
+      page.should have_content("Images")
+    end
+  end
+
+  # This spec actually is broken in a way because Add Image link would
+  # be visible to capybara even if we don't click on Images tab.
+  it "shows add image link" do
+    within "#custom_images_tab" do
+      click_link "Images"
+    end
+
+    page.should have_content("Add Image")
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,56 @@
+require 'rubygems'
+
+def setup_environment
+  # Configure Rails Environment
+  ENV["RAILS_ENV"] ||= 'test'
+
+  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
+
+  # set javascript driver for capybara
+  Capybara.javascript_driver = :selenium
+end
+
+def each_run
+  ActiveSupport::Dependencies.clear
+
+  FactoryGirl.reload
+
+  # Requires supporting files with custom matchers and macros, etc,
+  # in ./support/ and its subdirectories including factories.
+  ([Rails.root.to_s] | ::Refinery::Plugins.registered.pathnames).map{|p|
+    Dir[File.join(p, 'spec', 'support', '**', '*.rb').to_s]
+  }.flatten.sort.each do |support_file|
+    require support_file
+  end
+end
+
+# If spork is available in the Gemfile it'll be used but we don't force it.
+unless (begin; require 'spork'; rescue LoadError; nil end).nil?
+  Spork.prefork do
+    # Loading more in this block will cause your tests to run faster. However,
+    # if you change any configuration or code from libraries loaded here, you'll
+    # need to restart spork for it take effect.
+    setup_environment
+  end
+
+  Spork.each_run do
+    # This code will be run each time you run your specs.
+    each_run
+  end
+else
+  setup_environment
+  each_run
+end

data/spec/support/database_cleaner.rb

@@ -0,0 +1,17 @@
+require 'database_cleaner'
+
+RSpec.configure do |config|
+  config.use_transactional_fixtures = false
+  
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+  end
+  
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+  
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end

data/spec/support/devise.rb

@@ -0,0 +1,8 @@
+require 'devise'
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+  config.use_transactional_fixtures = false
+  
+  config.include Devise::TestHelpers, :type => :controller
+end

data/spec/support/refinery.rb

@@ -0,0 +1,6 @@
+require 'refinerycms-testing'
+
+RSpec.configure do |config|
+  config.extend Refinery::Testing::ControllerMacros::Authentication, :type => :controller
+  config.extend Refinery::Testing::RequestMacros::Authentication, :type => :request
+end

data/tasks/rspec.rake

@@ -0,0 +1,4 @@
+require 'rspec/core/rake_task'
+
+desc "Run specs"
+RSpec::Core::RakeTask.new

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-page-images
 version: !ruby/object:Gem::Version 
+  hash: 15
   prerelease: 
-  version: 1.0.4
+  segments: 
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
-- Resolve Digital
-- David Jones
 - Philip Arndt
+- David Jones
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 +12:00
-default_executable: 
+date: 2012-03-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: refinerycms-pages
@@ -21,11 +24,32 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.1
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: refinerycms-testing
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id002
 description: Page Images Engine for Refinery CMS
 email: dave@resolvedigital.com
 executables: []
@@ -35,22 +59,47 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- readme.md
-- app/models/image_page.rb
-- app/views/admin/pages/tabs/_images.html.erb
-- app/views/admin/pages/tabs/_images_bar.html.erb
-- app/views/admin/pages/tabs/_images_field.html.erb
+- .gitignore
+- .travis.yml
+- Gemfile
+- Rakefile
+- app/assets/javascripts/refinery/page-image-picker.js.erb
+- app/assets/stylesheets/refinery/page-image-picker.css.scss
+- 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
+- config/locales/bg.yml
+- config/locales/cs.yml
+- config/locales/de.yml
 - config/locales/en.yml
+- config/locales/fr.yml
 - config/locales/nl.yml
+- config/locales/pt-BR.yml
+- config/locales/ru.yml
+- config/locales/sk.yml
 - db/migrate/20101014230041_create_page_images.rb
 - db/migrate/20101014230042_add_caption_to_image_pages.rb
-- features/attach_page_images.feature
-- lib/gemspec.rb
-- lib/generators/refinerycms_page_images_generator.rb
+- db/migrate/20110511215016_translate_page_image_captions.rb
+- db/migrate/20110527052435_change_page_to_polymorphic.rb
+- lib/generators/refinery/page_images_generator.rb
+- lib/generators/refinery/templates/config/initializers/refinery/page_images.rb.erb
+- lib/refinery/page_images.rb
+- lib/refinery/page_images/configuration.rb
+- lib/refinery/page_images/engine.rb
+- lib/refinery/page_images/extension.rb
 - lib/refinerycms-page-images.rb
-- public/javascripts/page-image-picker.js
-- public/stylesheets/page-image-picker.css
-has_rdoc: true
+- readme.md
+- refinerycms-page-images.gemspec
+- spec/factories/page-images.rb
+- spec/models/refinery/blog_spec.rb
+- spec/models/refinery/page_spec.rb
+- spec/requests/attach_page_images_spec.rb
+- spec/spec_helper.rb
+- spec/support/database_cleaner.rb
+- spec/support/devise.rb
+- spec/support/refinery.rb
+- tasks/rspec.rake
 homepage: http://github.com/resolve/refinerycms-page-images
 licenses: []
 
@@ -64,19 +113,33 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Page Images Engine for Refinery CMS
-test_files: []
-
+test_files: 
+- spec/factories/page-images.rb
+- spec/models/refinery/blog_spec.rb
+- spec/models/refinery/page_spec.rb
+- spec/requests/attach_page_images_spec.rb
+- spec/spec_helper.rb
+- spec/support/database_cleaner.rb
+- spec/support/devise.rb
+- spec/support/refinery.rb
+has_rdoc: 

data/app/models/image_page.rb

@@ -1,10 +0,0 @@
-class ImagePage < ActiveRecord::Base
-  
-  belongs_to :image
-  belongs_to :page
-
-  before_save do |image_page|
-    image_page.position = (ImagePage.maximum(:position) || -1) + 1
-  end
-
-end

data/app/views/admin/pages/tabs/_images.html.erb

@@ -1,12 +0,0 @@
-<div class='wym_skin_refinery page_part' id='page_image_picker'>
-  <%= render :partial => '/admin/pages/tabs/images_bar', :locals => {:f => f} %>
-  <%= render :partial => '/admin/pages/tabs/images_field', :locals => {:f => f} %>
-</div>
-
-<% content_for :stylesheets do %>
-  <%= stylesheet_link_tag 'page-image-picker' %>
-<% end %>
-
-<% content_for :javascripts do %>
-  <%= javascript_include_tag 'page-image-picker' %>
-<% end %>

data/features/attach_page_images.feature

@@ -1,17 +0,0 @@
-@refinerycms @pages @pages-manage @page-images
-Feature: Attach Page Images
-  In order to control the content on my website
-  As an administrator
-  I want to create and manage page images
-
-  Background:
-    Given I am a logged in refinery user
-    And I have pages titled Home, About
-    When I go to the list of pages
-    And I follow "Edit this page"
-
-  Scenario: Page Edit Shows Images Tab
-    Then I should see "Images" within "#custom_images_tab"
-
-  Scenario: Add Image Button appears
-    Then I should see "Add Image"