casein 4.0.0 → 5.0.0.0

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

@@ -3,20 +3,20 @@
 module Casein
   class <%= class_name.pluralize %>Controller < Casein::CaseinController
   
-    ## optional filters for defining usage according to Casein::Users access_levels
+    ## 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]
-  
+  <% unless @no_index %>
     def index
       @casein_page_title = '<%= plural_name.humanize.capitalize %>'
-  		@<%= plural_name %> = <%= class_name %>.paginate :page => params[:page]
+  		@<%= plural_name %> = <%= class_name %>.order(sort_order(:<%= attributes[0].name %>)).paginate :page => params[:page]
     end
-  
+  <% end %>
     def show
       @casein_page_title = 'View <%= singular_name.humanize.downcase %>'
       @<%= singular_name %> = <%= class_name %>.find params[:id]
     end
- 
+  <% unless @read_only %>
     def new
       @casein_page_title = 'Add a new <%= singular_name.humanize.downcase %>'
     	@<%= singular_name %> = <%= class_name %>.new
@@ -67,6 +67,6 @@ module Casein
       def <%= singular_name %>_params
         params.require(:<%= singular_name %>).permit(<%= permit_list %>)
       end
-
+<% end %>
   end
 end

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

@@ -1,9 +1,12 @@
 <!-- Scaffolding generated by Casein <%= casein_get_full_version_string %> -->
-<% form_div_position = 1 %>
-<% for attribute in attributes %>
-<div class="<%= (form_div_position % 2) == 0 ? "tfContainer tfContainerSecond" : "tfContainer" %>">
-	<%%= casein_<%= field_type(attribute.type).to_s %> f, f.object, :<%= attribute.name %> %>
-</div><% form_div_position += 1 %>
-<% end %>
-<%= (form_div_position % 2) == 0 ? '<div class="tfContainer tfContainerSecond"></div>' : '' %>
-<div class="clearer"></div>
+<% 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>
+<% end %>

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

@@ -1,17 +1,19 @@
 <!-- Scaffolding generated by Casein <%= casein_get_full_version_string %> -->
 
-<table cellpadding="0" cellspacing="0" id="itemList" class="itemList">
-	<tr>
-		<% for attribute in attributes %><th><%= attribute.name.humanize %></th>
-		<% end %><th>&nbsp;</th>
-	</tr>
+<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_with_index do |<%= singular_name %>, index| %>
-		<tr class="<%%= 'even' if index.modulo(2) == 0 %> hover">
+	<%% <%= 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 %><td class="delete">
-				<%%= link_to(casein_show_row_icon("delete"), casein_<%= singular_name %>_path(<%= singular_name %>), :method => :delete, :data => { :confirm => "Are you sure you want to delete this <%= singular_name.humanize.downcase %>?" }) %>
-			</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

@@ -1,11 +1,15 @@
 <!-- Scaffolding generated by Casein <%= casein_get_full_version_string %> -->
 
-<h2><%= plural_name.humanize.capitalize %></h2>
+<h2><%= plural_name.humanize.capitalize %><%%= casein_pagination_details @<%= plural_name %> %></h2>
 
 <%%= render :partial => 'casein/<%= plural_name %>/table', :locals => { :<%= plural_name %> => @<%= plural_name %> } %>
 
-<%%= will_paginate @<%= plural_name %> %>
+<div class="text-center">
+	<%%= will_paginate @<%= plural_name %> %>
+</div>
 
 <%%= content_for :sidebar do %>
-	<li><%%= link_to "#{casein_show_icon "add"}Add a new <%= singular_name.humanize.downcase %>".html_safe, new_casein_<%= singular_name %>_path %></li>
+<% 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>
+<% end %>
 <%% end %>

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

@@ -7,12 +7,12 @@
 	<%%= render :partial => 'casein/<%= plural_name %>/form', :locals => { :f => f } %>
 	
 	<p class="submits">
-		<%%= link_to 'Cancel', casein_<%= @plural_route %>_path, :class => 'cancel' %> or
-		<%%= f.submit "Add new <%= singular_name.humanize.downcase %>", :class => "update" %>
+		<%%= 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 "table"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
+	<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

@@ -5,14 +5,14 @@
 <%%= 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 => 'cancel' %> or
-		<%%= f.submit "Save changes", :class => "update" %>
+	  	<%%= 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 "table"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
+	<li><%%= link_to "#{casein_show_icon "th-list"}Back to list".html_safe, casein_<%= @plural_route %>_path %></li>
 <%% end %>

data/lib/railties/tasks.rake

@@ -1,29 +1,31 @@
 require 'authlogic'
+require 'securerandom'
 
 namespace :casein do
-    
+
   namespace :users do
 
     desc "Create default admin user"
-    task :create_admin => :environment do
-    
-  		raise "Usage: specify email address, e.g. rake [task] email=mail@caseincms.com" unless ENV.include?("email")
-  		    
-      admin = Casein::User.new( {:login => 'admin', :name => 'Admin', :email => ENV['email'], :access_level => $CASEIN_USER_ACCESS_LEVEL_ADMIN, :password => 'password', :password_confirmation => 'password'} )
-      
+    task create_admin: :environment do
+
+      raise "Usage: specify email address, e.g. rake [task] email=mail@caseincms.com" unless ENV.include?("email")
+
+      random_password = random_string = SecureRandom.hex
+      admin = Casein::AdminUser.new({ login: 'admin', name: 'Admin', email: ENV['email'], access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN, password: random_password, password_confirmation: random_password })
+
       unless admin.save
         puts "[Casein] Failed: check that the 'admin' account doesn't already exist."
       else
-        puts "[Casein] Created new admin user with login 'admin' and password 'password'"
-      end      
+        puts "[Casein] Created new admin user with username 'admin' and password '#{random_password}'"
+      end
     end
 
     desc "Remove all users"
-    task :remove_all => :environment do
-      users = Casein::User.find(:all)
+    task remove_all: :environment do
+      users = Casein::AdminUser.all
       num_users = users.size
-      users.each { |user| user.destroy }
-      puts "[Casein] Removed #{num_users} user(s)"      
+      users.destroy_all
+      puts "[Casein] Removed #{num_users} user(s)"
     end
 
   end

metadata

@@ -1,112 +1,132 @@
 --- !ruby/object:Gem::Specification
 name: casein
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.0.0.0
 platform: ruby
 authors:
 - Russell Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: casein
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: authlogic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.4.2
+- !ruby/object:Gem::Dependency
+  name: scrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Casein is an open-source CMS for Ruby on Rails.
+description: A lightweight CMS toolkit for Ruby on Rails, based on Bootstrap.
 email: mail@russellquinn.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README.rdoc
 files:
 - Gemfile
-- MIT-LICENSE
+- LICENSE
 - PUBLIC_VERSION.yml
 - README.rdoc
 - Rakefile
+- app/assets/fonts/casein/glyphiconshalflings-regular.eot
+- app/assets/fonts/casein/glyphiconshalflings-regular.otf
+- app/assets/fonts/casein/glyphiconshalflings-regular.svg
+- app/assets/fonts/casein/glyphiconshalflings-regular.ttf
+- app/assets/fonts/casein/glyphiconshalflings-regular.woff
 - app/assets/images/casein/casein.png
-- app/assets/images/casein/header.png
-- app/assets/images/casein/icons/add.png
-- app/assets/images/casein/icons/delete.png
-- app/assets/images/casein/icons/table.png
-- app/assets/images/casein/login/alertBg.png
-- app/assets/images/casein/login/background.png
-- app/assets/images/casein/login/bottom.png
-- app/assets/images/casein/login/loginBoxBg.png
-- app/assets/images/casein/login/loginBoxBottom.png
-- app/assets/images/casein/login/loginBoxTop.png
-- app/assets/images/casein/login/loginSubmit.png
-- app/assets/images/casein/login/recoverSubmit.png
-- app/assets/images/casein/login/top.png
-- app/assets/images/casein/nav.png
-- app/assets/images/casein/rightNav.png
-- app/assets/images/casein/rightNavButton.png
-- app/assets/images/casein/visitSiteNav.png
+- app/assets/javascripts/casein/bootstrap.js
 - app/assets/javascripts/casein/casein.js
-- app/assets/javascripts/casein/login.js
+- app/assets/javascripts/casein/html5shiv.js
+- app/assets/stylesheets/casein/bootstrap-glyphicons.css.scss
+- app/assets/stylesheets/casein/bootstrap.css
+- app/assets/stylesheets/casein/casein-bootstrap-overrides.css.scss
 - app/assets/stylesheets/casein/casein.css.scss
-- app/assets/stylesheets/casein/elements.css.scss
 - app/assets/stylesheets/casein/login.css.scss
-- app/assets/stylesheets/casein/screen.css.scss
+- app/controllers/casein/admin_user_sessions_controller.rb
+- app/controllers/casein/admin_users_controller.rb
 - app/controllers/casein/casein_controller.rb
 - app/controllers/casein/password_resets_controller.rb
-- app/controllers/casein/user_sessions_controller.rb
-- app/controllers/casein/users_controller.rb
 - app/helpers/casein/casein_helper.rb
 - app/mailers/casein/casein_notification.rb
-- app/models/casein/user.rb
-- app/models/casein/user_session.rb
+- app/models/casein/admin_user.rb
+- app/models/casein/admin_user_session.rb
+- app/views/casein/admin_user_sessions/new.html.erb
+- app/views/casein/admin_users/index.html.erb
+- app/views/casein/admin_users/new.html.erb
+- app/views/casein/admin_users/show.html.erb
 - app/views/casein/casein/blank.html.erb
 - app/views/casein/casein_notification/generate_new_password.erb
 - app/views/casein/casein_notification/new_user_information.erb
 - app/views/casein/casein_notification/password_reset_instructions.erb
 - app/views/casein/password_resets/edit.html.erb
-- app/views/casein/user_sessions/new.html.erb
-- app/views/casein/users/index.html.erb
-- app/views/casein/users/new.html.erb
-- app/views/casein/users/show.html.erb
 - app/views/layouts/casein_auth.html.erb
 - app/views/layouts/casein_main.html.erb
+- config/initializers/will_paginate.rb
 - config/routes.rb
 - lib/casein.rb
 - lib/casein/engine.rb
@@ -115,9 +135,9 @@ files:
 - 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/helpers/casein/config_helper.rb
-- lib/generators/casein/install/templates/app/views/casein/layouts/_left_navigation.html.erb
-- lib/generators/casein/install/templates/app/views/casein/layouts/_right_navigation.html.erb
-- lib/generators/casein/install/templates/db/migrate/casein_create_users.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
+- lib/generators/casein/install/templates/db/migrate/casein_create_admin_users.rb
 - lib/generators/casein/install/templates/public/robots.txt
 - lib/generators/casein/scaffold/USAGE
 - lib/generators/casein/scaffold/scaffold_generator.rb
@@ -131,7 +151,8 @@ files:
 - lib/generators/casein/scaffold/templates/views/show.html.erb
 - lib/railties/tasks.rake
 homepage: http://github.com/russellquinn/casein
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,18 +160,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: A lightweight Ruby on Rails CMS.
+summary: A lightweight CMS toolkit for Ruby on Rails, based on Bootstrap.
 test_files: []

data/MIT-LICENSE

@@ -1,21 +0,0 @@
-Copyright (c) 2013 Russell Quinn
-Copyright (c) 2010-2012 Spoiled Milk ApS and Russell Quinn
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.