comfortable_mexican_sofa 1.12.10 → 1.12.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a378fe2ff8473a6bdb6f8abcf9737212752ff94e
-  data.tar.gz: 9800511d75e1766e3086d6909996a7667030e4e9
+SHA256:
+  metadata.gz: 9f70c039dbce8b042c0357c1fdea1934dbcd867702aa78a8194955db4174d82a
+  data.tar.gz: a50c14e1e7c81012e630ecd3feec5f0ef49595f01b6158719f0b1d23ceaaa43f
 SHA512:
-  metadata.gz: 7a695b06bc9e7c4e8d2c5bda284adf7a7567b9f1de25cf402d861c778f925e95c2f7dbf137a50bde59e3cde0c3a35f1af0097af9c0d099a0cf96b7bc270622e1
-  data.tar.gz: 13bfff432c679fbe34c2fc6ad0fa4e4ac5f60f550f20f41d9efac622093b7099ca2fc813e06572b68f9fbe986435854fe027a823f62b14ad6fb93ce148f466e8
+  metadata.gz: fac42de19669e82b6b9e91d58a3ba755b5e982a36f906c81e32532f547a7351936651a7044321a1edb5237324ffacf149a8b80fa3ce009f0696a7c7866f4238a
+  data.tar.gz: 4dbf87a9a70967c876da2119a25f54f15eed2e04032f64dd6f08e5d4e7421bfa59c38a8b17a8cccf1f9cec759d78549a9c496264ff868b37d31aa109b0380802

data/.travis.yml

@@ -6,10 +6,9 @@ before_script:
 script:
   - rake ci
 rvm:
-  - 2.0.0
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
+  - 2.2.7
+  - 2.3.5
+  - 2.4.2
 gemfile:
   - test/gemfiles/Gemfile.rails.4.1
   - test/gemfiles/Gemfile.rails.4.2
@@ -19,13 +18,7 @@ branches:
     - master
 matrix:
   fast_finish: true
-  include:
-    - rvm: 2.3.1
-      gemfile: test/gemfiles/Gemfile.rails.master
   exclude:
-    - rvm: 2.0.0
-      gemfile: test/gemfiles/Gemfile.rails.5.0
-    - rvm: 2.1.10
-      gemfile: test/gemfiles/Gemfile.rails.5.0
-  allow_failures:
-    - gemfile: test/gemfiles/Gemfile.rails.master
+    - rvm: 2.4.2
+      gemfile: test/gemfiles/Gemfile.rails.4.1
+      

data/Gemfile

@@ -5,8 +5,6 @@ gemspec
 # apps can also use will_paginate so there's no dependency in gemspec
 gem 'kaminari'
 
-gem 'rails', '~> 5.0.0'
-
 group :development do
   gem 'awesome_print'
   gem 'better_errors'
@@ -15,7 +13,7 @@ end
 
 group :test do
   gem 'rails-controller-testing'
-  
+
   gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
   gem 'jdbc-sqlite3',                     :platform => :jruby
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby

data/README.md

@@ -1,5 +1,10 @@
 # ComfortableMexicanSofa
-[![Gem Version](https://img.shields.io/gem/v/comfortable_mexican_sofa.svg?style=flat)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Gem Downloads](https://img.shields.io/gem/dt/comfortable_mexican_sofa.svg?style=flat)](http://rubygems.org/gems/comfortable_mexican_sofa) [![Build Status](https://img.shields.io/travis/comfy/comfortable-mexican-sofa.svg?style=flat)](https://travis-ci.org/comfy/comfortable-mexican-sofa) [![Dependency Status](https://img.shields.io/gemnasium/comfy/comfortable-mexican-sofa.svg?style=flat)](https://gemnasium.com/comfy/comfortable-mexican-sofa) [![Code Climate](https://img.shields.io/codeclimate/github/comfy/comfortable-mexican-sofa.svg?style=flat)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) [![Coverage Status](https://img.shields.io/coveralls/comfy/comfortable-mexican-sofa.svg?style=flat)](https://coveralls.io/r/comfy/comfortable-mexican-sofa?branch=master)
+[![Gem Version](https://img.shields.io/gem/v/comfortable_mexican_sofa.svg?style=flat)](http://rubygems.org/gems/comfortable_mexican_sofa) 
+[![Gem Downloads](https://img.shields.io/gem/dt/comfortable_mexican_sofa.svg?style=flat)](http://rubygems.org/gems/comfortable_mexican_sofa) 
+[![Build Status](https://img.shields.io/travis/comfy/comfortable-mexican-sofa.svg?branch=master&style=flat)](https://travis-ci.org/comfy/comfortable-mexican-sofa) 
+[![Dependency Status](https://img.shields.io/gemnasium/comfy/comfortable-mexican-sofa.svg?style=flat)](https://gemnasium.com/comfy/comfortable-mexican-sofa) 
+[![Code Climate](https://img.shields.io/codeclimate/github/comfy/comfortable-mexican-sofa.svg?style=flat)](https://codeclimate.com/github/comfy/comfortable-mexican-sofa) 
+[![Coverage Status](https://img.shields.io/coveralls/comfy/comfortable-mexican-sofa.svg?style=flat)](https://coveralls.io/r/comfy/comfortable-mexican-sofa?branch=master)
 
 ComfortableMexicanSofa is a powerful Rails 4/5 CMS Engine
 

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-tactile

data/app/assets/javascripts/comfy/admin/cms/base.js.coffee

@@ -3,7 +3,7 @@ window.CMS ||= {}
 window.CMS.code_mirror_instances = [ ]
 
 $ -> window.CMS.init()
-$(document).on 'page:load', -> window.CMS.init()
+$(document).on 'page:load turbolinks:load', -> window.CMS.init()
 
 window.CMS.init = ->
   window.CMS.current_path = window.location.pathname

data/app/assets/javascripts/comfy/admin/cms/lib/diff.js.coffee

@@ -1,7 +1,7 @@
 #= require comfy/admin/cms/lib/diff/diff_match_patch.min
 #= require comfy/admin/cms/lib/diff/pretty_text_diff.min
 
-$(document).on 'page:load ready', ->
+$(document).on 'page:load ready turbolinks:load', ->
   $("table.diff").prettyTextDiff ->
     cleanup: true
     originalContainer:  'tr td.original'

data/app/models/comfy/cms/site.rb

@@ -37,10 +37,16 @@ class Comfy::Cms::Site < ActiveRecord::Base
   def self.find_site(host, path = nil)
     return Comfy::Cms::Site.first if Comfy::Cms::Site.count == 1
     cms_site = nil
+
+    public_cms_path = ComfortableMexicanSofa.configuration.public_cms_path
+    if path && public_cms_path != "/"
+      path = path.sub(%r{\A#{public_cms_path}}, "")
+    end
+
     Comfy::Cms::Site.where(:hostname => real_host_from_aliases(host)).each do |site|
       if site.path.blank?
         cms_site = site
-      elsif "#{path.to_s.split('?')[0]}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
+      elsif "#{path.to_s.split('?')[0]}/" =~ %r{^/#{Regexp.escape(site.path.to_s)}/}
         cms_site = site
         break
       end

data/app/views/comfy/admin/cms/pages/_form.html.haml

@@ -33,6 +33,6 @@
 = render 'comfy/admin/cms/partials/page_form_after', :form => form
 
 = form.form_group :class => 'form-actions' do
-  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default'
+  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default', :data => { :disable_with => false }
   = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
   = link_to t('.cancel'), comfy_admin_cms_site_pages_path, :class => 'btn btn-link'

data/config/locales/pt-BR.yml

@@ -109,9 +109,9 @@ pt-BR:
             revision: &revision
               zero: '%{count} Revisão'
               one: '%{count} Revisão'
-              few: '%{count} Revisão'
-              many: '%{count} Revisão'
-              other: '%{count} Revisão'
+              few: '%{count} Revisões'
+              many: '%{count} Revisões'
+              other: '%{count} Revisões'
           form:
             select_parent_layout: Selecione o Leiaute Pai
             select_app_layout: Selecione o Leiaute da Aplicação

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.12.10"
+  VERSION = "1.12.11"
 end

data/test/models/site_test.rb

@@ -1,33 +1,33 @@
 require_relative '../test_helper'
 
 class CmsSiteTest < ActiveSupport::TestCase
-  
+
   def test_fixtures_validity
     Comfy::Cms::Site.all.each do |site|
       assert site.valid?, site.errors.inspect
     end
   end
-  
+
   def test_validation
     site = Comfy::Cms::Site.new
     assert site.invalid?
     assert_has_errors_on site, [:identifier, :label, :hostname]
-    
+
     site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'http://site.host')
     assert site.invalid?
     assert_has_errors_on site, :hostname
-    
+
     site = Comfy::Cms::Site.new(:identifier => comfy_cms_sites(:default).identifier, :hostname => 'site.host')
     assert site.invalid?
     assert_has_errors_on site, :identifier
-    
+
     site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'site.host')
     assert site.valid?, site.errors.inspect
-    
+
     site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'localhost:3000')
     assert site.valid?, site.errors.inspect
   end
-  
+
   def test_validation_path_uniqueness
     s1 = comfy_cms_sites(:default)
     s2 = Comfy::Cms::Site.new(
@@ -37,7 +37,7 @@ class CmsSiteTest < ActiveSupport::TestCase
     )
     assert s2.invalid?
     assert_has_errors_on s2, :hostname
-    
+
     s2 = Comfy::Cms::Site.new(
       :identifier => 'test',
       :hostname   => s1.hostname,
@@ -45,33 +45,33 @@ class CmsSiteTest < ActiveSupport::TestCase
     )
     assert s2.valid?
   end
-  
+
   def test_identifier_assignment
     site = Comfy::Cms::Site.new(:hostname => 'my-site.host')
     assert site.valid?
     assert_equal 'my-site-host', site.identifier
   end
-  
+
   def test_hostname_assignment
     site = Comfy::Cms::Site.new(:identifier => 'test-site')
     assert site.valid?
     assert_equal 'test-site', site.hostname
   end
-  
+
   def test_label_assignment
     site = Comfy::Cms::Site.new(:identifier => 'test', :hostname => 'my-site.host')
     assert site.valid?
     assert_equal 'Test', site.label
   end
-  
+
   def test_clean_path
     site = Comfy::Cms::Site.create!(:identifier => 'test_a', :hostname => 'test.host', :path => '/en///test//')
     assert_equal '/en/test', site.path
-    
+
     site = Comfy::Cms::Site.create!(:identifier => 'test_b', :hostname => 'my-site.host', :path => '/')
     assert_equal '', site.path
   end
-  
+
   def test_creation
     assert_difference 'Comfy::Cms::Site.count' do
       Comfy::Cms::Site.create!(
@@ -81,7 +81,7 @@ class CmsSiteTest < ActiveSupport::TestCase
       )
     end
   end
-  
+
   def test_cascading_destroy
     assert_difference 'Comfy::Cms::Site.count', -1 do
       assert_difference 'Comfy::Cms::Layout.count', -3 do
@@ -95,7 +95,7 @@ class CmsSiteTest < ActiveSupport::TestCase
       end
     end
   end
-  
+
   def test_scope_mirrored
     site = comfy_cms_sites(:default)
     assert !site.is_mirrored
@@ -103,59 +103,76 @@ class CmsSiteTest < ActiveSupport::TestCase
     site.update_columns(:is_mirrored => true)
     assert_equal 1, Comfy::Cms::Site.mirrored.count
   end
-  
+
   def test_find_site
     site_a = comfy_cms_sites(:default)
     assert_equal 'test.host', site_a.hostname
     assert_nil site_a.path
-    
+
     assert_equal site_a, Comfy::Cms::Site.find_site('test.host')
     assert_equal site_a, Comfy::Cms::Site.find_site('test.host', '/some/path')
     assert_equal site_a, Comfy::Cms::Site.find_site('test99.host', '/some/path')
-    
+
     site_b = Comfy::Cms::Site.create!(:identifier => 'test_a', :hostname => 'test2.host', :path => 'en')
     site_c = Comfy::Cms::Site.create!(:identifier => 'test_b', :hostname => 'test2.host', :path => 'fr')
-    
+
     assert_equal site_a,  Comfy::Cms::Site.find_site('test.host')
     assert_equal site_a,  Comfy::Cms::Site.find_site('test.host', '/some/path')
     assert_equal site_a,  Comfy::Cms::Site.find_site('test.host', '/some/path')
     assert_nil            Comfy::Cms::Site.find_site('test99.host', '/some/path')
-    
+
     assert_nil            Comfy::Cms::Site.find_site('test2.host')
     assert_nil            Comfy::Cms::Site.find_site('test2.host', '/some/path')
     assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en')
     assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en?a=b')
     assert_equal site_b,  Comfy::Cms::Site.find_site('test2.host', '/en/some/path?a=b')
-    
+
     assert_nil            Comfy::Cms::Site.find_site('test2.host', '/english/some/path')
-    
+
     assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr')
     assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr?a=b')
     assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr/some/path')
     assert_equal site_c,  Comfy::Cms::Site.find_site('test2.host', '/fr/some/path?a=b')
   end
-  
+
+  def find_site_with_base_path
+    base_path = '/base_path'
+    ComfortableMexicanSofa.configuration.public_cms_path = base_path
+    site_d = Comfy::Cms::Site.create!(:identifier => 'test_d', :hostname => 'test3.host', :path => 'de')
+    site_e = Comfy::Cms::Site.create!(:identifier => 'test_e', :hostname => 'test3.host', :path => 'sp')
+
+    assert_equal site_d, Comfy::Cms::Site.find_site('test3.host', "#{base_path}/de")
+    assert_equal site_d, Comfy::Cms::Site.find_site('test3.host', "#{base_path}/de/some/path")
+    assert_nil           Comfy::Cms::Site.find_site('test99.host', "#{base_path}/de/some/path")
+
+    assert_nil            Comfy::Cms::Site.find_site('test3.host')
+    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp/some/path")
+    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp")
+    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp?a=b")
+    assert_equal site_e,  Comfy::Cms::Site.find_site('test3.host', "#{base_path}/sp/some/path?a=b")
+  end
+
   def test_find_site_with_site_alias
     site_a = comfy_cms_sites(:default)
     site_b = Comfy::Cms::Site.create!(:identifier => 'site_b', :hostname => 'test2.host')
-    
+
     ComfortableMexicanSofa.config.hostname_aliases = {
       'test.host'   => 'alias_a.host',
       'test2.host'  => %w(alias_b.host alias_c.host)
     }
-    
+
     assert_equal site_a, Comfy::Cms::Site.find_site('alias_a.host')
     assert_equal site_b, Comfy::Cms::Site.find_site('alias_b.host')
     assert_equal site_b, Comfy::Cms::Site.find_site('alias_c.host')
   end
-  
+
   def test_url
     assert_equal '//test.host/', comfy_cms_sites(:default).url
   end
-  
+
   def test_url_with_public_cms_path
     ComfortableMexicanSofa.config.public_cms_path = '/custom'
     assert_equal '//test.host/custom/', comfy_cms_sites(:default).url
   end
-  
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.12.10
+  version: 1.12.11
 platform: ruby
 authors:
 - Oleg Khabarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -226,6 +226,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- _config.yml
 - app/assets/fonts/comfy/admin/cms/lib/redactor-font.eot
 - app/assets/images/comfy/admin/cms/arrow_bottom.gif
 - app/assets/images/comfy/admin/cms/arrow_right.gif
@@ -670,7 +671,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Rails 4/5 CMS Engine