casein 3.1.11 → 4.0.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 578b6e6643025f347d184e451109b3b72c5695b7
+  data.tar.gz: 53a3862aa9d7588e5178d00746a0f2c8e5667b4b
+SHA512:
+  metadata.gz: acc98be3977d289cb0efd059ff78e7d96573453e204167afe6172bc945103fa77f5679b764843100d84bed638d89fc489d9db3c4718a2bd3b71e7846eea95bf5
+  data.tar.gz: 50f3d65970c19250990fec2ac59dfb5bbb760c14f773efbfaa95234a8ece2618a7592d0aa6e02c471a6cf8bacd904f5d6d74cdee9689733f142c663361d2a2fb

data/Gemfile

@@ -1 +1,2 @@
+source 'https://rubygems.org'
 gemspec

data/MIT-LICENSE

@@ -1,4 +1,5 @@
-Copyright (c) 2010-2011 Spoiled Milk ApS
+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

data/PUBLIC_VERSION.yml

@@ -1,4 +1,4 @@
-major: 3
-minor: 1
-patch: 11
-build: 
+major: 4
+minor: 0
+patch: 0
+build: beta1

data/README.rdoc

@@ -1,26 +1,37 @@
-=Casein - a lightweight Ruby on Rails CMS.
+=Casein - a lightweight Ruby on Rails CMS
 
-Casein is a plugin that provides scaffolding generators and helper functions to quickly create a clean and minimal CRUD (Create, Read, Update and Delete) interface for your data. It also comes with a pre-rolled user authentication system. As Casein is completely decoupled from the front-end, it can be added to a new or existing Rails project, or used as a standalone CMS to drive platforms built on other technologies.
+**WORK IN PROGRESS FOR A RAILS 4.x VERSION**
 
-This version of Casein is designed for Ruby on Rails 3.x. For a legacy version that is compatible with Rails 2.x, see: http://github.com/spoiledmilk/casein
+Casein is a Rails 4.x gem that provides scaffolding generators and helper functions to quickly create a clean and minimal CRUD (Create, Read, Update and Delete) interface for your data. It also comes with a pre-rolled user authentication system. As Casein is completely decoupled from the front-end, it can be added to a new or existing Rails project, or used as a standalone CMS to drive platforms built on other technologies.
+
+==Requirements
+
+This version of Casein is designed for Ruby on Rails 4.x and Ruby 2.x.
+
+Legacy versions:
+
+Rail 3.x: http://github.com/spoiledmilk/casein3
+
+Rails 2.x: http://github.com/spoiledmilk/casein
 
 ==Disclaimer
 
-Casein is the in-house CMS framework used by digital agency Spoiled Milk and is being used in many live production websites. This open source project is an attempt to extract and share the core.
+Casein was created and is maintained by Russell Quinn (http://www.russellquinn.com)
+
+Previous versions of Casein were sponsored by Spoiled Milk (http://www.spoiledmilk.com)
 
 Casein is available to use under the terms of the MIT License. See the LICENSE file for more details.
 
-Casein is sponsored by Spoiled Milk (http://www.spoiledmilk.dk) and maintained by Russell Quinn (http://www.russellquinn.com)
+==What’s New
+
+Casein 4.x built for Ruby on Rails 3 and has the following major updates:
 
-Casein 3.x is built for Ruby on Rails 3 and has the following major updates:
+* Support for strong parameters
+* Support for asset pipeline
+* Rails 4 compatibility fixes
+* Many other tweaks and improvements over Casein 3.x
 
-* Authentication changed to use Authlogic
-* Supplied as a gem
-* Runs as an Engine
-* Now properly namespaced
-* Timezone support
-* Rails 3 compatibility fixes
-* Many other tweaks and improvements over Casein 2.x
+There is no real upgrade path from previous versions of Casein. It’s recommended to only use Casein 4.x on new projects.
 
 ==Installation
 
@@ -29,37 +40,19 @@ Casein 3.x is built for Ruby on Rails 3 and has the following major updates:
 — Add the Casein gem to your Gemfile:
 
   gem 'casein'
-	
-- Then use bundler to install Casein and its dependencies:
 
-  sudo bundle install
+— Then use bundler to install Casein and its dependencies:
+
+  bundle install
 	
 — If you have just created a new project, then remember to add your database details to /config/database.yml at this point.
 
-— These installation instructions also assume that you have set up your RAILS_ENV environment variable.
-
-— To enable Casein notification emails (used for new users and forgotten passwords) then add your SMTP server information to your initializers. For example create a new file called initializers/setup_mail.rb and add the following to it:
-
-  ActionMailer::Base.delivery_method = :smtp
-  ActionMailer::Base.raise_delivery_errors = false
-  ActionMailer::Base.smtp_settings = {
-    :enable_starttls_auto => false,
-    :address => "mail.yourdomain.com",
-    :port => 25,
-    :domain => "yourdomain.com",
-    :user_name => "donotreply@yourdomain.com",
-    :password => "whatever",
-    :authentication => :login
-  }
+— To enable Casein notification emails (used for new users and forgotten passwords) then add your SMTP server information to your initializers. For development, you can use something cool like MailCatcher (http://mailcatcher.me)
 
 — Install Casein configuration files into your project. This should not be run more than once without backing up or merging the generated files, as your customisations will be overwritten:
 
   rails g casein:install
 	
-— Add Casein assets to your project /public folder. These should not be modified as they may be overwritten in future updates:.
-
-  rails g casein:update
-	
 — Perform a database migration to create the Casein users table:
  
   rake db:create (if needed)
@@ -81,7 +74,39 @@ The default Casein install supports user authentication. Users may have a status
 
 Casein is a framework allowing you to quickly build up an interface to edit and create new records from your database model. As well as the user support and user interface, there are many configurations and generators to help you along the way.
 
-==Configuration
+==Scaffolding
+
+Casein has a scaffolding generator to automatically create all the CRUD views and controllers for your project models. This is the fastest way to add Casein support to your project.
+
+The command to run the scaffolding generator is:
+
+  rails g casein:scaffold ModelName [field:type, field:type]
+
+Where:
+
+* ModelName – The singular name of your model, e.g. customer
+* field:type – The name of your database fields and their types, e.g. name:string. The field name must match the name in your migrations and the type must be one of the Rails migration types (string, text, integer, float, decimal, datetime, timestamp, time, date, binary, boolean). Note that you do not have to specify all of the fields in your model, but just the ones that you wish to be editable in Casein.
+
+e.g. a typical scaffolding command might look like:
+
+  rails g casein:scaffold customer name:string age:integer date_of_birth:date is_male:boolean
+
+There is one command-line option that can be added to the end of the generate command:
+
+  --create-model-and-migration = Also creates a model and migration. By default the scaffold generator will work from existing models, but this option will generate the model and database migration files for you. This means you can also use Casein to set up a new project quickly as well.
+
+Once the command has been executed, the generator will:
+
+* Add a new tab for the model to: app/views/casein/layouts/_left_navigation.html.erb
+* Create a controller with the name: app/controllers/casein/model_controller.erb
+* Add views for index, new and show to: app/views/casein/model/
+* If you restart and run your application now, you’ll be able to log in to Casein and directly edit and create new instances of your model data right away!
+
+However, you’ll probably want to customise your views and side bars and extend your controller to suit your project. The scaffold generator just sets up the defaults for you.
+
+<em>NOTE: Once you start customising the generated scaffolding files, you should be aware that if you run the generator again you should not overwrite the changed files without backing them up first. The generator will warn you each time it finds a file that you’ve customised. If you run the scaffold generator from a new version of Casein, then you should manually merge your backup and the new file. You can of course however, leave your originals untouched.</em>
+
+==General Configuration
 
 <b>app/helpers/casein/config_helper.rb</b>
 
@@ -95,13 +120,13 @@ An ERB partial for the the left navigation tabs. Note that using the scaffolding
 
 An ERB partial for the the right navigation tabs. Note that the ‘users’ tab is added automatically for admin users.
 
-<b>/public/casein/javascripts/custom.js & /public/casein/stylesheets/custom.css</b>
+<b>/assets/javascripts/casein/custom.js & /assets/stylesheets/casein/custom.css.scss</b>
 
-The Casein assets are located in /public/casein. These are the only two files you should change. They allow you to add custom JavaScript or CSS to your Casein deployment. These files are not overwritten using the ‘rails g casein:update’ command.
+These files are added to your app’s /assets directory. They allow you to add custom JavaScript or CSS to your Casein deployment.
 
 ==Customising
 
-Now that you have the basic Casein installed and configured, you’ll want to extend it so that it actually has some functionality for your project!
+Once you have the Casein core installed and configured, and have added support for your models with the scaffolding generator, you’ll want to extend it so that it actually has some functionality for your project!
 
 <b>Rules and conventions</b>
 
@@ -143,38 +168,6 @@ There are several Casein Rake tasks available to manage users. To see what is av
 
 The Casein Rake tasks are all namespaced with ‘casein:’
 
-==Scaffolding
-
-Casein has a scaffolding generator to automatically create all the views and controllers for your project models. This is the fastest way to add Casein support to your project.
-
-The command to run the scaffolding generator is:
-
-  rails g casein:scaffold ModelName [field:type, field:type]
-
-Where:
-
-* ModelName – The singular name of your model, e.g. customer
-* field:type – The name of your database fields and their types, e.g. name:string. The field name must match the name in your migrations and the type must be one of the Rails migration types (string, text, integer, float, decimal, datetime, timestamp, time, date, binary, boolean). Note that you do not have to specify all of the fields in your model, but just the ones that you wish to be editable in Casein.
-
-e.g. a typical scaffolding command might look like:
-
-  rails g casein:scaffold customer name:string age:integer date_of_birth:date is_male:boolean
-
-There is one command-line option that can be added to the end of the generate command:
-
-  --create-model-and-migration = Also creates a model and migration. By default the scaffold generator will work from existing models, but this option will generate the model and database migration files for you. This means you can also use Casein to set up a new project quickly as well.
-
-Once the command has been executed, the generator will:
-
-* Add a new tab for the model to: app/views/casein/layouts/_left_navigation.html.erb
-* Create a controller with the name: app/controllers/casein/model_controller.erb
-* Add views for index, new and show to: app/views/casein/model/
-* If you restart and run your application now, you’ll be able to log in to Casein and directly edit and create new instances of your model data right away!
-
-However, you’ll probably want to customise your views and side bars and extend your controller to suit your project. The scaffold generator just sets up the defaults for you.
-
-<em>NOTE: Once you start customising the generated scaffolding files, you should be aware that if you run the generator again you should not overwrite the changed files without backing them up first. The generator will warn you each time it finds a file that you’ve customised. If you run the scaffold generator from a new version of Casein, then you should manually merge your backup and the new file. You can of course however, leave your originals untouched.</em>
-
 ===Changing form elements / other helpers
 
 Casein will insert form elements suitable for the field types you specified in the command line. However, you may wish to customise these, e.g. swap a text field for a password field, swap an integer field for a select dropdown, or swap a date field for a full calendar picker, etc.
@@ -223,6 +216,10 @@ e.g.
 
   match ':controller(/:action(/:id(.:format)))', :constraints => Casein::RouteConstraint.new
 
+===Default Timezone
+
+Every Casein user can set their own timezone via their profile. To change the default timezone for new users, set config.time_zone in your app.
+
 ==Acknowledgements
 
 The icons used in Casein were created by Mark James and are licensed under the Creative Commons Attribution 2.5 License (http://creativecommons.org/licenses/by/2.5/). The full series of icons are available here: http://www.famfamfam.com/lab/icons/silk/

data/Rakefile

@@ -1,11 +1,11 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
 
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc 'Test the casein gem.'
+desc 'Test the Casein gem.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
@@ -13,7 +13,7 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = true
 end
 
-desc 'Generate documentation for the casein gem.'
+desc 'Generate documentation for the Casein gem.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'Casein'
@@ -27,13 +27,14 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "casein"
     gem.summary = "A lightweight Ruby on Rails CMS."
-    gem.description = "Casein is an open-source CMS for Ruby on Rails, originally developed by Spoiled Milk."
+    gem.description = "Casein is an open-source CMS for Ruby on Rails."
     gem.files = Dir["Gemfile", "MIT-LICENSE", "Rakefile", "README.rdoc", "PUBLIC_VERSION.yml", "{lib}/**/*", "{app}/**/*", "{config}/**/*"]
     gem.email = "mail@russellquinn.com"
-    gem.authors = ["Russell Quinn", "Spoiled Milk"]
-    gem.homepage = "http://github.com/spoiledmilk/casein3"
-    gem.add_dependency("will_paginate", ["3.0.0"])
-    gem.add_dependency("authlogic", ["3.0.3"])
+    gem.authors = ["Russell Quinn"]
+    gem.homepage = "http://github.com/russellquinn/casein"
+    gem.add_dependency("will_paginate", ["3.0.4"])
+    gem.add_dependency("authlogic", ["3.3.0"])
+    gem.add_dependency("jquery-rails")
   end
 rescue
   puts "Jeweler or one of its dependencies is not installed."

data/{lib/generators/casein/update/templates/public/casein/javascripts → app/assets/javascripts/casein}/casein.js

@@ -1,3 +1,6 @@
+//= require jquery
+//= require jquery_ujs
+
 jQuery(document).ready(function()
 {
 	var contentHeight = Math.round(jQuery(window).height() - 130);

data/{lib/generators/casein/update/templates/public/casein/javascripts → app/assets/javascripts/casein}/login.js

@@ -1,3 +1,6 @@
+//= require jquery
+//= require jquery_ujs
+
 jQuery(document).ready(function()
 { 
 	if(jQuery("#notice"))

data/app/assets/stylesheets/casein/casein.css.scss

@@ -0,0 +1,4 @@
+/*
+ *= require ./elements.css.scss
+ *= require ./screen.css.scss
+*/

data/{lib/generators/casein/update/templates/public/casein/stylesheets/elements.css → app/assets/stylesheets/casein/elements.css.scss}

@@ -64,7 +64,7 @@
 
 #content .openFolder {
 	border-bottom: 1px solid #ddd;
-	background: url(/casein/images/icons/folder.png) no-repeat center left;
+	background: image-url('folder.png') no-repeat center left;
 	font-weight: bold;
 	cursor: pointer;
 }

data/{lib/generators/casein/update/templates/public/casein/stylesheets/login.css → app/assets/stylesheets/casein/login.css.scss}

@@ -16,7 +16,7 @@ a {
 }
 
 #header {
-	background: #efefef url(/casein/images/login/top.png) repeat-x bottom left;
+	background: #efefef image-url('casein/login/top.png') repeat-x bottom left;
 	padding: 80px 0 40px 0;
 }
 
@@ -32,7 +32,7 @@ a {
 }
 
 #content {
-	background: #fff url(/casein/images/login/bottom.png) repeat-x bottom left;
+	background: #fff image-url('casein/login/bottom.png') repeat-x bottom left;
 	padding: 70px 0;
 }
 

data/{lib/generators/casein/update/templates/public/casein/stylesheets/screen.css → app/assets/stylesheets/casein/screen.css.scss}

@@ -69,7 +69,7 @@ div.loginBox {
 	height: 96px;
 	padding: 25px;
 	position: relative;
-	background: url(/casein/images/header.png) repeat-x top left;
+	background: image-url('casein/header.png') repeat-x top left;
 	z-index: 900;
 }
 
@@ -133,18 +133,18 @@ div.loginBox {
 #navigation li a {
 	color: #fff;
 	padding: 11px 12px 9px 12px;
-	background: url(/casein/images/nav.png) repeat-x bottom left; 
+	background: image-url('casein/nav.png') repeat-x bottom left; 
 	text-decoration: none;
 }
 
 #navigation li a:hover {
   padding: 11px 12px 9px 12px;
-	background: url(/casein/images/nav.png) repeat-x top left;
+	background: image-url('casein/nav.png') repeat-x top left;
 	color: #000;
 }
 
 #navigation .active a {
-	background: url(/casein/images/nav.png) repeat-x top left;
+	background: image-url('casein/nav.png') repeat-x top left;
 	color: #000;
 }
 
@@ -169,12 +169,12 @@ div.loginBox {
 	color: #fff;
 	display: block;
 	padding: 12px 12px 10px 12px;
-	background: url(/casein/images/visitSiteNav.png) repeat-x top left;
+	background: image-url('casein/visitSiteNav.png') repeat-x top left;
 	text-decoration: none;
 }
 
 #altNavigation li a:hover {
-	background: url(/casein/images/visitSiteNav.png) repeat-x bottom left;
+	background: image-url('casein/visitSiteNav.png') repeat-x bottom left;
 	color: #000;
 }
 
@@ -189,7 +189,7 @@ div.loginBox {
 	width: 312px;
 	padding: 0 0 0 6px;
 	height: 100%;
-	background: url(/casein/images/rightNav.png) repeat-y top left;
+	background: image-url('casein/rightNav.png') repeat-y top left;
 	z-index: 10;
 }
 
@@ -205,19 +205,19 @@ div.loginBox {
 #rightBar li a {
 	display: block;
 	width: 288px;
-	background: url(/casein/images/rightNavButton.png) no-repeat top left;
+	background: image-url('casein/rightNavButton.png') no-repeat top left;
 	padding: 11px 0 11px 0;
 	color: #555;
 	text-decoration: none;
 }
 
 #rightBar li a:hover {
-	background: url(/casein/images/rightNavButton.png) no-repeat bottom left;
+	background: image-url('casein/rightNavButton.png') no-repeat bottom left;
 	color: #000;
 }
 
 #rightBar .active a {
-	background: url(/casein/images/rightNavButton.png) no-repeat bottom left;
+	background: image-url('casein/rightNavButton.png') no-repeat bottom left;
 	color: #000;
 }
 

data/app/controllers/casein/users_controller.rb

@@ -18,7 +18,7 @@ module Casein
     end
   
     def create
-      @casein_user = Casein::User.new params[:casein_user]
+      @casein_user = Casein::User.new casein_user_params
     
       if @casein_user.save
         flash[:notice] = "An email has been sent to " + @casein_user.name + " with the new account details"
@@ -38,7 +38,7 @@ module Casein
       @casein_user = Casein::User.find params[:id]
       @casein_page_title = @casein_user.name + " | Update User"
 
-      if @casein_user.update_attributes params[:casein_user]
+      if @casein_user.update_attributes casein_user_params
         flash[:notice] = @casein_user.name + " has been updated"
       else
         flash.now[:warning] = "There were problems when trying to update this user"
@@ -58,7 +58,7 @@ module Casein
       @casein_page_title = @casein_user.name + " | Update Password"
        
       if @casein_user.valid_password? params[:form_current_password]
-        if @casein_user.update_attributes params[:casein_user]
+        if @casein_user.update_attributes casein_user_params
           flash.now[:notice] = "Your password has been changed"
         else
           flash.now[:warning] = "There were problems when trying to change the password"
@@ -76,7 +76,7 @@ module Casein
        
       @casein_user.notify_of_new_password = true unless @casein_user.id == @session_user.id
       
-      if @casein_user.update_attributes params[:casein_user]
+      if @casein_user.update_attributes casein_user_params
         if @casein_user.id == @session_user.id
           flash.now[:notice] = "Your password has been reset"
         else    
@@ -97,6 +97,12 @@ module Casein
       end
       redirect_to casein_users_path
     end
+
+    private
+
+      def casein_user_params
+        params.require(:casein_user).permit(:login, :name, :email, :time_zone, :access_level, :password, :password_confirmation)
+      end
  
   end
 end