casein 5.1.1.5 → 5.2.0.0

data/lib/generators/casein/install/templates/app/views/casein/layouts/_top_navigation.html.erb

@@ -1,4 +1,4 @@
 <!-- NOTE: add "hidden-xs hidden-sm" class to li elements you want to be hidden at small browser widths -->
-<!-- e.g. <li class="hidden-xs hidden-sm"><%= link_to "Visit site", casein_config_hostname, :target => "_blank" %></li> -->
+<!-- e.g. <li class="hidden-xs hidden-sm"><%= link_to "Visit site", casein_config_hostname, target: "_blank" %></li> -->
 
-<li><%= link_to "Visit site", casein_config_hostname, :target => "_blank" %></li>
+<li><%= link_to "Visit site", casein_config_hostname, target: "_blank" %></li>

data/lib/generators/casein/install/templates/db/migrate/casein_create_admin_users.rb

@@ -2,17 +2,17 @@ class CaseinCreateAdminUsers < ActiveRecord::Migration
   
   def self.up
     create_table :casein_admin_users do |t|   
-      t.string    :login, :null => false
+      t.string    :login, null: false
       t.string    :name
       t.string    :email
-      t.integer   :access_level, :null => false, :default => 0
-      t.string    :crypted_password, :null => false
-      t.string    :password_salt, :null => false
+      t.integer   :access_level, null: false, default: 0
+      t.string    :crypted_password, null: false
+      t.string    :password_salt, null: false
       t.string    :persistence_token
       t.string    :single_access_token
       t.string    :perishable_token
-      t.integer   :login_count, :null => false, :default => 0
-      t.integer   :failed_login_count, :null => false, :default => 0
+      t.integer   :login_count, null: false, default: 0
+      t.integer   :failed_login_count, null: false, default: 0
       t.datetime  :last_request_at
       t.datetime  :current_login_at
       t.datetime  :last_login_at

data/lib/generators/casein/scaffold/scaffold_generator.rb

@@ -1,14 +1,14 @@
 module Casein
   class ScaffoldGenerator < Rails::Generators::NamedBase
-  
+
     include Casein::CaseinHelper
     include Rails::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
-  
-    argument :attributes, :type => :array, :required => true, :desc => "attribute list required"
-    
-    class_options :create_model_and_migration => false, :read_only => false, :no_index => false
-  
+
+    argument :attributes, type: :array, required: true, desc: "attribute list required"
+
+    class_options create_model_and_migration: false, read_only: false, no_index: false
+
     def self.next_migration_number dirname
       if ActiveRecord::Base.timestamped_migrations
         Time.now.utc.strftime("%Y%m%d%H%M%S")
@@ -16,7 +16,7 @@ module Casein
         "%.3d" % (current_migration_number(dirname) + 1)
       end
     end
-  
+
     def generate_files
       @plural_route = (plural_name != singular_name) ? plural_name : "#{plural_name}_index"
       @read_only = options[:read_only]
@@ -28,19 +28,19 @@ module Casein
       template 'views/new.html.erb', "app/views/casein/#{plural_name}/new.html.erb" unless @read_only
       template 'views/_form.html.erb', "app/views/casein/#{plural_name}/_form.html.erb"
       template 'views/_table.html.erb', "app/views/casein/#{plural_name}/_table.html.erb"
-      
+
       add_namespace_to_routes
       add_to_routes
       add_to_navigation unless @no_index
-      
+
       if options[:create_model_and_migration]
         template 'model.rb', "app/models/#{singular_name}.rb"
         migration_template 'migration.rb', "db/migrate/create_#{plural_name}.rb"
       end
     end
-  
+
   protected
-  
+
     #replacements for standard Rails generator route. This one only adds once
     def add_namespace_to_routes
       puts "   casein     adding namespace to routes.rb"
@@ -48,26 +48,26 @@ module Casein
       line_to_add = "namespace :casein do"
       insert_sentinel = 'Application.routes.draw do'
       if File.read(file_to_update).scan(/(#{Regexp.escape("#{line_to_add}")})/mi).blank?
-        gsub_add_once plural_name, file_to_update, "\n\t#Casein routes\n\t" + line_to_add + "\n\tend\n", insert_sentinel
+        gsub_add_once plural_name, file_to_update, "\n#Casein routes\n" + line_to_add + "\nend\n", insert_sentinel
       end
     end
-    
+
     def add_to_routes
       puts "   casein     adding #{plural_name} resources to routes.rb"
       file_to_update = Rails.root + 'config/routes.rb'
 
       if @no_index && @read_only
-        line_to_add = "resources :#{plural_name}, :only => [:show]"
+        line_to_add = "resources :#{plural_name}, only: [:show]"
       elsif @no_index
-        line_to_add = "resources :#{plural_name}, :except => [:index]"
+        line_to_add = "resources :#{plural_name}, except: [:index]"
       elsif @read_only
-        line_to_add = "resources :#{plural_name}, :only => [:index, :show]"
+        line_to_add = "resources :#{plural_name}, only: [:index, :show]"
       else
         line_to_add = "resources :#{plural_name}"
       end
 
       insert_sentinel = 'namespace :casein do'
-      gsub_add_once plural_name, file_to_update, "\t\t" + line_to_add, insert_sentinel
+      gsub_add_once plural_name, file_to_update, "    " + line_to_add, insert_sentinel
     end
 
     def add_to_navigation
@@ -77,7 +77,7 @@ module Casein
       insert_sentinel = '<!-- SCAFFOLD_INSERT -->'
       gsub_add_once plural_name, file_to_update, line_to_add, insert_sentinel
     end
-  
+
     def gsub_add_once m, file, line, sentinel
       unless options[:pretend]
         gsub_file file, /(#{Regexp.escape("\n#{line}")})/mi do |match|
@@ -88,12 +88,12 @@ module Casein
         end
       end
     end
-    
+
     def gsub_file(path, regexp, *args, &block)
       content = File.read(path).gsub(regexp, *args, &block)
       File.open(path, 'wb') { |file| file.write(content) }
     end
-  
+
     def field_type(type)
       case type.to_s.to_sym
         when :integer, :float, :decimal   then :text_field
@@ -105,7 +105,7 @@ module Casein
         when :boolean                     then :check_box
       else
         :text_field
-      end      
+      end
     end
   end
-end
+end

data/lib/generators/casein/scaffold/templates/controller.rb

@@ -2,52 +2,51 @@
 
 module Casein
   class <%= class_name.pluralize %>Controller < Casein::CaseinController
-  
     ## optional filters for defining usage according to Casein::AdminUser access_levels
-    # before_filter :needs_admin, :except => [:action1, :action2]
-    # before_filter :needs_admin_or_current_user, :only => [:action1, :action2]
+    # before_action :needs_admin, except: [:action1, :action2]
+    # before_action :needs_admin_or_current_user, only: [:action1, :action2]
   <% unless @no_index %>
     def index
       @casein_page_title = '<%= plural_name.humanize.capitalize %>'
-  		@<%= plural_name %> = <%= class_name %>.order(sort_order(:<%= attributes[0].name %>)).paginate :page => params[:page]
+      @<%= plural_name %> = <%= class_name %>.order(sort_order(:<%= attributes[0].name %>)).paginate page: params[:page]
     end
-  <% end %>
+<% end %>
     def show
       @casein_page_title = 'View <%= singular_name.humanize.downcase %>'
       @<%= singular_name %> = <%= class_name %>.find params[:id]
     end
-  <% unless @read_only %>
+<% unless @read_only %>
     def new
       @casein_page_title = 'Add a new <%= singular_name.humanize.downcase %>'
-    	@<%= singular_name %> = <%= class_name %>.new
+      @<%= singular_name %> = <%= class_name %>.new
     end
 
     def create
       @<%= singular_name %> = <%= class_name %>.new <%= singular_name %>_params
-    
+
       if @<%= singular_name %>.save
         flash[:notice] = '<%= singular_name.humanize.capitalize %> created'
         redirect_to casein_<%= @plural_route %>_path
       else
         flash.now[:warning] = 'There were problems when trying to create a new <%= singular_name.humanize.downcase %>'
-        render :action => :new
+        render action: :new
       end
     end
-  
+
     def update
       @casein_page_title = 'Update <%= singular_name.humanize.downcase %>'
-      
+
       @<%= singular_name %> = <%= class_name %>.find params[:id]
-    
+
       if @<%= singular_name %>.update_attributes <%= singular_name %>_params
         flash[:notice] = '<%= singular_name.humanize.capitalize %> has been updated'
         redirect_to casein_<%= @plural_route %>_path
       else
         flash.now[:warning] = 'There were problems when trying to update this <%= singular_name.humanize.downcase %>'
-        render :action => :show
+        render action: :show
       end
     end
- 
+
     def destroy
       @<%= singular_name %> = <%= class_name %>.find params[:id]
 
@@ -55,18 +54,17 @@ module Casein
       flash[:notice] = '<%= singular_name.humanize.capitalize %> has been deleted'
       redirect_to casein_<%= @plural_route %>_path
     end
-  
+
     private
-      <%
-          permit_list = ""
-          attributes.each_with_index {|attribute|
-            permit_list += ", " unless permit_list.empty?
-            permit_list += ":#{attribute.name}"
-          }
-      %>
-      def <%= singular_name %>_params
-        params.require(:<%= singular_name %>).permit(<%= permit_list %>)
-      end
-<% end %>
+<%
+        permit_list = ""
+        attributes.each_with_index { |attribute|
+          permit_list += ", " unless permit_list.empty?
+          permit_list += ":#{attribute.name}"
+        }
+%>
+    def <%= singular_name %>_params
+      params.require(:<%= singular_name %>).permit(<%= permit_list %>)
+    end<% end %>
   end
-end
+end

data/lib/generators/casein/scaffold/templates/migration.rb

@@ -2,7 +2,7 @@ class Create<%= class_name.pluralize %> < ActiveRecord::Migration
   def self.up
     create_table :<%= table_name %> do |t|
       <% attributes.each do |attribute| %>t.<%= attribute.type %> :<%= attribute.name %>
-      <% end %>
+<% end %>
       t.timestamps
     end
   end
@@ -10,4 +10,4 @@ class Create<%= class_name.pluralize %> < ActiveRecord::Migration
   def self.down
     drop_table :<%= table_name %>
   end
-end
+end

data/lib/generators/casein/scaffold/templates/model.rb

@@ -1,3 +1,2 @@
 class <%= class_name %> < ActiveRecord::Base
-  
-end
+end

data/lib/generators/casein/scaffold/templates/views/_form.html.erb

@@ -2,11 +2,11 @@
 <% attribute_itr = 0 %>
 <% while attribute_itr < attributes.count %>
 <div class="row">
-	<div class="col-lg-6">
-		<%%= casein_<%= field_type(attributes[attribute_itr].type).to_s %> f, f.object, :<%= attributes[attribute_itr].name %><%= ", {:readonly => true}" if @read_only %> %>
-	</div><% attribute_itr += 1 %>
-	<div class="col-lg-6">
-		<% if attribute_itr < attributes.count %><%%= casein_<%= field_type(attributes[attribute_itr].type).to_s %> f, f.object, :<%= attributes[attribute_itr].name %><%= ", {:readonly => true}" if @read_only %> %><% end %>
-	</div><% attribute_itr += 1 %>
+  <div class="col-lg-6">
+    <%%= casein_<%= field_type(attributes[attribute_itr].type).to_s %> f, f.object, :<%= attributes[attribute_itr].name %><%= ", { readonly: true }" if @read_only %> %>
+  </div><% attribute_itr += 1 %>
+  <div class="col-lg-6">
+    <% if attribute_itr < attributes.count %><%%= casein_<%= field_type(attributes[attribute_itr].type).to_s %> f, f.object, :<%= attributes[attribute_itr].name %><%= ", { readonly: true }" if @read_only %> %><% end %>
+  </div><% attribute_itr += 1 %>
 </div>
-<% end %>
+<% end %>

data/lib/generators/casein/scaffold/templates/views/_table.html.erb

@@ -1,19 +1,19 @@
 <!-- Scaffolding generated by Casein <%= casein_get_full_version_string %> -->
 
 <table class="table table-striped table-hover table-condensed">
-	<thead>
-		<tr>
-			<% for attribute in attributes %><th><%%= casein_sort_link "<%= attribute.name.humanize %>", :<%= attribute.name %> %></th>
-			<% end %><% unless @read_only %><th>&nbsp;</th><% end %>
-		</tr>
-	</thead>
-	
-	<%% <%= plural_name %>.each do |<%= singular_name %>| %>
-		<tr>
-			<% attributes.each do |attribute| %><td><%%= casein_table_cell_link <%= singular_name %>.<%= attribute.name %>, casein_<%= singular_name %>_path(<%= singular_name %>) %></td>
-			<% end %><% unless @read_only %><td class="delete">
-				<%%= link_to(casein_show_row_icon("trash"), casein_<%= singular_name %>_path(<%= singular_name %>), :method => :delete, :data => { :confirm => "Are you sure you want to delete this <%= singular_name.humanize.downcase %>?" }) %>
-			</td><% end %>
-		</tr>
-	<%% end %>
-</table>
+  <thead>
+    <tr>
+      <% for attribute in attributes %><th><%%= casein_sort_link "<%= attribute.name.humanize %>", :<%= attribute.name %> %></th>
+      <% end %><% unless @read_only %><th>&nbsp;</th><% end %>
+    </tr>
+  </thead>
+
+  <%% <%= plural_name %>.each do |<%= singular_name %>| %>
+    <tr>
+      <% attributes.each do |attribute| %><td><%%= casein_table_cell_link <%= singular_name %>.<%= attribute.name %>, casein_<%= singular_name %>_path(<%= singular_name %>) %></td>
+      <% end %><% unless @read_only %><td class="delete">
+        <%%= link_to(casein_show_row_icon("trash"), casein_<%= singular_name %>_path(<%= singular_name %>), method: :delete, data: { confirm: "Are you sure you want to delete this <%= singular_name.humanize.downcase %>?" }) %>
+      </td><% end %>
+    </tr>
+  <%% end %>
+</table>

data/lib/generators/casein/scaffold/templates/views/index.html.erb

@@ -2,14 +2,14 @@
 
 <h2><%= plural_name.humanize.capitalize %><%%= casein_pagination_details @<%= plural_name %> %></h2>
 
-<%%= render :partial => 'casein/<%= plural_name %>/table', :locals => { :<%= plural_name %> => @<%= plural_name %> } %>
+<%%= render partial: 'casein/<%= plural_name %>/table', locals: { <%= plural_name %>: @<%= plural_name %> } %>
 
 <div class="text-center">
-	<%%= will_paginate @<%= plural_name %> %>
+  <%%= will_paginate @<%= plural_name %> %>
 </div>
 
 <%%= content_for :sidebar do %>
 <% unless @read_only %>
-	<li><%%= link_to "#{casein_show_icon "plus-sign"}Add a new <%= singular_name.humanize.downcase %>".html_safe, new_casein_<%= singular_name %>_path %></li>
+  <li><%%= link_to "#{casein_show_icon "plus-sign"}Add a new <%= singular_name.humanize.downcase %>".html_safe, new_casein_<%= singular_name %>_path %></li>
 <% end %>
-<%% end %>
+<%% end %>

data/lib/generators/casein/scaffold/templates/views/new.html.erb

@@ -2,17 +2,17 @@
 
 <h2>Add a new <%= singular_name.humanize.downcase %></h2>
 
-<%%= form_for @<%= file_name %>, :url => casein_<%= @plural_route %>_path do |f| %>
-	
-	<%%= render :partial => 'casein/<%= plural_name %>/form', :locals => { :f => f } %>
-	
-	<p class="submits">
-		<%%= link_to 'Cancel', casein_<%= @plural_route %>_path, :class => 'btn btn-mini btn-danger' %>
-		<%%= f.submit "Add new <%= singular_name.humanize.downcase %>", :class => "btn btn-mini btn-primary" %>
-	</p>
+<%%= form_for @<%= file_name %>, url: casein_<%= @plural_route %>_path do |f| %>
+
+  <%%= render partial: 'casein/<%= plural_name %>/form', locals: { f: f } %>
+
+  <p class="submits">
+    <%%= link_to 'Cancel', casein_<%= @plural_route %>_path, class: 'btn btn-mini btn-danger' %>
+    <%%= f.submit "Add new <%= singular_name.humanize.downcase %>", class: "btn btn-mini btn-primary" %>
+  </p>
 
 <%% end %>
 
 <%%= content_for :sidebar do %>
-	<li><%%= link_to "#{casein_show_icon "th-list"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
-<%% end %>
+  <li><%%= link_to "#{casein_show_icon "th-list"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
+<%% end %>

data/lib/generators/casein/scaffold/templates/views/show.html.erb

@@ -2,17 +2,17 @@
 
 <h2>View <%= singular_name.humanize.downcase %></h2>
 
-<%%= form_for @<%= file_name %>, :url => casein_<%= singular_name %>_path(@<%= singular_name %>) do |f| %>
+<%%= form_for @<%= file_name %>, url: casein_<%= singular_name %>_path(@<%= singular_name %>) do |f| %>
 
-	<%%= render :partial => 'casein/<%= plural_name %>/form', :locals => { :f => f } %>
-<% unless @read_only %>	
-	<p class="submits">
-	  	<%%= link_to 'Cancel', casein_<%= @plural_route %>_path, :class => 'btn btn-mini btn-danger' %>
-		<%%= f.submit "Save changes", :class => "btn btn-mini btn-primary" %>
-	</p>
+  <%%= render partial: 'casein/<%= plural_name %>/form', locals: { f: f } %>
+<% unless @read_only %>
+  <p class="submits">
+      <%%= link_to 'Cancel', casein_<%= @plural_route %>_path, class: 'btn btn-mini btn-danger' %>
+    <%%= f.submit "Save changes", class: "btn btn-mini btn-primary" %>
+  </p>
 <% end %>
 <%% end %>
 
 <%%= content_for :sidebar do %>
-	<li><%%= link_to "#{casein_show_icon "th-list"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
-<%% end %>
+  <li><%%= link_to "#{casein_show_icon "th-list"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
+<%% end %>

data/lib/railties/tasks.rake

@@ -13,7 +13,8 @@ namespace :casein do
       admin = Casein::AdminUser.new({ login: 'admin', name: 'Admin', email: ENV['email'], access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN, password: password, password_confirmation: password })
 
       unless admin.save
-        puts "[Casein] Failed: check that the 'admin' account doesn't already exist."
+        puts "[Casein] Failed. Rails said:"
+        puts admin.errors.full_messages.join("\n")
       else
         puts "[Casein] Created new admin user with username 'admin' and password '#{password}'"
       end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: casein
 version: !ruby/object:Gem::Version
-  version: 5.1.1.5
+  version: 5.2.0.0
 platform: ruby
 authors:
 - Russell Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.4
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.4.4
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.7
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -165,9 +165,9 @@ files:
 - app/assets/images/casein/casein.png
 - app/assets/javascripts/casein/casein.js
 - app/assets/javascripts/casein/html5shiv.js
-- app/assets/stylesheets/casein/casein-bootstrap-overrides.css.scss
-- app/assets/stylesheets/casein/casein.css.scss
-- app/assets/stylesheets/casein/login.css.scss
+- app/assets/stylesheets/casein/casein-bootstrap-overrides.scss
+- app/assets/stylesheets/casein/casein.scss
+- app/assets/stylesheets/casein/login.scss
 - app/controllers/casein/admin_user_sessions_controller.rb
 - app/controllers/casein/admin_users_controller.rb
 - app/controllers/casein/casein_controller.rb
@@ -195,8 +195,10 @@ files:
 - lib/casein/version.rb
 - lib/generators/casein/install/USAGE
 - lib/generators/casein/install/install_generator.rb
+- lib/generators/casein/install/templates/app/assets/javascripts/casein/auth_custom.js
 - lib/generators/casein/install/templates/app/assets/javascripts/casein/custom.js
-- lib/generators/casein/install/templates/app/assets/stylesheets/casein/custom.css.scss
+- lib/generators/casein/install/templates/app/assets/stylesheets/casein/auth_custom.scss
+- lib/generators/casein/install/templates/app/assets/stylesheets/casein/custom.scss
 - lib/generators/casein/install/templates/app/helpers/casein/config_helper.rb
 - lib/generators/casein/install/templates/app/views/casein/layouts/_tab_navigation.html.erb
 - lib/generators/casein/install/templates/app/views/casein/layouts/_top_navigation.html.erb
@@ -233,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A lightweight CMS toolkit for Ruby on Rails, based on Bootstrap.