puffer 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/app/views/puffer/associated/one.js.erb

@@ -3,7 +3,11 @@
 <% records.each do |record| %>
   <li data-id="<%= record[primary_key] %>">
     <div class="title"><strong><%= record[primary_key] %></strong> — <%= record.to_title %></div>
-    <div class="description">record.password</div>
+    <ul class="description">
+      <% @field.association_columns.searchable.each do |column| %>
+        <li><strong><%= column.label %>:</strong> <%= render_field column, record %></li>
+      <% end %>
+    </ul>
   </li>
 <% end %>
 </ul>

data/lib/generators/puffer/install/templates/puffer/stylesheets/puffer.css

@@ -382,6 +382,13 @@ input[type=submit]
 .association .rui-autocompleter li .description
 {
     display: none;
+    margin: 5px 10px;
+}
+
+.association .rui-autocompleter li .description li
+{
+    margin: 0;
+    padding: 0;
 }
 
 .association .rui-autocompleter li:hover .description

data/lib/puffer/controller/generated.rb

@@ -18,7 +18,7 @@ module Puffer
           define_method "associated_#{field}_choosing" do
             @field = field
             @record = resource.member if params[:id]
-            @records = field.reflection.klass.includes(field.association_fields.includes).joins(field.association_fields.includes).where(field.association_fields.searches(params[:search])).limit(100).all
+            @records = field.reflection.klass.includes(field.association_columns.includes).where(field.association_columns.searches(params[:search])).limit(100).all
             render 'puffer/associated/one'
           end
 

data/lib/puffer/fields/field.rb

@@ -62,11 +62,11 @@ module Puffer
         @model
       end
 
-      def association_fields
-        raise "Can`t find records for association building. Please set :search_fields option for '#{field}' field." unless options[:search_fields].present?
+      def association_columns
+        raise "Can`t find records for association building. Please set :columns option for '#{field}' field." unless options[:columns].present?
         @reflection_fields ||= begin
           fields = Puffer::Fields.new
-          options[:search_fields].each do |field_name|
+          options[:columns].each do |field_name|
             fields.field reflection.klass, field_name
           end
           fields

data/lib/puffer/resource.rb

@@ -96,7 +96,7 @@ module Puffer
 
     def collection
       scope = parent ? parent.member.send(model_name.pluralize) : model
-      scope.includes(includes).joins(includes).where(searches(params[:search])).order(order).paginate :page => params[:page]
+      scope.includes(includes).where(searches(params[:search])).order(order).paginate :page => params[:page]
     end
 
     def member

data/puffer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{puffer}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["pyromaniac"]
@@ -32,12 +32,9 @@ Gem::Specification.new do |s|
     "app/views/layouts/puffer.html.erb",
     "app/views/puffer/_form.html.erb",
     "app/views/puffer/associated/_many.html.erb",
-    "app/views/puffer/associated/_one.html.erb",
     "app/views/puffer/associated/many.rjs",
     "app/views/puffer/associated/one.js.erb",
-    "app/views/puffer/associated/one.rjs",
     "app/views/puffer/association/_many.html.erb",
-    "app/views/puffer/association/_one.html.erb",
     "app/views/puffer/edit.html.erb",
     "app/views/puffer/index.html.erb",
     "app/views/puffer/new.html.erb",

data/spec/dummy/app/controllers/admin/profiles_controller.rb

@@ -12,7 +12,7 @@ class Admin::ProfilesController < Puffer::Base
   end
 
   form do
-    field :user, :search_fields => [:email, :password]
+    field :user, :columns => [:email, :password]
     field :name
     field :surname
     field :birth_date

data/spec/dummy/public/puffer/stylesheets/puffer.css

@@ -382,6 +382,13 @@ input[type=submit]
 .association .rui-autocompleter li .description
 {
     display: none;
+    margin: 5px 10px;
+}
+
+.association .rui-autocompleter li .description li
+{
+    margin: 0;
+    padding: 0;
 }
 
 .association .rui-autocompleter li:hover .description

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puffer
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - pyromaniac
@@ -206,12 +206,9 @@ files:
 - app/views/layouts/puffer.html.erb
 - app/views/puffer/_form.html.erb
 - app/views/puffer/associated/_many.html.erb
-- app/views/puffer/associated/_one.html.erb
 - app/views/puffer/associated/many.rjs
 - app/views/puffer/associated/one.js.erb
-- app/views/puffer/associated/one.rjs
 - app/views/puffer/association/_many.html.erb
-- app/views/puffer/association/_one.html.erb
 - app/views/puffer/edit.html.erb
 - app/views/puffer/index.html.erb
 - app/views/puffer/new.html.erb

data/app/views/puffer/associated/_one.html.erb

@@ -1,47 +0,0 @@
-<div class="header">
-  <div class="popup_close"><%= link_to t(:close), '#', :terbium_popup_close => true %></div>
-  <ul class="navigation">
-    <li class="selected">
-      <%= link_to t(:choosing), '#', :ajax => resource_path(record, "associated_#{field}_choosing") %>
-    </li>
-    <li class="notab">
-      <% form_tag '#', :class => 'associated_search', :ajax => current_path do %>
-        <%= text_field_tag :query, resource_session[:query] %>
-        <%= submit_tag 'Search' %>
-        <% if resource_session[:query].present? %>
-          <%= link_to 'clear', '#', :ajax => current_path(:query => '') %>
-        <% end %>
-      <% end %>
-    </li>
-  </ul>
-</div>
-
-<div class="pagination">
-  <%= will_paginate associated, :renderer => AssociatedLinkRenderer %>
-</div>
-
-<div class="popup_content">
-  <table class="list_table">
-    <thead>
-      <tr>
-      <% field.association_fields.each do |f| -%>
-        <th><%= f.label %></th>
-      <% end -%>
-        <th class="actions">Actions</th>
-      </tr>
-    </thead>
-    <tbody>
-    <% associated.each do |association| -%>
-      <tr id="<%= dom_id association %>">
-      <% field.association_fields.each do |f| -%>
-        <td><%= render_field association, f %></td>
-      <% end -%>
-        <td class="actions">
-          <%= link_to t(:show), resource_path(association), :target => '_blank' if (resource_path(association) rescue nil) %>
-          <%= link_to_function t(:choose), "$('associated_#{field}').replace(\"#{escape_javascript render(:partial => "terbium/association/one", :object => association, :locals => {:field => field})}\"); Event.addBehavior.reload(); this.up('.terbium_popup', 0).popup.hide()" %>
-        </td>
-      </tr>
-    <% end -%>
-    </tbody>
-  </table>
-</div>

data/app/views/puffer/associated/one.rjs

@@ -1 +0,0 @@
-page.replace_html 'terbium_popup', :partial => 'terbium/associated/one', :locals => {:field => @field, :associated => @records}

data/app/views/puffer/association/_one.html.erb

@@ -1,16 +0,0 @@
-<div id="associated_<%= field %>">
-  <% if one %>
-    <%= link_to_if_path one.to_title, :target => '_blank' do resource_path(one) end %>
-    <%= link_to_function t(:clear_associated), "clear_associated_#{field}()" %>
-    <% javascript_tag do %>
-      function clear_associated_<%= field %>() {
-        $('associated_<%= field %>').replace("<%= escape_javascript render(:partial => "terbium/association/one", :object => nil, :locals => {:field => field}) %>");
-        Event.addBehavior.reload();
-      }
-    <% end %>
-    <%= hidden_field_tag "#{model_name}[#{field.association_key}]", one.id, :id => "associated_#{field}_#{one.id}" %>
-  <% else %>
-    <%= link_to t(:choose_associated), '#', :terbium_popup => resource_path(record, "associated_#{field}_choosing") %>
-    <%= hidden_field_tag "#{model_name}[#{field.association_key}]" %>
-  <% end %>
-</div>