cable 0.9.9 → 0.9.10

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.10

data/app/controllers/admin/search_controller.rb

@@ -7,7 +7,7 @@ class Admin::SearchController < AdminController
     @results =  ThinkingSphinx.search params[:term], :match_mode => :extended, :star => true
     respond_to do |format|
       format.json { render request.format.to_sym => to_json_for_autocomplete( @results) }
-      format.html
+      format.html { redirect_to url_for([:admin, @results.first]) if @results.length == 1 }
     end
   end
   

data/app/helpers/admin/search_controller_helper.rb

@@ -2,10 +2,12 @@ module Admin::SearchControllerHelper
   
   def to_json_for_autocomplete( results )
     results.collect do |result|
-      if result.respond_to? :to_json_for_autocomplete
-        result.to_json_for_autocomplete
-      else
-        raise Cable::Errors::SearchError::MissingInterfaceMethod , "to_json_for_autocomplete method should be defined on #{result.class.name}"
+      unless result.nil?
+        if result.respond_to? :to_json_for_autocomplete
+          result.to_json_for_autocomplete
+        else
+          raise Cable::Errors::SearchError::MissingInterfaceMethod , "to_json_for_autocomplete method should be defined on #{result.class.name}"
+        end
       end
     end.to_json
   end

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

@@ -1,3 +1,4 @@
+<% @page_title = "Search Results"%>
 <table>
     <thead>
         <tr>

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

@@ -27,9 +27,9 @@
         
         
         <% if @admin_layout == "single" %>
-          
-         <%= render :partial => "layouts/search" %>
-        
+          <div class="prepend-15">
+             <%= render :partial => "layouts/search" %>
+            </div>
           <div id="main" class="span-24">
             <div class="box shadow">
               <h2 id="title"><%= @page_title %></h2>
@@ -53,7 +53,6 @@
             
             <h2 id="title"><%= @page_title %></h2>
             <div id="help"><%= yield :help %><a class="button">Help</a></div>
-            <%= render :partial => 'layouts/breadcrumb' %>
             <%= yield :page_menu %>
             <%= render :partial => 'layouts/messages' %>
             <%= yield %>

data/lib/generators/cable/resource/resource_generator.rb

@@ -39,6 +39,11 @@ module Cable
         def create_scaffold
           if options.views?
             if yes?("Would you like Cable to generate views for #{model_name.capitalize}?".color(:yellow))
+              if attributes.empty? and yes?("\tWould you like to use existing attributes?".color(:green))
+                self.attributes = model_name.classify.constantize.columns_hash.delete_if{|x| ["id", "created_at", "updated_at"].include? x }.collect{|c| [c.first,c.second.type]}.collect do |attri|
+                  Rails::Generators::GeneratedAttribute.new( attri.first, attri.second )
+                end
+              end
               template 'erb/scaffold/_form.html.erb',       "app/views/admin/#{plural_table_name}/_#{singular_table_name}.html.erb"
               template 'erb/scaffold/index.html.erb',       "app/views/admin/#{plural_table_name}/index.html.erb"
               template 'erb/scaffold/edit.html.erb',        "app/views/admin/#{plural_table_name}/edit.html.erb"

data/public/javascripts/jquery.ui.autocomplete.html.js

@@ -30,6 +30,7 @@ $.extend( proto, {
 	},
 
 	_renderItem: function( ul, item) {
+	    console.log( "autocomplete running")
 		return $( "<li></li>" )
 			.data( "item.autocomplete", item )
 			.append( $( "<a></a>" )[ this.options.html ? "html" : "text" ]( item.label + "<span class='search_type'>" + item.type +"</span>") )

data/public/stylesheets/tinymce/custom_rich_editor.css

@@ -1 +0,0 @@
-.mceContentBody strong { color:#BF2E1A;  }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cable
 version: !ruby/object:Gem::Version 
-  hash: 41
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Spencer Markowski