beautiful_scaffold 0.3.4 → 0.3.5

data/CHANGELOG

@@ -1,3 +1,14 @@
+== 0.3.5
+
+* enhancement
+  * Option to avoid to add bad gem for the rails app.
+  * Add concern to models
+  * Add concern for the routes
+
+* bugfix
+  * Change symbol into string (access session)
+  * Table Checkbox (All checkbox bugfix)
+
 == 0.3.4
 
 * bugfix

data/README.rdoc

@@ -7,15 +7,15 @@ Demo : http://demo.beautiful-scaffold.com/
 
 == Install
 
-=== RubyOnRails 3.X
+=== RubyOnRails 4.1
 
 Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.2.7'
+gem 'beautiful_scaffold', '0.3.4'
 
-=== RubyOnRails 4.X
+=== RubyOnRails 4.2
 
 Add this in your Gemfile :
-gem 'beautiful_scaffold', '~>0.3'
+gem 'beautiful_scaffold', '0.3.5'
 
 === Next
 
@@ -26,7 +26,7 @@ bundle install
 
 === Scaffold
 
-rails generate beautiful_scaffold model attr:type attr:type... [--namespace=name]
+rails generate beautiful_scaffold model attr:type attr:type... [--namespace=name] [--donttouchgem=name]
 
 type available :
 * integer

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.4"
+  s.version     = "0.3.5"
   s.platform    = Gem::Platform::RUBY  
   s.summary     = "Beautiful Scaffold generate fully customizable scaffold"
   s.email       = "claudel.sylvain@gmail.com"

data/lib/generators/beautiful_migration_generator.rb

@@ -9,10 +9,14 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
 
   argument :name, :type => :string, :desc => "Name of the migration CamelCase AddXxxToYyy (Yyy must be plural)"
   argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type (for bt relation model:references)"
+
   class_option :namespace, :default => nil
+  class_option :donttouchgem, :default => nil
 
   def install_gems
-    require_gems
+    if options[:donttouchgem].blank? then
+      require_gems
+    end
   end
 
   def add_field_for_fulltext

data/lib/generators/beautiful_scaffold_common_methods.rb

@@ -156,12 +156,10 @@ module BeautifulScaffoldCommonMethods
   end
 
   def require_gems
-    # for jquery-ui add "2.3.0" version for jquery-rails
-    #say_status("Warning", "Set 2.0.1 version for jquery-rails (for a good compatibility with beautiful_scaffold)", :yellow)
 
     gem('less-rails', :github => "CQQL/less-rails", :branch => 'less-2.5')
     gem('will_paginate')
-    gem('ransack', :github => 'activerecord-hackery/ransack', :branch => 'rails-4.1')
+    gem('ransack', :github => 'activerecord-hackery/ransack', :branch => 'rails-4.2')
     gem('polyamorous', :github => 'activerecord-hackery/polyamorous')
     gem('jquery-ui-rails')
     gem('prawn', '1.0.0')

data/lib/generators/beautiful_scaffold_generator.rb

@@ -17,9 +17,13 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
   argument :myattributes, :type => :array, :default => [], :banner => "field:type field:type"
   
   class_option :namespace, :default => nil
+  class_option :donttouchgem, :default => nil
 
   def install_gems
-    require_gems
+    if options[:donttouchgem].blank? then
+      require_gems
+    end
+
     #inside Rails.root do # Bug ?!
     Bundler.with_clean_env do
       run "bundle install"
@@ -127,38 +131,23 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
 
   def generate_model
     generate("model", "#{model} #{beautiful_attr_to_rails_attr.join(' ')} #{@fulltext_field.join(' ')}")
-    
-    inject_into_file("app/models/#{model}.rb",'
-  scope :sorting, lambda{ |options|
-    attribute = options[:attribute]
-    direction = options[:sorting]
 
-    attribute ||= "id"
-    direction ||= "DESC"
+    directory  "app/models/concerns", "app/models/concerns"
 
-    order("#{attribute} #{direction}")
-  }
-
-  include BeautifulScaffoldModule
-  before_save :fulltext_field_processing
+    inject_into_file("app/models/#{model}.rb",'
 
-  # You can OVERRIDE this method used in model form and search form (in belongs_to relation)
-  def caption
-    (self["name"] || self["label"] || self["description"] || "##{id}")
-  end
+  include DefaultSortingConcern
+  include FulltextConcern
+  include CaptionConcern
 
-  def fulltext_field_processing
-    # You can preparse with own things here
-    generate_fulltext_field([' + fulltext_attribute.map{ |e| ('"' + e + '"') }.join(",") + '])
+  cattr_accessor :fulltext_fields do
+    [' + fulltext_attribute.map{ |e| ('"' + e + '"') }.join(",") + ']
   end
 
   def self.permitted_attributes
     return ' + attributes_without_type.map{ |attr| ":#{attr}" }.join(",") + '
   end', :after => "class #{model_camelize} < ActiveRecord::Base")
 
-    inject_into_file("config/application.rb", '    config.autoload_paths += %W(#{config.root}/app/modules)' + "\n", :after => "< Rails::Application\n")
-
-    directory  "modules", "app/modules"
     copy_file  "app/models/pdf_report.rb", "app/models/pdf_report.rb"
   end
 
@@ -216,18 +205,36 @@ class BeautifulScaffoldGenerator < Rails::Generators::Base
     routes_in_text = File.read("config/routes.rb")
 
     if not routes_in_text[/beautiful#dashboard/] and not routes_in_text[/beautiful#select_fields/] then
-      myroute = "root :to => 'beautiful#dashboard'\n"
-      myroute += "  match ':model_sym/select_fields' => 'beautiful#select_fields', :via => [:get, :post]\n"
+
+      myroute = <<EOF
+root :to => 'beautiful#dashboard'
+  match ':model_sym/select_fields' => 'beautiful#select_fields', :via => [:get, :post]
+
+  concern :bs_routes do
+    collection do
+      post :batch
+      get  :treeview
+      match :search_and_filter, :action => :index, :as => :search, :via => [:get, :post]
+    end
+    member do
+      post :treeview_update
+    end
+  end
+
+  # Add route with concerns: :bs_routes here # Do not remove
+EOF
+
       route(myroute)
     end
 
     search_namespace = namespace_alone + "/" if not namespace_alone.blank?
     search_namespace ||= ""
 
-    myroute = 'match "' + search_namespace + model_pluralize + '/search_and_filter" => "' + search_namespace + model_pluralize + '#index", :via => [:get, :post], :as => :' + namespace_for_route + 'search_' + model_pluralize + "\n  "
-    myroute += "namespace :#{namespace_alone} do\n  " if not namespace_alone.blank?
-    myroute += "resources :#{model_pluralize} do\n    collection do\n      post :batch\n      get  :treeview\n    end\n    member do\n      post :treeview_update\n    end\n  end\n"
-    myroute += "end\n"                                if not namespace_alone.blank?
-    route(myroute)
+    myroute =  "\n  "
+    myroute += "namespace :#{namespace_alone} do\n    " if not namespace_alone.blank?
+    myroute += "resources :#{model_pluralize}, concerns: :bs_routes\n  "
+    myroute += "end\n"                                  if not namespace_alone.blank?
+
+    inject_into_file("config/routes.rb", myroute, :after => ":bs_routes here # Do not remove")
   end
 end

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

@@ -1,5 +1,5 @@
 //= require jquery
-//= require jquery.ui.all
+//= require jquery-ui
 //= require jquery_ujs
 //= require twitter/bootstrap
 //= require jquery.livequery

data/lib/generators/templates/app/assets/javascripts/beautiful_scaffold.js

@@ -70,7 +70,7 @@ function bs_init(){
 
     // Processing
     $(document).on('click', '#checkall', function(){
-        $('.cbbatch').attr('checked', ($(this).attr('checked') != undefined));
+        $('.cbbatch').prop('checked', this.checked);
     });
 
     // Filter columns

data/lib/generators/templates/app/assets/stylesheets/application-bs.css

@@ -10,7 +10,7 @@
  *
  *= require_self
  *= require reset
- *= require jquery.ui.all
+ *= require jquery-ui
  *= require datepicker
  *= require timepicker
  *= require beautiful-scaffold

data/lib/generators/templates/app/models/concerns/caption_concern.rb

@@ -0,0 +1,8 @@
+module CaptionConcern
+  extend ActiveSupport::Concern
+
+  # You can OVERRIDE this method used in model form and search form (in belongs_to relation)
+  def caption
+    (self["name"] || self["label"] || self["description"] || "##{id}")
+  end
+end

data/lib/generators/templates/app/models/concerns/default_sorting_concern.rb

@@ -0,0 +1,15 @@
+module DefaultSortingConcern
+  extend ActiveSupport::Concern
+
+  included do
+      scope :sorting, lambda{ |options|
+                attribute = options[:attribute]
+                direction = options[:sorting]
+
+                attribute ||= "id"
+                direction ||= "DESC"
+
+                order("#{attribute} #{direction}")
+              }
+  end
+end

data/lib/generators/templates/{modules/beautiful_scaffold_module.rb → app/models/concerns/fulltext_concern.rb}

@@ -1,11 +1,33 @@
-module BeautifulScaffoldModule
-  def generate_fulltext_field(fields)
+module FulltextConcern
+  extend ActiveSupport::Concern
+
+  included do
+    #########################
+    #
+    # Scopes
+    # Relations
+    # Filter
+    #...
+    #########################
+    before_save :fulltext_field_processing
+  end
+
+  #########################
+  # Méthode d'instance
+  #########################
+  def fulltext_field_processing
+    # You can preparse with own things here
+    generate_fulltext_field
+  end
+
+  def generate_fulltext_field
+    fields = (self.class.fulltext_fields || [])
     fields.each{ |f|
       html, clear = htmlize(self[f], self[f + '_typetext'])
       self[f + '_fulltext'] = clear
     }
   end
-  
+
   def htmlize(text, type)
     case type
       when 'bbcode' then
@@ -25,4 +47,10 @@ module BeautifulScaffoldModule
     end
     return html, Sanitize.clean(html)
   end
-end
+
+  class_methods do
+    #########################
+    # Méthode de Class
+    #########################
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Sylvain Claudel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-10-22 00:00:00 Z
+date: 2015-03-20 00:00:00 Z
 dependencies: []
 
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate and filter data) http://www.beautiful-scaffold.com
@@ -79,6 +79,9 @@ files:
 - lib/generators/templates/app/initializers/link_renderer.rb
 - lib/generators/templates/app/locales/beautiful_scaffold.en.yml
 - lib/generators/templates/app/locales/beautiful_scaffold.fr.yml
+- lib/generators/templates/app/models/concerns/caption_concern.rb
+- lib/generators/templates/app/models/concerns/default_sorting_concern.rb
+- lib/generators/templates/app/models/concerns/fulltext_concern.rb
 - lib/generators/templates/app/models/pdf_report.rb
 - lib/generators/templates/app/views/_beautiful_menu.html.erb
 - lib/generators/templates/app/views/_form.html.erb
@@ -233,7 +236,6 @@ files:
 - lib/generators/templates/markitup/skins/simple/style.css
 - lib/generators/templates/markitup/templates/preview.css
 - lib/generators/templates/markitup/templates/preview.html
-- lib/generators/templates/modules/beautiful_scaffold_module.rb
 homepage: http://beautiful-scaffold.com
 licenses: []
 
@@ -264,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: beautiful_scaffold
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Beautiful Scaffold generate fully customizable scaffold