typus 3.0.6 → 3.0.7

data/.gitignore

@@ -0,0 +1,15 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*
+
+# Projecte specific ignores
+.bundle
+all.css
+all.js
+db/*.sqlite3
+log/*.log
+test/fixtures/rails_app/public/system/*
+test/fixtures/rails_app/tmp/*
+tmp/**/*
+vendor/

data/Gemfile

@@ -1,7 +1,11 @@
-source 'http://rubygems.org'
+source "http://rubygems.org"
 
+# Specify your gem's dependencies in typus.gemspec
 gemspec
 
+# Yes, some dependencies are in typus.gemspec, but it's a little bit difficult
+# to mantain the above code there. I'll keep here for the moment ...
+
 gem 'acts_as_list'
 gem 'acts_as_tree'
 gem 'dragonfly', '~>0.8.1'
@@ -12,19 +16,19 @@ gem 'rails', '~> 3.0'
 
 group :test do
   gem 'shoulda'
-  gem 'tartare', :git => 'https://github.com/fesplugas/rails-tartare.git', :require => false
-
-  gem 'mocha'
+  gem 'mocha' # Make sure mocha is loaded at the end ...
 end
 
 group :development, :test do
 
   platforms :jruby do
     gem 'activerecord-jdbc-adapter', :require => false
-    # gem 'activerecord-jdbcpostgresql-adapter'
+
     gem 'jdbc-mysql'
     gem 'jdbc-postgres'
     gem 'jdbc-sqlite3'
+
+    gem 'jruby-openssl' # JRuby limited openssl loaded. http://jruby.org/openssl
   end
 
   platforms :ruby do

data/Rakefile

@@ -1,11 +1,10 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rubygems'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'typus/version'
-
-desc 'Default: run unit tests.'
 task :default => :test
 
 desc 'Test the typus plugin.'
@@ -16,6 +15,7 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
+=begin
 desc 'Generate plugin documentation.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
@@ -24,26 +24,39 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+=end
 
-desc 'Build the gem.'
-task :build do
-  system "gem build typus.gemspec"
-  system "gem install typus-#{Typus::VERSION}.gem"
+task :deploy do
+  system "cd test/fixtures/rails_app && cap deploy"
 end
 
-desc 'Build and release the gem.'
-task :release => :build do
-  system "git commit -m 'Bump version to #{Typus::VERSION}' lib/typus/version.rb"
-  system "git tag v#{Typus::VERSION}"
-  system "git push && git push --tags"
-  system "gem push typus-#{Typus::VERSION}.gem"
-  system "git clean -fd && rm -f typus-#{Typus::VERSION}.gem"
-  system "git branch -D 3-0-stable"
-  system "git checkout -b 3-0-stable && git push -f"
-  system "git checkout master"
+RUBIES = ["ruby-1.8.7-p330", "ruby-1.9.2-p136", "ree-1.8.7-2010.02", "jruby-1.5.6"]
+
+namespace :setup do
+
+  desc "Setup test environment"
+  task :test_environment do
+    RUBIES.each { |ruby| system "rvm install #{ruby}" }
+  end
+
+  desc "Setup CI Joe"
+  task :cijoe do
+    system "git config --replace-all cijoe.runner 'rake test:all'"
+  end
+
 end
 
-desc 'Deploy'
-task :deploy do
-  system "cd test/fixtures/rails_app && cap deploy"
+namespace :test do
+
+  task :all do
+    RUBIES.each do |ruby|
+      system "rvm use #{ruby}"
+      system "rm -f Gemfile.lock"
+      system "bundle install"
+      system "rake"
+      # system "rake DB=postgresql"
+      # system "rake DB=mysql"
+    end
+  end
+
 end

data/app/controllers/admin/base_controller.rb

@@ -24,10 +24,6 @@ class Admin::BaseController < ActionController::Base
     Typus.reload! unless Rails.env.production?
   end
 
-  def set_path
-    @back_to || request.referer || admin_dashboard_path
-  end
-
   def set_locale
     I18n.locale = admin_user.locale
   end

data/app/controllers/admin/resources_controller.rb

@@ -1,18 +1,18 @@
 class Admin::ResourcesController < Admin::BaseController
 
-  include Typus::Actions
-  include Typus::Filters
-  include Typus::Format
+  include Typus::Controller::Actions
+  include Typus::Controller::Associations
+  include Typus::Controller::Autocomplete
+  include Typus::Controller::Filters
+  include Typus::Controller::Format
 
   before_filter :get_model
   before_filter :set_scope
-  before_filter :get_object, :only => [:show, :edit, :update, :destroy, :toggle, :position, :relate, :unrelate, :detach]
+  before_filter :get_object, :only => [:show, :edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
   before_filter :check_resource_ownership, :only => [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate ]
   before_filter :check_if_user_can_perform_action_on_resources
   before_filter :set_order, :only => [:index]
-  before_filter :set_fields, :only => [:index, :new, :edit, :create, :update, :show, :detach]
-
-  before_filter :check_if_we_can_add_a_new_item, :only => [:new, :create]
+  before_filter :set_fields, :only => [:index, :new, :edit, :create, :update, :show]
 
   ##
   # This is the main index of the model. With filters, conditions and more.
@@ -21,13 +21,15 @@ class Admin::ResourcesController < Admin::BaseController
   # your formats.
   #
   def index
-    add_resource_action(default_action.titleize, {:action => default_action}, {})
-    add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
-
     get_objects
 
     respond_to do |format|
-      format.html { generate_html }
+      format.html do
+        prepend_predefined_filter("All", "index", "unscoped")
+        add_resource_action(default_action.titleize, {:action => default_action}, {})
+        add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
+        generate_html
+      end
       @resource.typus_export_formats.each { |f| format.send(f) { send("generate_#{f}") } }
     end
   end
@@ -36,6 +38,11 @@ class Admin::ResourcesController < Admin::BaseController
     item_params = params.dup
     item_params.delete_if { |k, v| !@resource.columns.map(&:name).include?(k) }
     @item = @resource.new(item_params)
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @item }
+    end
   end
 
   ##
@@ -48,63 +55,76 @@ class Admin::ResourcesController < Admin::BaseController
 
     set_attributes_on_create
 
-    if @item.save
-      params[:back_to] ? create_with_back_to : redirect_on_success
-    else
-      render :new
+    respond_to do |format|
+      if @item.save
+        format.html do
+          params[:resource] ? create_with_back_to : redirect_on_success
+        end
+        format.json { render :json => @item, :status => :created, :location => @item }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @item.errors, :status => :unprocessable_entity }
+      end
     end
   end
 
   def edit
-    add_resource_action(default_action.titleize, {:action => default_action}, {})
-    add_resource_action("Unrelate", {:action => "unrelate", :resource => @resource.model_name, :resource_id => @item.id}, {:confirm => "#{Typus::I18n.t("Unrelate")}?"})
   end
 
   def show
     check_resource_ownership if @resource.typus_options_for(:only_user_items)
+
+=begin
+    # FIXME
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render :json => @item }
+    end
+=end
   end
 
   def update
+    attributes = params[:attribute] ? { params[:attribute] => nil } : params[@object_name]
+
     respond_to do |format|
-      if @item.update_attributes(params[@object_name])
+      if @item.update_attributes(attributes)
         set_attributes_on_update
         reload_locales
         format.html { redirect_on_success }
         format.json { render :json => @item }
       else
         format.html { render :edit }
-        format.json { render :json => @item.errors.full_messages }
+        format.json { render :json => @item.errors, :status => :unprocessable_entity }
       end
     end
   end
 
-  def detach
-    if @item.update_attributes(params[:attribute] => nil)
-      notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
-      redirect_to :back, :notice => notice
-    else
-      render :edit
-    end
-  end
-
   def destroy
     if @item.destroy
       notice = Typus::I18n.t("%{model} successfully removed.", :model => @resource.model_name.human)
     else
       alert = @item.errors.full_messages
     end
-    redirect_to set_path, :notice => notice, :alert => alert
+    redirect_to :back, :notice => notice, :alert => alert
   end
 
   def toggle
     @item.toggle(params[:field])
-    @item.save!
-
-    notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
 
     respond_to do |format|
-      format.html { redirect_to set_path, :notice => notice }
-      format.json { render :json => @item }
+      if @item.save
+        format.html do
+          notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+          redirect_to :back, :notice => notice
+        end
+        format.json { render :json => @item }
+      else
+        format.html do
+          set_fields
+          render :edit
+        end
+        format.json { render :json => @item.errors, :status => :unprocessable_entity }
+      end
     end
   end
 
@@ -120,7 +140,7 @@ class Admin::ResourcesController < Admin::BaseController
   def position
     @item.send(params[:go])
     notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
-    redirect_to set_path, :notice => notice
+    redirect_to :back, :notice => notice
   end
 
   ##
@@ -151,10 +171,10 @@ class Admin::ResourcesController < Admin::BaseController
     association_name = params[:related][:association_name].tableize
 
     if @item.send(association_name) << resource_class.find(params[:related][:id])
-      flash[:notice] = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+      notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
     end
 
-    redirect_to set_path
+    redirect_to :back, :notice => notice
   end
 
   ##
@@ -165,44 +185,25 @@ class Admin::ResourcesController < Admin::BaseController
   #   - has_one
   #
   def unrelate
-
-    ##
-    # Find the remote object which is named item!
-    #
-
     item_class = params[:resource].typus_constantize
     item = item_class.find(params[:resource_id])
 
-    ##
-    # Detect which kind of relationship there's between both models.
-    #
-    #     item respect @item
-    #
-
-    # This is not nil in case of a has_many :through association.
-    association_name = params[:association_name].to_sym unless params[:association_name].blank?
-
     case item_class.relationship_with(@resource)
     when :has_one
       association_name = @resource.model_name.underscore.to_sym
       worked = item.send(association_name).delete
     else
-      association_name ||= @resource.model_name.tableize.to_sym
+      association_name = params[:association_name] ? params[:association_name].to_sym : @resource.model_name.tableize.to_sym
       worked = item.send(association_name).delete(@item)
     end
 
-    ##
-    # Finally delete the associated object. Depending on your models setup
-    # associated models will be removed or foreign_key will be set to nil.
-    #
-
     if worked
       notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
     else
       alert = item.error.full_messages
     end
 
-    redirect_to set_path, :notice => notice, :alert => alert
+    redirect_to :back, :notice => notice, :alert => alert
   end
 
   private
@@ -235,7 +236,7 @@ class Admin::ResourcesController < Admin::BaseController
       check_resources_ownership
     end
 
-    @items = @resource.order(set_order).includes(eager_loading)
+    @resource = @resource.order(set_order).includes(eager_loading)
   end
 
   def set_fields
@@ -248,178 +249,41 @@ class Admin::ResourcesController < Admin::BaseController
   end
 
   def redirect_on_success
-    action = @resource.typus_options_for(:action_after_save)
     path = params.dup.cleanup
-    path.merge!(:action => action)
-
-    case params[:action]
-    when "create"
-      path.merge!(:id => @item.id) unless action.eql?("index")
-      notice = Typus::I18n.t("%{model} successfully created.", :model => @resource.model_name.human)
-    when "update", "detach"
-      case action
-      when "index"
-        if params[:back_to]
-          path = "#{params[:back_to]}##{@resource.to_resource}"
-        else
-          path.delete_if { |k, v| %w(action id).include?(k) }
-        end
-      else
-        path.merge!(:action => action) #, :id => @item.id)
-      end
-      notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+
+    if action_after_save.eql?('index')
+      path.delete_if { |k, v| %w(action id).include?(k) }
+    else
+      path.merge!(:action => action_after_save, :id => @item.id)
     end
 
+    message = (params[:action] == 'create') ? "%{model} successfully created." : "%{model} successfully updated."
+    notice = Typus::I18n.t(message, :model => @resource.model_name.human)
+
     redirect_to path, :notice => notice
   end
 
   ##
   # Here what we basically do is to associate objects after they have been
-  # created. It's similar to calling `relate`.
-  #
-  # We have two objects:
+  # created. It's similar to calling `relate` but which the difference that
+  # we are creating a new record.
   #
-  #   - @item: Which is the create object.
-  #   - item: Which is the object which be associated to.
-  #
-  # http://0.0.0.0:3000/admin/entries/new?back_to=%2Fadmin%2Fcategories%2Fedit%2F3&resource=categories&resource_id=3
+  # We have two objects, detect the relationship_between them and then
+  # call the related method.
   #
   def create_with_back_to
-
-    #
-    # Find the remote object which is named item!
-    #
-
     item_class = params[:resource].typus_constantize
-    item = item_class.find(params[:resource_id]) if params[:resource_id]
-
-    ##
-    # Detect which kind of relationship there's between both models.
-    #
-
-    ##
-    # Here we have something like:
-    #
-    # Eg 1.
-    #
-    #   - We are editing an Order and want to add a new Invoice.
-    #   - Click on "Add New" and we are redirected to the form.
-    #   - We want to know which kind of relationship there's between both
-    #     objects.
-    #
-    #         >> Order.relationship_with(Invoice)
-    #         => :has_one
-    #
-    # Eg 2.
-    #
-    #   - We are editing a Entry and want to add a new Attachment.
-    #   - Click on "Add New" and we are redirected to the form.
-    #   - We want to know which kind of relationship there's between both
-    #     objects.
-    #
-    #         >> Entry.relationship_with(Attachment)
-    #         => :has_and_belongs_to_many
-    #
-    # Eg 3.
-    #
-    #   - We are editing a Entry and want to add a new Comment.
-    #   - Click on "Add New" and we are redirected to the form.
-    #   - We want to know which kind of relationship there's between both
-    #     objects.
-    #
-    #         >> Entry.relationship_with(Comment)
-    #         => :has_many
-    #
-    # Eg 4.
-    #
-    #   - We are editing a Post (Entry) and want to add a new Attachment.
-    #   - Click on "Add New" and we are redirected to the form.
-    #   - We want to know which kind of relationship there's between both
-    #     objects.
-    #
-    #         >> Post.relationship_with(Attachment)
-    #         => :has_and_belongs_to_many
-    #
-
-    case item_class.relationship_with(@resource)
-    when :has_one
-      # Order#invoice = @item
-      association_name = @resource.model_name.underscore.to_sym
-      item.send("#{association_name}=", @item)
-      worked = true
-    when :has_and_belongs_to_many
-      # Attachment#entries.push(item)
-      association_name = @resource.model_name.tableize.to_sym
-      worked = item.send(association_name).push(@item)
-    when :belongs_to
-      # Entry#comments.push(item)
-      association_name = item_class.model_name.tableize.to_sym
-      if item
-        worked = @item.send(association_name).push(item)
-      end
-    when :has_many
-      # Dog#image_holders
-      association_name = @resource.model_name.tableize.to_sym
-      worked = item.send(association_name).push(@item)
-    end
-
-    association = @resource.reflect_on_association(association_name)
-
-    ##
-    # Set @back_to
-    #
-
-    @back_to = if item
-                 params[:back_to]
-               else
-                 "#{params[:back_to]}?#{association.primary_key_name}=#{@item.id}"
-               end
-
-    ##
-    # Finally delete the associated object. Depending on your models setup
-    # associated models will be removed or foreign_key will be set to nil.
-    #
-
-    if item
-      if worked
-        notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
-      else
-        alert = @item.errors.full_messages
-      end
-    end
-
-    redirect_to set_path, :notice => notice, :alert => alert
+    options = { :controller => item_class.to_resource }
+    assoc = item_class.relationship_with(@resource).to_s
+    send("set_#{assoc}_association", item_class, options)
   end
 
   def default_action
     @resource.typus_options_for(:default_action_on_item)
   end
 
-  ##
-  # If we are trying to create a new Invoice which belongs_to Order, we should
-  # verify before the the Order doesn't have an Invoice, otherwise we would
-  # have and Order with many Invoices which is something not desired.
-  #
-  # Eg:
-  #
-  #     @resource (Invoice)
-  #     params[:resource] = "Order"
-  #     params[:resource_id] = "1"
-  #
-  # Does this Order already has an Invoice. If true, redirect to back.
-  #
-  def check_if_we_can_add_a_new_item
-    if params[:resource] && params[:resource_id]
-      item_class = params[:resource].typus_constantize
-      item = item_class.find(params[:resource_id]) if params[:resource_id]
-
-      if item_class.relationship_with(@resource) == :has_one
-        association_name = @resource.model_name.underscore.to_sym
-        if item.send(association_name)
-          render :text => "Not allowed!", :status => :unprocessable_entity
-        end
-      end
-    end
+  def action_after_save
+    @resource.typus_options_for(:action_after_save)
   end
 
 end