RubyGems - typus - Versions diffs - 3.0.10 → 3.0.11.rc1 - Mend

typus 3.0.10 → 3.0.11.rc1

Files changed (113) hide show

data/app/views/admin/templates/_belongs_to_with_autocomplete.html.erb CHANGED

@@ -1,10 +1,29 @@
+<% content_for :javascripts do %>
+  <% label = "#{@item.class.model_name.underscore.gsub("/","_")}_#{related_fk}" %>
+  <script type="text/javascript">
+    $(document).ready(function () {
+        $("#tokenInput_for_<%= related_fk %>").tokenInput("/admin/<%= association.name.to_s.pluralize %>/autocomplete", {
+            hintText: "",
+            queryParam: 'term',
+            tokenLimit: 1,
+            <% if (item = @item.send(attribute)) %>
+            prePopulate: [ { id: <%= item.id %>, name: "<%= item.to_label %>" } ],
+            <% end %>
+            onAdd: function(item) {
+                $("#<%= label %>").val(item.id);
+            },
+            onDelete: function (item) {
+                $("#<%= label %>").val("");
+            }
+        });
+    });
+  </script>
+<% end %>
 <li id="<%= attribute %>">
   <%= form.label related_fk, "#{label_text} <small>#{message}</small>".html_safe %>
   <%= form.hidden_field related_fk %>
-  <input data-autocomplete="<%= "/admin/#{related.to_resource}/autocomplete" %>"
-         id="autocomplete"
-         id_element="#<%= "#{@item.class.model_name.downcase}_#{related_fk}" %>"
-         name="autocomplete"
+  <input id="tokenInput_for_<%= related_fk %>"
          size="30"
          type="text"
          value="<%= @item.send(attribute).try(:to_label) %>" />

data/app/views/admin/templates/_relate_form.html.erb CHANGED

@@ -1,5 +1,5 @@
 <%= form_tag :action => :relate, :id => @item.id do %>
   <%= hidden_field :related, :model, :value => model_to_relate %>
   <%= hidden_field :related, :association_name, :value => association_name %>
-  <p><%= select :related, :id, items_to_relate.map { |f| [f.to_label, f.id] } %> &nbsp; <%= submit_tag Typus::I18n.t("Assign"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %></p>
+  <p><%= select :related, :id, items_to_relate.map { |f| [f.to_label, f.id] }, { :include_blank => true } %> &nbsp; <%= submit_tag Typus::I18n.t("Assign"), :class => "button", :disable_with => Typus::I18n.t("Sending data ...") %></p>
 <% end %>

data/app/views/admin/templates/_selector.html.erb CHANGED

@@ -1,5 +1,9 @@
 <%
-  values = @resource::const_get(attribute.upcase)
+  values = if @resource.const_defined?(attribute.upcase)
+             @resource::const_get(attribute.upcase)
+           else
+             @resource.send(attribute)
+           end
 %>
 <li id="<%= attribute %>">

data/app/views/layouts/admin/base.html.erb CHANGED

@@ -3,36 +3,7 @@
 <html lang="<%= I18n.locale %>">
 <head>
-  <meta charset="utf-8" />
-  <meta name="apple-mobile-web-app-capable" content="yes" />
-  <meta name="generator" content="Typus <%= Typus::VERSION %>" />
-  <%= favicon_link_tag %>
-  <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
-  <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
-                          "/vendor/jquery-ui-1.8.9.custom/css/ui-lightness/jquery-ui-1.8.9.custom.css",
-                          "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css",
-                          "/vendor/typus/stylesheets/screen",
-                          "/vendor/typus/stylesheets/application" %>
-  <%= yield :stylesheets -%>
-  <%= javascript_include_tag "/vendor/jquery-ui-1.8.9.custom/js/jquery-1.4.4.min.js",
-                             "/vendor/jquery-ui-1.8.9.custom/js/jquery-ui-1.8.9.custom.min.js",
-                             "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js",
-                             "/vendor/typus/javascripts/jquery.searchField.js",
-                             "/vendor/typus/javascripts/jquery.rails.js",
-                             "/vendor/typus/javascripts/jquery.rails.autocomplete.js",
-                             "/vendor/typus/javascripts/jquery.application.js",
-                             "/vendor/typus/javascripts/application" %>
-  <%= yield :javascripts -%>
-  <%= csrf_meta_tag %>
+  <%= render 'admin/shared/head' %>
 </head>
 <body>

data/app/views/layouts/admin/headless.html.erb CHANGED

@@ -3,36 +3,7 @@
 <html lang="<%= I18n.locale %>">
 <head>
-  <meta charset="utf-8" />
-  <meta name="apple-mobile-web-app-capable" content="yes" />
-  <meta name="generator" content="Typus <%= Typus::VERSION %>" />
-  <%= favicon_link_tag %>
-  <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
-  <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
-                          "/vendor/jquery-ui-1.8.9.custom/css/ui-lightness/jquery-ui-1.8.9.custom.css",
-                          "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css",
-                          "/vendor/typus/stylesheets/screen",
-                          "/vendor/typus/stylesheets/application" %>
-  <%= yield :stylesheets -%>
-  <%= javascript_include_tag "/vendor/jquery-ui-1.8.9.custom/js/jquery-1.4.4.min.js",
-                             "/vendor/jquery-ui-1.8.9.custom/js/jquery-ui-1.8.9.custom.min.js",
-                             "/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js",
-                             "/vendor/typus/javascripts/jquery.searchField.js",
-                             "/vendor/typus/javascripts/jquery.rails.js",
-                             "/vendor/typus/javascripts/jquery.rails.autocomplete.js",
-                             "/vendor/typus/javascripts/jquery.application.js",
-                             "/vendor/typus/javascripts/application" %>
-  <%= yield :javascripts -%>
-  <%= csrf_meta_tag %>
+  <%= render 'admin/shared/head' %>
 </head>
 <body>

data/app/views/layouts/admin/session.html.erb CHANGED

@@ -3,25 +3,7 @@
 <html lang="<%= I18n.locale %>">
 <head>
-  <meta charset="utf-8" />
-  <meta name="apple-mobile-web-app-capable" content="yes" />
-  <meta name="generator" content="Typus <%= Typus::VERSION %>" />
-  <%= favicon_link_tag %>
-  <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
-  <%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
-                          "/vendor/typus/stylesheets/screen",
-                          "/vendor/typus/stylesheets/application" %>
-  <%= javascript_include_tag "/vendor/jquery-ui-1.8.9.custom/js/jquery-1.4.4.min.js",
-                             "/vendor/typus/javascripts/jquery.rails.js",
-                             "/vendor/typus/javascripts/application" %>
-  <%= csrf_meta_tag %>
+  <%= render 'admin/shared/head' %>
 </head>
 <body id="account">

data/doc/mongo_db.md ADDED

@@ -0,0 +1,10 @@
+# MongoDB
+Start:
+    $ mongod --fork --logpath /var/log/mongodb.log --logappend --dbpath /var/lib/mongodb/
+Stop:
+    $ mongo
+    > db.shutdownServer()

data/lib/generators/typus/typus_generator.rb CHANGED

@@ -1,6 +1,5 @@
 require "rails/generators/migration"
-require "generators/typus/assets_generator"
 require "generators/typus/config_generator"
 require "generators/typus/controller_generator"
 require "generators/typus/initializers_generator"
@@ -28,10 +27,6 @@ Description:
         Typus::Generators::InitializersGenerator.new.invoke_all
       end
-      def generate_assets
-        Typus::Generators::AssetsGenerator.new.invoke_all
-      end
       def generate_controllers
         Typus.application_models.each do |model|
           Typus::Generators::ControllerGenerator.new([model.pluralize]).invoke_all

data/lib/support/active_record.rb CHANGED

@@ -40,4 +40,12 @@ class ActiveRecord::Base
     end
   end
+  def self.namespaced?
+    name.match(/::/)
+  end
+  def self.namespace
+    name.split("::").first if self.namespaced?
+  end
 end

data/lib/typus.rb CHANGED

@@ -24,6 +24,7 @@ module Typus
   module Controller
     autoload :Actions, "typus/controller/actions"
+    autoload :ActsAs, "typus/controller/acts_as"
     autoload :Associations, "typus/controller/associations"
     autoload :Autocomplete, "typus/controller/autocomplete"
     autoload :Filters, "typus/controller/filters"
@@ -38,7 +39,7 @@ module Typus
   end
   mattr_accessor :autocomplete
-  @@autocomplete = 100
+  @@autocomplete = nil
   mattr_accessor :admin_title
   @@admin_title = "Typus"

data/lib/typus/controller/actions.rb CHANGED

@@ -20,6 +20,13 @@ module Typus
       #       super
       #     end
       #
+      # Additionally you can set a condition to each action passing a Proc as 4th parameter. If the proc return true
+      # the item will be showed and if return false will be hidden.
+      #
+      #     def index
+      #       add_resource_action('Recover', {:action => 'untrash'}, {}, Proc.new {|item| item.is_trash? })
+      #       super
+      #     end
       def add_resource_action(*args)
         @resource_actions ||= []

data/lib/typus/controller/acts_as.rb ADDED

@@ -0,0 +1,22 @@
+module Typus
+  module Controller
+    module ActsAs
+      ##
+      # Change item position:
+      #
+      #   params[:go] = 'move_to_top'
+      #
+      # Available positions are move_to_top, move_higher, move_lower, move_to_bottom.
+      #
+      # NOTE: Only works if `acts_as_list` is installed.
+      #
+      def position
+        @item.send(params[:go])
+        notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+        redirect_to :back, :notice => notice
+      end
+    end
+  end
+end

data/lib/typus/controller/associations.rb CHANGED

@@ -2,6 +2,72 @@ module Typus
   module Controller
     module Associations
+      ##
+      # Action to relate models which respond to:
+      #
+      #   - has_and_belongs_to_many
+      #   - has_many
+      #
+      # For example:
+      #
+      #   class Item < ActiveRecord::Base
+      #     has_many :line_items
+      #   end
+      #
+      #   class LineItem < ActiveRecord::Base
+      #     belongs_to :item
+      #   end
+      #
+      #   >> related_item = LineItem.find(params[:related][:id])
+      #   => ...
+      #   >> item = Item.find(params[:id])
+      #   => ...
+      #   >> item.line_items << related_item
+      #   => ...
+      #
+      def relate
+        resource_class = params[:related][:model].typus_constantize
+        association_name = params[:related][:association_name].tableize
+        if params[:related][:id].present? && (item = resource_class.find(params[:related][:id]))
+          @item.send(association_name) << item
+          notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
+        else
+          notice = Typus::I18n.t("Please, select an option.")
+        end
+        redirect_to :back, :notice => notice
+      end
+      ##
+      # Action to unrelate models which respond to:
+      #
+      #   - has_and_belongs_to_many
+      #   - has_many
+      #   - has_one
+      #
+      def unrelate
+        item_class = params[:resource].typus_constantize
+        item = item_class.find(params[:resource_id])
+        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 = params[:association_name] ? params[:association_name].to_sym : @resource.model_name.tableize.split("/").last.to_sym
+          worked = item.send(association_name).delete(@item)
+        end
+        if worked
+          notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
+        else
+          alert = item.error.full_messages
+        end
+        redirect_to :back, :notice => notice, :alert => alert
+      end
       protected
       ##

data/lib/typus/controller/autocomplete.rb CHANGED

@@ -7,7 +7,7 @@ module Typus
           params.merge!(:search => params[:term])
           get_objects
           @items = @resource.limit(20)
-          render :json => @items.map { |i| { "id" => i.id, "label" => i.to_label, "value" => i.to_label } }
+          render :json => @items.map { |i| { "id" => i.id, "label" => i.to_label, "value" => i.to_label, "name" => i.to_label } }
         end
       end

data/lib/typus/controller/format.rb CHANGED

@@ -38,7 +38,7 @@ module Typus
                          a, b = key.split(".")
                          record.send(a).send(b)
                        when :belongs_to
-                         record.send(key).to_label
+                         record.send(key).try(:to_label)
                        else
                          record.send(key)
                        end

data/lib/typus/engine.rb CHANGED

@@ -1,6 +1,11 @@
 module Typus
   class Engine < Rails::Engine
-  end
+    initializer "static assets" do |app|
+      if app.config.serve_static_assets
+        app.middleware.insert_after ::ActionDispatch::Static, ::ActionDispatch::Static, "#{root}/app/assets"
+      end
+    end
+  end
 end

data/lib/typus/orm/active_record/class_methods.rb CHANGED

@@ -58,7 +58,7 @@ module Typus
                 next
               end
-              dragonfly = respond_to?(:dragonfly_apps_for_attributes) && dragonfly_apps_for_attributes.try(:has_key?, field)
+              dragonfly = respond_to?(:dragonfly_attachment_classes) && dragonfly_attachment_classes.map { |i| i.attribute }.include?(field)
               paperclip = respond_to?(:attachment_definitions) && attachment_definitions.try(:has_key?, field)
               if dragonfly || paperclip

data/lib/typus/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Typus
-  VERSION = "3.0.10"
+  VERSION = "3.0.11.rc1"
 end

data/test/app/controllers/admin/assets_controller_test.rb CHANGED

@@ -85,11 +85,15 @@ class Admin::AssetsControllerTest < ActionController::TestCase
     context "create" do
-      should "redirect to edit with custom layout" do
-        asset = {:caption => "My Caption", :dragonfly_required => File.new("#{Rails.root}/public/images/rails.png")}
+      setup do
+        @asset = { :caption => "My Caption",
+                   :dragonfly_required => File.new("#{Rails.root}/public/images/rails.png"),
+                   :paperclip_required => File.new("#{Rails.root}/public/images/rails.png") }
+      end
+      should "redirect to edit with custom layout" do
         assert_difference('Asset.count') do
-          post :create, { :asset => asset, :layout => "admin/headless" }
+          post :create, { :asset => @asset, :layout => "admin/headless" }
         end
         assert_response :redirect
@@ -98,10 +102,9 @@ class Admin::AssetsControllerTest < ActionController::TestCase
       should "redirect to index with custom layout" do
         Typus::Resources.expects(:action_after_save).returns("index")
-        asset = {:caption => "My Caption", :dragonfly_required => File.new("#{Rails.root}/public/images/rails.png")}
         assert_difference('Asset.count') do
-          post :create, { :asset => asset, :layout => "admin/headless" }
+          post :create, { :asset => @asset, :layout => "admin/headless" }
         end
         assert_response :redirect

data/test/app/controllers/admin/pages_controller_test.rb CHANGED

@@ -27,10 +27,10 @@ class Admin::PagesControllerTest < ActionController::TestCase
       Factory(:page, :status => false)
     end
-    should "return unscoped results" do
+    should "return scoped results" do
       assert Page.count.eql?(1)
       get :index
-      assert assigns(:items).size.eql?(2)
+      assert assigns(:items).size.eql?(1)
     end
   end

data/test/app/controllers/admin/posts_controller_test.rb CHANGED

@@ -152,8 +152,7 @@ class Admin::PostsControllerTest < ActionController::TestCase
     should "be included in index" do
       get :index
-      expected = [["All", "index", "unscoped"]]
-      assert_equal expected, assigns(:predefined_filters)
+      assert assigns(:predefined_filters).nil?
     end
   end
@@ -486,6 +485,32 @@ title;status
       assert_equal "Post successfully updated.", flash[:notice]
     end
+    should "return a message instead a 404 error if related_id is empty" do
+      comment = Factory(:comment, :post => nil)
+      @request.env['HTTP_REFERER'] = "/admin/posts/edit/#{@post.id}#comments"
+      assert_no_difference('@post.comments.count') do
+        post :relate, { :id => @post.id, :related => { :model => 'Comment', :id => "", :association_name => 'comments' } }
+      end
+      assert_response :redirect
+      assert_redirected_to @request.env['HTTP_REFERER']
+      assert_equal "Please, select an option.", flash[:notice]
+    end
+    should "return a message instead a 404 error if related_id is nil" do
+      comment = Factory(:comment, :post => nil)
+      @request.env['HTTP_REFERER'] = "/admin/posts/edit/#{@post.id}#comments"
+      assert_no_difference('@post.comments.count') do
+        post :relate, { :id => @post.id, :related => { :model => 'Comment', :id => nil, :association_name => 'comments' } }
+      end
+      assert_response :redirect
+      assert_redirected_to @request.env['HTTP_REFERER']
+      assert_equal "Please, select an option.", flash[:notice]
+    end
     should "relate category to post (has_and_belongs_to_many)" do
       category = Factory(:category)
       @request.env['HTTP_REFERER'] = "/admin/posts/edit/#{@post.id}#categories"