Merge branch 'develop'

Author: ElliottAYoung

Gemfile

@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.2'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
-gem 'cortex-plugins-core', '= 0.12.3'
+gem 'cortex-plugins-core', '= 0.12.4'
 
 # API
 gem 'grape', '~> 0.17'

Gemfile.lock

@@ -136,7 +136,7 @@ GEM
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
-    cortex-plugins-core (0.12.3)
+    cortex-plugins-core (0.12.4)
       cells (~> 4.1)
       cells-haml (~> 0.0)
       cells-rails (~> 0.0)
@@ -172,7 +172,7 @@ GEM
     dotenv-rails (2.2.1)
       dotenv (= 2.2.1)
       railties (>= 3.2, < 5.2)
-    down (2.4.3)
+    down (2.5.1)
     elasticsearch (5.0.4)
       elasticsearch-api (= 5.0.4)
       elasticsearch-transport (= 5.0.4)
@@ -327,8 +327,9 @@ GEM
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jsonb_accessor (1.0.0.beta.4)
+    jsonb_accessor (1.0.0.beta.6)
       activerecord (>= 5.0)
+      activesupport (>= 5.0)
       pg (>= 0.18.1)
     kaminari (0.17.0)
       actionpack (>= 3.0.0)
@@ -618,7 +619,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.7)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core (= 0.12.3)
+  cortex-plugins-core (= 0.12.4)
   database_cleaner (~> 1.5)
   deep_cloneable (~> 2.2.2)
   devise (~> 4.2.1)

app/models/concerns/searchable.rb

@@ -35,9 +35,9 @@ def range_search(field, type, q)
       def published_filter
         # Bring in documents based on Draft status, Published date met, or either: Expired date not yet met, or Expired date null
         [
-          {bool: {should: [term_search(:draft, false)]}},
-          {bool: {should: [range_search(:published_at, :lte, DateTime.now.to_s)]}},
-          {bool: {should: [range_search(:expired_at, :gte, DateTime.now.to_s), {missing: { field: :expired_at }}]}}
+          {bool: {must: [term_search(:draft, false)]}},
+          {bool: {must: [range_search(:published_at, :lte, DateTime.now.to_s)]}},
+          {bool: {should: [range_search(:expired_at, :gte, DateTime.now.to_s), {bool: {must_not: {exists: { field: :expired_at }}}}]}}
         ]
       end
     end

app/models/concerns/searchable_post.rb

@@ -93,21 +93,25 @@ def search_with_params(params, tenant, published = nil)
       if author
         bool[:bool][:filter] << term_search(:author, author)
       end
+
       if published
         bool[:bool][:filter] << published_filter
+        search query: bool, sort: [{is_sticky: {order: 'desc'}, published_at: {order: 'desc'}}]
+      else
+        search query: bool
       end
-
-      search query: bool
     end
 
     def show_all(tenant, published = nil)
       bool = {bool: {filter: [{term: {tenant_id: tenant.id}}]}}
 
       if published
         bool[:bool][:filter] << published_filter
+        search query: bool, sort: [{is_sticky: {order: 'desc'}, published_at: {order: 'desc'}}]
+      else
+        search query: bool, sort: [{is_sticky: {order: 'desc'}, created_at: {order: 'desc'}}]
       end
 
-      search query: bool, sort: [{is_sticky: {order: 'desc'}, created_at: {order: 'desc'}}]
     end
   end
 end

app/models/content_item.rb

@@ -113,7 +113,7 @@ def method_missing(*args)
       "#{publish_state.downcase}?" == args[0].to_s
     else
       # Used to query for any field on the relevant ContentType and return data from the content_item
-      field_items.select { |field_item| field_item.field.name.parameterize({ separator: '_' }) == args[0].to_s }.first.data.values[0]
+      field_items.select { |field_item| field_item.field.name.parameterize(separator: '_') == args[0].to_s }.first.data.values[0]
     end
   end
 end

app/models/content_type.rb

@@ -25,7 +25,7 @@ def self.permissions
   end
 
   def content_items_index_name
-    content_type_name_sanitized = name.parameterize('_')
+    content_type_name_sanitized = name.parameterize(separator: '_')
     "#{Rails.env}_content_type_#{content_type_name_sanitized}_content_items"
   end