pages_core 3.4.3 → 3.5.1

data/app/models/password_reset_token.rb

@@ -5,8 +5,8 @@ class PasswordResetToken < ActiveRecord::Base
 
   validates :user_id, presence: true
 
-  scope :active,  -> { where("expires_at >= ?", Time.now) }
-  scope :expired, -> { where("expires_at < ?", Time.now) }
+  scope :active,  -> { where("expires_at >= ?", Time.now.utc) }
+  scope :expired, -> { where("expires_at < ?", Time.now.utc) }
 
   class << self
     def default_expiration
@@ -18,18 +18,18 @@ class PasswordResetToken < ActiveRecord::Base
     end
 
     def find_by_token(token)
-      active.where(token: token).first
+      active.find_by(token: token)
     end
   end
 
   def expired?
-    expires_at < Time.now
+    expires_at < Time.now.utc
   end
 
   private
 
   def ensure_expiration
-    self.expires_at ||= Time.now + self.class.default_expiration
+    self.expires_at ||= Time.now.utc + self.class.default_expiration
   end
 
   def ensure_token

data/app/models/role.rb

@@ -8,7 +8,7 @@ class Role < ActiveRecord::Base
   class << self
     def define(name, description, default = false)
       if roles.map(&:name).include?(name.to_s)
-        fail ArgumentError, "Tried to define role :#{role}, " \
+        raise ArgumentError, "Tried to define role :#{role}, " \
           "but a role by that name already exists"
       else
         roles << OpenStruct.new(

data/app/models/tag.rb

@@ -9,32 +9,30 @@ class Tag < ActiveRecord::Base
 
   class << self
     def tags_and_suggestions_for(taggable, options = {})
-      options = default_options.merge(options)
+      limit = options[:limit] || 100
       tags = (taggable.tags.sorted + pinned.sorted).uniq
-      if tags.count < options[:limit]
-        suggested = suggestions(tags, options)
-        tags = tags.to_a + suggested[0...(options[:limit] - tags.length)]
-      end
-      tags
+
+      return tags unless tags.count < limit
+      tags + suggestions(tags, limit)[0...(limit - tags.length)]
     end
 
     def parse(*tags)
       Array(tags).flatten
-        .map { |tag| tag.is_a?(Tag) ? tag.name : tag }
-        .map { |tag| tag.split(",") }
-        .flatten
-        .map(&:strip)
+                 .map { |tag| tag.is_a?(Tag) ? tag.name : tag }
+                 .map { |tag| tag.split(",") }
+                 .flatten
+                 .map(&:strip)
     end
 
     private
 
-    def suggestions(tags, options = {})
+    def suggestions(tags, limit)
       Tag.joins(:taggings)
-        .select("`tags`.*, COUNT(`tags`.id) AS counter")
-        .group("`tags`.id")
-        .order("counter DESC")
-        .limit(options[:limit])
-        .reject { |t| tags.include?(t) }
+         .select("tags.*, COUNT(tags.id) AS counter")
+         .group("tags.id")
+         .order("counter DESC")
+         .limit(limit)
+         .reject { |t| tags.include?(t) }
     end
 
     def default_options

data/app/models/tagging.rb

@@ -4,7 +4,8 @@ class Tagging < ActiveRecord::Base
   belongs_to :tag
   belongs_to :taggable, polymorphic: true
 
-  validates_presence_of :taggable_id, :taggable_type
+  validates :taggable_id, presence: true
+  validates :taggable_type, presence: true
   validates :tag_id,
             presence: true,
             uniqueness: { scope: [:taggable_type, :taggable_id] }

data/app/models/user.rb

@@ -50,8 +50,8 @@ class User < ActiveRecord::Base
 
     # Finds a user by either username or email address.
     def find_by_username_or_email(string)
-      where(username: string.to_s).first ||
-        where(email: string.to_s).first
+      find_by(username: string.to_s) ||
+        find_by(email: string.to_s)
     end
   end
 
@@ -65,12 +65,12 @@ class User < ActiveRecord::Base
   end
 
   def can_login?
-    self.activated?
+    activated?
   end
 
   def mark_active!
     return if last_login_at && last_login_at > 10.minutes.ago
-    update_columns(last_login_at: Time.now)
+    update_columns(last_login_at: Time.now.utc)
   end
 
   def name_and_email
@@ -122,10 +122,9 @@ class User < ActiveRecord::Base
 
   def valid_password?(password)
     if hashed_password.length <= 40
-      return true if hashed_password == Digest::SHA1.hexdigest(password)
+      hashed_password == Digest::SHA1.hexdigest(password)
     else
-      return true if BCrypt::Password.new(hashed_password) == password
+      BCrypt::Password.new(hashed_password) == password
     end
-    false
   end
 end

data/app/policies/page_policy.rb

@@ -15,10 +15,6 @@ class PagePolicy < Policy
     def new_news?
       create?
     end
-
-    def reorder_pages?
-      create?
-    end
   end
 
   module Member
@@ -29,5 +25,13 @@ class PagePolicy < Policy
     def edit?
       user.role?(:pages)
     end
+
+    def move?
+      edit?
+    end
+
+    def delete_meta_image?
+      edit?
+    end
   end
 end

data/app/policies/user_policy.rb

@@ -9,7 +9,7 @@ class UserPolicy < Policy
     end
 
     def new?
-      (!User.any?) || user.role?(:users)
+      !User.any? || user.role?(:users)
     end
 
     def create?

data/app/serializers/page_tree_serializer.rb

@@ -0,0 +1,15 @@
+class PageTreeSerializer < ActiveModel::Serializer
+  attributes :id, :param, :parent_page_id, :locale, :status, :news_page
+  attributes :name
+  attributes :published_at, :pinned
+
+  has_many :children, serializer: PageTreeSerializer
+
+  def children
+    object.subpages.visible.in_locale(object.locale)
+  end
+
+  def param
+    object.to_param
+  end
+end

data/app/views/admin/invites/new.html.erb

@@ -9,7 +9,8 @@
 
 <%= form_for [:admin, @invite], builder: PagesCore::FormBuilder do |f| %>
   <%= f.labelled_text_field :email %>
-  <%= render partial: "admin/users/access_control", locals: { user: @user, f: f } %>
+  <%= render(partial: "admin/users/access_control",
+             locals: { user: @user, f: f }) %>
   <button type="submit">
     Send invite
   </button>

data/app/views/admin/invites/show.html.erb

@@ -9,17 +9,16 @@
   </p>
 </div>
 
-<%= form_for @user, url: accept_admin_invite_path(@invite, token: @invite.token), builder: PagesCore::FormBuilder do |f| %>
-
+<%= form_for(@user,
+             url: accept_admin_invite_path(@invite, token: @invite.token),
+             builder: PagesCore::FormBuilder) do |f| %>
   <%= f.labelled_text_field :name %>
   <%= f.labelled_text_field :email %>
   <%= f.labelled_password_field :password %>
   <%= f.labelled_password_field :confirm_password %>
-
   <p>
     <button type="submit">
       Sign up
     </button>
   </p>
-
 <% end %>

data/app/views/admin/pages/_edit_comments.html.erb

@@ -3,19 +3,35 @@
     <tr>
       <td>
         <p>
-          <strong><%= c.name %></strong><br />
-          <% if c.email? %><%= mail_to c.email, c.email %><br /><% end %>
-          <% if c.url? %><%= link_to c.url, c.url %><br /><% end %>
+          <strong>
+            <%= c.name %>
+          </strong>
+          <br />
+          <% if c.email? %>
+            <%= mail_to c.email, c.email %>
+            <br />
+          <% end %>
+          <% if c.url? %>
+            <%= link_to c.url, c.url %>
+            <br />
+          <% end %>
         </p>
         <p>
-          <%= time_ago_in_words c.created_at %> ago<br />
+          <%= time_ago_in_words c.created_at %>
+          ago<br />
           from <%= c.remote_ip %>
         </p>
         <p>
-          <%= link_to "Delete comment", admin_page_comment_url(@locale, @page, c), class: :delete, data: {confirm: "Are you sure?"}, method: :delete %>
+          <%= link_to("Delete comment",
+                      admin_page_comment_url(@locale, @page, c),
+                      class: :delete,
+                      data: { confirm: "Are you sure?" },
+                      method: :delete) %>
         </p>
       </td>
-      <td><%= c.body %></td>
+      <td>
+        <%= c.body %>
+      </td>
     </tr>
   <% end %>
 </table>

data/app/views/admin/pages/_edit_content.html.erb

@@ -4,7 +4,9 @@
 
 <% if !@page.new_record? && @page.template_config.value(:tags) %>
   <div class="field">
-    <label>Tags</label>
-    <%= tag_editor_for f, @page %>
+    <label>
+      Tags
+    </label>
+    <%= tag_editor_for(f, @page) %>
   </div>
 <% end %>

data/app/views/admin/pages/_edit_images.html.erb

@@ -1,84 +1,95 @@
-  <div class="page_images">
-
-    <div class="editor">
-      <div class="controls">
-        <div class="nav">
-          <%= link_to "Close",    '#', class: :close %>
-        </div>
-        <h4>Image Editor</h4>
-        <%= fields_for PageImage.new do |pi| %>
-          <%= pi.fields_for :image_attributes, Image.new do |i| %>
-            <%= i.hidden_field :id, class: 'image_id' %>
-            <fieldset>
-              <label>
-                Alternative text
-              </label>
-              <%= i.text_field(:alternative,
-                               class: 'alternative',
-                               placeholder: 'Alternative text') %>
-            </fieldset>
-            <fieldset class="caption-fieldset">
-              <label>
-                Caption
-              </label>
-              <%= i.text_field(:caption,
-                               class: 'caption',
-                               placeholder: 'Write your caption/byline') %>
-            </fieldset>
-            <%= text_field_tag 'embed', '', class: 'embed' %>
-            <%= pi.check_box :primary %><label>Primary</label>
-            <%= i.hidden_field :crop_start_x, class: 'crop_start_x' %>
-            <%= i.hidden_field :crop_start_y, class: 'crop_start_y' %>
-            <%= i.hidden_field :crop_width, class: 'crop_width' %>
-            <%= i.hidden_field :crop_height, class: 'crop_height' %>
-          <% end %>
-
-          <button class="save">
-            Save
-          </button>
-
-          <%= link_to "Delete image", '#', class: :delete %>
-        <% end %>
-      </div>
-      <div class="edit-image-container">
-        <%= link_to "", '#', class: :previous %>
-        <%= link_to "",     '#', class: :next %>
-        <div class="edit-image">
-        </div>
+<div class="page_images">
+  <div class="editor">
+    <div class="controls">
+      <div class="nav">
+        <%= link_to("Close", '#', class: :close) %>
       </div>
-    </div>
+      <h4>Image Editor</h4>
+      <%= fields_for PageImage.new do |pi| %>
+        <%= pi.fields_for(:image_attributes, Image.new) do |i| %>
+          <%= i.hidden_field :id, class: 'image_id' %>
+          <fieldset>
+            <label>
+              Alternative text
+            </label>
+            <%= i.text_field(:alternative,
+                             class: 'alternative',
+                             placeholder: 'Alternative text') %>
+          </fieldset>
+          <fieldset class="caption-fieldset">
+            <label>
+              Caption
+            </label>
+            <%= i.text_field(:caption,
+                             class: 'caption',
+                             placeholder: 'Write your caption/byline') %>
+          </fieldset>
+          <%= text_field_tag 'embed', '', class: 'embed' %>
+          <%= pi.check_box :primary %><label>Primary</label>
+          <%= i.hidden_field :crop_start_x, class: 'crop_start_x' %>
+          <%= i.hidden_field :crop_start_y, class: 'crop_start_y' %>
+          <%= i.hidden_field :crop_width, class: 'crop_width' %>
+          <%= i.hidden_field :crop_height, class: 'crop_height' %>
+        <% end %>
 
-    <div class="uploadButton">
-      <p>
-        <button type="button" class="upload-images-button">
-          Upload images
+        <button class="save">
+          Save
         </button>
-      </p>
-    </div>
-
-    <div class="no_images">
-      <p>No images have been uploaded.</p>
-    </div>
 
-    <div class="primary_container">
-      <% if @page.image? && (page_image = @page.page_images.select{|pi| pi.primary?}.first) %>
-        <a class="image primary"
-           data-page-image-id="<%= page_image.id %>"
-           data-uncropped-url="<%= uncropped_dynamic_image_path(page_image.image, size: '2000x2000') %>"
-           href="<%= dynamic_image_url page_image.image, size: '2000x2000' %>">
-          <%= dynamic_image_tag(page_image.image, size: '380x380', crop: true, upscale: true) %>
-        </a>
+        <%= link_to "Delete image", '#', class: :delete %>
       <% end %>
     </div>
-    <div class="images clearfix">
-      <% @page.page_images.reject{|pi| pi.primary?}.each do |i| %>
-        <a class="image"
-           data-page-image-id="<%= i.id %>"
-           data-uncropped-url="<%= uncropped_dynamic_image_path(i.image, size: '2000x2000') %>"
-           href="<%= dynamic_image_url i.image, size: '2000x2000' %>">
-          <%= dynamic_image_tag(i.image, size: '240x240', crop: true, upscale: true) %>
-        </a>
-      <% end %>
+    <div class="edit-image-container">
+      <%= link_to "", '#', class: :previous %>
+      <%= link_to "",     '#', class: :next %>
+      <div class="edit-image">
+      </div>
     </div>
+  </div>
 
+  <div class="uploadButton">
+    <p>
+      <button type="button" class="upload-images-button">
+        Upload images
+      </button>
+    </p>
+  </div>
+
+  <div class="no_images">
+    <p>No images have been uploaded.</p>
+  </div>
+
+  <div class="primary_container">
+    <% if @page.image? &&
+      (page_image = @page.page_images.select{|pi| pi.primary?}.first) %>
+      <a class="image primary"
+         data-page-image-id="<%= page_image.id %>"
+         data-uncropped-url="<%= uncropped_dynamic_image_path(
+                                   page_image.image,
+                                   size: '2000x2000')
+                             %>"
+         href="<%= dynamic_image_url page_image.image, size: '2000x2000' %>">
+        <%= dynamic_image_tag(page_image.image,
+                              size: '380x380',
+                              crop: true,
+                              upscale: true) %>
+      </a>
+    <% end %>
+  </div>
+  <div class="images clearfix">
+    <% @page.page_images.reject{|pi| pi.primary?}.each do |i| %>
+      <a class="image"
+         data-page-image-id="<%= i.id %>"
+         data-uncropped-url="<%= uncropped_dynamic_image_path(
+                                   i.image,
+                                   size: '2000x2000')
+                             %>"
+         href="<%= dynamic_image_url i.image, size: '2000x2000' %>">
+        <%= dynamic_image_tag(i.image,
+                              size: '240x240',
+                              crop: true,
+                              upscale: true) %>
+      </a>
+    <% end %>
   </div>
+</div>