caboose-cms 0.9.198 → 0.9.200

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 15d290bc3b20a58ce749b220b794bf432f69dc2e
-  data.tar.gz: 8af2eb62daef4576150ddc29645363cd3e346d7f
+SHA256:
+  metadata.gz: f817e4674619e197010211d645eb180b35da7235aa925b1602dc8816c9923e44
+  data.tar.gz: c71233ef8c618b7131b8e440af1b682ddebd65b3baca55af07420bd96103ccea
 SHA512:
-  metadata.gz: 76a5fd26d550e493e6279357a0e16d7a1b7f70e5f12e9d09c691264d4845b82ae3179963b2b5c13b6d2f681d1aff847b7b09c6369ee5715ebb66e211f8e8c813
-  data.tar.gz: 437c8447d14af0d24b3c0decabfb2c168a18d435d5a4409f3df87df2d308d562747deff5a1c2b464da59e3c162dcd4da84a2fd403076fb00b5f2fd5d9887e9a6
+  metadata.gz: 791c1623a2682cd57a1d4d54406ae25a6d122347e77fc8941caf2404a4ef8ce49d101db92b8a9f6fb6841a9bfecb62b1411c323f08abab0d5ef7a5bb355e6db7
+  data.tar.gz: 765dcda3f8d8dc7ce3714a1ad1e045a1d02136d4c6090479440a384700157956654be6c2304ba8ffe29288a100e875a3473af7a8cc4fba1339422515539a8b41

data/app/assets/stylesheets/caboose/login.scss

@@ -1,3 +1,5 @@
+@import url('https://fonts.googleapis.com/css?family=Roboto:300,300i');
+
 .caboose-login-wrapper {
   padding: 40px 2%;
   text-align: center;

data/app/controllers/caboose/sites_controller.rb

@@ -219,6 +219,7 @@ module Caboose
           when 'zip' then site.zip = value
           when 'fax' then site.fax = value
           when 'contact_email' then site.contact_email = value
+          when 'recaptcha_threshold' then site.recaptcha_threshold = value
           when 'head_code' then site.head_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
           when 'body_open_code' then site.body_open_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))
           when 'body_close_code' then site.body_close_code = (value.blank? ? nil : value.gsub('<end/script>','</script>'))

data/app/models/caboose/form_submission.rb

@@ -11,6 +11,7 @@ class Caboose::FormSubmission < ActiveRecord::Base
   	:sent_to,
   	:bcc_to,
   	:category,
+    :recaptcha_score,
   	:date_submitted,
     :ip_address,
   	:is_spam,

data/app/models/caboose/schema.rb

@@ -343,6 +343,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :block_id, :integer ],
         [ :form_name, :string ],
         [ :sent_to, :string ],
+        [ :recaptcha_score, :float ],
         [ :date_submitted, :datetime ],
         [ :ip_address, :string ],
         [ :bcc_to, :string ],
@@ -901,7 +902,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :contact_email, :string ],
         [ :head_code, :text ],
         [ :body_open_code, :text ],
-        [ :body_close_code, :text ]
+        [ :body_close_code, :text ],
+        [ :recaptcha_threshold, :float, { :default => 0.5 } ]
       ],
       Caboose::SiteMembership => [
         [ :site_id     , :integer ],

data/app/models/caboose/site.rb

@@ -64,7 +64,8 @@ class Caboose::Site < ActiveRecord::Base
     :contact_email,
     :head_code,
     :body_open_code,
-    :body_close_code
+    :body_close_code,
+    :recaptcha_threshold
             
   before_save :validate_presence_of_store_config
 
@@ -142,6 +143,10 @@ class Caboose::Site < ActiveRecord::Base
     return nil if d.nil?
     return d.site_id
   end
+
+  def valid_domains
+    self.domains.map{ |d| d.domain.blank? ? "" : d.domain.gsub(":3000","") }
+  end
   
   def self.sanitize_name(name)
     self.name = self.name.downcase.gsub(' ', '_')

data/app/views/caboose/sites/admin_edit.html.erb

@@ -23,6 +23,7 @@ user_ids = [] if user_ids.nil?
 <p><div id='site_<%= @site.id %>_assets_url' ></div></p>
 <p><div id='site_<%= @site.id %>_default_layout_id'       ></div></p>
 <p><div id='site_<%= @site.id %>_favicon'                    ></div></p>
+<p><div id='site_<%= @site.id %>_recaptcha_threshold'       ></div></p>
 
 <h2>Domains</h2>
 <p><a href='#' onclick="add_domain(<%= @site.id %>);return false;">New Domain</a></p>
@@ -106,7 +107,8 @@ $(document).ready(function() {
       { name: 'use_fonts'               , nice_name: 'Enable Fonts'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_fonts               ? true : false) %>, width: 400 },
       { name: 'use_dragdrop'               , nice_name: 'Enable Drag & Drop'             , type: 'checkbox' , value: <%= raw Caboose.json(@site.use_dragdrop              ? true : false) %>, width: 400 },
       { name: 'allow_self_registration' , nice_name: 'Allow Self Registration'  , type: 'checkbox' , value: <%= raw Caboose.json(@site.allow_self_registration ? true : false) %>, width: 400 },
-      { name: 'default_layout_id'       , nice_name: 'Default Layout'           , type: 'select'   , value: <%= raw Caboose.json(@site.default_layout_id)                      %>, width: 600, options_url: "/admin/sites/<%= @site.id %>/default-layout-options" }      
+      { name: 'default_layout_id'       , nice_name: 'Default Layout'           , type: 'select'   , value: <%= raw Caboose.json(@site.default_layout_id)                      %>, width: 600, options_url: "/admin/sites/<%= @site.id %>/default-layout-options" },
+      { name: 'recaptcha_threshold'               , nice_name: 'Recaptcha Threshold'             , type: 'text' , value: <%= raw Caboose.json(@site.recaptcha_threshold)  %>, width: 250 }    
     ]    
   });       
 });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.198'
+  VERSION = '0.9.200'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.198
+  version: 0.9.200
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-13 00:00:00.000000000 Z
+date: 2018-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -56,16 +56,16 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -1278,7 +1278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: CMS built on rails.