beautiful_scaffold 0.3.0.rc5 → 0.3.0.rc6

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 0.3.0.rc6
+
+* enhancement
+  * Add title for show, edit, destroy icon
+
+* bugfix
+  * require jquery-barcode to application-bs.js
+  * avoid to display log of require
+  * jointable def up def down -> def change (migration)
+
 == 0.3.0.rc5
 
 * bugfix

data/beautiful_scaffold.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "beautiful_scaffold"
-  s.version     = "0.3.0.rc5"
+  s.version     = "0.3.0.rc6"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

data/lib/generators/beautiful_jointable_generator.rb

@@ -14,7 +14,7 @@ class BeautifulJointableGenerator < Rails::Generators::Base
       sorted_model = join_models.sort
 
       # Generate migration
-      migration_content_up = "
+      migration_content = "
       create_table :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, :id => false do |t|
         t.integer :#{sorted_model[0]}_id
         t.integer :#{sorted_model[1]}_id
@@ -23,15 +23,12 @@ class BeautifulJointableGenerator < Rails::Generators::Base
       add_index :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize}, [:#{sorted_model[0]}_id, :#{sorted_model[1]}_id]
       "
 
-      migration_content_down = "\n drop_table :#{sorted_model[0].pluralize}_#{sorted_model[1].pluralize} "
-
       migration_name = "create_join_table_for_#{sorted_model[0]}_and_#{sorted_model[1]}"
       generate("migration", migration_name)
 
       filename = Dir.glob("db/migrate/*#{migration_name}.rb")[0]
 
-      inject_into_file(filename, migration_content_up, :after => "def up")
-      inject_into_file(filename, migration_content_down, :after => "def down")
+      inject_into_file(filename, migration_content, :after => "def change")
 
       # Add habtm relation
       inject_into_file("app/models/#{sorted_model[0]}.rb", "\n  has_and_belongs_to_many :#{sorted_model[1].pluralize}", :after => "ActiveRecord::Base")

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -96,7 +96,7 @@ module BeautifulScaffoldCommonMethods
   
   def attributes
     # https://raw.github.com/rails/rails/master/railties/lib/rails/generators/generated_attribute.rb
-    puts require 'rails/generators/generated_attribute'
+    require 'rails/generators/generated_attribute'
     return myattributes.map{ |a|
       attr, type = a.split(":")
       Rails::Generators::GeneratedAttribute.new(attr, type.to_sym)

data/lib/generators/templates/app/assets/javascripts/application-bs.js

@@ -26,6 +26,7 @@
 //= require markitup/sets/wiki/set
 //= require tagit.js
 //= require chardinjs
+//= require jquery-barcode
 //= require beautiful_scaffold
 //= require fixed_menu
 

data/lib/generators/templates/app/views/index.html.erb

@@ -75,9 +75,9 @@
             <td <%%= visible_column("<%= singular_table_name %>", "updated_at") %> class="col-updated_at <%%= align_attribute("datetime") %>">
               <%%= l(<%= singular_table_name %>.updated_at, :format => :long) %>
             </td>
-            <td><%%= link_to '<i class="icon-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-            <td><%%= link_to '<i class="icon-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>) %></td>
-            <td><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :confirm => t(:are_you_sure, :default => "Are you sure?"), :method => :delete %></td>
+            <td><%%= link_to '<i class="icon-search"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:show, :default => "Show") %></td>
+            <td><%%= link_to '<i class="icon-pencil"></i>'.html_safe, edit_<%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :title => t(:edit, :default => "Edit") %></td>
+            <td><%%= link_to '<i class="icon-remove"></i>'.html_safe, <%= namespace_for_route %><%= singular_table_name %>_path(<%= singular_table_name %>), :confirm => t(:are_you_sure, :default => "Are you sure?"), :method => :delete, :title => t(:destroy, :default => "Destroy") %></td>
           </tr>
           <%% end %>
         </tbody>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc5
+  version: 0.3.0.rc6
   prerelease: 6
 platform: ruby
 authors: