trusty-cms 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08f5e8a4af024687fbd7b3254c2b59c20d5f33e3'
-  data.tar.gz: 89474a5f5fa76618a79704889210b170a2584be5
+SHA256:
+  metadata.gz: 2e373d392203b28442ebf17a3b2174a282c43357f4a89351056aacf7b400f505
+  data.tar.gz: e0f34c90b48af63d7de0788795a4373638f2426d5c926ba5f4067eec58bf5eb9
 SHA512:
-  metadata.gz: 871dcea0008cb217654ade4a262dc0421b1abaaf4ea10e70523a819a45186e9ce6a6584be3f3b305208204a502879114af031cded53a026717eeaeb8d049ff4c
-  data.tar.gz: 8f3028f2224bad2539abc7f4fb9beef0838e13200e4055871a4e44f121d4b768949a3eb489aba4cebb4110b07bfadf8a0616dc0750b83b1f64400820d98d7dbc
+  metadata.gz: 5076487c7701af146ecf07dccad04ce4c1c4f5951522781d4ccf327f6a3bc0cf963ee3a54ab02dbc7f45a26cae9488f4a20e57aa674519c2c175d0855d3292c9
+  data.tar.gz: 339e7be449be6161b6baff53c7e7533424a7d4ed327320b31f5a2a28d8f976f124971727493d0bb3a1ff45f8ab88065149fbab6037ac22eb7daab796e50a2831

data/Gemfile

@@ -13,12 +13,11 @@ gemspec
 
 group :development, :test do
   gem 'acts_as_list'
-  gem 'cocaine'
   gem 'codeclimate-test-reporter'
   gem 'database_cleaner'
   gem 'factory_bot_rails'
   gem 'launchy',         '~> 2.4.2'
-  gem 'mysql2',          '~> 0.4.2'
+  gem 'mysql2'
   gem 'poltergeist',      '~> 1.14.0'
   gem 'pry-byebug'
   gem 'rails-observers'

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.3.0)
+    trusty-cms (3.3.1)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (~> 2.6.1)
       bundler (~> 1.7)
       ckeditor (~> 4.2.2)
-      cocaine (~> 0.5.8)
       compass-rails (~> 3.0.2)
       delocalize (~> 0.2)
       execjs (~> 2.7)
@@ -15,15 +14,15 @@ PATH
       haml-rails (~> 1.0.0)
       highline (~> 1.7.8)
       kraken-io
-      mysql2 (~> 0.4.2)
+      mysql2
       paperclip (> 5.2)
       rack (~> 2.0.1)
       rack-cache (~> 1.7)
       radius (~> 0.7)
-      rails (~> 5.2.0.rc2)
+      rails (~> 5.2.0)
       rake (< 11.0)
       rdoc (~> 5.1)
-      roadie-rails (~> 1.2.1)
+      roadie-rails
       stringex (~> 2.7.1)
       therubyracer (~> 0.12.3)
       tzinfo (~> 1.2.3)
@@ -35,43 +34,43 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (5.2.0.rc2)
-      actionpack (= 5.2.0.rc2)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.0.rc2)
-      actionpack (= 5.2.0.rc2)
-      actionview (= 5.2.0.rc2)
-      activejob (= 5.2.0.rc2)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.0.rc2)
-      actionview (= 5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
-    activerecord (5.2.0.rc2)
-      activemodel (= 5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
       arel (>= 9.0)
-    activestorage (5.2.0.rc2)
-      actionpack (= 5.2.0.rc2)
-      activerecord (= 5.2.0.rc2)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.0.rc2)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -98,8 +97,8 @@ GEM
       orm_adapter (~> 0.5.0)
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
+    cocaine (0.6.0)
+      terrapin (= 0.6.0)
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     coderay (1.1.2)
@@ -120,10 +119,10 @@ GEM
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.0.5)
-    crass (1.0.3)
+    crass (1.0.4)
     css_parser (1.6.0)
       addressable
-    database_cleaner (1.6.2)
+    database_cleaner (1.7.0)
     delocalize (0.4.0)
       rails (>= 3.0)
     diff-lcs (1.3)
@@ -156,7 +155,7 @@ GEM
       ruby_parser (~> 3.5)
     httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     json (2.1.0)
     kraken-io (0.1.3)
@@ -185,7 +184,7 @@ GEM
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    mysql2 (0.4.10)
+    mysql2 (0.5.1)
     nio4r (2.3.0)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
@@ -207,24 +206,24 @@ GEM
       byebug (~> 10.0)
       pry (~> 0.10)
     public_suffix (3.0.2)
-    rack (2.0.4)
+    rack (2.0.5)
     rack-cache (1.7.1)
       rack (>= 0.4)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
     radius (0.7.4)
-    rails (5.2.0.rc2)
-      actioncable (= 5.2.0.rc2)
-      actionmailer (= 5.2.0.rc2)
-      actionpack (= 5.2.0.rc2)
-      actionview (= 5.2.0.rc2)
-      activejob (= 5.2.0.rc2)
-      activemodel (= 5.2.0.rc2)
-      activerecord (= 5.2.0.rc2)
-      activestorage (= 5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
       bundler (>= 1.3.0)
-      railties (= 5.2.0.rc2)
+      railties (= 5.2.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -233,9 +232,9 @@ GEM
       loofah (~> 2.2, >= 2.2.2)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (5.2.0.rc2)
-      actionpack (= 5.2.0.rc2)
-      activesupport (= 5.2.0.rc2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -245,11 +244,11 @@ GEM
       ffi (>= 0.5.0, < 2)
     rdoc (5.1.0)
     ref (2.0.0)
-    roadie (3.2.2)
+    roadie (3.3.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.5)
-    roadie-rails (1.2.1)
-      railties (>= 3.0, < 5.2)
+    roadie-rails (1.3.0)
+      railties (>= 3.0, < 5.3)
       roadie (~> 3.1)
     rspec-core (3.7.1)
       rspec-support (~> 3.7.0)
@@ -277,7 +276,7 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    sexp_processor (4.10.1)
+    sexp_processor (4.11.0)
     simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -319,12 +318,11 @@ PLATFORMS
 
 DEPENDENCIES
   acts_as_list
-  cocaine
   codeclimate-test-reporter
   database_cleaner
   factory_bot_rails
   launchy (~> 2.4.2)
-  mysql2 (~> 0.4.2)
+  mysql2
   poltergeist (~> 1.14.0)
   pry-byebug
   rails-observers

data/app/models/asset.rb

@@ -56,7 +56,7 @@ class Asset < ActiveRecord::Base
                         #'Expires'       => 1.month.from_now.httpdate
                     }
 
-  validates_attachment_content_type :asset, :content_type => ["image/jpg", "image/jpeg", "image/png", "image/gif", "application/pdf", "application/javascript", "text/javascript", "text/css"]
+  validates_attachment_content_type :asset, :content_type => ["application/zip", "image/jpg", "image/jpeg", "image/png", "image/gif", "application/pdf", "application/javascript", "text/javascript", "text/css"]
 
   before_save :assign_title
   before_save :assign_uuid
@@ -189,7 +189,7 @@ private
   end
 
   def assign_title
-    self.title = self.asset_file_name.sub(self.original_extension, "").sub(".", "")
+    self.title = self.asset_file_name.downcase.sub(self.original_extension, "").sub(".", "")
   end
 
   def assign_uuid

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.10.2/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2018-04-04T12:30:29-04:00">2018-04-04T12:30:29-04:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2018-04-24T10:24:00-04:00">2018-04-24T10:24:00-04:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -4388,7 +4388,7 @@
           <code class="ruby">        value = t(&quot;desc.#{tag_name.gsub(&#39;:&#39;,&#39;-&#39;)}&quot;).match(&#39;desc&#39;) ? description : t(&quot;desc.#{tag_name.gsub(&#39;:&#39;,&#39;-&#39;)}&quot;)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="8">
+        <li class="missed" data-hits="0" data-linenumber="8">
           
           
           <code class="ruby">        output &lt;&lt; render(:partial =&gt; &quot;admin/references/tag_reference.haml&quot;,</code>
@@ -4406,7 +4406,7 @@
           <code class="ruby">                        :description =&gt;  RedCloth.new(TrustyCms::Taggable::Util.strip_leading_whitespace(value)).to_html</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="11">
+        <li class="never" data-hits="" data-linenumber="11">
           
           
           <code class="ruby">                       })</code>
@@ -4568,7 +4568,7 @@
           <code class="ruby">  def filter</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="38">
+        <li class="missed" data-hits="0" data-linenumber="38">
           
           
           <code class="ruby">    @filter ||= begin</code>
@@ -4580,7 +4580,7 @@
           <code class="ruby">      TextFilter.find_descendant(params[:filter_name])</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="40">
+        <li class="never" data-hits="" data-linenumber="40">
           
           
           <code class="ruby">    end</code>
@@ -7540,7 +7540,7 @@
           <code class="ruby">      def pagination_parameters</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="19">
+        <li class="missed" data-hits="0" data-linenumber="19">
           
           
           <code class="ruby">        {</code>
@@ -7558,7 +7558,7 @@
           <code class="ruby">          :per_page =&gt; params[WillPaginate::ViewHelpers.pagination_options[:per_page_param_name]] || TrustyCms::Config[&#39;pagination.per_page&#39;] || 20</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="22">
+        <li class="never" data-hits="" data-linenumber="22">
           
           
           <code class="ruby">        }</code>

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.3.0'
+    VERSION = '3.3.1'
   end
 end