comfortable_mexican_sofa 1.6.13 → 1.6.14

data/VERSION

@@ -1 +1 @@
-1.6.13
+1.6.14

data/app/models/cms/page.rb

@@ -36,7 +36,7 @@ class Cms::Page < ActiveRecord::Base
     :presence   => true
   validates :slug,
     :presence   => true,
-    :format     => /^\w[a-z0-9_-]*$/i,
+    :format     => /^\w[\.a-z0-9_-]*$/i,
     :uniqueness => { :scope => :parent_id },
     :unless     => lambda{ |p| p.site && (p.site.pages.count == 0 || p.site.pages.root == self) }
   validates :layout,

data/comfortable_mexican_sofa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfortable_mexican_sofa"
-  s.version = "1.6.13"
+  s.version = "1.6.14"
 
   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 = "2012-02-23"
+  s.date = "2012-02-24"
   s.description = ""
   s.email = "oleg@theworkinggroup.ca"
   s.extra_rdoc_files = [

data/config/locales/en.yml

@@ -6,6 +6,7 @@ en:
     slug: Slug
     parent_id: Parent
     content: Content
+    identifier: Identifier
   activerecord:
     models:
       cms/site: Site
@@ -14,11 +15,13 @@ en:
       cms/snippet: Snippet
     attributes:
       cms/site:
+        identifier: Identifier
         hostname: Hostname
         path: Path
         locale: Language
         is_mirrored: Mirrored
       cms/layout:
+        identifier: Identifier
         label: Layout Name
         app_layout: App Layout
         parent_id: Parent Layout
@@ -30,6 +33,11 @@ en:
         slug: Slug
         target_page_id: Redirect to Page
         is_published: Published
+      cms/file:
+        file: File
+        description: Description
+      cms/snippet:
+        identifier: Identifier
         
   # -- Controllers ----------------------------------------------------------
   cms:

data/config/locales/pt-BR.yml

@@ -3,9 +3,9 @@ pt-BR:
   # -- Models ---------------------------------------------------------------
   attributes:
     label: Nome
+    slug: Identificador
     parent_id: Pai
     content: Conteúdo
-    slug: Identificador
     identifier: Identificador
   activerecord:
     models:
@@ -15,11 +15,13 @@ pt-BR:
       cms/snippet: Fragmento
     attributes:
       cms/site:
+        identifier: Identificador
         hostname: Nome do Host
         path: Caminho
         locale: Idioma
         is_mirrored: Espelhado
       cms/layout:
+        identifier: Identificador
         label: Nome do Leiaute
         app_layout: Leiaute da Aplicação
         parent_id: Leiaute Pai
@@ -227,4 +229,4 @@ pt-BR:
       image:
         insert: Inserir Imagem
       link:
-        create: Criar Link
+        create: Criar Link

data/test/unit/models/page_test.rb

@@ -44,6 +44,15 @@ class CmsPageTest < ActiveSupport::TestCase
     assert_has_errors_on page, :target_page_id
   end
   
+  def test_validation_of_slug
+    page = cms_pages(:child)
+    page.slug = 'slug.with.d0ts-and_things'
+    assert page.valid?
+    
+    page.slug = 'inva lid'
+    assert page.invalid?
+  end
+  
   def test_label_assignment
     page = cms_sites(:default).pages.new(
       :slug   => 'test',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.6.13
+  version: 1.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000Z
+date: 2012-02-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70242361677380 !ruby/object:Gem::Requirement
+  requirement: &70275681873660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70242361677380
+  version_requirements: *70275681873660
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70242361676880 !ruby/object:Gem::Requirement
+  requirement: &70275681865720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70242361676880
+  version_requirements: *70275681865720
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70242361676360 !ruby/object:Gem::Requirement
+  requirement: &70275681864260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,7 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70242361676360
+  version_requirements: *70275681864260
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -366,7 +366,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3226353458440503437
+      hash: -4525357111478288434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: