trusty-cms 3.8.3 → 3.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c798051f6a9e3ca039cde76868c92f4c167851a51a7faba5e0f094cbc28bba
-  data.tar.gz: 1622ca9cff174468884c1b605563870e1edbb19ed6a2289b8782f01641f65dd2
+  metadata.gz: 16008084828e31ad0ae76709269a435f9a89241d5a8a1e59cde3a310088ec616
+  data.tar.gz: c6c8ec48f78cde6e481e4aede127233895be9d83c9365467022e3fddaa3189f8
 SHA512:
-  metadata.gz: fed160cae1847c602d13b8db042f2d494f4d673fb5eac40745d5214a453bc7d4743199984cd737c07a9be1d739bec5cf6988b2ddf3f9958a0907184bcb2bd76d
-  data.tar.gz: 109ac3bb659fc9ea54806ca3e292e286aeef883a40d315d3a88f7d0e6810efd8647be7db598e919b3adc5abc3b11eb4fff1f96a6f398fc5a330e44fcc841db24
+  metadata.gz: f994ecbba09fbecd02765367dc379222345d06eaa337707de0f475ddd05708e10f3fc6854755fda963c9937df36a2dffc16f7b4fabb1edfa5e8b4a2d6fbcd6f7
+  data.tar.gz: a4031c894cbfebf29206cdcaf9a0b24aeb03adf8bc4a9f16293b56b1a8a8d2619a96fd4763ac141984863213adf3a54d720fee46c1ba3cc5d308c982d3fc2a6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.8.3)
+    trusty-cms (3.8.4)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)

data/app/helpers/application_helper.rb

@@ -61,7 +61,6 @@ module ApplicationHelper
           else
             options.to_s
           end
-    #TODO: look for other instances of request_uri
     request.original_fullpath =~ Regexp.new('^' + Regexp.quote(clean(url)))
   end
 

data/app/models/asset_type.rb

@@ -97,7 +97,6 @@ class AssetType
   #
   def paperclip_styles
     # Styles are not relevant if processors are not defined.
-    # TODO: should this default to an icon set?
     @paperclip_styles ||= if paperclip_processors.any?
       normalize_style_rules(configured_styles.merge(styles))
     else
@@ -107,9 +106,7 @@ class AssetType
   end
 
   # Takes a motley collection of differently-defined styles and renders them into the standard hash-of-hashes format.
-  # Solitary strings are assumed to be
-  #TODO: define permitted and/or expected options for the asset type and pass through that subset of the style-definition hash
-  #
+  # Solitary strings are assumed to be  #
   def normalize_style_rules(styles={})
     styles.each_pair do |name, rule|
       unless rule.is_a? Hash

data/app/models/page.rb

@@ -194,11 +194,11 @@ class Page < ActiveRecord::Base
     elsif (path =~ /^#{Regexp.quote(my_path)}([^\/]*)/)
       slug_child = children.find_by_slug($1)
       if slug_child
-        found = slug_child.find_by_path(path, live, clean) # TODO: set to find_by_path after deprecation
+        found = slug_child.find_by_path(path, live, clean)
         return found if found
       end
       children.each do |child|
-        found = child.find_by_path(path, live, clean) # TODO: set to find_by_path after deprecation
+        found = child.find_by_path(path, live, clean)
         return found if found
       end
     end

data/app/models/standard_tags.rb

@@ -441,7 +441,6 @@ module StandardTags
     options = aggregate_children(tag)
     children = Page.where(options)
 
-    # TODO: What is this nonsnese?
     if first = children.first
       tag.locals.page = first
       tag.expand
@@ -464,7 +463,6 @@ module StandardTags
     options = aggregate_children(tag)
     children = Page.where(options)
 
-    # TODO: More nonsense
     if last = children.last
       tag.locals.page = last
       tag.expand
@@ -1343,7 +1341,6 @@ module StandardTags
 
     def dev?(request)
       return false if request.nil?
-      # TODO: More nonsense!
       if dev_host = TrustyCms::Config['dev.host']
         dev_host == request.host
       else

data/app/models/trusty_cms/page_response_cache_director.rb

@@ -11,7 +11,6 @@ module TrustyCms
 
     class << self
       def cache_timeout
-        # TODO: This cache is caching even in development. That shouldn't be happening.
         @cache_timeout ||= 5.minutes
       end
 

data/config/application.rb

@@ -50,8 +50,6 @@ module TrustyCms
                           :verbose => false,
                           :allow_reload => false,
                           :allow_revalidate => false
-    # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
-    # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
 

data/config/locales/en.yml

@@ -4,14 +4,14 @@ en:
   activerecord:
     errors:
       messages:
-        blank: 'this must not be blank' # required
-        invalid: 'this does not match the expected format' #invalid_format
-        not_a_number: 'this must be a number' # must be number
-        not_a_page: "there must be a page at this address"
-        not_permitted: 'this must be one of the permitted values'
-        taken: 'this name is already in use' # name_in_use
-        too_long: 'this must not be longer than %{count} characters' # character_limit
-        too_short: 'this must be at least %{count} characters long' # character_minimum
+        blank: 'This field is required.' # required
+        invalid: 'This does not match the expected format' #invalid_format
+        not_a_number: 'This must be a number' # must be number
+        not_a_page: "There must be a page at this address"
+        not_permitted: 'This must be one of the permitted values'
+        taken: 'This name is already in use' # name_in_use
+        too_long: 'This must not be longer than %{count} characters' # character_limit
+        too_short: 'This must be at least %{count} characters long' # character_minimum
       models:
         asset:
           attributes:
@@ -20,15 +20,15 @@ en:
         page:
           attributes:
             slug:
-              taken: 'this slug is already in use by a sibling of this page' # slug_in_use
+              taken: 'This slug is already in use by a sibling of this page' # slug_in_use
         user:
           attributes:
             email:
-              invalid: 'this is not a valid e-mail address' # invalid_email
+              invalid: 'This is not a valid e-mail address' # invalid_email
             login:
-              taken: 'this login is already in use' # login already in use
+              taken: 'This login is already in use' # login already in use
             password:
-              confirmation: 'this must match confirmation' # password_confirmation
+              confirmation: 'This must match confirmation' # password_confirmation
   add_child: 'Add Child'
   add_field: 'Add Field'
   add_part: 'Add Part'
@@ -42,11 +42,9 @@ en:
     images: 'Images'
     others: 'Others'
     audios: 'Audio'
-    flashes: 'Flash'
     fonts: 'Fonts'
     videos: 'Video'
     pdfs: 'PDFs'
-    swfs: 'Flash'
   available_tags: 'Available Tags'
   available_tags_for: 'Available Tags for %{name}'
   body: 'Body'
@@ -68,13 +66,13 @@ en:
     asset_page_attachment_note: 'Attached assets. These can be inserted with drag and drop or shown with the <code>&lt;r:assets:each /&gt;</code> tag.'
     asset_note: 'Attached assets. '
     assets: 'Assets'
-    assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on a asset name above to edit it or click <code>Remove</code> to delete it.'
+    assets_explanation: 'Assets and images can be uploaded and then attached or inserted into pages, snippets and layouts. Click on an asset name above to edit it or click <code>Remove</code> to delete it.'
     assets_title: 'Assets'
     asset_page_upload_note: 'Assets uploaded here will be automatically associated with this page.'
     asset_upload_note: 'Choose an asset to upload here. If the <code>Title</code> field is left blank, the filename (without the file type) will be automatically added. By clicking on <code>More</code>, you can add a caption as well.'
     attached_assets: 'Attached Assets'
     attach: 'Attach'
-    attach_asset: 'attach asset'
+    attach_asset: 'Attach asset'
     attach_assets: 'Attach assets'
     attach_existing: 'Attach Existing Assets'
     attach_to_page: 'Attach to page'
@@ -87,7 +85,7 @@ en:
     caption: 'Caption'
     confirm_refresh_assets: 'Are you sure you want to regenerate every asset thumbnail? This is likely to take a long time and use a lot of server resources: <strong class="warning">the performance of your site is very likely to be affected</strong> and your browser may time out before the operation is complete. This is only recommended if your asset collection is small!'
     confirm_remove_asset: 'Are you sure you want to permanently remove the following asset?'
-    confirm_remove_from_page: 'Are you sure you want to remove this assets from the page?'
+    confirm_remove_from_page: 'Are you sure you want to remove this asset from the page?'
     delete_asset: 'Delete Asset'
     detach: 'Detach'
     edit: 'Edit'

data/lib/configuration_extensions/configuration_extensions.rb

@@ -259,8 +259,6 @@ class Rails::Application::Configuration
   end
 end
 
-
-# TODO: Move all of this to a separate file.
 class Boot
   def run
     load_mutex

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.8.3'
+    VERSION = '3.8.4'
   end
 end

data/spec/dummy/config/application.rb

@@ -37,7 +37,6 @@ module TrustyCms
       $LOAD_PATH.unshift path
     end
     # config.add_plugin_paths(extension_loader.paths(:plugin))
-    # TODO: Come back and look at this.
     trusty_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
     config.i18n.load_path = trusty_locale_paths + extension_loader.paths(:locale)
 
@@ -85,8 +84,6 @@ module TrustyCms
     #  :metastore => "trusty:tmp/cache/meta"
     #    Sets the meta store type and storage location.  We recommend you use
     #    trusty: since this will enable manual expiration and acceleration headers.
-
-    # TODO: We're not sure this is actually working, but we can't really test this until the app initializes.
     config.middleware.use Rack::Cache,
                           :private_headers => ['Authorization'],
                           :entitystore => "trusty:tmp/cache/entity",
@@ -94,13 +91,8 @@ module TrustyCms
                           :verbose => false,
                           :allow_reload => false,
                           :allow_revalidate => false
-    # TODO: There's got to be a better place for this, but in order for assets to work fornow, we need ConditionalGet
-    # TODO: Workaround from: https://github.com/rtomayko/rack-cache/issues/80
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
-
-
-
     config.filter_parameters += [:password, :password_confirmation]
 
     # Use the database for sessions instead of the cookie-based default,

data/vendor/extensions/clipped-extension/lib/asset_tags.rb

@@ -184,9 +184,7 @@ module AssetTags
     asset_content_type = tag.locals.asset.asset_content_type
     tag.expand unless asset_content_type.match(regexp).nil?
   end
-  
-  #TODO: could use better docs for Asset#other? case explaining what types it covers
-  
+    
   [:title, :caption, :asset_file_name, :extension, :asset_content_type, :asset_file_size, :id].each do |method|
     desc %{
       Renders the @#{method.to_s}@ attribute of the asset
@@ -293,21 +291,5 @@ private
       :conditions => conditions
     }
   end
-  
-  def swf_embed_markup(url, dimensions, fallback_content)
-    width, height = dimensions
-    %{<!--[if !IE]> -->
-      <object type="application/x-shockwave-flash" data="#{url}" width="#{width}" height="#{height}">
-    <!-- <![endif]-->
-    <!--[if IE]>
-      <object width="#{width}" height="#{height}"
-        classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"
-        codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0">
-        <param name="movie" value="#{url}" />
-    <!-->
-    #{fallback_content}
-      </object>
-    <!-- <![endif]-->}
-  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.4
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-03 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list