comfortable_mexican_sofa 1.4.7 → 1.4.8

data/.travis.yml

@@ -7,4 +7,11 @@ rvm:
   # - jruby
 gemfile:
   - gemfiles/Gemfile.rails-3.0.x
-  - gemfiles/Gemfile.rails-3.1.x
+  - gemfiles/Gemfile.rails-3.1.x
+notifications:
+  recipients:
+    - oleg@twg.ca
+branches:
+  only:
+    - master
+  

data/README.md

@@ -1,4 +1,4 @@
-# ComfortableMexicanSofa (Rails 3 CMS Engine) [![Build Status](https://secure.travis-ci.org/twg/comfortable-mexican-sofa.png)](http://travis-ci.org/twg/comfortable-mexican-sofa)
+# ComfortableMexicanSofa (Rails 3 CMS Engine) [![Build Status](http://travis-ci.org/twg/comfortable-mexican-sofa.png)](http://travis-ci.org/twg/comfortable-mexican-sofa)
 
 ComfortableMexicanSofa is a powerful CMS Engine for your Rails 3 applications.
 
@@ -49,7 +49,7 @@ Once you have a layout, you may start creating pages and populating content. It'
 
 For more information please [see Wiki pages](https://github.com/twg/comfortable-mexican-sofa/wiki).
 
-![Sofa's Page Edit View](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/page_editing.png)
+![Sofa's Page Edit View](https://github.com/twg/comfortable-mexican-sofa/raw/master/doc/preview.png)
 
 ComfortableMexicanSofa is released under the [MIT license](https://github.com/twg/comfortable-mexican-sofa/raw/master/LICENSE) 
 

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.8

data/app/controllers/cms_admin/pages_controller.rb

@@ -62,7 +62,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   end
 
   def reorder
-    (params[:page] || []).each_with_index do |id, index|
+    (params[:cms_page] || []).each_with_index do |id, index|
       if (cms_page = Cms::Page.find_by_id(id))
         cms_page.update_attribute(:position, index)
       end

data/app/controllers/cms_content_controller.rb

@@ -35,18 +35,10 @@ protected
   end
   
   def load_cms_site
-    if params[:site_id]
-      @cms_site ||= Cms::Site.find_by_id(params[:site_id])
+    @cms_site ||= if params[:site_id]
+      Cms::Site.find_by_id(params[:site_id])
     else
-      @cms_site ||= Cms::Site.first if Cms::Site.count == 1
-      Cms::Site.find_all_by_hostname(request.host.downcase).each do |site|
-        if site.path.blank?
-          @cms_site = site
-        elsif "#{request.fullpath}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
-          @cms_site = site
-          break
-        end
-      end unless @cms_site
+      Cms::Site.find_site(request.host.downcase, request.fullpath)
     end
     
     if @cms_site
@@ -62,11 +54,11 @@ protected
     return unless ComfortableMexicanSofa.config.enable_fixtures
     ComfortableMexicanSofa::Fixtures.import_all(@cms_site.hostname)
   end
-
+  
   def load_cms_page
     @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
     return redirect_to(@cms_page.target_page.full_path) if @cms_page.target_page
-
+    
   rescue ActiveRecord::RecordNotFound
     if @cms_page = @cms_site.pages.published.find_by_full_path('/404')
       render_html(404)

data/app/models/cms/block.rb

@@ -1,8 +1,6 @@
 class Cms::Block < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
   
   set_table_name :cms_blocks
   

data/app/models/cms/categorization.rb

@@ -1,8 +1,6 @@
 class Cms::Categorization < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
   
   set_table_name :cms_categorizations
   

data/app/models/cms/category.rb

@@ -1,8 +1,6 @@
 class Cms::Category < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
   
   set_table_name :cms_categories
   

data/app/models/cms/file.rb

@@ -1,8 +1,6 @@
 class Cms::File < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
     
   set_table_name :cms_files
   

data/app/models/cms/layout.rb

@@ -1,8 +1,6 @@
 class Cms::Layout < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
     
   set_table_name :cms_layouts
   

data/app/models/cms/page.rb

@@ -1,8 +1,6 @@
 class Cms::Page < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
     
   set_table_name :cms_pages
   

data/app/models/cms/revision.rb

@@ -1,8 +1,6 @@
 class Cms::Revision < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
   
   set_table_name :cms_revisions
   

data/app/models/cms/site.rb

@@ -1,8 +1,6 @@
 class Cms::Site < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
   
   set_table_name :cms_sites
   
@@ -27,6 +25,22 @@ class Cms::Site < ActiveRecord::Base
   # -- Scopes ---------------------------------------------------------------
   scope :mirrored, where(:is_mirrored => true)
   
+  # -- Class Methods --------------------------------------------------------
+  # returning the Cms::Site instance based on host and path
+  def self.find_site(host, path = nil)
+    return Cms::Site.first if Cms::Site.count == 1
+    cms_site = nil
+    Cms::Site.find_all_by_hostname(host).each do |site|
+      if site.path.blank?
+        cms_site = site
+      elsif "#{path}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
+        cms_site = site
+        break
+      end
+    end
+    return cms_site
+  end
+  
 protected
   
   def assign_label

data/app/models/cms/snippet.rb

@@ -1,8 +1,6 @@
 class Cms::Snippet < ActiveRecord::Base
   
-  if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-    establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-  end
+  ComfortableMexicanSofa.establish_connection(self)
   
   set_table_name :cms_snippets
   

data/app/views/cms_admin/sites/index.html.erb

@@ -7,6 +7,7 @@
       <div class='item'>
         <div class='icon'></div>
         <div class='action_links'>
+          <%= link_to t('.select'),  cms_admin_site_pages_path(site) %>
           <%= link_to t('.edit'), edit_cms_admin_site_path(site) %>
           <%= link_to t('.delete'), cms_admin_site_path(site), :method => :delete, :confirm => t('.are_you_sure') %>
         </div>

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.7"
+  s.version = "1.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2011-08-31}
+  s.date = %q{2011-09-05}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -196,7 +196,7 @@ Gem::Specification.new do |s|
     "db/migrate/upgrades/04_upgrade_to_1_3_0.rb",
     "db/migrate/upgrades/05_upgrade_to_1_4_0.rb",
     "db/seeds.rb",
-    "doc/page_editing.png",
+    "doc/preview.png",
     "doc/sofa.png",
     "gemfiles/Gemfile.rails-3.0.x",
     "gemfiles/Gemfile.rails-3.1.x",

data/config/locales/en.yml

@@ -101,6 +101,7 @@ en:
       index:
         title: Sites
         new_link: Create New Site
+        select: Select Site
         edit: Edit
         delete: Delete
         are_you_sure: Are you sure you want to delete this site?

data/config/locales/es.yml

@@ -101,6 +101,7 @@ es:
       index:
         title: Listado de Sitios
         new_link: Crear nuevo Sitio
+        select: Select Site
         edit: Editar
         delete: Eliminar
         are_you_sure: ¿Está seguro de que desea eliminar este sitio?

data/db/migrate/01_create_cms.rb

@@ -2,9 +2,7 @@ class CreateCms < ActiveRecord::Migration
   
   def self.up
     
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     
     # -- Sites --------------------------------------------------------------
     create_table :cms_sites do |t|
@@ -104,18 +102,18 @@ class CreateCms < ActiveRecord::Migration
     
     create_table :cms_categorizations, :force => true do |t|
       t.integer :category_id
-      t.string :categorized_type
+      t.string  :categorized_type
       t.integer :categorized_id
     end
     add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
+      
+    ActiveRecord::Base.establish_connection
   end
   
   def self.down
     
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     
     drop_table :cms_sites
     drop_table :cms_layouts
@@ -126,5 +124,7 @@ class CreateCms < ActiveRecord::Migration
     drop_table :cms_revisions
     drop_table :cms_categories
     drop_table :cms_categorizations
+    
+    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/02_upgrade_to_1_1_0.rb

@@ -1,25 +1,23 @@
 class UpgradeTo110 < ActiveRecord::Migration
   def self.up
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     rename_column :cms_layouts,   :cms_site_id,   :site_id
     rename_column :cms_pages,     :cms_site_id,   :site_id
     rename_column :cms_pages,     :cms_layout_id, :layout_id
     rename_column :cms_blocks,    :cms_page_id,   :page_id
     rename_column :cms_snippets,  :cms_site_id,   :site_id
     rename_column :cms_uploads,   :cms_site_id,   :site_id
+    ActiveRecord::Base.establish_connection
   end
 
   def self.down
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     rename_column :cms_uploads,   :site_id,   :cms_site_id
     rename_column :cms_snippets,  :site_id,   :cms_site_id
     rename_column :cms_blocks,    :page_id,   :cms_page_id
     rename_column :cms_layouts,   :site_id,   :cms_site_id
     rename_column :cms_pages,     :layout_id, :cms_layout_id
     rename_column :cms_pages,     :site_id,   :cms_site_id
+    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/03_upgrade_to_1_2_0.rb

@@ -1,8 +1,6 @@
 class UpgradeTo120 < ActiveRecord::Migration
   def self.up
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     create_table :cms_revisions, :force => true do |t|
       t.string    :record_type
       t.integer   :record_id
@@ -10,12 +8,12 @@ class UpgradeTo120 < ActiveRecord::Migration
       t.datetime  :created_at
     end
     add_index :cms_revisions, [:record_type, :record_id, :created_at]
+    ActiveRecord::Base.establish_connection
   end
 
   def self.down
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     drop_table :cms_revisions
+    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/04_upgrade_to_1_3_0.rb

@@ -1,8 +1,6 @@
 class UpgradeTo130 < ActiveRecord::Migration
   def self.up
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     add_column :cms_sites, :is_mirrored, :boolean, :null => false, :default => false
     add_column :cms_sites, :path, :string
     add_column :cms_sites, :locale, :string, :null => false, :default => 'en'
@@ -11,12 +9,11 @@ class UpgradeTo130 < ActiveRecord::Migration
     add_column :cms_layouts,  :is_shared, :boolean, :null => false, :default => false
     add_column :cms_pages,    :is_shared, :boolean, :null => false, :default => false
     add_column :cms_snippets, :is_shared, :boolean, :null => false, :default => false
+    ActiveRecord::Base.establish_connection
   end
 
   def self.down
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     remove_index :cms_sites, :is_mirrored
     remove_column :cms_sites, :path
     remove_column :cms_sites, :is_mirrored
@@ -25,5 +22,6 @@ class UpgradeTo130 < ActiveRecord::Migration
     remove_column :cms_layouts,   :is_shared
     remove_column :cms_pages,     :is_shared
     remove_column :cms_snippets,  :is_shared
+    ActiveRecord::Base.establish_connection
   end
 end

data/db/migrate/upgrades/05_upgrade_to_1_4_0.rb

@@ -1,8 +1,6 @@
 class UpgradeTo140 < ActiveRecord::Migration
   def self.up
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     rename_table :cms_uploads, :cms_files
     add_column :cms_files, :label, :string
     add_column :cms_files, :description, :string, :limit => 2048
@@ -17,17 +15,16 @@ class UpgradeTo140 < ActiveRecord::Migration
     
     create_table :cms_categorizations, :force => true do |t|
       t.integer :category_id
-      t.string :categorized_type
+      t.string  :categorized_type
       t.integer :categorized_id
     end
     add_index :cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
+    ActiveRecord::Base.establish_connection
   end
   
   def self.down
-    if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
-      establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
-    end
+    ComfortableMexicanSofa.establish_connection(ActiveRecord::Base)
     remove_index :cms_files, [:site_id, :label]
     remove_column :cms_files, :description
     remove_column :cms_files, :label
@@ -35,5 +32,6 @@ class UpgradeTo140 < ActiveRecord::Migration
     
     drop_table :cms_categories
     drop_table :cms_categorizations
+    ActiveRecord::Base.establish_connection
   end
 end

data/lib/comfortable_mexican_sofa.rb

@@ -50,5 +50,12 @@ module ComfortableMexicanSofa
       Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1 && Rails.configuration.assets.enabled
     end
     
+    # Establishing database connection if custom one is defined
+    def establish_connection(klass)
+      if ComfortableMexicanSofa.config.database_config && !Rails.env.test?
+        klass.establish_connection "#{ComfortableMexicanSofa.config.database_config}_#{Rails.env}"
+      end
+    end
+    
   end
 end

data/lib/comfortable_mexican_sofa/extensions/rails.rb

@@ -3,11 +3,6 @@ class String
   def idify
     self.strip.gsub(/\W/, '_').gsub(/\s|^_*|_*$/, '').squeeze('_')
   end
-  
-  # Capitalize all words in the string
-  def capitalize_all(delimiter = ' ')
-    self.split(delimiter).collect{|w| w.capitalize }.join(' ')
-  end
 end
 
 module Enumerable

data/lib/comfortable_mexican_sofa/tag.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # This module provides all Tag classes with neccessary methods.
 # Example class that will behave as a Tag:
 #   class MySpecialTag

data/lib/comfortable_mexican_sofa/view_methods.rb

@@ -23,7 +23,7 @@ module ComfortableMexicanSofa::ViewMethods
   # Content of a snippet. Example:
   #   cms_snippet_content(:my_snippet)
   def cms_snippet_content(snippet_slug, cms_site = nil)
-    return '' unless cms_site ||= (@cms_site || Cms::Site.find_by_hostname(request.host.downcase))
+    return '' unless cms_site ||= (@cms_site || Cms::Site.find_site(request.host.downcase, request.fullpath))
     return '' unless snippet = cms_site.snippets.find_by_slug(snippet_slug)
     render :inline => ComfortableMexicanSofa::Tag.process_content(Cms::Page.new, snippet.content)
   end

data/test/functional/cms_admin/pages_controller_test.rb

@@ -340,7 +340,7 @@ class CmsAdmin::PagesControllerTest < ActionController::TestCase
     assert_equal 0, page_one.position
     assert_equal 1, page_two.position
 
-    post :reorder, :site_id => cms_sites(:default), :page => [page_two.id, page_one.id]
+    post :reorder, :site_id => cms_sites(:default), :cms_page => [page_two.id, page_one.id]
     assert_response :success
     page_one.reload
     page_two.reload

data/test/unit/models/site_test.rb

@@ -80,4 +80,30 @@ class CmsSiteTest < ActiveSupport::TestCase
     assert_equal 1, Cms::Site.mirrored.count
   end
   
+  def test_find_site
+    site_a = cms_sites(:default)
+    assert_equal 'test.host', site_a.hostname
+    assert_equal nil, site_a.path
+    
+    assert_equal site_a, Cms::Site.find_site('test.host')
+    assert_equal site_a, Cms::Site.find_site('test.host', '/some/path')
+    assert_equal site_a, Cms::Site.find_site('test99.host', '/some/path')
+    
+    site_b = Cms::Site.create!(:hostname => 'test2.host', :path => 'en')
+    site_c = Cms::Site.create!(:hostname => 'test2.host', :path => 'fr')
+    
+    assert_equal site_a,  Cms::Site.find_site('test.host')
+    assert_equal site_a,  Cms::Site.find_site('test.host', '/some/path')
+    assert_equal nil,     Cms::Site.find_site('test99.host', '/some/path')
+    
+    assert_equal nil,     Cms::Site.find_site('test2.host')
+    assert_equal nil,     Cms::Site.find_site('test2.host', '/some/path')
+    assert_equal site_b,  Cms::Site.find_site('test2.host', '/en')
+    assert_equal site_b,  Cms::Site.find_site('test2.host', '/en/some/path')
+    assert_equal nil,     Cms::Site.find_site('test2.host', '/english/some/path')
+    
+    assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr')
+    assert_equal site_c,  Cms::Site.find_site('test2.host', '/fr/some/path')
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000 -04:00
+date: 2011-09-05 00:00:00.000000000 -04:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70266482551060 !ruby/object:Gem::Requirement
+  requirement: &70169043481960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266482551060
+  version_requirements: *70169043481960
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70266482550000 !ruby/object:Gem::Requirement
+  requirement: &70169043481480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70266482550000
+  version_requirements: *70169043481480
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70266482548480 !ruby/object:Gem::Requirement
+  requirement: &70169043481000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70266482548480
+  version_requirements: *70169043481000
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -233,7 +233,7 @@ files:
 - db/migrate/upgrades/04_upgrade_to_1_3_0.rb
 - db/migrate/upgrades/05_upgrade_to_1_4_0.rb
 - db/seeds.rb
-- doc/page_editing.png
+- doc/preview.png
 - doc/sofa.png
 - gemfiles/Gemfile.rails-3.0.x
 - gemfiles/Gemfile.rails-3.1.x
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3625883374521999007
+      hash: -3607967943366637378
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: