casein 3.1.0 → 3.1.1

data/PUBLIC_VERSION.yml

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

data/README.rdoc

@@ -2,6 +2,8 @@
 
 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.
 
+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
+
 ==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.
@@ -12,10 +14,13 @@ Casein is sponsored by Spoiled Milk (http://www.spoiledmilk.dk) and maintained b
 
 Casein 3.x is built for Ruby on Rails 3 and has the following major updates:
 
+* 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
 
 ==Installation
 
@@ -55,7 +60,7 @@ Casein 3.x is built for Ruby on Rails 3 and has the following major updates:
 
   rails g casein:update
 	
-- Perform a database migration to create the Casein users table:
+— Perform a database migration to create the Casein users table:
  
   rake db:create (if needed)
   rake db:migrate

data/Rakefile

@@ -28,7 +28,7 @@ begin
     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.files = Dir["Gemfile", "MIT-LICENSE", "Rakefile", "README.rdoc", "{lib}/**/*", "{app}/**/*", "{config}/**/*"]
+    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"

data/app/helpers/casein/casein_helper.rb

@@ -1,8 +1,8 @@
 module Casein
   module CaseinHelper
 	
-	  def casein_get_version_info
-	    YAML::load_file File.join(File.dirname(__FILE__), '..', '..', '..', 'VERSION.yml')
+	  def casein_get_version_info  
+	    YAML::load_file File.join(File.dirname(__FILE__), '..', '..', '..', 'PUBLIC_VERSION.yml')
 	  end
 	
   	def casein_get_full_version_string

data/app/mailers/casein/casein_notification.rb

@@ -1,35 +1,30 @@
 module Casein
   
-  require 'casein/config_helper'
-	include Casein::ConfigHelper
-	  
   class CaseinNotification < ActionMailer::Base
 	
-  	default :from => casein_config_email_from_address
-
   	self.prepend_view_path File.join(File.dirname(__FILE__), '..', 'views', 'casein')
 	
-  	def generate_new_password casein_user, host, pass
+  	def generate_new_password from, casein_user, host, pass
   		@name = casein_user.name
   		@host = host
   		@login = casein_user.login
   		@pass = pass
   		@from_text = casein_config_website_name
   		
-  		mail(:to => casein_user.email, :subject => "[#{casein_config_website_name}] New password")
+  		mail(:to => casein_user.email, :from => from, :subject => "[#{casein_config_website_name}] New password")
   	end
   
-  	def new_user_information casein_user, host, pass
+  	def new_user_information from, casein_user, host, pass
       @name = casein_user.name
   		@host = host
   		@login = casein_user.login
   		@pass = pass
   		@from_text = casein_config_website_name
   		
-  		mail(:to => casein_user.email, :subject => "[#{casein_config_website_name}] New user account")
+  		mail(:to => casein_user.email, :from => from, :subject => "[#{casein_config_website_name}] New user account")
   	end
   	
-  	def password_reset_instructions casein_user, host
+  	def password_reset_instructions from, casein_user, host
   	  ActionMailer::Base.default_url_options[:host] = host.gsub("http://", "")
       @name = casein_user.name
       @host = host
@@ -37,7 +32,7 @@ module Casein
       @reset_password_url = edit_casein_password_reset_url + "/?token=#{casein_user.perishable_token}"
       @from_text = casein_config_website_name
 
-      mail(:to => casein_user.email, :subject => "[#{casein_config_website_name}] Password reset instructions")
+      mail(:to => casein_user.email, :from => from, :subject => "[#{casein_config_website_name}] Password reset instructions")
     end
 
   end

data/app/models/casein/user.rb

@@ -28,19 +28,19 @@ module Casein
     end
 	
   	def send_create_notification
-      Casein::CaseinNotification.new_user_information(self, casein_config_hostname, @password).deliver
+      Casein::CaseinNotification.new_user_information(casein_config_email_from_address, self, casein_config_hostname, @password).deliver
     end
   
     def send_update_notification
       if notify_of_new_password
         notify_of_new_password = false
-        Casein::CaseinNotification.generate_new_password(self, casein_config_hostname, @password).deliver
+        Casein::CaseinNotification.generate_new_password(casein_config_email_from_address, self, casein_config_hostname, @password).deliver
       end
     end
     
     def send_password_reset_instructions
       reset_perishable_token!
-      Casein::CaseinNotification.password_reset_instructions(self, casein_config_hostname).deliver
+      Casein::CaseinNotification.password_reset_instructions(casein_config_email_from_address, self, casein_config_hostname).deliver
     end
     
     def check_time_zone

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: casein
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 3
   - 1
-  - 0
-  version: 3.1.0
+  - 1
+  version: 3.1.1
 platform: ruby
 authors: 
 - Russell Quinn
@@ -62,6 +62,7 @@ extra_rdoc_files:
 files: 
 - Gemfile
 - MIT-LICENSE
+- PUBLIC_VERSION.yml
 - README.rdoc
 - Rakefile
 - app/controllers/casein/casein_controller.rb