refinerycms-portfolio 0.9.7 → 0.9.8.rc1

data/app/controllers/admin/portfolio_controller.rb

@@ -0,0 +1,13 @@
+class Admin::PortfolioController < Admin::BaseController
+
+  crudify :portfolio_entry, :order => 'lft ASC', :conditions => "parent_id IS NULL", :sortable => true
+
+  def emancipate
+    if (entry = PortfolioEntry.find(params[:id])).present?
+      entry.update_attribute(:parent_id, (entry.parent.present? ? entry.parent.parent_id : nil))
+    end
+
+    redirect_to :action => "index"
+  end
+
+end

data/app/controllers/portfolio_controller.rb

@@ -3,33 +3,28 @@ class PortfolioController < ApplicationController
   before_filter :load_page, :only => [:index, :show, :empty]
 
   def index
-    redirect_to portfolio_url(PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")) rescue error_404
+    if (first_entry = PortfolioEntry.where(:parent_id => nil).first).present?
+      redirect_to portfolio_url(first_entry)
+    end
   end
 
   def show
     begin
-      if params[:id]
-        @master_entry = PortfolioEntry.find(params[:id])
+      @master_entry = if params[:id]
+        PortfolioEntry.find(params[:id])
       else
-        @master_entry = PortfolioEntry.find_by_parent_id(nil, :order => "position ASC")
+        PortfolioEntry.where(:parent_id => nil).first
       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
+        multi_level
       else
-        @portfolio_entry = @master_entry
+        single_level
       end
 
       begin
-        if params[:image_id]
-          @image = @portfolio_entry.images[params[:image_id].to_i]
-        else
-          @image = @portfolio_entry.images.first
-        end
+        image_index = (params[:image_id].presence || '0').to_i
+        @image = @portfolio_entry.images[image_index]
       rescue
         render :action => "empty"
       end
@@ -42,6 +37,20 @@ class PortfolioController < ApplicationController
 
 protected
 
+  def multi_level
+    @portfolio_entries = @master_entry.children
+    @portfolio_entry = if params[:portfolio_id]
+      @portfolio_entries.find(params[:portfolio_id])
+    else
+      @portfolio_entries.first
+    end
+  end
+
+  def single_level
+    @portfolio_entries = PortfolioEntry.all
+    @portfolio_entry = @master_entry
+  end
+
   def load_page
     @page = Page.find_by_link_url('/portfolio', :include => [:parts])
   end

data/app/helpers/portfolio_helper.rb

@@ -9,9 +9,8 @@ module PortfolioHelper
   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, '96x96#c'),
+            portfolio_image_link(master, portfolio, index))
   end
 
 end

data/app/models/portfolio_entry.rb

@@ -4,25 +4,17 @@ class PortfolioEntry < ActiveRecord::Base
 
   # call to gems included in refinery.
   has_friendly_id :title, :use_slug => true
-  acts_as_tree :order => "position"
+  acts_as_nested_set
+  default_scope :order => 'lft ASC'
 
   has_and_belongs_to_many :images
 
-  def content
-    self.body
-  end
-
-  def content=(value)
-    self.body = value
-  end
+  alias_attribute :content, :body
 
   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
+    self.images = ids.reject{|id| id.blank?}.collect {|image_id|
+      Image.find(image_id.to_i) rescue nil
+    }.compact
   end
 
   def indented_title

data/app/views/admin/{portfolio_entries → portfolio}/_form.html.erb

@@ -3,8 +3,12 @@
   <%= javascript_include_tag 'portfolio' %>
 <% end %>
 
-<%= error_messages_for :portfolio_entry %>
-<% form_for [:admin, @portfolio_entry] do |f| %>
+<%= form_for([:admin, @portfolio_entry]) do |f| %>
+  <%= render :partial => "/shared/admin/error_messages",
+             :locals => {
+               :object => f.object,
+               :include_object_name => true
+             }  %>
   <div class='field'>
     <%= f.required_label t('.title') %>
     <%= f.text_field :title, :class => "larger widest" %>
@@ -12,15 +16,20 @@
   <div class='field images_field'>
     <span class='clearfix label_inline_with_link'>
       <%= label_tag('portfolio_entry_image_ids', t('.images')) %>
-      <%= link_to "#{refinery_icon_tag "add.png"} #{t('.add')}",
-                  insert_admin_images_url(:dialog => true, :width => 950, :height => 510, :callback => "image_added"),
+      <%= link_to "#{refinery_icon_tag "add.png"} #{t('.add')}".html_safe,
+                  insert_admin_images_url(
+                    :dialog => true,
+                    :width => 866,
+                    :height => 510,
+                    :callback => "image_added"
+                  ),
                   :name => t('.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 %>
+          <%= image_fu image, '135x135#c' %>
           <%= hidden_field_tag 'portfolio_entry[image_ids][]', image.id,
                                :id => "portfolio_entry_image_id_#{image.id}" %>
         </li>
@@ -31,14 +40,14 @@
       </li>
     </ul>
   </div>
-  <div class='field clearfix'>
+  <div id='portfolio_body' class='field clearfix'>
     <%= f.label :body, t('.content') %>
     <%= f.text_area :body, :class => "wymeditor widest", :rows => 7 %>
   </div>
-  <% if @portfolio_entries_for_parents_list.any? %>
+  <% if (nested_portfolios = nested_set_options(PortfolioEntry, @portfolio_entry) {|i| "#{'-' * i.level} #{i.title}" }).present? %>
     <div class='field'>
       <%= f.label t('.parent') %>
-      <%= f.collection_select :parent_id, @portfolio_entries_for_parents_list, :id, :indented_title, :include_blank => true %>
+      <%= f.select :parent_id, nested_portfolios, :include_blank => true %>
     </div>
   <% end %>
 

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

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

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

@@ -1,10 +1,11 @@
 <% 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>
+
+<% content_for :body_content_title, @master_entry.title %>
+<% content_for :body_content_left do %>
+  <p>
+    <em><%= t(:portfolio_no_entries, :default => "We haven't entered anything in for this project yet.") %></em>
+  </p>
+<% end %>
+
+<%= render :partial => "/shared/content_page" %>

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

@@ -1,33 +1,37 @@
-<% ::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>
-      <% 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>
+<% content_for :title, @portfolio_entry.title %>
 
-    <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>
+<% content_for :body_content_title do %>
+  <span><%= @master_entry.title %></span>
+
+  <%= select(:portfolio_entry, :to_param,
+             @portfolio_entries.collect{|entry|
+               [entry.title, entry.to_param]
+             }) if @portfolio_entries.many? %>
+<% end %>
+
+<% content_for :body_content_left do %>
+  <div id='portfolio_main_image_container'>
+    <%= render :partial => "main_image" %>
   </div>
+<% end %>
+
+<% content_for :body_content_right do %>
+  <h2><%= @portfolio_entry.title %></h2>
+  <ul id='portfolio_images'>
+    <% @portfolio_entry.images.each_with_index do |image, index| %>
+      <li class="<%= cycle('odd', 'even') %> #{index == params[:image_id].to_i) ? 'selected' : 'other'}">
+        <%= link_to_portfolio_image(@master_entry, @portfolio_entry, image, index) %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
+<div class='portfolio'>
+  <%= render :partial => "/shared/content_page" %>
 </div>
+
 <% content_for :head do %>
+  <%= stylesheet_link_tag('portfolio') %>
   <%# remove the jquery_include_tags call if jquery is included in your layout.
   %>
   <%= jquery_include_tags(:include_ui => false) %>

data/config/locales/en.yml

@@ -1,6 +1,10 @@
 en:
+  plugins:
+    portfolio:
+      title: Portfolio
+      description: Manage a portfolio within RefineryCMS
   admin:
-    portfolio_entries:
+    portfolio:
       index:
         actions: Actions
         create_new_portfolio_entry: "Create New Portfolio Entry"

data/config/locales/pt-BR.yml

@@ -0,0 +1,25 @@
+pt-BR:
+  plugins:
+    portfolio:
+      title: Pasta
+  admin:
+    portfolio:
+      index:
+        actions: Ações
+        create_new_portfolio_entry: "Criar novo Portfólio"
+        reorder_portfolio: "Reordenar Portfólio"
+        reorder_portfolio_done: "Finalizar reordenação do Portfólio"
+        portfolio: Portfólio
+        no_portfolio_entries_yet: 'Não há portfólios cadastrados. Clique em "Criar novo Portfólio" para cadastrar seu primeiro portfólio.'
+      list:
+        view_live: "Ver este portfólio no site<br/><em>(abrirá em uma nova janela)</em>"
+        edit_this_entry: "Alterar este portfólio"
+        move_this_entry_up: "Mover este portfólio um nível acima"
+        confirm_delete_entry_title: "Remover este portfólio para sempre"
+      form:
+        title: Título
+        images: Imagens
+        add: Adicionar
+        add_another_image: "Adicionar outra Imagem"
+        content: Conteúdo
+        parent: Pai

data/config/locales/sl.yml

@@ -3,7 +3,7 @@ sl:
     portfolio:
       title: Portfelja
   admin:
-    portfolio_entries:
+    portfolio:
       index:
         actions: Dejavnosti
         create_new_portfolio_entry: "Ustvari Novo Portfelje"

data/config/routes.rb

@@ -1,24 +1,38 @@
 require File.expand_path("../../lib/portfolio.rb", __FILE__)
 
-ActionController::Routing::Routes.draw do |map|
+Refinery::Application.routes.draw do
+  match '/portfolio', :as => 'portfolio', :to => 'portfolio#index'
 
   # 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"
-  end
+    match "/portfolio/:id/projects/:portfolio_id/:image_id",
+          :as => :portfolio_image,
+          :to => "portfolio#show"
 
-  map.portfolio "/portfolio/:id/", :controller => 'portfolio', :action => 'show'
+    match "/portfolio/:id/projects/:portfolio_id",
+          :as => :portfolio_project,
+          :to => "portfolio#show"
+  else
+    match "/portfolio/:id/:image_id",
+          :as => :portfolio_image,
+          :to => "portfolio#show"
 
-  map.resources :portfolio do |portfolio|
-    portfolio.resources :portfolio, :as => :portfolio
+    match "/portfolio/:id",
+          :as => :portfolio_project,
+          :to => "portfolio#show"
   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}
+  match '/portfolio/:id', :as => 'portfolio', :to => 'portfolio#show'
+
+  scope(:path => 'refinery', :as => 'admin', :module => 'admin') do
+    resources :portfolio, :as => :portfolio_entries do
+      member do
+        get :emancipate
+      end
+      collection do
+        post :update_positions
+      end
+    end
   end
 
 end

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require File.expand_path('../portfolio.rb', __FILE__)
+require File.expand_path('../portfolio/version.rb', __FILE__)
 version = Refinery::Portfolio.version
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = %w( readme.md license.md  )
@@ -16,9 +16,11 @@ Gem::Specification.new do |s|
   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)
+  s.authors           = ['Resolve Digital']
   s.require_paths     = %w(lib)
 
+  s.add_dependency    'refinerycms', '>= 0.9.8'
+
   s.files             = [
     '#{files.join("',\n    '")}'
   ]

data/lib/generators/portfolio/portfolio_generator.rb

@@ -0,0 +1,59 @@
+require 'rails/generators/migration'
+
+class PortfolioGenerator < Rails::Generators::NamedBase
+
+  include Rails::Generators::Migration
+
+  source_root File.expand_path('../templates', __FILE__)
+  argument :name, :type => :string, :default => 'portfolio'
+
+  def generate
+    Dir.glob(File.expand_path('../templates/**/**', __FILE__)).each do |path|
+      template path, plugin_path_for(path) unless File.directory?(path)
+    end
+  end
+
+protected
+
+  def plugin_path_for(path)
+    path = path.gsub(File.dirname(__FILE__) + "/templates/", "vendor/engines/#{plural_name}/")
+    path = path.gsub("plural_name", plural_name)
+    path = path.gsub("singular_name", singular_name)
+    path = path.gsub(".migration", '')
+
+    # hack can be removed after issue is fixed
+    next_migration_number = ActiveRecord::Generators::Base.next_migration_number(File.dirname(__FILE__))
+    path = path.gsub("migration_number", next_migration_number)
+
+    # replace our local db path with the app one instead.
+    path = path.gsub("/db/", "/../../../db/")
+  end
+
+end
+
+# Below is a hack until this issue:
+# https://rails.lighthouseapp.com/projects/8994/tickets/3820-make-railsgeneratorsmigrationnext_migration_number-method-a-class-method-so-it-possible-to-use-it-in-custom-generators
+# is fixed on the Rails project.
+
+require 'rails/generators/named_base'
+require 'rails/generators/migration'
+require 'rails/generators/active_model'
+require 'active_record'
+
+module ActiveRecord
+  module Generators
+    class Base < Rails::Generators::NamedBase #:nodoc:
+      include Rails::Generators::Migration
+
+      # Implement the required interface for Rails::Generators::Migration.
+      def self.next_migration_number(dirname) #:nodoc:
+        next_migration_number = current_migration_number(dirname) + 1
+        if ActiveRecord::Base.timestamped_migrations
+          [Time.now.utc.strftime("%Y%m%d%H%M%S"), "%.14d" % next_migration_number].max
+        else
+          "%.3d" % next_migration_number
+        end
+      end
+    end
+  end
+end

data/lib/generators/portfolio/templates/db/migrate/migration_number_create_structure_for_portfolio.rb

@@ -0,0 +1,42 @@
+class CreateStructureForPortfolio < 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  :parent_id
+      t.integer  :lft
+      t.integer  :rgt
+      t.integer  :depth
+      t.timestamps
+    end
+
+    add_index :portfolio_entries, :id
+    add_index :portfolio_entries, :parent_id
+    add_index :portfolio_entries, :lft
+    add_index :portfolio_entries, :rgt
+
+    load(Rails.root.join('db', 'seeds', 'portfolio.rb'))
+  end
+
+  def self.down
+    UserPlugin.destroy_all({:name => "portfolio"})
+
+    Page.find_all_by_link_url("/portfolio").each do |page|
+      page.destroy!
+    end
+
+    drop_table :images_portfolio_entries
+    drop_table :portfolio_entries
+  end
+
+end

data/lib/generators/portfolio/templates/db/seeds/portfolio.rb

@@ -0,0 +1,30 @@
+User.find(:all).each do |user|
+  user.plugins.create({
+    :name => "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)
+})
+Page.default_parts.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, {}).dup
+new_thumbnails = image_thumbnails.merge({
+  :portfolio_thumb => '96x96#c',
+  :portfolio => '600x512'
+})
+# handles a change in Refinery API
+if RefinerySetting.methods.map(&:to_sym).include?(:set)
+  RefinerySetting.set(:image_thumbnails, new_thumbnails)
+else
+  RefinerySetting[:image_thumbnails] = new_thumbnails
+end

data/lib/portfolio.rb

@@ -1,23 +1,5 @@
-module Refinery
-  module Portfolio
+require 'portfolio/version'
 
-    def self.version
-      ::Refinery::Portfolio::Version.to_s
-    end
-
-    class Version
-      def self.to_s
-        %q{0.9.7}
-      end
-    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
+unless defined?(::Refinery::Portfolio::Engine)
+  require File.expand_path('../refinerycms-portfolio.rb', __FILE__)
+end

data/lib/portfolio/version.rb

@@ -0,0 +1,7 @@
+module Refinery
+  module Portfolio
+    def self.version
+      %q{0.9.8.rc1}
+    end
+  end
+end

data/lib/refinerycms-portfolio.rb

@@ -0,0 +1,34 @@
+require 'refinery'
+
+module Refinery
+  module Portfolio
+
+    class << self
+      def multi_level?
+        RefinerySetting.table_exists? and RefinerySetting.find_or_set(:multi_level_portfolio, false, {
+          :callback_proc_as_string => %q{::ActionController::Routing::Routes.reload!},
+          :restricted => true
+        })
+      end
+    end
+
+    class Engine < Rails::Engine
+      initializer "static assets" do |app|
+        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/public"
+      end
+
+      config.after_initialize do
+        Refinery::Plugin.register do |plugin|
+          plugin.name = "portfolio"
+          plugin.version = ::Refinery::Portfolio.version
+          plugin.menu_match = /admin\/portfolio(_entries)?/
+          plugin.activity = {
+            :class => PortfolioEntry
+          }
+        end unless Refinery::Plugins.registered.names.include?('portfolio')
+      end
+    end
+  end
+end
+
+require File.expand_path('../portfolio', __FILE__)

data/public/javascripts/portfolio.js

@@ -45,9 +45,10 @@ image_added = function(image) {
 }
 
 $(document).ready(function() {
+  $('h1#body_content_page_title').addClass('clearfix');
   reset_functionality();
 
-  $("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
+  $("ul#portfolio_images li.other a img").fadeTo(0, 0.3);
 
   $('#portfolio_entry_to_param').change(function() {
     window.location = portfolio_entry_url + this.value;
@@ -61,12 +62,12 @@ $(document).ready(function() {
         if (textStatus == "success") {
           $('#portfolio_main_image').before(data).remove();
 
-          $('ul#portfolio_images li a.selected').removeClass('selected').addClass('pale');
+          $('ul#portfolio_images li.selected').removeClass('selected').addClass('other');
 
-          clicked_on.removeClass('pale').addClass('selected');
+          clicked_on.parent().removeClass('other').addClass('selected');
           clicked_on.find('img').fadeTo(0, 1);
 
-          $("ul#portfolio_images li a.pale img").fadeTo(0, 0.3);
+          $("ul#portfolio_images li.other a img").fadeTo(0, 0.3);
         }
       });
     }

data/public/stylesheets/portfolio.css

@@ -1,26 +1,27 @@
-#body_content.portfolio #body_content_left {
+.portfolio #body_content #body_content_left {
 	width: 621px;
 	margin-right: 39px;
 }
-#body_content.portfolio #body_content_left h1 {
+.portfolio #body_content h1#body_content_page_title {
 	margin-bottom: 24px;
+	width: 621px;
 }
-#body_content.portfolio #body_content_left h1 span {
+.portfolio #body_content h1#body_content_page_title span {
 	float: left;
 }
-#body_content.portfolio #body_content_left h1 select {
+.portfolio #body_content h1#body_content_page_title select {
 	margin-left: 12px;
 	float: right;
 	margin-top: 3px;
 	display: block;
 }
-#body_content.portfolio #body_content_right {
+.portfolio #body_content #body_content_right {
 	width: 280px;
 	text-align: left;
-	padding-top: 43px;
 }
-#body_content.portfolio #body_content_right h2, #body_content.portfolio #body_content_right {
+.portfolio #body_content #body_content_right h2, .portfolio #body_content #body_content_right {
 	font-size: 15px;
+	margin-top: 0px;
 	font-weight: normal;
 }
 #portfolio_main_image_container {

data/readme.md

@@ -6,26 +6,18 @@ By: [Resolve Digital](http://www.resolvedigital.com)
 
 Open your ``Gemfile`` and add this line to the bottom:
 
-    gem 'refinerycms-portfolio', '= 0.9.6', :require => 'portfolio'
+    gem 'refinerycms-portfolio', '>= 0.9.8.rc1'
 
 Now run ``bundle install`` and once bundler has installed the gem run:
 
-    rake refinery:portfolio:install
+    rails generate portfolio
+    rake db:migrate
 
-..and follow the instructions!
-
-## Plugin Installation
-
-From within your Refinery directory at command line, 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!
+Now, restart your web server and enjoy.
 
 ## Single or Multiple Level Portfolios
 
-The standard setup for portfolios is multi-level, with a parent portfolio having child portfolios.  If your needs are simpler, you can switch to a single level of portfolios by changing the Refinery Setting for 'Multi Level Portfolio' to false.
+The standard setup for portfolios is single-level.
+If you need a multi-level portfolio where you have "categories" of portfolio
+items you can switch to a multi level setup by changing the Refinery Setting for
+``Multi Level Portfolio`` to true.

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: refinerycms-portfolio
 version: !ruby/object:Gem::Version 
-  hash: 53
-  prerelease: false
+  hash: 977940518
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  - rc1
+  version: 0.9.8.rc1
 platform: ruby
 authors: 
 - Resolve Digital
@@ -15,10 +16,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-09 00:00:00 +12:00
+date: 2010-09-20 00:00:00 +12:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: refinerycms
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :runtime
+  version_requirements: *id001
 description: A really straightforward open source Ruby on Rails portfolio plugin designed for integration with RefineryCMS
 email: info@refinerycms.com
 executables: []
@@ -30,30 +46,32 @@ extra_rdoc_files: []
 files: 
 - readme.md
 - license.md
-- app/controllers/admin/portfolio_entries_controller.rb
+- app/controllers/admin/portfolio_controller.rb
 - app/controllers/portfolio_controller.rb
 - app/helpers/portfolio_helper.rb
 - app/models/portfolio_entry.rb
-- app/views/admin/portfolio_entries/_form.html.erb
-- app/views/admin/portfolio_entries/_list.html.erb
-- app/views/admin/portfolio_entries/_sortable_list.html.erb
-- app/views/admin/portfolio_entries/edit.html.erb
-- app/views/admin/portfolio_entries/index.html.erb
-- app/views/admin/portfolio_entries/new.html.erb
+- app/views/admin/portfolio/_form.html.erb
+- app/views/admin/portfolio/_list.html.erb
+- app/views/admin/portfolio/_sortable_list.html.erb
+- app/views/admin/portfolio/edit.html.erb
+- app/views/admin/portfolio/index.html.erb
+- app/views/admin/portfolio/new.html.erb
 - app/views/portfolio/_main_image.html.erb
 - app/views/portfolio/empty.html.erb
 - app/views/portfolio/show.html.erb
 - config/locales/en.yml
+- config/locales/pt-BR.yml
 - config/locales/sl.yml
 - config/routes.rb
-- generators/portfolio/portfolio_generator.rb
-- generators/portfolio/templates/migration.rb
 - lib/gemspec.rb
+- lib/generators/portfolio/portfolio_generator.rb
+- lib/generators/portfolio/templates/db/migrate/migration_number_create_structure_for_portfolio.rb
+- lib/generators/portfolio/templates/db/seeds/portfolio.rb
+- lib/portfolio/version.rb
 - lib/portfolio.rb
-- lib/tasks/portfolio.rake
+- lib/refinerycms-portfolio.rb
 - public/javascripts/portfolio.js
 - public/stylesheets/portfolio.css
-- rails/init.rb
 has_rdoc: true
 homepage: http://refinerycms.com
 licenses: []
@@ -75,12 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/app/controllers/admin/portfolio_entries_controller.rb

@@ -1,32 +0,0 @@
-class Admin::PortfolioEntriesController < Admin::BaseController
-
-  crudify :portfolio_entry, :order => 'position ASC', :conditions => "parent_id IS NULL"
-  before_filter :find_portfolio_entries_for_parents_list, :only => [:new, :create, :edit, :update]
-
-  def emancipate
-    if (entry = PortfolioEntry.find(params[:id])).present?
-      entry.update_attribute(:parent_id, (entry.parent.present? ? entry.parent.parent_id : nil))
-    end
-
-    redirect_to :action => "index"
-  end
-
-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 ::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.
-      unless @portfolio_entry.nil? or @portfolio_entry.new_record?
-        @portfolio_entries_for_parents_list.reject! do |entry|
-          entry.id == @portfolio_entry.id or @portfolio_entry.descendants.include?(entry)
-        end
-      end
-    else
-      @portfolio_entries_for_parents_list = []
-    end
-  end
-
-end

data/generators/portfolio/portfolio_generator.rb

@@ -1,23 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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(:name => "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/tasks/portfolio.rake

@@ -1,37 +0,0 @@
-namespace :refinery do
-  namespace :portfolio do
-	  desc "Install extra files from the portfolio plugin"
-
-  	task :install do
-  		[%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/rails/init.rb

@@ -1,17 +0,0 @@
-Refinery::Plugin.register do |plugin|
-  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