tkh_content 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0956cce8f0e3e182d3cc40535eee2367f7572ea4
-  data.tar.gz: ef5fc25cca67bac87f98c856672addaca180ea00
+  metadata.gz: e327b5dcab57aa6cf9cd716eb3494b6afd95827a
+  data.tar.gz: a2996c313dec26737fc2ae43059306267d17f819
 SHA512:
-  metadata.gz: 3ef7b8ca98e531ac4dc7b8e9931f62fd50e18172981e654b79301ffbfca884c8e9256aec678634f2a01cc8be47764c2807991c71294d10846a6758451857e527
-  data.tar.gz: 018f39603a1148b674e04614e0e84539f6be17755c8874f64ce2143200d5e755c0273b36d85d9827f8cdca16cde93188cf802e3d9c43de964af32a2dd56bc913
+  metadata.gz: 373a6a843e3f9c056c1a1c6266e3ca9d4979590531920200885e9d67f171fb7e8cd51f31d977ece1da302cb8cc831900ad03cccad1870f30f5391e02043f6a1e
+  data.tar.gz: 7ede317f6ed7af64bd6441ab60fe6cad3218cd6c57364b1866945fd76123a4d06b56e782081e4b2a3557cfcf7854d80c688bd14844ea1c24b86bd33fa587f21f

data/CHANGELOG.md

@@ -1,11 +1,25 @@
 # TKH Content
 
 
+
+
+## 0.9.2
+
+* Fixes and tweaks related to the update to Rails 4
+* Connected gem to tkh_authentication partial in comment area
+* Updated many gems/dependencies
+
+
 ## 0.9
 
 * Upgraded to Ruby 2.0 and Rails 4
 
 
+## 0.4.6
+
+* Added a dynamic content variable for upcoming events list
+
+
 ## 0.4.5
 
 * Configured CKEditor so that it does not override classes and other bits of HTML code created by the user in the source.

data/app/assets/javascripts/pages.js.coffee

@@ -15,4 +15,6 @@ jQuery ->
     else
       $('#page-tag-list').hide(450)
       $('#page-short-title').show(450)
-      $('#parent-page-title').show(450)
+      $('#parent-page-title').show(450)
+
+

data/app/controllers/comments_controller.rb

@@ -1,23 +1,23 @@
 class CommentsController < ApplicationController
-  
+
   before_filter :authenticate, :except => ['for_feed']
   before_filter :authenticate_with_admin, :except => ['create', 'for_feed']
-  
+
   def index
     @comments = Comment.by_recent.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
-  
+
   # comments are shown within a page
   # new comments are created by users from within a page
 
   def edit
-    @comment = Comment.find params[:id]
+    @comment = Comment.find(params[:id])
     switch_to_admin_layout
   end
 
   def create
-    @comment = Comment.new params[:comment]
+    @comment = Comment.new(comment_params)
     @comment.author_id = current_user.id
     @comment.locale = I18n.locale.to_s
     @comment.status = 'pending' # translation not done with globalize3 but with locale files upon showing status to user
@@ -30,7 +30,7 @@ class CommentsController < ApplicationController
 
   def update
     @comment = Comment.find(params[:id])
-    if @comment.update_attributes(params[:comment])
+    if @comment.update_attributes(comment_params)
       redirect_to comments_path, notice: t('comments.update.notice')
     else
       render action: "edit", warning: t('comments.update.warning'), layout: 'admin'
@@ -42,7 +42,7 @@ class CommentsController < ApplicationController
     @comment.destroy
     redirect_to comments_url, notice: t('comments.destroy.notice')
   end
-  
+
   def accept
     @comment = Comment.find params[:id]
     @comment.status = 'accepted'
@@ -52,7 +52,7 @@ class CommentsController < ApplicationController
       redirect_to comments_path, warning: t('comments.moderation.accept.warning')
     end
   end
-  
+
   def block
     @comment = Comment.find params[:id]
     @comment.status = 'blocked'
@@ -62,12 +62,12 @@ class CommentsController < ApplicationController
       redirect_to comments_path, warning: t('comments.moderation.block.warning')
     end
   end
-  
+
   def pending
     @comments = Comment.pending.by_created.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
-  
+
   def accepted
     @comments = Comment.accepted.by_recent.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
@@ -77,7 +77,7 @@ class CommentsController < ApplicationController
     @comments = Comment.blocked.by_recent.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
-  
+
   def for_feed
     @comments = Comment.showable.for_locale(I18n.locale).by_recently_created.limit(50)
     respond_to do |format|
@@ -85,5 +85,13 @@ class CommentsController < ApplicationController
       format.atom
     end
   end
-  
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def comment_params
+    params.require(:comment).permit(:body, :page_id)
+    # non-accessible attributes: author_id, :status, :locale
+  end
+
 end

data/app/controllers/contacts_controller.rb

@@ -1,23 +1,23 @@
 class ContactsController < ApplicationController
-  
+
   before_filter :authenticate,            :except => 'create'
   before_filter :authenticate_with_admin, :except => 'create'
-  
+
   def index
     @contacts = Contact.by_recent.paginate(:page => params[:page], :per_page => 35)
     switch_to_admin_layout
   end
-  
+
   def show
     @contact = Contact.find(params[:id])
     switch_to_admin_layout
   end
 
   def create
-    @contact = Contact.new(params[:contact])
+    @contact = Contact.new(contact_params)
     saved = @contact.save
     sent_email = send_message_to_admin(@contact)
-    
+
     if saved && sent_email == 'success'
       redirect_to root_path, notice: t("contacts.create.notice")
     elsif saved && sent_email == 'exception'
@@ -31,17 +31,17 @@ class ContactsController < ApplicationController
       redirect_to :back
     end
   end
-  
+
   def valid_email?(string)
     (!string.blank? && string =~ /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i) ? true : false
   end
   # helper_method :valid_email?
-  
+
   private
-  
+
   def send_message_to_admin(contact)
     # check email validity
-    if valid_email?(contact.sender_email)    
+    if valid_email?(contact.sender_email)
       # Actually send the email to the student
       begin
         ContactMailer.message_from_contact_form(contact).deliver
@@ -55,6 +55,11 @@ class ContactsController < ApplicationController
       return 'invalid'
     end
   end
-  
-  
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def contact_params
+    params.require(:contact).permit(:sender_name, :sender_email, :body)
+  end
+
+
 end

data/app/controllers/pages_controller.rb

@@ -1,8 +1,8 @@
 class PagesController < ApplicationController
-  
+
   before_filter :authenticate,            :except => 'show'
   before_filter :authenticate_with_admin, :except => 'show'
-  
+
   def index
     @pages = Page.by_recent.paginate(:page => params[:page], :per_page => 35)
     switch_to_admin_layout
@@ -24,18 +24,18 @@ class PagesController < ApplicationController
   end
 
   def create
-    @page = Page.new(params[:page])
+    @page = Page.new(page_params)
     @page.author_id = current_user.id
     if @page.save
       redirect_to @page, notice: t('pages.create.notice')
     else
-      render action: "new", warning: t('pages.create.warning'), layout: 'admin'
+      render action: "new", flash: { error: t('pages.create.warning') }, layout: 'admin'
     end
   end
 
   def update
     @page = Page.find(params[:id])
-    if @page.update_attributes(params[:page])
+    if @page.update_attributes(page_params)
       redirect_to @page, notice: t('pages.update.notice')
     else
       render action: "edit", warning: t('pages.update.warning'), layout: 'admin'
@@ -52,33 +52,46 @@ class PagesController < ApplicationController
       redirect_to ( :back || pages_url )
     end
   end
-  
+
   def publish
     page = Page.find(params[:id])
     page.published_at = Time.now
-    page.save
-    redirect_to pages_path, notice: t('pages.status.changed.published')
+    if page.save
+      redirect_to pages_path, notice: t('pages.status.changed.published')
+    else
+      redirect_to :back, :flash => { :error => 'There was a problem while publishing this page.' }
+    end
   end
-  
+
   def unpublish
     page = Page.find(params[:id])
     page.published_at = nil
-    page.save
-    redirect_to pages_path, notice: t('pages.status.changed.unpublished')
+    if page.save
+      redirect_to pages_path, notice: t('pages.status.changed.unpublished')
+    else
+      redirect_to :back, :flash => { :error => 'There was a problem while unpublishing this page.' }
+    end
   end
-  
+
   def toggle_for_blog
     page = Page.find(params[:id])
     page.for_blog? ? page.for_blog = false : page.for_blog = true
     page.save
     redirect_to pages_path notice: t('pages.status.changed.toggled')
   end
-  
+
   def sort
     params[:page].each_with_index do |id, index|
       Page.update_all({ menu_position: index+1 }, { id: id })
     end
     render nothing: true
   end
-  
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def page_params
+    params.require(:page).permit(:title, :short_title, :description, :body, :for_blog, :parent_id, :tag_list, :parent_page_title, :author_name)
+  end
+
 end

data/app/helpers/pages_helper.rb

@@ -3,6 +3,8 @@ module PagesHelper
     content = content.gsub /\(-: contact_us_form :-\)/, render('contacts/form') if content.match(/\(-: contact_us_form :-\)/)
     # from what will be the tkh_yoga_center_gem
     content = content.gsub /\(-: dropin_class_schedule :-\)/, render('dropin_classes/schedule') if content.match(/\(-: dropin_class_schedule :-\)/)
+    # from what will be the tkh_upcoming_events_gem
+    content = content.gsub /\(-: upcoming_events_list :-\)/, render('events/upcoming_events_list') if content.match(/\(-: upcoming_events_list :-\)/)
     content
   end
 end

data/app/models/comment.rb

@@ -1,25 +1,22 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Comment < ActiveRecord::Base
-  
+
   belongs_to :author, class_name: 'User', foreign_key: 'author_id'
   belongs_to :page
-  
-  # non-accessible attributes: author_id, :status, :locale
-  attr_accessible :body, :page_id
-  
+
   validates_presence_of :page_id, :body
-  
-  scope :showable, where('status = ? OR status = ?', 'pending', 'accepted')
-  scope :pending, where('status = ?', 'pending')
-  scope :accepted, where('status = ?', 'accepted')
-  scope :blocked, where('status = ?', 'blocked')
+
+  scope :showable, -> { where('status = ? OR status = ?', 'pending', 'accepted') }
+  scope :pending, -> { where('status = ?', 'pending') }
+  scope :accepted, -> { where('status = ?', 'accepted') }
+  scope :blocked, -> { where('status = ?', 'blocked') }
   scope :for_locale, lambda { |locale| where('locale = ?', locale) }
-  scope :by_recent, order('updated_at desc')
-  scope :by_created, order('created_at')
-  scope :by_recently_created, order('created_at desc')
-  
+  scope :by_recent, -> { order('updated_at desc') }
+  scope :by_created, -> { order('created_at') }
+  scope :by_recently_created, -> { order('created_at desc') }
+
 end

data/app/models/contact.rb

@@ -1,16 +1,14 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Contact < ActiveRecord::Base
-  
-  attr_accessible :sender_name, :sender_email, :body
-  
+
   validates_presence_of :sender_name
   validates :sender_email, :presence => true, :format => { :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :on => :create }
   validates_presence_of :body
 
-  scope :by_recent, order('updated_at desc')
-  
+  scope :by_recent, -> { order('updated_at desc') }
+
 end

data/app/models/page.rb

@@ -1,72 +1,70 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Page < ActiveRecord::Base
-  
-  belongs_to :author, class_name: 'User', foreign_key: 'author_id'
+
+  belongs_to :author, class_name: 'User'
   has_many :comments, :dependent => :destroy
-  
-  attr_accessible :title, :short_title, :description, :body, :for_blog, :parent_id, :tag_list, :parent_page_title, :author_name
-  
+
   has_many :taggings
   has_many :tags, through: :taggings
-  
+
   validates_presence_of :title
   validates_presence_of :description
   validates_presence_of :body
   validates_presence_of :author_id
-  
+
   translates :title, :short_title, :description, :body
-    
+
   def to_param
     title ? "#{id}-#{title.to_url}" : id
   end
 
-  scope :by_recent, order('updated_at desc')
-  scope :for_blog, where('for_blog = ?', true)
-  scope :not_for_blog, where('for_blog = ?', false)
-  scope :published, where('published_at IS NOT ?', nil)
-  scope :by_recently_published, order('published_at desc')
+  scope :by_recent, -> { order('updated_at desc') }
+  scope :for_blog, -> { where('for_blog = ?', true) }
+  scope :not_for_blog, -> { where('for_blog = ?', false) }
+  scope :published, -> { where('published_at IS NOT ?', nil) }
+  scope :by_recently_published, -> { order('published_at desc') }
   # tree scopes
-  scope :orphans, where('parent_id IS ?', nil)
+  scope :orphans, -> { where('parent_id IS ?', nil) }
   scope :with_parent_id, lambda { |id| where('parent_id = ?', id) }
-  scope :by_title, order('title')
-  scope :by_menu_position, order('menu_position')
-  
+  scope :by_title, -> { order('title') }
+  scope :by_menu_position, -> { order('menu_position') }
+
   def nickname
     @nickname ||= short_title || title
   end
-  
+
   ### menu related instance methods
-  
+
   def orphan?
     parent_id == nil
   end
-  
+
   def has_children?
     Page.with_parent_id(id).published.count >= 1
   end
-  
+
   def children
     Page.published.with_parent_id(id)
   end
-  
+
   def parent
     Page.find(parent_id)
   end
-  
+
   def has_siblings?
     Page.with_parent_id(parent_id).published.count >= 1
   end
-  
+
   def siblings
     Page.published.with_parent_id(parent_id)
   end
-  
+
   ### tagging related methods
-  
+
   def self.tagged_with(name)
     Tag.find_by_name!(name).pages
   end
@@ -85,7 +83,7 @@ class Page < ActiveRecord::Base
       Tag.where(name: n.strip).first_or_create!
     end
   end
-  
+
   ### autocomplete related instance methods
   def parent_page_title
       parent.try(:title) unless self.orphan?
@@ -97,7 +95,7 @@ class Page < ActiveRecord::Base
       self.parent_id = nil
     end
   end
-  
+
   def author_name
     author.try(:formal_name)
   end
@@ -107,5 +105,5 @@ class Page < ActiveRecord::Base
     first_name = name_as_array[1].strip
     self.author_id = User.where("last_name = ? AND first_name = ?", last_name, first_name).first.id
   end
-  
+
 end

data/app/models/tag.rb

@@ -1,23 +1,21 @@
 # this is needed for now to make mass assignment security compatible with the translation of globalize3
-Globalize::ActiveRecord::Translation.class_eval do
-  attr_accessible :locale
-end
+# Globalize::ActiveRecord::Translation.class_eval do
+#   attr_accessible :locale
+# end
 
 class Tag < ActiveRecord::Base
-  
-  attr_accessible :name
-  
+
+  # attr_accessible :name
+
   has_many :taggings
   has_many :pages, through: :taggings
-  
+
   translates :name
-  
-  scope :alphabetically, order('name')
-    
+
+  scope :alphabetically, -> { order('name') }
+
   def to_param
     name ? "#{id}-#{name.to_url}" : id
   end
-  
-end
-
 
+end

data/app/views/pages/_form.html.erb

@@ -1,6 +1,6 @@
-<%= simple_form_for @page, :html => { class: 'form-horizontal' } do |f| %>
+<%= simple_form_for @page, :html => { class: 'form-horizontal', role: 'form' } do |f| %>
 	<%= f.error_notification %>
-	
+
   <div class="form-inputs">
 		<%= f.input :title, label: t('activerecord.attributes.pages.title'), hint: t('pages.hint.title') %>
 		<%= f.input :for_blog, label: t('activerecord.attributes.pages.for_the_blog') %>
@@ -10,27 +10,26 @@
 								as: :string,
 								:wrapper_html => { :id => 'parent-page-title' },
 								label: t('activerecord.attributes.pages.parent_title'),
-								:input_html => { 
+								:input_html => {
 																:autocomplete => 'off',
 																:data => { 	provide: 'typeahead',
-																	 					source: Page.not_for_blog.by_title.map(&:title).to_json } 
+																	 					source: Page.not_for_blog.by_title.map(&:title).to_json }
 																	} %>
 	  <%= f.input :description, label: t('activerecord.attributes.pages.description'), :input_html => { :rows => 3 } %>
 		<%= f.input :body, label: t('activerecord.attributes.pages.body'), :input_html => { :rows => 35, :class => 'ckeditor' } %>
-		
+
 		<% if controller.action_name == 'edit' # the current_user is the page creator in create method %>
 			<%= f.input :author_name,
 									as: :string,
 									:wrapper_html => { :id => 'author-name' },
 									label: "author name",
-									:input_html => { 
+									:input_html => {
 																	:autocomplete => 'off',
-																	:data => { 	provide: 'typeahead',
-																		 					source: User.administrators.alphabetically.map(&:formal_name).to_json } 
+																	:data => { 	source: User.administrators.alphabetically.map(&:formal_name).to_json }
 																		} %>
 		<% end -%>
 	</div>
-	
+
   <div class="form-actions">
     <%= f.button :submit, :class => 'btn btn-primary' %>
   </div>

data/app/views/pages/_new_comment_section.html.erb

@@ -3,7 +3,7 @@
 	<% if current_user %>
 		<%= render 'comments/form_in_page' %>
 	<% else %>
-		<p><label class="label label-info"><%= t('comments.login_needed') %></label></p>
-		<%= render 'shared/embedded_login_module' %>
+    <p><label class="label label-info"><%= t('comments.login_needed') %></label></p>
+    <%= render 'shared/embedded_access_control' %>
 	<% end -%>
-</div>
+</div>

data/app/views/pages/_tab_admin_menu.html.erb

@@ -1,5 +1,7 @@
-<ul class="nav nav-tabs" id="admin-menu-tab">	
+<h1><%= t 'activerecord.models.pages' %></h1>
+
+<ul class="nav nav-tabs" id="admin-menu-tab">
 	<%= content_tag :li, link_to(t('new'), new_page_path), ({ class: 'active' } if controller.action_name.to_s == 'new' ) %>
 	<%= content_tag :li, link_to(t('list'), pages_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
-	<%= content_tag :li, link_to(t('edit'), '#'), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>	
+	<%= content_tag :li, link_to(t('edit'), '#'), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>
 </ul>

data/app/views/pages/edit.html.erb

@@ -1,5 +1,3 @@
-<h1><%= t 'activerecord.models.pages' %></h1>
-
 <%= render 'tab_admin_menu' %>
 
 <%= render 'form' %>

data/app/views/pages/index.html.erb

@@ -1,44 +1,46 @@
-<h1><%= t 'activerecord.models.pages' %></h1>
-
 <%= render 'tab_admin_menu' %>
 
+<%= will_paginate @pages, inner_window: 2 %>
+
 <table class='table table-striped'>
 	<thead>
   	<tr>
 	    <th><%= t 'activerecord.attributes.pages.title' %></th>
-	    <th><%= t 'activerecord.attributes.pages.description' %></th>
 			<th><%= t 'pages.author' %></th>
 			<th><%= t 'activerecord.attributes.pages.for_the_blog' %>?</th>
 			<th><%= t 'pages.published' %></th>
 	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
-	
+
 	<tbody>
 		<% @pages.each do |page| %>
 		  <tr>
 		    <td><%= link_to page.title, page %></td>
-		    <td><%= truncate page.description, length: 55, separator: ' ...' %></td>
 				<td><%= page.author.name %></td>
 				<td>
-					<%= page.for_blog? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %>
-					<%= link_to t('toggle'), toggle_for_blog_page_path(page), class: 'btn btn-mini', method: :post %>
+					<% if page.for_blog? %>
+						<span class="label label-success"><span class="glyphicon glyphicon-ok"></span></span>
+					<% else %>
+						<span class="label label-info"><span class="glyphicon glyphicon-remove"></span></span>
+					<% end %>
 				</td>
 				<td>
 					<% if page.published_at %>
-						<span class="label label-success">✓</span> <%= link_to t('pages.unpublish'), unpublish_page_path(page), class: 'btn btn-mini', method: :post %>
+						<span class="label label-success"><span class="glyphicon glyphicon-ok"></span></span><%= link_to t('pages.unpublish'), unpublish_page_path(page), class: 'btn btn-xs btn-default', method: :post %>
 					<% else %>
-					  <span class="label label-important">X</span> <%= link_to t('pages.publish'), publish_page_path(page), class: 'btn btn-mini btn-primary', method: :post %>
+					  <span class="label label-info"><span class="glyphicon glyphicon-remove"></span></span><%= link_to t('pages.publish'), publish_page_path(page), class: 'btn btn-xs btn-default', method: :post %>
 					<% end -%>
 				</td>
-		    <td><%= link_to t('edit'), edit_page_path(page), class: 'btn btn-mini' %>
-					<%= link_to t('delete'), page, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
+		    <td>
+		    	<%= link_to t('edit'), edit_page_path(page), class: 'btn btn-xs btn-default' %><%= link_to t('delete'), page, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %>
+		    </td>
 		  </tr>
 		<% end %>
 	</tbody>
 </table>
 
-<%= will_paginate @pages %>
+<%= will_paginate @pages, inner_window: 2 %>
 
 <%= link_to t('pages.create_new').capitalize, new_page_path, class: 'btn btn-primary' %>
 

data/app/views/pages/new.html.erb

@@ -1,5 +1,3 @@
-<h1><%= t 'activerecord.models.pages' %></h1>
-
 <%= render 'tab_admin_menu' %>
 
 <%= render 'form' %>

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/tkh_content.rb

@@ -1,12 +1,11 @@
 require "tkh_content/version"
+require 'rails'
 require 'bootstrap-sass'
+require 'bootstrap-will_paginate'
 require 'simple_form'
 require 'stringex'
-require 'globalize3'
+require 'globalize'
 require 'will_paginate'
-require 'bootstrap-will_paginate'
-# require 'bootstrap-wysihtml5-rails'
-# require 'tkh_inline_editor'
 require 'ckeditor_rails'
 
 module TkhContent

metadata

@@ -1,101 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: bootstrap-will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: globalize3
+  name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: bootstrap-will_paginate
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -112,16 +112,16 @@ dependencies:
   name: ckeditor_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: Rails engine running pages and blog posts.