comfortable_mexican_sofa 1.4.17 → 1.4.18

data/VERSION

@@ -1 +1 @@
-1.4.17
+1.4.18

data/comfortable_mexican_sofa.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.4.17"
+  s.version = "1.4.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]

data/config/locales/es.yml

@@ -76,12 +76,12 @@ es:
       not_found: Revisión no encontrada
 
     files:
-      created: Files uploaded
-      creation_failure: Failed to upload files
-      updated: File updated
-      update_failure: Failed to update file
-      deleted: File deleted
-      not_found: File not found
+      created: Archivos subidos
+      creation_failure: Fallo la subida del archivo
+      updated: Archivo actualizado
+      update_failure: Fallo la actualización del archivo
+      deleted: Archivo borrado
+      not_found: Archivo no encontrado
 
     content:
       site_not_found: Sitio no encontrado
@@ -95,13 +95,13 @@ es:
       layouts: Diseños
       pages: Páginas
       snippets: Fragmentos
-      files: Files
+      files: Archivos
       
     sites:
       index:
         title: Listado de Sitios
         new_link: Crear nuevo Sitio
-        select: Select Site
+        select: Selecciona el Sitio
         edit: Editar
         delete: Eliminar
         are_you_sure: ¿Está seguro de que desea eliminar este sitio?
@@ -184,30 +184,30 @@ es:
         
     files:
       index:
-        title: Files
-        new_link: Upload New File
-        edit: Edit
-        delete: Delete
-        are_you_sure: Are you sure?
+        title: Archivos
+        new_link: Subir Nuevo Archivo
+        edit: Editar
+        delete: Borrar
+        are_you_sure: ¿Estás seguro?
         button: Cargar Archivos
       new:
-        title: New File
+        title: Nuevo Archivo
       edit:
-        title: Editing File
+        title: Editar Archivo
       form:
-        create: Upload File
-        update: Update File
+        create: Subir Archivo
+        update: Actualizar Archivo
           
     categories:
       index:
-        label: Categories
-        edit: Edit
-        done: Done
-        all: All
-        add: Add
+        label: Categorias
+        edit: Editar
+        done: Listo
+        all: Todos
+        add: Agregar
       show:
-        are_you_sure: Are you sure?
+        are_you_sure: ¿Estás seguro?
       edit:
-        save: Save
+        save: Guardar
       form:
-        label: Categories
+        label: Categorias

data/lib/comfortable_mexican_sofa/fixtures.rb

@@ -13,8 +13,11 @@ module ComfortableMexicanSofa::Fixtures
   end
   
   def self.import_layouts(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, layout_ids = [])
-    return unless site = Cms::Site.find_by_hostname(to_hostname)
-    return unless path ||= find_fixtures_path((from_hostname || to_hostname), 'layouts')
+    site = Cms::Site.find_or_create_by_hostname(to_hostname)
+    unless path ||= find_fixtures_path((from_hostname || to_hostname), 'layouts')
+      $stderr.puts 'Cannot find fixtures'
+      return
+    end
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
       slug = path.split('/').last
@@ -62,15 +65,21 @@ module ComfortableMexicanSofa::Fixtures
     end
     
     # removing all db entries that are not in fixtures
-    site.layouts.where('id NOT IN (?)', layout_ids.uniq).each{ |l| l.destroy } if root
+    if root
+      site.layouts.where('id NOT IN (?)', layout_ids.uniq).each{ |l| l.destroy } 
+      $stdout.puts 'Imported Layouts!'
+    end
     
     # returning ids of layouts in fixtures
     layout_ids.uniq
   end
   
   def self.import_pages(to_hostname, from_hostname = nil, path = nil, root = true, parent = nil, page_ids = [])
-    return unless site = Cms::Site.find_by_hostname(to_hostname)
-    return unless path ||= find_fixtures_path((from_hostname || to_hostname), 'pages')
+    site = Cms::Site.find_or_create_by_hostname(to_hostname)
+    unless path ||= find_fixtures_path((from_hostname || to_hostname), 'pages')
+      $stderr.puts 'Cannot find fixtures'
+      return
+    end
     
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
       slug = path.split('/').last
@@ -119,15 +128,21 @@ module ComfortableMexicanSofa::Fixtures
     end
     
     # removing all db entries that are not in fixtures
-    site.pages.where('id NOT IN (?)', page_ids.uniq).each{ |p| p.destroy } if root
+    if root
+      site.pages.where('id NOT IN (?)', page_ids.uniq).each{ |p| p.destroy }
+      $stdout.puts 'Imported Pages!'
+    end
     
     # returning ids of layouts in fixtures
     page_ids.uniq
   end
   
   def self.import_snippets(to_hostname, from_hostname = nil)
-    return unless site = Cms::Site.find_by_hostname(to_hostname)
-    return unless path = find_fixtures_path((from_hostname || to_hostname), 'snippets')
+    site = Cms::Site.find_or_create_by_hostname(to_hostname)
+    unless path = find_fixtures_path((from_hostname || to_hostname), 'snippets')
+      $stdout.puts 'Cannot find fixtures'
+      return
+    end
     
     snippet_ids = []
     Dir.glob("#{path}/*").select{|f| File.directory?(f)}.each do |path|
@@ -161,6 +176,7 @@ module ComfortableMexicanSofa::Fixtures
     
     # removing all db entries that are not in fixtures
     site.snippets.where('id NOT IN (?)', snippet_ids).each{ |s| s.destroy }
+    $stdout.puts 'Imported Snippets!'
   end
   
   def self.export_layouts(from_hostname, to_hostname = nil)

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -11,10 +11,8 @@ namespace :comfortable_mexican_sofa do
       to    = ENV['TO'] || ENV['FROM']
       from  = ENV['FROM']
       
-      abort "Site with hostname [#{to}] not found. Aborting." if !Cms::Site.find_by_hostname(to)
-      puts "Importing from Folder [#{from}] to Site [#{to}] ..."
+      puts "Importing CMS Fixtures from Folder [#{from}] to Site [#{to}] ..."
       ComfortableMexicanSofa::Fixtures.import_all(to, from)
-      puts 'Done!'
     end
     
     desc 'Export database data into Fixtures (options: FROM=example.com TO=example.local)'
@@ -22,8 +20,7 @@ namespace :comfortable_mexican_sofa do
       to    = ENV['TO'] || ENV['FROM']
       from  = ENV['FROM']
       
-      abort "Site with hostname [#{from}] not found. Aborting." if !Cms::Site.find_by_hostname(from)
-      puts "Exporting from Site [#{from}] to Folder [#{to}] ..."
+      puts "Exporting CMS data from Site [#{from}] to Folder [#{to}] ..."
       ComfortableMexicanSofa::Fixtures.export_all(from, to)
       puts 'Done!'
     end

data/test/test_helper.rb

@@ -6,6 +6,11 @@ require 'rails/test_help'
 
 class ActiveSupport::TestCase
   
+  $stdout_orig = $stdout
+  $stderr_orig = $stderr
+  $stdout = StringIO.new
+  $stderr = StringIO.new
+  
   fixtures :all
   include ActionDispatch::TestProcess
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  version: 1.4.17
+  version: 1.4.18
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70252456634400 !ruby/object:Gem::Requirement
+  requirement: &70197712792820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70252456634400
+  version_requirements: *70197712792820
 - !ruby/object:Gem::Dependency
   name: active_link_to
-  requirement: &70252456630840 !ruby/object:Gem::Requirement
+  requirement: &70197712791920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70252456630840
+  version_requirements: *70197712791920
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70252456630360 !ruby/object:Gem::Requirement
+  requirement: &70197712791440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,7 +45,7 @@ dependencies:
         version: 2.3.14
   type: :runtime
   prerelease: false
-  version_requirements: *70252456630360
+  version_requirements: *70197712791440
 description: ''
 email: oleg@theworkinggroup.ca
 executables: []
@@ -349,7 +349,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1666253122703358863
+      hash: 1469996073004586426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: