caseadilla 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c48623f5e7e79c4b923b12eb91e1095c3851f3af
-  data.tar.gz: fb1c957602e8e67f40e6e7d90a341883e8e5e3bd
+  metadata.gz: 54ebd4a33e0d42a43de0ba6dfc91d9c9820311e7
+  data.tar.gz: 7db6e8357cccc11831ad407d1e22afa464803093
 SHA512:
-  metadata.gz: 7ea31aa4da299bf4fdbeb44ddee077b0b510f3dca717e1d9cda39b357c0987a5611f6519c819b25142d2863920bd59795e6411b1cbd807185feadf84ba885c32
-  data.tar.gz: 7f7c79861c19cba634f9adefa3f8e1f1793b672ce0c448820501808b4a2b972f79d79f3787cae847d44bc6b85bf473b5cef2d770c17be05207e1cc7d741bb5b9
+  metadata.gz: 2c1debf8ad153706c0e443ff70521a91d33fc431e7b765392ff5bb979b17f09e6e8b5c5349581c9a09c4df7bf89b979af46bbb11b6d90eabb418b28b834d41a5
+  data.tar.gz: 1fec81f2551558ed11f961937802fa3b3839e3fbac80304c930e352d39410d3a1b5bc940e0effa0f3da6d979328a4a3b56f37281c461ba310b5efe0762248d1c

data/app/controllers/caseadilla/caseadilla_controller.rb

@@ -1,5 +1,6 @@
 module Caseadilla
   class CaseadillaController < ApplicationController
+    # filter_access_to [:index, :blank]
 
     require 'caseadilla/caseadilla_helper'
     include Caseadilla::CaseadillaHelper
@@ -11,10 +12,12 @@ module Caseadilla
 
     # before_filter :set_time_zone
     before_action :require_sign_in
-    
+    before_action :redirect_if_not_authorized
+    # skip_before_action :redirect_if_not_authorized, only: :index
+
     ActionView::Base.field_error_proc = proc { |input, instance| "#{input}".html_safe }
 
-    def index		
+    def index
   		redirect_to caseadilla_config_dashboard_url
     end
 
@@ -35,16 +38,23 @@ module Caseadilla
     def veggie?
       return false unless Caseadilla::Engine.flavor = :veggie
     end
-    
+
     # def set_time_zone
     #   Time.zone = current_user.time_zone if current_user
     # end
-    
+
     def redirect_back_or_default(default)
       redirect_to(session[:return_to] || default)
       session[:return_to] = nil
     end
 
+    def redirect_if_not_authorized
+      auth = Authorization::Engine.new
+      unless auth.permit? :access, user: current_user, context: :caseadilla
+        redirect_to root_path, alert: "You are not authorized to access that page."
+      end
+    end
+
     def sort_order(default)
       "#{(params[:c] || default.to_s).gsub(/[\s;'\"]/,'')} #{'ASC' if params[:d] == 'up'} #{'DESC' if params[:d] == 'down'}"
     end
@@ -54,4 +64,4 @@ module Caseadilla
     end
 
   end
-end
+end

data/app/controllers/caseadilla/caseadilla_user_sessions_controller.rb

@@ -1,15 +1,17 @@
 module Caseadilla
   class CaseadillaUserSessionsController < Caseadilla::CaseadillaController
-    
+    # filter_access_to [:create]
+
     skip_before_action :require_sign_in, :only => [:new, :create]
+    skip_before_action :redirect_if_not_authorized, only: [:new, :create]
     before_filter :requires_no_session_user, :except => [:destroy]
-  
+
     layout 'caseadilla_auth'
-  
+
     def new
       @user_session = nil
     end
-  
+
     def create
       @user_session = nil
       if @user_session.save
@@ -18,14 +20,14 @@ module Caseadilla
         render :action => :new
       end
     end
-  
+
     def destroy
       current_user_session.destroy
       redirect_back_or_default new_caseadilla_user_session_url
     end
 
   private
-  
+
     def requires_no_session_user
       if current_user
         redirect_to :controller => :caseadilla, :action => :index
@@ -33,4 +35,4 @@ module Caseadilla
     end
 
   end
-end
+end

data/app/helpers/caseadilla/caseadilla_helper.rb

@@ -1,6 +1,6 @@
 module Caseadilla
   module CaseadillaHelper
-  
+
     def caseadilla_get_footer_string include_version = false
       if include_version
         "Running on #{link_to 'Caseadilla', 'http://www.github.com/zeiv/caseadilla'} #{caseadilla_get_full_version_string}, an open-source project.".html_safe
@@ -8,65 +8,65 @@ module Caseadilla
         "Running on #{link_to 'Caseadilla', 'http://www.github.com/zeiv/caseadilla'}, an open-source project.".html_safe
       end
     end
-  
+
     def caseadilla_get_full_version_string
       Caseadilla::VERSION
     end
-  
+
     def caseadilla_get_short_version_string
       Caseadilla::VERSION.slice(0..(str.index('.')))
     end
-  
+
     def caseadilla_generate_page_title
-    
+
       if @caseadilla_page_title.nil?
         return caseadilla_config_website_name
       end
-    
-      caseadilla_config_website_name + " > " + @caseadilla_page_title  
+
+      caseadilla_config_website_name + " > " + @caseadilla_page_title
     end
-  
+
     def caseadilla_get_access_level_text level
       case level
-        when $CASEIN_USER_ACCESS_LEVEL_ADMIN
+        when $caseadilla_USER_ACCESS_LEVEL_ADMIN
           return "Administrator"
-        when $CASEIN_USER_ACCESS_LEVEL_USER
+        when $caseadilla_USER_ACCESS_LEVEL_USER
           return "User"
         else
           return "Unknown"
       end
     end
-  
+
     def caseadilla_get_access_level_array
-      [["Administrator", $CASEIN_USER_ACCESS_LEVEL_ADMIN], ["User", $CASEIN_USER_ACCESS_LEVEL_USER]]
+      [["Administrator", $caseadilla_USER_ACCESS_LEVEL_ADMIN], ["User", $caseadilla_USER_ACCESS_LEVEL_USER]]
     end
 
     def caseadilla_pagination_details objs
       " <small class='pagination-details'>/ page #{objs.current_page} of #{objs.total_pages}</small>".html_safe if objs.current_page && objs.total_pages > 1
     end
-  
+
     def caseadilla_table_cell_link contents, link, options = {}
-    
+
       if options.key? :caseadilla_truncate
         contents = truncate(contents, :length => options[:caseadilla_truncate], :omission => "...")
       end
-    
+
       link_to "#{contents}".html_safe, link, options
     end
-    
+
     def caseadilla_table_cell_no_link contents, options = {}
-    
+
       if options.key? :caseadilla_truncate
         contents = truncate(contents, :length => options[:caseadilla_truncate], :omission => "...")
       end
-    
+
       "<div class='no-link'>#{contents}</div>".html_safe
     end
-  
+
     def caseadilla_show_icon icon_name
       "<div class='icon'><span class='glyphicon glyphicon-#{icon_name}'></span></div>".html_safe
     end
-  
+
     def caseadilla_show_row_icon icon_name
       "<div class='iconRow'><span class='glyphicon glyphicon-#{icon_name}'></span></div>".html_safe
     end
@@ -109,77 +109,77 @@ module Caseadilla
         return "<span class='label label-success'>No</span>".html_safe
       end
     end
-  
+
     # Styled form tag helpers
-  
+
     def caseadilla_text_field form, obj, attribute, options = {}
       caseadilla_form_tag_wrapper(form.text_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_password_field form, obj, attribute, options = {}
       caseadilla_form_tag_wrapper(form.password_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_text_area form, obj, attribute, options = {}
       caseadilla_form_tag_wrapper(form.text_area(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_text_area_wysiwyg form, obj, attribute, options = {}
       options.reverse_merge!({style: "height: 250px;"})
       caseadilla_form_tag_wrapper(form.text_area(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control wysihtml5'))), form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_check_box form, obj, attribute, options = {}
       form_tag = "<div class='check-box'>#{form.check_box(attribute, strip_caseadilla_options(options))}</div>".html_safe
       caseadilla_form_tag_wrapper(form_tag, form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_check_box_group form, obj, check_boxes = {}
       form_tags = ""
-    
+
       for check_box in check_boxes
         form_tags += caseadilla_check_box form, obj, check_box[0], check_box[1]
       end
-    
+
       caseadilla_form_tag_wrapper(form_tag, form, obj, attribute, options)
     end
-  
+
     def caseadilla_radio_button form, obj, attribute, tag_value, options = {}
       form_tag = form.radio_button(obj, attribute, tag_value, strip_caseadilla_options(options))
-    
+
       if options.key? :caseadilla_button_label
         form_tag = "<div>" + form_tag + "<span class=\"rcText\">#{options[:caseadilla_button_label]}</span></div>".html_safe
       end
-    
+
       caseadilla_form_tag_wrapper(form_tag, form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_radio_button_group form, obj, radio_buttons = {}
       form_tags = ""
-    
+
       for radio_button in radio_buttons
         form_tags += caseadilla_radio_button form, obj, check_box[0], check_box[1], check_box[2]
       end
-    
+
       caseadilla_form_tag_wrapper(form_tag, form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_select form, obj, attribute, option_tags, options = {}
       caseadilla_form_tag_wrapper(form.select(attribute, option_tags, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
     end
-    
+
     def caseadilla_time_zone_select form, obj, attribute, option_tags, options = {}
       caseadilla_form_tag_wrapper(form.time_zone_select(attribute, option_tags, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_collection_select form, obj, attribute, collection, value_method, text_method, options = {}
       caseadilla_form_tag_wrapper(collection_select(obj.class.name.downcase.to_sym, attribute, collection, value_method, text_method, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_collection_check_boxes form, obj, attribute, collection, value_method, text_method, options = {}
       caseadilla_form_tag_wrapper(collection_check_boxes(obj.class.name.downcase.to_sym, attribute, collection, value_method, text_method, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')), form, obj, attribute, options).html_safe
     end
-    
+
     def caseadilla_date_select form, obj, attribute, options = {}
       caseadilla_form_tag_wrapper("<div class='caseadilla-date-select'>".html_safe + form.date_select(attribute, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')) + "</div>".html_safe, form, obj, attribute, options).html_safe
     end
@@ -187,11 +187,11 @@ module Caseadilla
     def caseadilla_time_select form, obj, attribute, options = {}
       caseadilla_form_tag_wrapper("<div class='caseadilla-time-select'>".html_safe + form.time_select(attribute, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')) + "</div>".html_safe, form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_datetime_select form, obj, attribute, options = {}
       caseadilla_form_tag_wrapper("<div class='caseadilla-datetime-select'>".html_safe + form.datetime_select(attribute, strip_caseadilla_options(options), merged_class_hash(options, 'form-control')) + "</div>".html_safe, form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_file_field form, obj, object_name, attribute, options = {}
       class_hash = merged_class_hash(options, 'form-control')
       contents = "<div class='#{class_hash[:class]}'>" + file_field(object_name, attribute, strip_caseadilla_options(options)) + '</div>'
@@ -202,7 +202,7 @@ module Caseadilla
 
       caseadilla_form_tag_wrapper(contents, form, obj, attribute, options).html_safe
     end
-  
+
     def caseadilla_hidden_field form, obj, attribute, options = {}
       form.hidden_field(attribute, strip_caseadilla_options(options)).html_safe
     end
@@ -210,21 +210,73 @@ module Caseadilla
     def caseadilla_custom_field form, obj, attribute, custom_contents, options = {}
       caseadilla_form_tag_wrapper(custom_contents, form, obj, attribute, options).html_safe
     end
-  
+
+    def caseadilla_color_field form, obj, attribute, options = {}
+        caseadilla_form_tag_wrapper(form.color_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_search_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.search_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_telephone_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.telephone_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_url_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.url_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_email_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.email_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_date_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.date_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_datetime_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.datetime_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_datetime_local_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.datetime_local_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_month_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.month_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_week_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.week_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_time_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.time_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_number_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.number_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
+    def caseadilla_range_field form, obj, attribute, options = {}
+      caseadilla_form_tag_wrapper(form.range_field(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
+    end
+
   protected
 
     def strip_caseadilla_options options
       options.reject {|key, value| key.to_s.include? "caseadilla_" }
     end
-    
+
     def merged_class_hash options, new_class
       if options.key? :class
         new_class += " #{options[:class]}"
       end
-        
+
       {:class => new_class}
     end
-    
+
     def options_hash_with_merged_classes options, new_class
       if options.key? :class
         new_class += " #{options[:class]}"
@@ -259,4 +311,4 @@ module Caseadilla
         html += "<div class='well'>#{form_tag}</div></div>"
     end
   end
-end
+end

data/app/views/caseadilla/caseadilla/blank.html.erb

@@ -6,5 +6,5 @@
 	<p>You&rsquo;re ready to begin scaffolding and customizing!</p>
 	<p><small style="font-size: 0.7em;">To remove this screen, set <code>caseadilla_config_dashboard_url</code></small></p>
 	<br />
-	<p><a href="https://github.com/zeiv/caseadilla/blob/master/README.rdoc" class="btn btn-primary btn-large">View README on GitHub</a></p>
-</div>
+	<p><a href="https://github.com/zeiv/caseadilla/blob/master/README.md" class="btn btn-primary btn-large">View README on GitHub</a></p>
+</div>

data/app/views/caseadilla/caseadilla_user_sessions/new.html.erb

@@ -12,7 +12,7 @@
         <%= flash[:notice] %>
       </div>
     <% end %>
-	
+
 	<div class="form-group">
 		<%= f.text_field :email, :placeholder => "Email", :class => "form-control input-lg" %>
 	</div>
@@ -35,5 +35,5 @@
 	<div class="form-group">
 		<%= link_to "Forgot your password?", new_password_path(:user) %>
 	</div>
-	
-<% end %>
+
+<% end %>

data/app/views/caseadilla/users/show.html.erb

@@ -27,16 +27,41 @@
   </div>
 
   <p class="submits">
-      <%= link_to 'Cancel', caseadilla_users_path, :class => 'btn btn-mini btn-danger' %>
+    <%= link_to 'Cancel', caseadilla_users_path, :class => 'btn btn-mini btn-danger' %>
     <%= f.submit "Save changes", :class => "btn btn-mini btn-primary" %>
   </p>
+
+<% end %>
+
+<% if current_user.role_id < @user.role_id %>
+  <%= simple_form_for @caseadilla_user, as: resource_name, url: caseadilla_user_path(@caseadilla_user), html:{ method: :put } do |f| %>
+    <h2>Reset password <small>(admin action &mdash; use carefully)</small></h2>
+    <div class="row">
+      <div class="col-lg-6">
+        <%= caseadilla_password_field f, f.object, :password, {:caseadilla_label => "New password"} %>
+      </div>
+      <div class="col-lg-6">
+        <%= caseadilla_password_field f, f.object, :password_confirmation, {:caseadilla_label => "Repeat new password"} %>
+      </div>
+      <div class="col-lg-12 password-checkbox">
+        <div class="checkbox">
+          <label>
+            <%= check_box_tag :generate_random_password, "1", false, {:id => 'generate-random-password-checkbox'} %> Generate random password
+          </label>
+        </div>
+      </div>
+    </div>
+    <p class="submits">
+      <%= f.submit "Reset password", :class => "btn btn-mini btn-warning" %>
+    </p>
+  <% end %>
 <% end %>
 
 <%= content_for :sidebar do %>
   <% if current_user #.is_admin? %>
-      <li><%= link_to "#{caseadilla_show_icon('th-list')}Back to list".html_safe, caseadilla_users_path %></li>
-      <% if current_user == @caseadilla_user %>        
-        <li><%= link_to "#{caseadilla_show_icon('pencil')}Change password".html_safe, change_password_caseadilla_user_path %></li>
-      <% end %>
+    <li><%= link_to "#{caseadilla_show_icon('th-list')}Back to list".html_safe, caseadilla_users_path %></li>
+    <% if current_user == @caseadilla_user %>
+      <li><%= link_to "#{caseadilla_show_icon('pencil')}Change password".html_safe, change_password_caseadilla_user_path %></li>
+    <% end %>
   <% end %>
-<% end %>
+<% end %>

data/app/views/layouts/caseadilla_main.html.erb

@@ -9,7 +9,7 @@
   		<%= stylesheet_link_tag(stylesheet) %>
   	<% end %>
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.3/css/jasny-bootstrap.min.css">
-  	
+
   	<% caseadilla_config_javascript_includes.each do |javascript| %>
   		<%= javascript_include_tag(javascript) %>
   	<% end %>
@@ -35,7 +35,7 @@
           <div id="user-info">
             <ul>
               <li>Hello <%= link_to current_user.first_name, caseadilla_user_path(current_user) %></li>
-              <li><%= Time.zone.name %></li>
+              <li><%= current_user.time_zone || Time.zone.name %></li>
 
               <% if current_user #.is_admin? %>
                 <li><%= link_to 'Users', caseadilla_users_path %></li>
@@ -57,17 +57,17 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
-        </button> 
+        </button>
       </div>
 
-      <div class="container hidden-xs">    
+      <div class="container hidden-xs">
         <ul class="nav navbar-nav">
           <%= render :partial => '/caseadilla/layouts/tab_navigation' %>
         </ul>
       </div>
 
       <div class='navbar-offcanvas offcanvas navbar-inverse'>
-        <div class="container hidden-sm hidden-md hidden-lg">    
+        <div class="container hidden-sm hidden-md hidden-lg">
           <ul class="nav navbar-nav">
           <li><%= link_to 'Home', caseadilla_root_path %></li>
             <li class="divider"></li>
@@ -121,9 +121,9 @@
                 <%= yield :help %>
               </div>
             <% end %>
-            
+
             <%= yield %>
-            
+
             </div>
 
         </div>
@@ -138,4 +138,4 @@
       </div>
     </div>
   </body>
-</html>
+</html>

data/caseadilla.gemspec

@@ -10,8 +10,9 @@ Gem::Specification.new do |spec|
   spec.email         = ["fxb9500@gmail.com"]
   spec.description   = "Caseadilla is a CMS for Rails based on Casein and Comfortable Mexican Sofa. It is designed to allow you to easily fit the CMS to your app, not the other way around.  By default, Caseadilla installs with Devise for authentication and Declarative Authorization, however it can be installed without either if you want to use an existing auth system."
   spec.summary       = "A powerful yet unobtrusive CMS and data management system for Rails."
-  spec.homepage      = ""
+  spec.homepage      = "http://www.xavierbick.com"
   spec.license       = "MIT"
+  spec.required_ruby_version = "2.0.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -19,31 +20,28 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "> 0"
   if spec.respond_to? :specification_version then
     spec.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      spec.add_runtime_dependency(%q<caseadilla>, [">= 0"])
-      spec.add_runtime_dependency(%q<will_paginate>, ["= 3.0.5"])
-      spec.add_runtime_dependency(%q<devise>, [">= 3.2"])
-      spec.add_runtime_dependency(%q<declarative_authorization>, [">= 0.5.7"])
-      spec.add_runtime_dependency(%q<scrypt>, ["= 1.2.1"])
-      spec.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
+      spec.add_runtime_dependency(%q<will_paginate>, ["~> 3.0"])
+      spec.add_runtime_dependency(%q<devise>, ["~> 3.2"])
+      spec.add_runtime_dependency(%q<zeiv-declarative_authorization>, [">= 1.0.0.pre"])
+      spec.add_runtime_dependency(%q<scrypt>, ["~> 1.2"])
+      spec.add_runtime_dependency(%q<jquery-rails>, ["> 0"])
     else
-      spec.add_dependency(%q<caseadilla>, [">= 0"])
-      spec.add_dependency(%q<will_paginate>, ["= 3.0.5"])
-      spec.add_dependency(%q<devise>, [">= 3.2"])
-      spec.add_dependency(%q<declarative_authorization>, [">= 0.5.7"])
-      spec.add_dependency(%q<scrypt>, ["= 1.2.1"])
-      spec.add_dependency(%q<jquery-rails>, [">= 0"])
+      spec.add_dependency(%q<will_paginate>, ["~> 3.0"])
+      spec.add_dependency(%q<devise>, ["~> 3.2"])
+      spec.add_dependency(%q<zeiv-declarative_authorization>, [">= 1.0.0.pre"])
+      spec.add_dependency(%q<scrypt>, ["~> 1.2.1"])
+      spec.add_dependency(%q<jquery-rails>, ["> 0"])
     end
   else
-    spec.add_dependency(%q<caseadilla>, [">= 0"])
-    spec.add_dependency(%q<will_paginate>, ["= 3.0.5"])
-    spec.add_dependency(%q<devise>, ["= 3.2"])
-    spec.add_dependency(%q<declarative_authorization>, [">= 0.5.7"])
-    spec.add_dependency(%q<scrypt>, ["= 1.2.1"])
-    spec.add_dependency(%q<jquery-rails>, [">= 0"])
+    spec.add_dependency(%q<will_paginate>, ["~> 3.0"])
+    spec.add_dependency(%q<devise>, ["~> 3.2"])
+    spec.add_dependency(%q<zeiv-declarative_authorization>, [">= 1.0.0.pre"])
+    spec.add_dependency(%q<scrypt>, ["~> 1.2"])
+    spec.add_dependency(%q<jquery-rails>, ["> 0"])
   end
-end
+end

data/config/routes.rb

@@ -1,9 +1,9 @@
 Rails.application.routes.draw do
-  
+
   match "/admin" => redirect("/caseadilla"), :via => :get
-  
+
   namespace :caseadilla do
-  
+
     if Caseadilla::Engine.flavor = :steak
       resources :users do
         member do
@@ -12,13 +12,13 @@ Rails.application.routes.draw do
         end
       end
       resources :roles
-      
-      match "/sign_in" => "caseadilla_user_sessions#new", via: :get
+
+      get "/sign_in" => "caseadilla_user_sessions#new"
       # resource :password_reset, :only => [:create, :edit, :update]
     end
-        
+
     match "/blank" => "caseadilla#blank", :via => :get
     root :to => "caseadilla#index"
   end
-  
-end
+
+end

data/lib/caseadilla/version.rb

@@ -1,3 +1,3 @@
 module Caseadilla
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/generators/caseadilla/install/install_generator.rb

@@ -1,6 +1,6 @@
 module Caseadilla
   class InstallGenerator < Rails::Generators::Base
-    
+
     include Rails::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
     argument :flavor, type: :string, default: "auto"
@@ -53,6 +53,15 @@ module Caseadilla
         migration_template 'steak/db/migrate/add_name_to_users.rb', "db/migrate/add_name_to_users.rb"
         rake 'db:migrate' unless options[:no_commit]
 
+        inject_into_file "app/controllers/application_controller.rb", after: ":exception" do <<-'RUBY'
+
+
+  def after_sign_in_path_for(resource)
+    URI(request.referer).path == '/caseadilla/sign_in' ? caseadilla_root_path : root_path
+  end
+        RUBY
+        end
+
         inject_into_file "app/models/#{options[:auth_model].downcase}.rb", "  before_create :add_user_role", after: "belongs_to :role\n"
         inject_into_file "app/models/#{options[:auth_model].downcase}.rb", after: /def role_symbols.*?end\n/m do <<-'RUBY'
 
@@ -105,6 +114,7 @@ module Caseadilla
         inject_into_file 'config/authorization_rules.rb', after: "authorization do\n" do <<-'RUBY'
 
   role :admin do
+    has_permission_on :caseadilla, to: :access
     has_permission_on :caseadilla_users, to: [:manage, :change_password]
     has_permission_on :caseadilla_roles, to: :manage
   end
@@ -151,4 +161,4 @@ module Caseadilla
     #   @flavor = f
     # end
   end
-end
+end

data/lib/generators/caseadilla/scaffold/scaffold_generator.rb

@@ -1,14 +1,14 @@
 module Caseadilla
   class ScaffoldGenerator < Rails::Generators::NamedBase
-  
+
     include Caseadilla::CaseadillaHelper
     include Rails::Generators::Migration
     source_root File.expand_path('../templates', __FILE__)
-  
+
     argument :attributes, :type => :array, :required => true, :desc => "attribute list required"
-    
+
     class_options :create_model => false, :read_only => false, :no_index => false
-  
+
     def self.next_migration_number dirname
       if ActiveRecord::Base.timestamped_migrations
         Time.now.utc.strftime("%Y%m%d%H%M%S")
@@ -16,7 +16,7 @@ module Caseadilla
         "%.3d" % (current_migration_number(dirname) + 1)
       end
     end
-  
+
     def generate_files
       @plural_route = (plural_name != singular_name) ? plural_name : "#{plural_name}_index"
       @read_only = options[:read_only]
@@ -28,19 +28,19 @@ module Caseadilla
       template 'views/new.html.erb', "app/views/caseadilla/#{plural_name}/new.html.erb" unless @read_only
       template 'views/_form.html.erb', "app/views/caseadilla/#{plural_name}/_form.html.erb"
       template 'views/_table.html.erb', "app/views/caseadilla/#{plural_name}/_table.html.erb"
-      
+
       add_namespace_to_routes
       add_to_routes
       add_to_navigation unless @no_index
-      
+
       if options[:create_model]
         template 'model.rb', "app/models/#{singular_name}.rb"
         migration_template 'migration.rb', "db/migrate/create_#{plural_name}.rb"
       end
     end
-  
+
   protected
-  
+
     #replacements for standard Rails generator route. This one only adds once
     def add_namespace_to_routes
       puts "   caseadilla     adding namespace to routes.rb"
@@ -51,7 +51,7 @@ module Caseadilla
         gsub_add_once plural_name, file_to_update, "\n\t#Caseadilla routes\n\t" + line_to_add + "\n\tend\n", insert_sentinel
       end
     end
-    
+
     def add_to_routes
       puts "   caseadilla     adding #{plural_name} resources to routes.rb"
       file_to_update = Rails.root + 'config/routes.rb'
@@ -77,7 +77,7 @@ module Caseadilla
       insert_sentinel = '<!-- SCAFFOLD_INSERT -->'
       gsub_add_once plural_name, file_to_update, line_to_add, insert_sentinel
     end
-  
+
     def gsub_add_once m, file, line, sentinel
       unless options[:pretend]
         gsub_file file, /(#{Regexp.escape("\n#{line}")})/mi do |match|
@@ -88,12 +88,12 @@ module Caseadilla
         end
       end
     end
-    
+
     def gsub_file(path, regexp, *args, &block)
       content = File.read(path).gsub(regexp, *args, &block)
       File.open(path, 'wb') { |file| file.write(content) }
     end
-  
+
     def field_type(type)
       case type.to_s.to_sym
         when :integer, :float, :decimal   then :text_field
@@ -101,11 +101,11 @@ module Caseadilla
         when :time, :timestamp            then :time_select
         when :datetime                    then :datetime_select
         when :string                      then :text_field
-        when :text                        then :text_area
+        when :text                        then :text_area_wysiwyg
         when :boolean                     then :check_box
       else
         :text_field
-      end      
+      end
     end
   end
-end
+end

data/lib/railties/tasks.rake

@@ -7,21 +7,24 @@ namespace :caseadilla do
     desc "Create default admin user"
     task create_admin: :environment do
 
-      raise "Usage: specify email address, e.g. rake [task] email=mail@caseadillacms.com" unless ENV.include?("email")
+      unless ENV.include?("email") and ENV.include?("first_name") and ENV.include?("last_name") and ENV.include?("password")
+        raise "Usage: specify email address, first and last name, and a password. \nE.g. rake [task] email=mail@example.com first_name=John last_name=Doe password=password123"
+      end
 
-      random_password = random_string = SecureRandom.hex
-      admin = Caseadilla::AdminUser.new({ login: 'admin', name: 'Admin', email: ENV['email'], access_level: $CASEIN_USER_ACCESS_LEVEL_ADMIN, password: random_password, password_confirmation: random_password })
+      admin = User.new({email: ENV['email'], first_name: ENV['first_name'], last_name: ENV['last_name'], password: ENV['password'] })
 
       unless admin.save
-        puts "[Caseadilla] Failed: check that the 'admin' account doesn't already exist."
+        puts "[Caseadilla] Failed: check that the account doesn't already exist."
       else
-        puts "[Caseadilla] Created new admin user with username 'admin' and password '#{random_password}'"
+        puts "[Caseadilla] Created new admin user with email '#{ENV['email']}' and password '#{ENV['password']}'"
       end
+      admin.role = Role.find_by_title 'admin'
+      admin.save!
     end
 
     desc "Remove all users"
     task remove_all: :environment do
-      users = Caseadilla::AdminUser.all
+      users = User.all
       num_users = users.size
       users.destroy_all
       puts "[Caseadilla] Removed #{num_users} user(s)"
@@ -29,4 +32,4 @@ namespace :caseadilla do
 
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caseadilla
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Xavier Bick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2015-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,98 +28,84 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: caseadilla
-  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.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: declarative_authorization
+  name: zeiv-declarative_authorization
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 1.0.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.7
+        version: 1.0.0.pre
 - !ruby/object:Gem::Dependency
   name: scrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '1.2'
 - !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: Caseadilla is a CMS for Rails based on Casein and Comfortable Mexican
@@ -205,7 +191,7 @@ files:
 - lib/generators/caseadilla/scaffold/templates/views/new.html.erb
 - lib/generators/caseadilla/scaffold/templates/views/show.html.erb
 - lib/railties/tasks.rake
-homepage: ''
+homepage: http://www.xavierbick.com
 licenses:
 - MIT
 metadata: {}
@@ -215,9 +201,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -225,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A powerful yet unobtrusive CMS and data management system for Rails.