casein 5.2.0.0 → 5.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d4b37234ce457806986bdfafc8297cec5a044a0
-  data.tar.gz: 7eaffb7741b722eae3ee27912f71660afe1c90ba
+  metadata.gz: ff0f49f01f423bf89fc04f98f064bb30c825f2fb
+  data.tar.gz: fa91ab17644cc8fd9c5046c168f987d2d2949860
 SHA512:
-  metadata.gz: d40b856a88a4dffb826baaba75214e5b202c47b3f49c5e13af564e57f6770235199b36d929866a1e58c3b679c8cda9ac59a61c3faf9c3b9f7b0832db4c18ae6d
-  data.tar.gz: e83824b71af4253db9fada75768ff80c1685fb27b9ccb92a48e571395800bf822f2e0845372164dd2f12688f758a495b5e03a3ced4e662b8f5de7541a414c1ee
+  metadata.gz: f5ec95980a6ca24a64c1119bf4898a7e953124410fa8b2ba5507a12e13738523c17e14c3a930036f84ce347df644872a6965f840fb96ecc89990761a57810260
+  data.tar.gz: c4346dbb675b58da56b3832f332f472915b265dc979bec16b58ac299ec5d2220d995b7e449253ca4215695d55118baae4d9acda9aa3485f987d2d4b4cafd3209

data/README.rdoc

@@ -10,19 +10,26 @@ Screenshots at: http://www.caseincms.com
 
 ==Requirements
 
-This version of Casein is designed for Ruby on Rails 5.x and Ruby 2.1.x.
+This version of Casein is designed for Ruby on Rails 5.x and Ruby 2.2.x or later.
 
 Casein 5.1.1.5 was the last gem release compatible with Rails 4.x.
 
-==What’s New in 5.2.0
+==What’s New in 5.3.0
 
-Casein 5.2.0 has the following updates:
+Casein 5.3.0 has the following updates:
+
+* Support for passing html_options into casein_select (see [here](https://github.com/russellquinn/casein/pull/80))
+* Fixed a bug where jQuery couldn't be found if it wasn't in your main project's Gemfile (for example, when using Rails 5.1.x)
+* Updated the migration templates to include Rails version number and modern syntax
+* Made password-reset error message clearer to explain what the problem might be
+
+Casein 5.2.0 had the following updates:
 
 * Compatible with Rails 5.x
 * Added auth_custom.js and auth_custom.scss for customizing JavaScript and CSS in the authentication layout
 * Deprecation updates and small improvements
 
-Version 5.2.0 should be a drop-in replacement for 5.1.1, but requires Rails 5.x and Ruby 2.1.x.
+Version 5.2.0 is almost a drop-in replacement for 5.1.1, but requires Rails 5.x and Ruby 2.1.x. The only other change is the addition of two methods to 'app/helpers/casein/config_helper.rb'. These are 'casein_config_auth_stylesheet_includes' and 'casein_config_auth_javascript_includes'. And two new template files. These are 'auth_custom.scss' and 'auth_custom.js'. You should run 'rails g casein:install' again to install the new files and, when you reach 'config_helper.rb' press 'd' to show differences and manually merge the changes.
 
 Thanks to @brchristian and @mkunkel for this release.
 
@@ -32,7 +39,7 @@ Thanks to @brchristian and @mkunkel for this release.
 
 — Add the Casein gem to your Gemfile:
 
-  gem 'casein', '~>5.2.0'
+  gem 'casein', '~>5.3.0'
 
 — Then use bundler to install Casein and its dependencies:
 
@@ -201,7 +208,7 @@ All of the standard Rails form helpers are available, but the Casein versions ar
   casein_check_box_group form, obj, check_boxes = {}
   casein_radio_button form, obj, attribute, tag_value, options = {}
   casein_radio_button_group form, obj, radio_buttons = {}
-  casein_select form, obj, attribute, option_tags, options = {}
+  casein_select form, obj, attribute, option_tags, options = {}, html_options = {}
   casein_time_zone_select form, obj, attribute, option_tags, options = {}
   casein_collection_select form, obj, object_name, attribute, collection, value_method, text_method, options = {}
   casein_date_select form, obj, attribute, options = {}

data/app/controllers/casein/password_resets_controller.rb

@@ -56,7 +56,7 @@ module Casein
       @reset_user = Casein::AdminUser.find_using_perishable_token params[:token]
       
       unless @reset_user
-        flash[:warning] = "Your account could not be located. Try to copy and paste the URL directly from the email."
+        flash[:warning] = "Your account could not be located. This can happen if you wait more than 10 minutes to click the link or if you select 'Forgotten Password' multiple times, which invalidates all previous reset links."
         redirect_to new_casein_admin_user_session_url
       end
     end

data/app/helpers/casein/casein_helper.rb

@@ -172,8 +172,12 @@ module Casein
       casein_form_tag_wrapper(form_tag, form, obj, attribute, options).html_safe
     end
 
-  	def casein_select form, obj, attribute, option_tags, options = {}
-  		casein_form_tag_wrapper(form.select(attribute, option_tags, strip_casein_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
+  	def casein_select form, obj, attribute, option_tags, options = {}, html_options = {}
+
+      html_options_to_use = merged_class_hash(options, 'form-control') #legacy support
+      html_options_to_use = options_hash_with_merged_classes(html_options, html_options_to_use[:class])
+      
+  		casein_form_tag_wrapper(form.select(attribute, option_tags, strip_casein_options(options), html_options_to_use), form, obj, attribute, options).html_safe
   	end
 
   	def casein_time_zone_select form, obj, attribute, option_tags, options = {}

data/lib/casein/engine.rb

@@ -1,6 +1,7 @@
 require "casein"
 require "rails"
 require 'bootstrap-sass'
+require 'jquery-rails'
 
 module Casein
   class Engine < Rails::Engine

data/lib/casein/version.rb

@@ -1,4 +1,4 @@
 module Casein
-  VERSION_HASH = { major: 5, minor: 2, patch: 0, build: 0 }
+  VERSION_HASH = { major: 5, minor: 3, patch: 0, build: 0 }
   VERSION = VERSION_HASH.values.join(".")
 end

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

@@ -1,6 +1,6 @@
-class CaseinCreateAdminUsers < ActiveRecord::Migration
+class CaseinCreateAdminUsers < ActiveRecord::Migration[5.1]
   
-  def self.up
+  def change
     create_table :casein_admin_users do |t|   
       t.string    :login, null: false
       t.string    :name
@@ -22,9 +22,5 @@ class CaseinCreateAdminUsers < ActiveRecord::Migration
       t.timestamps
     end
   end
-  
-  def self.down
-    drop_table :casein_admin_users
-  end
-  
+    
 end

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

@@ -1,13 +1,9 @@
-class Create<%= class_name.pluralize %> < ActiveRecord::Migration
-  def self.up
+class Create<%= class_name.pluralize %> < ActiveRecord::Migration[<%= Rails::VERSION::MAJOR %>.<%= Rails::VERSION::MINOR %>]
+  def change
     create_table :<%= table_name %> do |t|
-      <% attributes.each do |attribute| %>t.<%= attribute.type %> :<%= attribute.name %>
+<% attributes.each do |attribute| %>      t.<%= attribute.type %> :<%= attribute.name %>
 <% end %>
       t.timestamps
     end
   end
-
-  def self.down
-    drop_table :<%= table_name %>
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: casein
 version: !ruby/object:Gem::Version
-  version: 5.2.0.0
+  version: 5.3.0.0
 platform: ruby
 authors:
 - Russell Quinn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate