beautiful_scaffold 0.3.0.rc6 → 0.3.1

data/CHANGELOG

@@ -1,3 +1,15 @@
+== 0.3.1
+
+* enhancement
+  * Spinner works with turbolink
+
+* bugfix
+  * Remove PJAX references
+  * i18n bug names of columns
+  * Flash notice/error with redirect_to fixed
+  * Change Info string to Error in flash[:error] div
+  * Add new attributes in model's permitted attributes and columns select and mass inserting form
+
 == 0.3.0.rc6
 
 * enhancement

data/README.rdoc

@@ -15,7 +15,7 @@ gem 'beautiful_scaffold', '0.2.7'
 === RubyOnRails 4.X
 
 Add this in your Gemfile :
-gem 'beautiful_scaffold', '0.3.0.rc5'
+gem 'beautiful_scaffold', '0.3.1'
 
 === Next
 

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.rc6"
+  s.version     = "0.3.1"
   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

@@ -41,6 +41,8 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
         inject_into_file("app/models/#{a}.rb", "\n  has_many :#{model_pluralize}, :dependent => :nullify", :after => "ActiveRecord::Base")
         a += "_id"
       end
+
+      inject_into_file("app/models/#{model}.rb", ":#{a},", :after => "def self.permitted_attributes\n    return ")
     }
   end
 
@@ -54,6 +56,7 @@ class BeautifulMigrationGenerator < Rails::Generators::Base
     inject_into_file("#{commonpath}index.html.erb", render_partial("app/views/partials/_index_header.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Header - Do not remove -->\n" )
     inject_into_file("#{commonpath}index.html.erb", render_partial("app/views/partials/_index_column.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Column - Do not remove -->\n" )
     inject_into_file("#{commonpath}index.html.erb", render_partial("app/views/partials/_index_search.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Search - Do not remove -->\n" )
+    inject_into_file("#{commonpath}index.html.erb", myattributes.map{ |attr| a,t = attr.split(':');(['references', 'reference'].include?(t) ? "'#{a}_id'" : "'#{a}'") }.join(',') + ',', :after => ":model_columns => [" )
     # Show
     inject_into_file("#{commonpath}show.html.erb", render_partial("app/views/partials/_show_field.html.erb"), :before => "<!-- Beautiful_scaffold - AddField - Field - Do not remove -->\n" )    
   end

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

@@ -37,6 +37,15 @@ function initPage(){
 }
 $(function() {
     initPage();
+    function startSpinner(){
+      $('.loader').show();
+    }
+    function stopSpinner(){
+      $('.loader').hide();
+    }
+    document.addEventListener("page:fetch", startSpinner);
+    document.addEventListener("page:receive", stopSpinner);
+    document.addEventListener("page:restore", stopSpinner);
 });
 $(window).bind('page:change', function() {
     initPage();

data/lib/generators/templates/app/controllers/base.rb

@@ -35,11 +35,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
 
     respond_to do |format|
       format.html{
-        if request.headers['X-PJAX']
-          render :layout => false
-        else
-          render
-        end
+        render
       }
       format.json{
         render :json => @<%= model %>_scope.all 
@@ -67,11 +63,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
   def show
     respond_to do |format|
       format.html{
-        if request.headers['X-PJAX']
-          render :layout => false
-        else
-          render
-        end
+        render
       }
       format.json { render :json => @<%= model %> }
     end
@@ -82,11 +74,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
 
     respond_to do |format|
       format.html{
-        if request.headers['X-PJAX']
-          render :layout => false
-        else
-          render
-        end
+        render
       }
       format.json { render :json => @<%= model %> }
     end
@@ -105,14 +93,14 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
           if params[:mass_inserting] then
             redirect_to <%= namespace_for_route %><%= model_pluralize %>_path(:mass_inserting => true)
           else
-            redirect_to <%= namespace_for_route %><%= singular_table_name %>_path(@<%= model %>), :notice => t(:create_success, :model => "<%= model %>")
+            redirect_to <%= namespace_for_route %><%= singular_table_name %>_path(@<%= model %>), :flash => { :notice => t(:create_success, :model => "<%= model %>") }
           end
         }
         format.json { render :json => @<%= model %>, :status => :created, :location => @<%= model %> }
       else
         format.html {
           if params[:mass_inserting] then
-            redirect_to <%= namespace_for_route %><%= model_pluralize %>_path(:mass_inserting => true), :error => t(:error, "Error")
+            redirect_to <%= namespace_for_route %><%= model_pluralize %>_path(:mass_inserting => true), :flash => { :error => t(:error, "Error") }
           else
             render :action => "new"
           end
@@ -126,7 +114,7 @@ class <%= namespace_for_class %><%= model_camelize.pluralize %>Controller < Beau
 
     respond_to do |format|
       if @<%= model %>.update_attributes(params_for_model)
-        format.html { redirect_to <%= namespace_for_route %><%= singular_table_name %>_path(@<%= model %>), :notice => t(:update_success, :model => "<%= model %>") }
+        format.html { redirect_to <%= namespace_for_route %><%= singular_table_name %>_path(@<%= model %>), :flash => { :notice => t(:update_success, :model => "<%= model %>") }}
         format.json { head :ok }
       else
         format.html { render :action => "edit" }

data/lib/generators/templates/app/helpers/beautiful_helper.rb

@@ -249,7 +249,7 @@ module BeautifulHelper
   def build_treeview(obj, child_relation, caption_method = "caption")
     out = '
       <li id="treeelt_' + obj.id.to_s + '" data-id="' + obj.id.to_s + '">
-        <a href="#" class="nopjax">' + obj.send(caption_method).to_s + '</a>
+        <a href="#">' + obj.send(caption_method).to_s + '</a>
         <ul>'
     ar = obj.send(child_relation.to_sym)
     ar = ar.order('position') if obj.class.column_names.include?("position")

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

@@ -6,7 +6,7 @@
   <div class="modal-body">
     <% for field in model_columns %>
       <label class="checkbox">
-        <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name.to_sym].include?(field) %>> <%= t(field, :default => field.capitalize) %>
+        <input type="checkbox" name="field[]" value="<%= field %>" <%= "checked" if session[:fields][model_name.to_sym].include?(field) %>> <%= t("app.models.#{model_name}.bs_attributes.#{field}", :default => field.capitalize) %>
       </label><br />
     <% end %>
   </div>

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

@@ -94,10 +94,10 @@
 
         </div>
         <div class="btn-group pull-right">
-          <%%= link_to '<i class="icon-download"></i> CSV'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "nopjax btn" %>
-          <%%= link_to '<i class="icon-download"></i> XML'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "nopjax btn" %>
-          <%%= link_to '<i class="icon-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "nopjax btn" %>
-          <%%= link_to '<i class="icon-download"></i> PDF'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "nopjax btn" %>
+          <%%= link_to '<i class="icon-download"></i> CSV'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :csv), :class => "btn" %>
+          <%%= link_to '<i class="icon-download"></i> XML'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :xml), :class => "btn" %>
+          <%%= link_to '<i class="icon-download"></i> JSON'.html_safe, <%= namespace_for_route %><%= plural_table_name %>_path(:format => :json), :class => "btn" %>
+          <%%= link_to '<i class="icon-download"></i> PDF'.html_safe,  <%= namespace_for_route %><%= plural_table_name %>_path(:format => :pdf), :class => "btn" %>
         </div>
       </div>
     <%% end %>

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

@@ -26,7 +26,7 @@
             </li>
             <li class="hidden-desktop">
               <!-- Mobile navbar -->
-              <a href="#" class="nopjax" data-toggle="collapse" data-target=".nav-collapse">
+              <a href="#" data-toggle="collapse" data-target=".nav-collapse">
                 <i class="icon-th-list"></i>
               </a>
             </li>
@@ -38,7 +38,6 @@
           </ul>
           <div class="nav-collapse collapse">
             <ul class="nav hidden-desktop">
-              <%% @nopjax = "nopjax" %>
               <%%= render :partial => "layouts/beautiful_menu" %>
             </ul>
           </div>
@@ -56,7 +55,6 @@
           </ul>
         </div>
         <div class="span10">
-          <!-- Zone PJAX -->
           <%% if not flash[:notice].blank? then %>
             <div class="alert alert-info">
               <a class="close" data-dismiss="alert" href="#">×</a>
@@ -67,14 +65,13 @@
           <%% if not flash[:error].blank? then %>
             <div class="alert alert-error">
               <a class="close" data-dismiss="alert" href="#">×</a>
-              <h4 class="alert-heading">Info : </h4>
+              <h4 class="alert-heading">Error : </h4>
               <%%= flash[:error] %>
             </div>
           <%% end %>
-          <div id="pjax-container">
+          <div>
             <%%= yield %>
           </div>
-          <!-- FIN Zone PJAX -->
         </div>
       </div>
     </div>

data/lib/generators/templates/app/views/partials/_sign_in_form.html.erb

@@ -13,6 +13,6 @@
     </div>
     <%%= f.submit t(:sign_in, :default => "Sign in"), :class => "btn" %>
   <%% end %>
-  <a data-toggle="modal" href="#modal-forget-password" class="nopjax"><%%= t(:forgot_your_password, :default => "Forgot your password?") %></a>
-  <a data-toggle="modal" href="#modal-register-form" class="nopjax"><%%= t(:register, :default => "Register") %></a>
+  <a data-toggle="modal" href="#modal-forget-password"><%%= t(:forgot_your_password, :default => "Forgot your password?") %></a>
+  <a data-toggle="modal" href="#modal-register-form"><%%= t(:register, :default => "Register") %></a>
 </div>

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: beautiful_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.3.0.rc6
-  prerelease: 6
+  version: 0.3.1
+  prerelease: 
 platform: ruby
 authors:
 - Sylvain Claudel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-15 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Beautiful Scaffold generate a complete scaffold (sort, export, paginate
   and filter data) http://www.beautiful-scaffold.com
@@ -47,7 +47,6 @@ files:
 - lib/generators/templates/app/assets/javascripts/jquery-barcode.js
 - lib/generators/templates/app/assets/javascripts/jquery.jstree.js
 - lib/generators/templates/app/assets/javascripts/jquery.livequery.js
-- lib/generators/templates/app/assets/javascripts/jquery.pjax.js
 - lib/generators/templates/app/assets/javascripts/modernizr.custom.js
 - lib/generators/templates/app/assets/javascripts/tagit.js
 - lib/generators/templates/app/assets/stylesheets/application-bs.css
@@ -241,9 +240,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: beautiful_scaffold
 rubygems_version: 1.8.25

data/lib/generators/templates/app/assets/javascripts/jquery.pjax.js

@@ -1,370 +0,0 @@
-// jquery.pjax.js
-// copyright chris wanstrath
-// https://github.com/defunkt/jquery-pjax
-
-(function($){
-
-// When called on a link, fetches the href with ajax into the
-// container specified as the first parameter or with the data-pjax
-// attribute on the link itself.
-//
-// Tries to make sure the back button and ctrl+click work the way
-// you'd expect.
-//
-// Accepts a jQuery ajax options object that may include these
-// pjax specific options:
-//
-// container - Where to stick the response body. Usually a String selector.
-//             $(container).html(xhr.responseBody)
-//      push - Whether to pushState the URL. Defaults to true (of course).
-//   replace - Want to use replaceState instead? That's cool.
-//
-// For convenience the first parameter can be either the container or
-// the options object.
-//
-// Returns the jQuery object
-$.fn.pjax = function( container, options ) {
-  options = optionsFor(container, options)
-  return this.live('click', function(event){
-    return handleClick(event, options)
-  })
-}
-
-// Public: pjax on click handler
-//
-// Exported as $.pjax.click.
-//
-// event   - "click" jQuery.Event
-// options - pjax options
-//
-// Examples
-//
-//   $('a').live('click', $.pjax.click)
-//   // is the same as
-//   $('a').pjax()
-//
-//  $(document).on('click', 'a', function(event) {
-//    var container = $(this).closest('[data-pjax-container]')
-//    return $.pjax.click(event, container)
-//  })
-//
-// Returns false if pjax runs, otherwise nothing.
-function handleClick(event, container, options) {
-  options = optionsFor(container, options)
-
-  var link = event.currentTarget
-
-  // Middle click, cmd click, and ctrl click should open
-  // links in a new tab as normal.
-  if ( event.which > 1 || event.metaKey )
-    return
-
-  // Ignore cross origin links
-  if ( location.protocol !== link.protocol || location.host !== link.host )
-    return
-
-  // Ignore anchors on the same page
-  if ( link.hash && link.href.replace(link.hash, '') ===
-       location.href.replace(location.hash, '') )
-    return
-
-  var defaults = {
-    url: link.href,
-    container: $(link).attr('data-pjax'),
-    clickedElement: $(link),
-    fragment: null
-  }
-
-  $.pjax($.extend({}, defaults, options))
-
-  event.preventDefault()
-  return false
-}
-
-
-// Loads a URL with ajax, puts the response body inside a container,
-// then pushState()'s the loaded URL.
-//
-// Works just like $.ajax in that it accepts a jQuery ajax
-// settings object (with keys like url, type, data, etc).
-//
-// Accepts these extra keys:
-//
-// container - Where to stick the response body.
-//             $(container).html(xhr.responseBody)
-//      push - Whether to pushState the URL. Defaults to true (of course).
-//   replace - Want to use replaceState instead? That's cool.
-//
-// Use it just like $.ajax:
-//
-//   var xhr = $.pjax({ url: this.href, container: '#main' })
-//   console.log( xhr.readyState )
-//
-// Returns whatever $.ajax returns.
-var pjax = $.pjax = function( options ) {
-  var $container = findContainerFor(options.container),
-      success = options.success || $.noop
-
-  // We don't want to let anyone override our success handler.
-  delete options.success
-
-  options = $.extend(true, {}, pjax.defaults, options)
-
-  if ( $.isFunction(options.url) ) {
-    options.url = options.url()
-  }
-
-  options.context = $container
-
-  options.success = function(data){
-    if ( options.fragment ) {
-      // If they specified a fragment, look for it in the response
-      // and pull it out.
-      var $fragment = $(data).find(options.fragment)
-      if ( $fragment.length )
-        data = $fragment.children()
-      else
-        return window.location = options.url
-    } else {
-        // If we got no data or an entire web page, go directly
-        // to the page and let normal error handling happen.
-        if ( !$.trim(data) || /<html/i.test(data) )
-          return window.location = options.url
-    }
-
-    // Make it happen.
-    this.html(data)
-
-    // If there's a <title> tag in the response, use it as
-    // the page's title.
-    var oldTitle = document.title,
-        title = $.trim( this.find('title').remove().text() )
-
-    // No <title>? Fragment? Look for data-title and title attributes.
-    if ( !title && options.fragment ) {
-      title = $fragment.attr('title') || $fragment.data('title')
-    }
-
-    if ( title ) document.title = title
-
-    var state = {
-      pjax: $container.selector,
-      fragment: options.fragment,
-      timeout: options.timeout
-    }
-
-    // If there are extra params, save the complete URL in the state object
-    var query = $.param(options.data)
-    if ( query != "_pjax=true" )
-      state.url = options.url + (/\?/.test(options.url) ? "&" : "?") + query
-
-    if ( options.replace ) {
-      pjax.active = true
-      window.history.replaceState(state, document.title, options.url)
-    } else if ( options.push ) {
-      // this extra replaceState before first push ensures good back
-      // button behavior
-      if ( !pjax.active ) {
-        window.history.replaceState($.extend({}, state, {url:null}), oldTitle)
-        pjax.active = true
-      }
-
-      window.history.pushState(state, document.title, options.url)
-    }
-
-    // Google Analytics support
-    if ( (options.replace || options.push) && window._gaq )
-      _gaq.push(['_trackPageview'])
-
-    // If the URL has a hash in it, make sure the browser
-    // knows to navigate to the hash.
-    var hash = window.location.hash.toString()
-    if ( hash !== '' ) {
-      window.location.href = hash
-    }
-
-    // Invoke their success handler if they gave us one.
-    success.apply(this, arguments)
-  }
-
-  // Cancel the current request if we're already pjaxing
-  var xhr = pjax.xhr
-  if ( xhr && xhr.readyState < 4) {
-    xhr.onreadystatechange = $.noop
-    xhr.abort()
-  }
-
-  pjax.options = options
-  pjax.xhr = $.ajax(options)
-  $(document).trigger('pjax', [pjax.xhr, options])
-
-  return pjax.xhr
-}
-
-
-// Internal: Build options Object for arguments.
-//
-// For convenience the first parameter can be either the container or
-// the options object.
-//
-// Examples
-//
-//   optionsFor('#container')
-//   // => {container: '#container'}
-//
-//   optionsFor('#container', {push: true})
-//   // => {container: '#container', push: true}
-//
-//   optionsFor({container: '#container', push: true})
-//   // => {container: '#container', push: true}
-//
-// Returns options Object.
-function optionsFor(container, options) {
-  // Both container and options
-  if ( container && options )
-    options.container = container
-
-  // First argument is options Object
-  else if ( $.isPlainObject(container) )
-    options = container
-
-  // Only container
-  else
-    options = {container: container}
-
-  // Find and validate container
-  if (options.container)
-    options.container = findContainerFor(options.container)
-
-  return options
-}
-
-// Internal: Find container element for a variety of inputs.
-//
-// Because we can't persist elements using the history API, we must be
-// able to find a String selector that will consistently find the Element.
-//
-// container - A selector String, jQuery object, or DOM Element.
-//
-// Returns a jQuery object whose context is `document` and has a selector.
-function findContainerFor(container) {
-  container = $(container)
-
-  if ( !container.length ) {
-    throw "no pjax container for " + container.selector
-  } else if ( container.selector !== '' && container.context === document ) {
-    return container
-  } else if ( container.attr('id') ) {
-    return $('#' + container.attr('id'))
-  } else {
-    throw "cant get selector for pjax container!"
-  }
-}
-
-
-var timeoutTimer = null
-
-pjax.defaults = {
-  timeout: 650,
-  push: true,
-  replace: false,
-  // We want the browser to maintain two separate internal caches: one for
-  // pjax'd partial page loads and one for normal page loads. Without
-  // adding this secret parameter, some browsers will often confuse the two.
-  data: { _pjax: true },
-  type: 'GET',
-  dataType: 'html',
-  beforeSend: function(xhr, settings){
-    var context = this
-
-    if (settings.async && settings.timeout > 0) {
-      timeoutTimer = setTimeout(function() {
-        var event = $.Event('pjax:timeout')
-        context.trigger(event, [xhr, pjax.options])
-        if (event.result !== false)
-          xhr.abort('timeout')
-      }, settings.timeout)
-
-      // Clear timeout setting so jquerys internal timeout isn't invoked
-      settings.timeout = 0
-    }
-
-    this.trigger('pjax:start', [xhr, pjax.options])
-    // start.pjax is deprecated
-    this.trigger('start.pjax', [xhr, pjax.options])
-    xhr.setRequestHeader('X-PJAX', 'true')
-  },
-  error: function(xhr, textStatus, errorThrown){
-    if ( textStatus !== 'abort' )
-      window.location = pjax.options.url
-  },
-  complete: function(xhr){
-    if (timeoutTimer)
-      clearTimeout(timeoutTimer)
-
-    this.trigger('pjax:end', [xhr, pjax.options])
-    // end.pjax is deprecated
-    this.trigger('end.pjax', [xhr, pjax.options])
-  }
-}
-
-// Export $.pjax.click
-pjax.click = handleClick
-
-
-// Used to detect initial (useless) popstate.
-// If history.state exists, assume browser isn't going to fire initial popstate.
-var popped = ('state' in window.history), initialURL = location.href
-
-
-// popstate handler takes care of the back and forward buttons
-//
-// You probably shouldn't use pjax on pages with other pushState
-// stuff yet.
-$(window).bind('popstate', function(event){
-  // Ignore inital popstate that some browsers fire on page load
-  var initialPop = !popped && location.href == initialURL
-  popped = true
-  if ( initialPop ) return
-
-  var state = event.state
-
-  if ( state && state.pjax ) {
-    var container = state.pjax
-    if ( $(container+'').length )
-      $.pjax({
-        url: state.url || location.href,
-        fragment: state.fragment,
-        container: container,
-        push: false,
-        timeout: state.timeout
-      })
-    else
-      window.location = location.href
-  }
-})
-
-
-// Add the state property to jQuery's event object so we can use it in
-// $(window).bind('popstate')
-if ( $.inArray('state', $.event.props) < 0 )
-  $.event.props.push('state')
-
-
-// Is pjax supported by this browser?
-$.support.pjax =
-  window.history && window.history.pushState && window.history.replaceState
-  // pushState isn't reliable on iOS until 5.
-  && !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]|WebApps\/.+CFNetwork)/)
-
-
-// Fall back to normalcy for older browsers.
-if ( !$.support.pjax ) {
-  $.pjax = function( options ) {
-    window.location = $.isFunction(options.url) ? options.url() : options.url
-  }
-  $.pjax.click = $.noop
-  $.fn.pjax = function() { return this }
-}
-
-})(jQuery);