casein 5.0.1.0 → 5.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b74cfa7fbe0270c2cc2ce110b4e7fb71e904dcf
-  data.tar.gz: dc5f86e1a0c1d67deddb67d56128282c4ff932b5
+  metadata.gz: 9ba7770489c1f7bb3656bb6bac034ce469ad6701
+  data.tar.gz: 51f79ca93f5d7ceb85974e7d47a5b520679743a1
 SHA512:
-  metadata.gz: dc100ed3cb97892ae21a54240d3d6c41277ccd265642712575100803634c7ae1035eca0e3932bbcf548eab553c4c07cfcd06de41a7c6135a5a77c9e2c419c4e5
-  data.tar.gz: eeeffc3ee03e64422e8820b0628818328f3e6007a1dda4562212b4b9ef9e41236dbf126e4326e153f28081ca4ac78b0491cdbea4647c0e762caa05297674fb91
+  metadata.gz: 408ddcb64313158e13d030a34dc5f0e3f482fdeeffa5c28c4fe631dd9dd7c35ee6125ec114588f79b7dd8ba77aae261ec138add0fa2c5bc7413cdd4010121b01
+  data.tar.gz: a4ae1d0e0f6ea91e4e06362c1ad9b45465ac54f24cf15f8c42cf87eed781bdbc1ae264094a0ed38a30dc3b245ca7423d99b3bfb6a09200ad514430f1e92e3635

data/LICENSE

@@ -26,221 +26,3 @@ 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.
-
-- - -
-
-Casein uses Bootstrap and Glyphicons.
-
-Bootstrap is copyright (c) 2014 Twitter and is used under the Apache 2.0 license.
-http://getbootstrap.com
-
-Glyphicons is an extensive glyph library created by Jan Kovařík and made available for Bootstrap under the same Apache 2.0 license.
-http://glyphicons.com
-
-Bootstrap-glyphicons is copyright (c) 2014 Mark Otto and is used under the MIT License.
-http://glyphicons.getbootstrap.com
-
-- - -
-
-Bootstrap and Glyphicons license:
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-- - - 
-
-Bootstrap-glyphicons license:
-
-Copyright (c) 2014 Mark Otto
-
-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.

data/PUBLIC_VERSION.yml

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

data/README.rdoc

@@ -1,10 +1,10 @@
 =Casein - a lightweight CMS toolkit for Ruby on Rails, based on Bootstrap
 
-** ALL-NEW CASEIN 5.0.0 — featuring new responsive UI based on Bootstrap 3! **
+** ALL-NEW CASEIN 5.1.0 — featuring new responsive UI based on Bootstrap 3.3! **
 
 Casein is a Rails 4.x gem that provides scaffolding generators and helper functions to quickly create a clean and minimal CRUD interface for your data.
 
-It comes with a pre-rolled user-authentication system, supports user-based timezones, and is mobile-ready.
+It comes with a pre-rolled user-authentication system, supports user-based timezones, and is mobile ready.
 
 As Casein is completely decoupled from the front end, it can be added to new or existing Rails projects, or used as a standalone CMS to drive platforms built on other technologies.
 
@@ -17,18 +17,22 @@ This version of Casein is designed for Ruby on Rails 4.x and Ruby 2.x.
 Legacy versions:
 
 Rails 3.x: http://github.com/spoiledmilk/casein3
-
 Rails 2.x: http://github.com/spoiledmilk/casein
 
-==Disclaimer
+==What’s New in 5.1
 
-Casein was created and is maintained by Russell Quinn. http://www.russellquinn.com
+Casein 5.1 has the following updates:
 
-Casein is available to use under the terms of the MIT License. See the LICENSE file for more details.
+* Finally updated to Boostrap 3.3 (all bundled Bootstrap files removed in favor of bootstrap-sass gem)
+* Rake task to create admin user now takes an optional password
+* Authlogic version bumped to 3.4
+* UI tweaks
 
-==What’s New
+Version 5.1 should be a drop-in replacement for 5.0.
 
-Casein 5.x is built for Ruby on Rails 4.x and has the following major updates:
+Thanks to @bunnymatic for help with this release.
+
+==What Was New in 5.0
 
 * Now based on Bootstrap 3
 * Complete UI overhaul, now mobile-first
@@ -37,15 +41,13 @@ Casein 5.x is built for Ruby on Rails 4.x and has the following major updates:
 * Rails 4 compatibility fixes
 * Many other tweaks and improvements over Casein 3.x and 4.x
 
-There is no real upgrade path from previous versions of Casein, including v4.x. It’s recommended to only use Casein v5.x on new projects.
-
 ==Installation
 
 — Create a new Rails project (or use an existing one) and enter the project directory from a terminal prompt.
 
 — Add the Casein gem to your Gemfile:
 
-  gem 'casein', '5.0.0'
+  gem 'casein', '~>5.1.0'
 
 — Then use bundler to install Casein and its dependencies:
 
@@ -64,9 +66,9 @@ There is no real upgrade path from previous versions of Casein, including v4.x.
   rake db:create (if needed)
   rake db:migrate
 	
-— Run the following Rake task to set up an initial user. The default username and a random password will be displayed once the task has completed. You should specify your email address. If you've set up an SMTP server in your Rails environment then you’ll also receive an email notification about the new account.
+— Run the following Rake task to set up an initial user. The default username and a random password will be displayed once the task has completed. You should specify your email address and password. (Or omit the password parameter to have a random password assigned.) If you've set up an SMTP server in your Rails environment then you’ll also receive an email notification about the new account.
 
-  rake casein:users:create_admin email=you@yourdomain.com
+  rake casein:users:create_admin email=you@yourdomain.com [password=your_password]
 
 — Run your app! (rebooting the web server if applicable)
 
@@ -95,16 +97,16 @@ Where:
 
 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
+  rails g casein:scaffold Customer name:string age:integer date_of_birth:date has_paid:boolean
 
 By default the scaffold generator expects the model and database migration to already exist. This is because you typically won't want all of your model attributes to be editable in Casein. So you'd set up your model and migration the usual way, then run the Casein scaffold generator just for the appropriate attributes. However, you can add --create-model-and-migration to the generator to also create these files at the same time.
 
 
-Command-line options that can be added to the end of the generate command:
+Command-line options that can be added to the end of the scaffold generate command:
 
   --create-model-and-migration = Also creates a model and migration.
   --read-only = Creates scaffolding to view model data only (you will not be able to edit, create, or delete records). This is useful if you want to create a read-only viewer of data that's generated elsewhere.
-  --no-index = Excludes the index view and does not add to the model to the navigation. The _table partial is still generated. This is useful generating has/belongs relationships.
+  --no-index = Excludes the index view and does not add the model to the navigation. The _table partial is still generated. This is useful when generating has/belongs relationships.
 
 Once the command has been executed, the generator will:
 
@@ -189,8 +191,6 @@ The Casein Rake tasks are all namespaced with ‘casein:’
 
 Casein is now based on Bootstrap (http://getbootstrap.com) and jQuery. Bootstrap offers a wealth of UI components, CSS styles, and JavaScript plugins. See the Bootstrap website for full details.
 
-Note that Casein runs from the shortlived Bootstrap v3.0.0 beta and hasn't yet been updated to Bootstrap v3.1.x. Some of the Bootstrap syntax might be different if you're used to 3.1.x. (Update coming soon!)
-
 ===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.
@@ -209,7 +209,7 @@ All of the standard Rails form helpers are available, but the Casein versions ar
   casein_radio_button_group form, obj, radio_buttons = {}
   casein_select form, obj, attribute, option_tags, options = {}
   casein_time_zone_select form, obj, attribute, option_tags, options = {}
-  casein_collection_select form, obj, object, attribute, collection, value_method, text_method, options = {}
+  casein_collection_select form, obj, object_name, attribute, collection, value_method, text_method, options = {}
   casein_date_select form, obj, attribute, options = {}
   casein_time_select form, obj, attribute, options = {}
   casein_datetime_select form, obj, attribute, options = {}
@@ -220,6 +220,7 @@ All of the standard Rails form helpers are available, but the Casein versions ar
 For more information on each function, check the app/helpers/casein/casein_helper.rb file within the project. The method parameters are typically the same as the Rails form tag helpers. There are some extra Casein options that can be passed through as part of the options hash:
 
   :casein_label – by default the humanized version of the database field name is used as the label, but this will override it with a string of your choice.
+  :casein_sublabel — add a smaller, clarrifying label to the right of the main label 
   :casein_button_label – available in casein_radio_button and casein_check_box. Used to give individual buttons their labels.
   :casein_truncate - may be passed into casein_table_cell_link along with a maximum length to automatically truncate strings and suffix with '...'
 
@@ -251,12 +252,8 @@ e.g.
 
 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
-
-Casein uses Bootstrap and Glyphicons.
-
-Bootstrap is copyright (c) 2014 Twitter and is used under the MIT license. http://getbootstrap.com
+==Disclaimer
 
-Glyphicons is an extensive glyph library created by Jan Kovařík and made available for Bootstrap under the same Apache 2.0 license. http://glyphicons.com
+Casein was created and is maintained by Russell Quinn. http://www.russellquinn.com
 
-Bootstrap-glyphicons is copyright (c) 2013 Mark Otto and is used under the MIT License. http://glyphicons.getbootstrap.com
+Casein is available to use under the terms of the MIT License. See the LICENSE file for more details.

data/Rakefile

@@ -34,8 +34,10 @@ begin
     gem.license = "MIT"
     gem.homepage = "http://www.caseincms.com"
     gem.add_dependency("will_paginate", ["3.0.7"])
-    gem.add_dependency("authlogic", ["3.4.2"])
+    gem.add_dependency("authlogic", ["3.4.3"])
     gem.add_dependency("scrypt", ["1.2.1"])
+    gem.add_dependency("bootstrap-sass", ["3.3.1"])
+    gem.add_dependency("sass-rails")
     gem.add_dependency("jquery-rails")
   end
 rescue

data/app/assets/javascripts/casein/casein.js

@@ -1,6 +1,6 @@
 //= require jquery
 //= require jquery_ujs
-//= require ./bootstrap.js
+//= require bootstrap
 
 jQuery(document).ready(function() {
 

data/app/assets/stylesheets/casein/casein-bootstrap-overrides.css.scss

@@ -1,23 +1,25 @@
 /* BOOTSTRAP OVERRIDES */
 
+@import 'bootstrap/variables';
+
 .alert {
 	line-height: 22px;
 	padding: 10px 15px 10px 15px;
 }
 
-.navbar-toggle {
-	top: 54px;
-	left: 15px;
+.container-navbar-brand {
+	margin-bottom: 15px;
 }
 
 .navbar-brand {
 	padding-top: 10px;
 	padding-bottom: 25px;
+	padding-left: 10px;
 }
 
 .navbar-nav > li > a:hover,
 .navbar-nav > li > a:focus {
-	color: #000000;
+  color: #000000;
   border: 1px solid #cdcdcd;
   padding: 14px 9px 14px 9px;
 }
@@ -41,12 +43,26 @@
 	margin: 10px 0px 0px 0px;
 }
 
+@media screen and (max-width: 767px) {
+		#navbar.collapse, #navbar.collapsing  {
+		padding-left: 5%;
+		padding-right: 5%;
+	}
+}
+
 @media screen and (min-width: 768px) {
 
+	.container-navbar-brand {
+		margin-bottom: 0px;
+	}
+
+	.navbar-collapse {
+		padding-left: 0px;
+		padding-right: 0px;
+	}
+
 	.navbar-brand {
-		padding-top: 5px;
-		padding-bottom: 5px;
-		margin-left: 1px;
+		padding-left: 20px;
 	}
 
 	.navbar-nav {