refinerycms-portfolio 0.9.5.3 → 0.9.6

data/app/controllers/admin/portfolio_entries_controller.rb

@@ -15,7 +15,7 @@ protected
 
   # This finds all of the entries that could possibly be assigned as the current entry's parent.
   def find_portfolio_entries_for_parents_list
-    if RefinerySetting.find_or_set(:multi_level_portfolio, true)
+    if ::Refinery::Portfolio.multi_level?
       @portfolio_entries_for_parents_list = PortfolioEntry.find(:all, :order => "parent_id, position ASC")
 
       # We need to remove all references to the current entry or any of its decendants or we get a nightmare.
@@ -29,4 +29,4 @@ protected
     end
   end
 
-end
+end

data/app/controllers/portfolio_controller.rb

@@ -7,37 +7,37 @@ class PortfolioController < ApplicationController
   end
 
   def show
-		begin
-			if params[:id]
-	    	@master_entry = PortfolioEntry.find(params[:id])
-			else
-				@master_entry = PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")
-			end
-
-      if RefinerySetting.find_or_set(:multi_level_portfolio, true)
+    begin
+      if params[:id]
+        @master_entry = PortfolioEntry.find(params[:id])
+      else
+        @master_entry = PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")
+      end
+
+      if ::Refinery::Portfolio.multi_level?
         if params[:portfolio_id]
-    			@portfolio_entry = @master_entry.children.find(params[:portfolio_id])
-    		else
-    			@portfolio_entry = @master_entry.children.first
-    		end
-    	else
-    	  @portfolio_entry = @master_entry
-  	  end
-
-			begin
-		    if params[:image_id]
-		      @image = @portfolio_entry.images[params[:image_id].to_i]
-		    else
-		      @image = @portfolio_entry.images.first
-		    end
-			rescue
-				render :action => "empty"
-			end
-		rescue
-			error_404
-		end
-
-		render :partial => "main_image", :layout => false if request.xhr?
+          @portfolio_entry = @master_entry.children.find(params[:portfolio_id])
+        else
+          @portfolio_entry = @master_entry.children.first
+        end
+      else
+        @portfolio_entry = @master_entry
+      end
+
+      begin
+        if params[:image_id]
+          @image = @portfolio_entry.images[params[:image_id].to_i]
+        else
+          @image = @portfolio_entry.images.first
+        end
+      rescue
+        render :action => "empty"
+      end
+    rescue
+      error_404
+    end
+
+    render :partial => "main_image", :layout => false if request.xhr?
   end
 
 protected
@@ -46,4 +46,4 @@ protected
     @page = Page.find_by_link_url('/portfolio', :include => [:parts])
   end
 
-end
+end

data/app/helpers/portfolio_helper.rb

@@ -1,17 +1,17 @@
 module PortfolioHelper
-  
+
   def portfolio_image_link(master, portfolio, image_index)
-    if RefinerySetting.find_or_set(:multi_level_portfolio, true)
+    if ::Refinery::Portfolio.multi_level?
       portfolio_image_url(master, portfolio, image_index)
     else
       portfolio_image_url(master, image_index)
     end
   end
-  
+
   def link_to_portfolio_image(master, portfolio, image, index)
-	  link_to	image_fu(image, :portfolio_thumb),
-	      portfolio_image_link(master, portfolio, index), 
-	      :class => ( (index == params[:image_id].to_i) ? "selected" : "pale" )
+    link_to(image_fu(image, :portfolio_thumb),
+            portfolio_image_link(master, portfolio, index),
+            :class => ((index == params[:image_id].to_i) ? "selected" : "pale"))
   end
-  
-end
+
+end

data/app/models/portfolio_entry.rb

@@ -3,7 +3,7 @@ class PortfolioEntry < ActiveRecord::Base
   validates_presence_of :title
 
   # call to gems included in refinery.
-  has_friendly_id :title, :use_slug => true, :strip_diacritics => true
+  has_friendly_id :title, :use_slug => true
   acts_as_tree :order => "position"
 
   has_and_belongs_to_many :images
@@ -16,17 +16,17 @@ class PortfolioEntry < ActiveRecord::Base
     self.body = value
   end
 
-	def image_ids=(ids)
-		self.images.clear
+  def image_ids=(ids)
+    self.images.clear
 
-		ids.reject{|id| id.blank? }.each do |image_id|
-			image = Image.find(image_id.to_i) rescue nil
-			self.images << image unless image.nil?
-		end
-	end
+    ids.reject{|id| id.blank? }.each do |image_id|
+      image = Image.find(image_id.to_i) rescue nil
+      self.images << image unless image.nil?
+    end
+  end
 
-	def indented_title
+  def indented_title
     "#{"--" * self.ancestors.size} #{self.title}".chomp
   end
 
-end
+end

data/app/views/admin/portfolio_entries/_form.html.erb

@@ -1,30 +1,39 @@
+<% content_for :head do %>
+  <%= stylesheet_link_tag 'portfolio' %>
+  <%= javascript_include_tag 'portfolio' %>
+<% end %>
+
 <%= error_messages_for :portfolio_entry %>
 <% form_for [:admin, @portfolio_entry] do |f| %>
   <div class='field'>
-    <%= f.label :title %>
-    <%= f.text_field :title, :class => "larger", :style => 'width: 954px' %>
+    <%= f.required_label :title %>
+    <%= f.text_field :title, :class => "larger widest" %>
   </div>
   <div class='field images_field'>
-		<span class='clearfix label_inline_with_link'>
-	    <%= label_tag('portfolio_entry_image_ids', 'Images') %>
-			<%= link_to "#{refinery_icon_tag "add.png"} Add", "#{insert_admin_images_url(:dialog => true, :width => 950, :height => 510, :callback => "image_added")}", :name => "Add Another Image", :id => "add_image_link" %>
-		</span>
-		<ul id='portfolio_images' class='clearfix portfolio_entry_images'>
-			<% @portfolio_entry.images.each do |image| %>
-				<li id='image_<%= image.id %>'>
-					<%= image_fu image, :grid %>
-					<%= hidden_field_tag 'portfolio_entry[image_ids][]', image.id, :id => "portfolio_entry_image_id_#{image.id}" %>
-				</li>
-			<% end %>
-			<li class='empty'>
-      	<img id="current_portfolio_entry_image" src="" alt="" style='display: none' />
-				<input type='hidden' id='portfolio_entry_image_id' name='portfolio_entry[image_ids][]' />
-			</li>
-		</ul>
-	</div>
-  <div class='field clearfix' style='width: 963px'>
+    <span class='clearfix label_inline_with_link'>
+      <%= label_tag('portfolio_entry_image_ids', 'Images') %>
+      <%= link_to "#{refinery_icon_tag "add.png"} Add",
+                  insert_admin_images_url(:dialog => true, :width => 950, :height => 510, :callback => "image_added"),
+                  :name => "Add Another Image",
+                  :id => "add_image_link" %>
+    </span>
+    <ul id='portfolio_images' class='clearfix portfolio_entry_images'>
+      <% @portfolio_entry.images.each do |image| %>
+        <li id='image_<%= image.id %>'>
+          <%= image_fu image, :grid %>
+          <%= hidden_field_tag 'portfolio_entry[image_ids][]', image.id,
+                               :id => "portfolio_entry_image_id_#{image.id}" %>
+        </li>
+      <% end %>
+      <li class='empty'>
+        <img id="current_portfolio_entry_image" src="" alt="" style='display: none' />
+        <input type='hidden' id='portfolio_entry_image_id' name='portfolio_entry[image_ids][]' />
+      </li>
+    </ul>
+  </div>
+  <div class='field clearfix'>
     <%= f.label :body, 'Content' %>
-    <%= f.text_area :body, :class => "wymeditor", :rows => 7 %>
+    <%= f.text_area :body, :class => "wymeditor widest", :rows => 7 %>
   </div>
   <% if @portfolio_entries_for_parents_list.any? %>
     <div class='field'>
@@ -32,13 +41,11 @@
       <%= f.collection_select :parent_id, @portfolio_entries_for_parents_list, :id, :indented_title, :include_blank => true %>
     </div>
   <% end %>
-  <div class='form-actions'>
-    <%= f.submit 'Save', :class => "wymupdate" %>
-		or
-		<%= link_to "Cancel", admin_portfolio_entries_url, :title => "Cancelling will lose all changes you've made to this entry" %>
-  </div>
+
+  <%= render :partial => "/shared/admin/form_actions",
+             :locals => {
+               :f => f,
+               :continue_editing => true
+             } -%>
+
 <% end %>
-<% content_for :head do %>
-	<%= stylesheet_link_tag 'portfolio' %>
-	<%= javascript_include_tag 'portfolio' %>
-<% end %>

data/app/views/admin/portfolio_entries/_list.html.erb

@@ -1,22 +1,22 @@
 <%
-	branch = if list === @portfolio_entries.first
-		"branch_start"
-	elsif list === @portfolio_entries.last or (list.parent and list === list.parent.children.last)
-		"branch_end"
-	end
+  branch = if list === @portfolio_entries.first
+    "branch_start"
+  elsif list === @portfolio_entries.last or (list.parent and list === list.parent.children.last)
+    "branch_end"
+  end
 -%>
 <li class='clearfix record<%= " #{branch}" %>' id="<%= dom_id(list) -%>">
   <div class='clearfix'>
     <span class='actions'>
-			<% url = list.parent ? portfolio_project_url(list.parent, list) : portfolio_url(list)  %>
-    	<%= link_to refinery_icon_tag('application_go.png'), url, :target => "_blank",
+      <% url = (::Refinery::Portfolio.multi_level? && list.parent ? portfolio_project_url(list.parent, list) : portfolio_url(list))  %>
+      <%= link_to refinery_icon_tag('application_go.png'), url, :target => "_blank",
                  :title => "View this entry live <br/><em>(opens in a new window)</em>" %>
-    	<%= link_to refinery_icon_tag('application_edit.png'), edit_admin_portfolio_entry_path(list),
+      <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_portfolio_entry_path(list),
                  :title => "Edit this entry" %>
       <%= link_to refinery_icon_tag('arrow_up.png'),
-                 {:controller => "/admin/portfolio_entries", :action => "emancipate", :id => list.id},
+                 emancipate_admin_portfolio_entry_url(list),
                  :title => "Move this entry up one level" if list.parent.present? %>
-    	<%= link_to refinery_icon_tag('delete.png'), admin_portfolio_entry_path(list),
+      <%= link_to refinery_icon_tag('delete.png'), admin_portfolio_entry_path(list),
                  :class => "cancel confirm-delete",
                  :title => "Remove this entry forever" %>
     </span>
@@ -27,4 +27,4 @@
       <%= render :partial => 'list', :collection => children %>
     </ul>
   <% end %>
-</li>
+</li>

data/app/views/admin/portfolio_entries/_sortable_list.html.erb

@@ -1,2 +1,2 @@
 <%= render :partial => 'list', :collection => @portfolio_entries %>
-<%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>
+<%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>

data/app/views/admin/portfolio_entries/edit.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

data/app/views/admin/portfolio_entries/index.html.erb

@@ -5,27 +5,27 @@
       <%= link_to "Create New Portfolio Entry", new_admin_portfolio_entry_url, :class => "add_icon" %>
     </li>
    <% if PortfolioEntry.count > 1 %>
-		<li>
-			<%= link_to "Reorder Portfolio", "", :id => "reorder_action", :class => "reorder_icon" %>
-			<%= link_to "Done Reordering Portfolio", "", :id => "reorder_action_done", :style => "display: none;", :class => "reorder_icon" %>
-		</li>
+    <li>
+      <%= link_to "Reorder Portfolio", "", :id => "reorder_action", :class => "reorder_icon" %>
+      <%= link_to "Done Reordering Portfolio", "", :id => "reorder_action_done", :style => "display: none;", :class => "reorder_icon" %>
+    </li>
    <% end %>
   </ul>
 </div>
 <div id='records' class='tree'>
   <% if @portfolio_entries.any? %>
-  	<h2>Portfolio</h2>
-  	<ul id='sortable_list'>
-  		<%= render :partial => 'sortable_list' %>
-  	</ul>
-  	<% else %>
-  	  <p>
-    		<strong>
-    			There are no portfolio entries yet.
-    			Click "Create New Portfolio Entry" to add your first portfolio entries.
-    		</strong>
-    	</p>
+    <h2>Portfolio</h2>
+    <ul id='sortable_list'>
+      <%= render :partial => 'sortable_list' %>
+    </ul>
+    <% else %>
+      <p>
+        <strong>
+          There are no portfolio entries yet.
+          Click "Create New Portfolio Entry" to add your first portfolio entries.
+        </strong>
+      </p>
   <% end %>
 </div>
-<%= render :partial => "/shared/admin/make_sortable", 
-					 :locals => { :tree => RefinerySetting.find_or_set(:multi_level_portfolio, true) } if PortfolioEntry.count > 1 %>
+<%= render :partial => "/shared/admin/make_sortable",
+           :locals => { :tree => ::Refinery::Portfolio.multi_level? } if PortfolioEntry.count > 1 %>

data/app/views/admin/portfolio_entries/new.html.erb

@@ -1 +1 @@
-<%= render :partial => "form" %>
+<%= render :partial => "form" %>

data/app/views/portfolio/_main_image.html.erb

@@ -1 +1 @@
-<%= image_fu @image, :portfolio, :id => "portfolio_main_image" unless @image.nil? %>
+<%= image_fu @image, :portfolio, :id => "portfolio_main_image" unless @image.nil? %>

data/app/views/portfolio/empty.html.erb

@@ -1,10 +1,10 @@
 <% content_for :title, "#{@master_entry.title} - " %>
 <% content_for :head, stylesheet_link_tag('portfolio') %>
 <div id='body_content' class='clearfix'>
-	<div id='body_content_left' class='clearfix'>
-		<h1><%= @master_entry.title %></h1>
-		<p>
-	  	<em><%= t(:portfolio_no_entries, :default => "We haven't entered anything in for this project yet.") %></em>
-		</p>
-	</div>
-</div>
+  <div id='body_content_left' class='clearfix'>
+    <h1><%= @master_entry.title %></h1>
+    <p>
+      <em><%= t(:portfolio_no_entries, :default => "We haven't entered anything in for this project yet.") %></em>
+    </p>
+  </div>
+</div>

data/app/views/portfolio/show.html.erb

@@ -1,57 +1,38 @@
+<% ::ActionController::Routing::Routes.reload! %>
 <% content_for :title, "#{@portfolio_entry.title} - " %>
 <% content_for :head, stylesheet_link_tag('portfolio') %>
 <div id='body_content' class='clearfix portfolio'>
-	<div id='body_content_left' class='clearfix'>
-		<h1 class='clearfix'>
-		  <span><%= @master_entry.title %></span>
-			<%= select :portfolio_entry, :to_param, @master_entry.children.collect{|entry| [entry.title, entry.to_param] } if RefinerySetting.find_or_set(:multi_level_portfolio, true) %>
-		</h1>
+  <div id='body_content_left' class='clearfix'>
+    <h1 class='clearfix'>
+      <span><%= @master_entry.title %></span>
+      <% if ::Refinery::Portfolio.multi_level? %>
+        <%= select :portfolio_entry, :to_param, @master_entry.children.collect{|entry| [entry.title, entry.to_param] } %>
+      <% else %>
+        <%= select :portfolio_entry, :to_param, PortfolioEntry.all.collect{|entry| [entry.title, entry.to_param] } %>
+      <% end %>
+    </h1>
 
-		<%= render :partial => "main_image" %>
-	</div>
-	<div id='body_content_right' class='clearfix'>
-		<h2><%= @portfolio_entry.title %></h2>
-		<ul id='portfolio_images'>
-			<% @portfolio_entry.images.each_with_index do |image, index| %>
-				<li class='<%= cycle("odd", "even") %>'>
-					<%= link_to_portfolio_image @master_entry, @portfolio_entry, image, index %>
-				</li>
-			<% end %>
-		</ul>
-	</div>
+    <div id='portfolio_main_image_container'>
+      <%= render :partial => "main_image" %>
+    </div>
+  </div>
+  <div id='body_content_right' class='clearfix'>
+    <h2><%= @portfolio_entry.title %></h2>
+    <ul id='portfolio_images'>
+      <% @portfolio_entry.images.each_with_index do |image, index| %>
+        <li class='<%= cycle("odd", "even") %>'>
+          <%= link_to_portfolio_image @master_entry, @portfolio_entry, image, index %>
+        </li>
+      <% end %>
+    </ul>
+  </div>
 </div>
 <% content_for :head do %>
-	<%# remove these javascript_include_tag calls if they are included in your layout.
-	%>
-	<%= javascript_include_tag 'jquery' %>
-	<script type='text/javascript'>
-		$(document).ready(function(){
-			$("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
-
-			$('#portfolio_entry_to_param').change(function() {
-				window.location = "<%= RefinerySetting.find_or_set(:multi_level_portfolio, true) ? portfolio_project_url(@master_entry, nil) : portfolio_project_url(@master_entry) %>" + this.value;
-			});
-
-      var clicked_on = null;
-			$("ul#portfolio_images li a").click(function(event) {
-			  if (!$(this).hasClass('selected')) {
-			    clicked_on = $(this);
-  			  $.get($(this).attr('href'), function(data, textStatus) {
-  			    if (textStatus == "success") {
-  			      $('#portfolio_main_image').before(data).remove();
-
-  			      $('ul#portfolio_images li a.selected').removeClass('selected').addClass('pale');
-
-  			      clicked_on.removeClass('pale').addClass('selected');
-  			      clicked_on.find('img').fadeTo(0, 1);
-
-  			      $("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
-  		      }
-  			  });
-  		  }
-
-        return false;
-			});
-		});
-	</script>
-<% end %>
+  <%# remove the jquery_include_tags call if jquery is included in your layout.
+  %>
+  <%= jquery_include_tags(:include_ui => false) %>
+  <%= javascript_include_tag 'portfolio' %>
+  <script type='text/javascript'>
+    var portfolio_entry_url = "<%= portfolio_project_url(@master_entry, '') if ::Refinery::Portfolio.multi_level? %>";
+  </script>
+<% end %>

data/config/routes.rb

@@ -1,16 +1,11 @@
-ActionController::Routing::Routes.draw do |map|
-
-  map.resources :portfolio do |portfolio|
-		portfolio.resources :portfolio, :as => :portfolio
-	end
+require File.expand_path("../../lib/portfolio.rb", __FILE__)
 
-  map.namespace(:admin) do |admin|
-    admin.resources :portfolio_entries, :as => :portfolio, :collection => {:emancipate => :get}
-  end
+ActionController::Routing::Routes.draw do |map|
 
-  if RefinerySetting.table_exists? and RefinerySetting.find_or_set(:multi_level_portfolio, true)
-	  map.portfolio_project "/portfolio/:id/projects/:portfolio_id", :controller => "portfolio", :action => "show"
-	  map.portfolio_image "/portfolio/:id/projects/:portfolio_id/:image_id", :controller => "portfolio", :action => "show"
+  # Make sure you restart your web server after changing the multi level setting.
+  if ::Refinery::Portfolio.multi_level?
+    map.portfolio_project "/portfolio/:id/projects/:portfolio_id", :controller => "portfolio", :action => "show"
+    map.portfolio_image "/portfolio/:id/projects/:portfolio_id/:image_id", :controller => "portfolio", :action => "show"
   else
     map.portfolio_project "/portfolio/:id", :controller => "portfolio", :action => "show"
     map.portfolio_image "/portfolio/:id/:image_id", :controller => "portfolio", :action => "show"
@@ -18,4 +13,12 @@ ActionController::Routing::Routes.draw do |map|
 
   map.portfolio "/portfolio/:id/", :controller => 'portfolio', :action => 'show'
 
-end
+  map.resources :portfolio do |portfolio|
+    portfolio.resources :portfolio, :as => :portfolio
+  end
+
+  map.namespace(:admin, :path_prefix => (defined?(REFINERY_GEM_VERSION) ? 'admin' : 'refinery')) do |admin|
+    admin.resources :portfolio_entries, :as => :portfolio, :member => {:emancipate => :get}, :collection => {:update_positions => :post}
+  end
+
+end

data/generators/portfolio/portfolio_generator.rb

@@ -0,0 +1,23 @@
+class PortfolioGenerator < Rails::Generator::NamedBase
+
+  def initialize(*runtime_args)
+    # set first argument to the table's name so that the user doesn't have to pass it in.
+    runtime_args[0] = ["portfolio_entries"]
+    super(*runtime_args)
+  end
+
+  def banner
+    "Usage: script/generate portfolio"
+  end
+
+  def manifest
+    record do |m|
+      m.migration_template 'migration.rb', 'db/migrate',
+        :migration_file_name => "create_structure_for_portfolio",
+        :assigns => {
+          :migration_name => "CreateStructureForPortfolio"
+        }
+    end
+  end
+
+end if defined?(Rails::Generator::NamedBase)

data/generators/portfolio/templates/migration.rb

@@ -0,0 +1,52 @@
+class <%= migration_name %> < ActiveRecord::Migration
+
+  def self.up
+    create_table :images_portfolio_entries, :id => false, :force => true do |t|
+      t.integer :image_id
+      t.integer :portfolio_entry_id
+      t.integer :position
+    end
+
+    # people should be allowed to have the same image twice, if they really want to.
+    add_index :images_portfolio_entries, [:image_id, :portfolio_entry_id], :name => 'composite_key_index', :unique => false
+
+    create_table :portfolio_entries, :force => true do |t|
+      t.string   :title
+      t.text     :body
+      t.integer  :position
+      t.integer  :parent_id
+      t.timestamps
+    end
+
+    add_index :portfolio_entries, :id
+    add_index :portfolio_entries, :parent_id
+
+    User.find(:all).each do |user|
+      user.plugins.create(:title => "Portfolio", :position => (user.plugins.maximum(:position) || -1) +1)
+    end
+
+    page = Page.create(:title => "Portfolio", :link_url => "/portfolio", :menu_match => "\/portfolio(|\/.+?)", :deletable => false, :position => ((Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)+1))
+    RefinerySetting.find_or_set(:default_page_parts, ["Body", "Side Body"]).each do |default_page_part|
+      page.parts.create(:title => default_page_part, :body => nil)
+    end
+
+    # we need to retrieve the value, merge it in and then save it back because it's a frozen hash.
+    image_thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})
+    RefinerySetting[:image_thumbnails] = image_thumbnails.merge({:portfolio_thumb => 'c96x96', :portfolio => '600x512'})
+  end
+
+  def self.down
+    UserPlugin.destroy_all({:title => "Portfolio"})
+
+    Page.find_all_by_link_url("/portfolio").each do |page|
+      page.destroy!
+    end
+
+    image_thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {}).dup
+    RefinerySetting[:image_thumbnails] = image_thumbnails.delete_if {|key, value| key == :portfolio_thumb or key == :portfolio }
+
+    drop_table :images_portfolio_entries
+    drop_table :portfolio_entries
+  end
+
+end

data/lib/gemspec.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+require File.expand_path('../portfolio.rb', __FILE__)
+version = Refinery::Portfolio::Version::STRING
+raise "Could not get version so gemspec can not be built" if version.nil?
+files = %w( readme.md license.md  )
+%w(app config generators lib public rails test vendor).each do |dir|
+  files += Dir.glob("#{dir}/**/*") if File.directory?(dir)
+end
+
+gemspec = <<EOF
+Gem::Specification.new do |s|
+  s.name              = %q{refinerycms-portfolio}
+  s.version           = %q{#{version}}
+  s.description       = %q{A really straightforward open source Ruby on Rails portfolio plugin designed for integration with RefineryCMS}
+  s.date              = %q{#{Time.now.strftime('%Y-%m-%d')}}
+  s.summary           = %q{Ruby on Rails portfolio plugin for RefineryCMS.}
+  s.email             = %q{info@refinerycms.com}
+  s.homepage          = %q{http://refinerycms.com}
+  s.authors           = %w(Resolve\\ Digital Philip\\ Arndt)
+  s.require_paths     = %w(lib)
+
+  s.files             = [
+    '#{files.join("',\n    '")}'
+  ]
+  #{"s.test_files        = [
+    '#{Dir.glob("test/**/*.rb").join("',\n    '")}'
+  ]" if File.directory?("test")}
+end
+EOF
+
+if (save = ARGV.delete('-s'))
+  if File.exist?(file = File.expand_path("../../refinerycms-portfolio.gemspec", __FILE__))
+    File.delete(file)
+  end
+  File.open(file, 'w') { |f| f.puts gemspec }
+else
+  puts gemspec
+end

data/lib/portfolio.rb

@@ -1 +1,21 @@
-# empty as yet
+module Refinery
+  module Portfolio
+    class Version
+      MAJOR = 0
+      MINOR = 9
+      TINY = 6
+      BUILD = nil
+
+      STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
+    end
+
+    class << self
+      def multi_level?
+        RefinerySetting.table_exists? and RefinerySetting.find_or_set(:multi_level_portfolio, true, {
+          :callback_proc_as_string => %q{::ActionController::Routing::Routes.reload!},
+          :restricted => true
+        })
+      end
+    end
+  end
+end

data/lib/tasks/portfolio.rake

@@ -3,7 +3,35 @@ namespace :refinery do
 	  desc "Install extra files from the portfolio plugin"
 
   	task :install do
-  		puts `ruby #{File.expand_path(File.dirname(__FILE__) << '/../..')}/bin/refinerycms-portfolio-install #{Rails.root.to_s}`
+  		[%w(db migrate), %w(public stylesheets), %w(public javascripts)].each do |dir|
+        Rails.root.join(dir.join(File::SEPARATOR)).mkpath
+      end
+
+      portfolio_root = Pathname.new(File.expand_path("../../../", __FILE__))
+      copies = [
+        {:from => %w(public stylesheets), :to => %w(public stylesheets), :filename => "portfolio.css"},
+        {:from => %w(public javascripts), :to => %w(public javascripts), :filename => "portfolio.js"}
+      ]
+      puts "\nCopying files...\n\n"
+    	copies.each do |copy|
+        copy_from = portfolio_root.join(copy[:from].join(File::SEPARATOR), copy[:filename])
+    	  copy_to = Rails.root.join(copy[:to].join(File::SEPARATOR), copy[:filename])
+        unless copy_to.exist? and ENV["force"].presence.to_s != "true"
+    	    FileUtils::cp copy_from.to_s, copy_to.to_s
+    	    puts "Copied to #{copy_to}"
+        else
+          puts "'#{File.join copy[:to], copy[:filename]}' already existed in your application so your existing file was not overwritten - use force=true to overwrite."
+          puts "Without this file being up to date, the portfolio may not function properly."
+        end
+      end
+
+    	puts "\nCopied all files."
+    	puts "\nGenerating migration..."
+    	puts `ruby #{Rails.root.join('script', 'generate').cleanpath.to_s.gsub(/\/$/, '')} portfolio`
+    	puts "\nNow, run these tasks:"
+    	puts "  rake db:migrate"
+    	puts "  rake images:regenerate"
+    	puts "\nWe hope you enjoy using our portfolio plugin!\n\n"
   	end
 	end
 end

data/public/javascripts/portfolio.js

@@ -1,3 +1,5 @@
+var portfolio_entry_url = null;
+
 reset_functionality = function() {
   $("#portfolio_images").sortable({
     'tolerance': 'pointer'
@@ -6,7 +8,7 @@ reset_functionality = function() {
     , 'items': 'li'
   });
 
-  $('#portfolio_images li:not(.empty)').each(function(index, li) {
+  $('#content portfolio_images li:not(.empty)').each(function(index, li) {
     $(li).mouseover(function(e){
       if ((image_actions = $(this).find('.image_actions')).length == 0) {
         image_actions = $("<div class='image_actions'></div>");
@@ -44,4 +46,33 @@ image_added = function(image) {
   reset_functionality();
 }
 
-$(document).ready(reset_functionality);
+$(document).ready(function() {
+  reset_functionality();
+
+  $("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
+
+  $('#portfolio_entry_to_param').change(function() {
+    window.location = portfolio_entry_url + this.value;
+  });
+
+  var clicked_on = null;
+  $("ul#portfolio_images li a").click(function(event) {
+    if (!$(this).hasClass('selected')) {
+      clicked_on = $(this);
+      $.get($(this).attr('href'), function(data, textStatus) {
+        if (textStatus == "success") {
+          $('#portfolio_main_image').before(data).remove();
+
+          $('ul#portfolio_images li a.selected').removeClass('selected').addClass('pale');
+
+          clicked_on.removeClass('pale').addClass('selected');
+          clicked_on.find('img').fadeTo(0, 1);
+
+          $("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
+        }
+      });
+    }
+
+    return false;
+  });
+});

data/public/stylesheets/portfolio.css

@@ -10,7 +10,6 @@
 }
 #body_content.portfolio #body_content_left h1 select {
 	margin-left: 12px;
-	min-width: 200px;
 	float: right;
 	margin-top: 3px;
 	display: block;
@@ -24,9 +23,10 @@
 	font-size: 15px;
 	font-weight: normal;
 }
-
-#portfolio_main_image {
-	border: 3px solid #d4cabc;
+#portfolio_main_image_container {
+  border: 3px solid #d4cabc;
+  width: 100%;
+  text-align: center;
 }
 #portfolio_images {
 	margin: 0px;
@@ -42,7 +42,6 @@
 #portfolio_images li.odd {
 	margin-right: 18px;
 }
-
 #portfolio_images.portfolio_entry_images {
     width: 100%;
 }
@@ -65,12 +64,10 @@
 #portfolio_images.portfolio_entry_images li .image_actions * {
     cursor: pointer;
 }
-
 #content ul.ui-sortable li {
     border: 0px none;
     background: none !important;
 }
-
 #content #portfolio_images.ui-sortable li.placeholder {
     width: 135px;
     height: 135px;

data/rails/init.rb

@@ -1,15 +1,17 @@
 Refinery::Plugin.register do |plugin|
-	plugin.directory = directory
-	plugin.title = "Portfolio"
-	plugin.description = "Manage a portfolio"
-	plugin.url = "/admin/#{plugin.title.downcase}"
-	plugin.version = '0.9.5.3'
-	plugin.menu_match = /admin\/portfolio(_entries)?/
-	plugin.activity = {
-		:class => PortfolioEntry,
-		:title => 'title',
-		:url_prefix => 'edit',
-		:created_image => "layout_add.png",
-		:updated_image => "layout_edit.png"
-	}
-end
+  plugin.directory = directory
+  plugin.title = "Portfolio"
+  plugin.description = "Manage a portfolio within RefineryCMS"
+  plugin.version = '0.9.6'
+  plugin.menu_match = /(admin|refinery)\/portfolio(_entries)?/
+  plugin.url = '/refinery/portfolio'
+  plugin.activity = {
+    :class => PortfolioEntry,
+    :title => 'title',
+    :url_prefix => 'edit',
+    :created_image => "layout_add.png",
+    :updated_image => "layout_edit.png"
+  }
+  # this tells refinery where this plugin is located on the filesystem and helps with urls.
+  plugin.directory = directory
+end

data/readme.md

@@ -1,49 +1,28 @@
-# Portfolio plugin for [RefineryCMS](http://www.refinerycms.com)
-[Github](http://github.com/resolve/refinerycms)
+# Portfolio plugin for [RefineryCMS](http://www.refinerycms.com) ([Github](http://github.com/resolve/refinerycms))
 
 By: [Resolve Digital](http://www.resolvedigital.com)
 
-## Plugin Installation
-
-Just 'git clone' Refinery, install this as a plugin using:
-
-    script/plugin install git://github.com/resolve/refinerycms-portfolio.git
-
-Then run:
-
-    rake refinery:portfolio:install
-
-..and follow the instructions!
-
 ## Gem Installation
 
-### Method One
-Just install the gem 'portfolio' with the command:
-
-    gem install refinerycms-portfolio --source http://gemcutter.org
+Open your ``Gemfile`` and add this line to the bottom:
 
-Then run:
+    gem 'refinerycms-portfolio', '= 0.9.6', :require => 'portfolio'
 
-    refinerycms-portfolio-install /path/to/your/refinery/application
+Now run ``bundle install`` and once bundler has installed the gem run:
 
-Then place in your config/environment.rb (or config/application.rb for refinery 0.9.6.x) file before all other Refinery gem calls:
-
-    config.gem "refinerycms-portfolio", :version => ">= 0.9.5.3", :lib => "portfolio", :source => "http://gemcutter.org"
+    rake refinery:portfolio:install
 
 ..and follow the instructions!
 
-### Method Two
-Place in your config/environment.rb (or config/application.rb for refinery 0.9.6.x) file before all other Refinery gem calls:
-
-    config.gem "refinerycms-portfolio", :version => ">= 0.9.5.3", :lib => "portfolio", :source => "http://gemcutter.org"
+## Plugin Installation
 
-Then run in your application's directory:
+From within your Refinery directory at command line, install this as a plugin using:
 
-    rake gems:install
+    script/plugin install git://github.com/resolve/refinerycms-portfolio.git
 
 Then run:
 
-    refinerycms-portfolio-install /path/to/your/refinery/application
+    rake refinery:portfolio:install
 
 ..and follow the instructions!
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-portfolio
 version: !ruby/object:Gem::Version 
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 9
-  - 5
-  - 3
-  version: 0.9.5.3
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Resolve Digital
@@ -16,22 +16,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 +12:00
-default_executable: refinerycms-portfolio-install
+date: 2010-06-30 00:00:00 +12:00
+default_executable: 
 dependencies: []
 
-description: A really straightforward open source Ruby on Rails portfolio plugin designed for integration with RefineryCMS.
+description: A really straightforward open source Ruby on Rails portfolio plugin designed for integration with RefineryCMS
 email: info@refinerycms.com
-executables: 
-- refinerycms-portfolio-install
+executables: []
+
 extensions: []
 
 extra_rdoc_files: []
 
 files: 
-- contributors.md
-- license.md
 - readme.md
+- license.md
 - app/controllers/admin/portfolio_entries_controller.rb
 - app/controllers/portfolio_controller.rb
 - app/helpers/portfolio_helper.rb
@@ -45,11 +44,11 @@ files:
 - app/views/portfolio/_main_image.html.erb
 - app/views/portfolio/empty.html.erb
 - app/views/portfolio/show.html.erb
-- bin/refinerycms-portfolio-install
 - config/locale/en.yml
 - config/routes.rb
-- db/migrate/20090917224823_create_portfolio_structure.rb
-- db/migrate/20091121033434_add_position_to_images_portfolio_entries.rb
+- generators/portfolio/portfolio_generator.rb
+- generators/portfolio/templates/migration.rb
+- lib/gemspec.rb
 - lib/portfolio.rb
 - lib/tasks/portfolio.rake
 - public/javascripts/portfolio.js
@@ -65,23 +64,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   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.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby on Rails portfolio plugin for RefineryCMS.

data/bin/refinerycms-portfolio-install

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-require 'pathname'
-require 'fileutils'
-
-portfolio_root = Pathname.new(File.expand_path(File.dirname(__FILE__) << "/.."))
-rails_root = if defined?(Rails.root)
-  Rails.root
-elsif defined?(RAILS_ROOT)
-  Pathname.new(RAILS_ROOT)
-else
-  Pathname.new(ARGV.first)
-end
-if rails_root.exist?
-  [%w(db migrate), %w(public stylesheets), %w(public javascripts)].each do |dir|
-    rails_root.join(dir.join(File::SEPARATOR)).mkpath
-  end
-
-  copies = [
-    {:from => %w(db migrate), :to => %w(db migrate), :filename => "20090917224823_create_portfolio_structure.rb"},
-    {:from => %w(db migrate),:to => %w(db migrate), :filename => "20091121033434_add_position_to_images_portfolio_entries.rb"},
-    {:from => %w(public stylesheets), :to => %w(public stylesheets), :filename => "portfolio.css"},
-    {:from => %w(public javascripts), :to => %w(public javascripts), :filename => "portfolio.js"}
-  ]
-	copies.each do |copy|
-    copy_from = portfolio_root.join(copy[:from].join(File::SEPARATOR), copy[:filename])
-	  copy_to = rails_root.join(copy[:to].join(File::SEPARATOR), copy[:filename])
-    unless copy_to.exist?
-	    FileUtils::copy_file copy_from.to_s, copy_to.to_s
-    else
-      puts "'#{File.join copy[:to], copy[:filename]}' already existed in your application so your existing file was not overwritten."
-    end
-  end
-
-	puts "---------"
-	puts "Copied all refinerycms-portfolio files."
-	puts "Now, run rake db:migrate and then rake images:regenerate"
-else
-  puts "Please specify the path of the project that you want to use the portfolio with, i.e. refinerycms-portfolio-install /path/to/project"
-end

data/contributors.md

@@ -1,4 +0,0 @@
-# Contributors
-
-## Major
-* parndt - Philip Arndt, [Resolve Digital](http://www.resolvedigital.co.nz)

data/db/migrate/20090917224823_create_portfolio_structure.rb

@@ -1,49 +0,0 @@
-class CreatePortfolioStructure < ActiveRecord::Migration
-  def self.up
-	  create_table :images_portfolio_entries, :id => false, :force => true do |t|
-	    t.integer :image_id
-	    t.integer :portfolio_entry_id
-	  end
-
-    # people should be allowed to have the same image twice, if they really want to.
-	  #add_index :images_portfolio_entries, [:image_id, :portfolio_entry_id], :name => :composite_key_index, :unique => true
-
-	  create_table :portfolio_entries, :force => true do |t|
-	    t.string   :title
-	    t.text     :body
-	    t.integer  :position
-	    t.integer  :parent_id
-	    t.datetime :created_at
-	    t.datetime :updated_at
-	  end
-
-		User.find(:all).each do |user|
-			user.plugins.create(:title => "Portfolio", :position => (user.plugins.maximum(:position) || -1) +1)
-		end
-
-		page = Page.create(:title => "Portfolio", :link_url => "/portfolio", :deletable => false, :position => ((Page.maximum(:position, :conditions => "parent_id IS NULL") || -1)+1))
-		RefinerySetting.find_or_set(:default_page_parts, ["body", "side_body"]).each do |default_page_part|
-			page.parts.create(:title => default_page_part, :body => nil)
-		end
-
-    # we need to retrieve the value, merge it in and then save it back because it's a frozen hash.
-		image_thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})
-		RefinerySetting[:image_thumbnails] = image_thumbnails.merge({:portfolio_thumb => 'c96x96', :portfolio => '600x512'})
-  end
-
-  def self.down
-		UserPlugin.destroy_all({:title => "Portfolio"})
-
-		Page.find_all_by_link_url("/portfolio").each do |page|
-			page.link_url, page.menu_match, page.deletable = nil
-			page.destroy
-		end
-		Page.destroy_all({:link_url => "/portfolio"})
-
-		image_thumbnails = RefinerySetting.find_or_set(:image_thumbnails, {})
-		RefinerySetting[:image_thumbnails] = image_thumbnails.delete_if {|key, value| key == :portfolio_thumb or key == :portfolio }
-
-		drop_table :images_portfolio_entries
-		drop_table :portfolio_entries
-  end
-end

data/db/migrate/20091121033434_add_position_to_images_portfolio_entries.rb

@@ -1,9 +0,0 @@
-class AddPositionToImagesPortfolioEntries < ActiveRecord::Migration
-  def self.up
-    add_column :images_portfolio_entries, :position, :integer
-  end
-
-  def self.down
-    remove_column :images_portfolio_entries, :position
-  end
-end