comfortable_mexican_sofa 1.8.3 → 1.8.4

data/lib/comfortable_mexican_sofa/fixture/layout.rb

@@ -0,0 +1,90 @@
+module ComfortableMexicanSofa::Fixture::Layout
+  class Importer < ComfortableMexicanSofa::Fixture::Importer
+    
+    def import!(path = self.path, parent = nil)
+      Dir["#{path}*/"].each do |path|
+        identifier = path.split('/').last
+        
+        layout = self.site.layouts.find_or_initialize_by_identifier(identifier)
+        layout.parent = parent
+        
+        # setting attributes
+        if File.exists?(attrs_path = File.join(path, 'attributes.yml'))
+          if fresh_fixture?(layout, attrs_path)
+            attrs = get_attributes(attrs_path)
+            layout.label      = attrs['label']
+            layout.app_layout = attrs['app_layout'] || parent.try(:app_layout)
+            layout.position   = attrs['position'] if attrs['position']
+          end
+        end
+        
+        # setting content
+        if File.exists?(content_path = File.join(path, 'content.html'))
+          if fresh_fixture?(layout, content_path)
+            layout.content = File.open(content_path).read
+          end
+        end
+        if File.exists?(content_path = File.join(path, 'stylesheet.css'))
+          if fresh_fixture?(layout, content_path)
+            layout.css = File.open(content_path).read
+          end
+        end
+        if File.exists?(content_path = File.join(path, 'javascript.js'))
+          if fresh_fixture?(layout, content_path)
+            layout.js = File.open(content_path).read
+          end
+        end
+        
+        # saving
+        if layout.changed? || self.force_import
+          if layout.save
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Imported Layout \t #{layout.identifier}")
+          else
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Failed to import Layout \n#{layout.errors.inspect}")
+          end
+        end
+        
+        self.fixture_ids << layout.id
+        
+        # importing child layouts
+        import!(path, layout)
+      end
+      
+      # cleaning up
+      unless parent
+        self.site.layouts.where('id NOT IN (?)', self.fixture_ids).each{ |s| s.destroy }
+      end
+    end
+  end
+
+  class Exporter < ComfortableMexicanSofa::Fixture::Exporter
+    def export!
+      prepare_folder!(self.path)
+      
+      self.site.layouts.each do |layout|
+        layout_path = File.join(path, layout.ancestors.reverse.collect{|l| l.identifier}, layout.identifier)
+        FileUtils.mkdir_p(layout_path)
+        
+        # writing attributes
+        open(File.join(layout_path, 'attributes.yml'), 'w') do |f|
+          f.write({
+            'label'       => layout.label,
+            'app_layout'  => layout.app_layout,
+            'position'    => layout.position
+          }.to_yaml)
+        end
+        open(File.join(layout_path, 'content.html'), 'w') do |f|
+          f.write(layout.content)
+        end
+        open(File.join(layout_path, 'stylesheet.css'), 'w') do |f|
+          f.write(layout.css)
+        end
+        open(File.join(layout_path, 'javascript.js'), 'w') do |f|
+          f.write(layout.js)
+        end
+        
+        ComfortableMexicanSofa.logger.warn("[FIXTURES] Exported Layout \t #{layout.identifier}")
+      end
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/fixture/page.rb

@@ -0,0 +1,122 @@
+module ComfortableMexicanSofa::Fixture::Page
+  class Importer < ComfortableMexicanSofa::Fixture::Importer
+    
+    attr_accessor :target_pages
+    
+    def import!(path = self.path, parent = nil)
+      Dir["#{path}*/"].each do |path|
+        slug = path.split('/').last
+        
+        page = if parent
+          parent.children.where(:slug => slug).first || site.pages.new(:parent => parent, :slug => slug)
+        else
+          site.pages.root || site.pages.new(:slug => slug)
+        end
+        
+        # setting attributes
+        categories = []
+        if File.exists?(attrs_path = File.join(path, 'attributes.yml'))
+          if fresh_fixture?(page, attrs_path)
+            attrs = get_attributes(attrs_path)
+            
+            page.label        = attrs['label']
+            page.layout       = site.layouts.where(:identifier => attrs['layout']).first || parent.try(:layout)
+            page.is_published = attrs['is_published'].nil?? true : attrs['is_published']
+            page.position     = attrs['position'] if attrs['position']
+            
+            categories        = attrs['categories']
+            
+            if attrs['target_page']
+              self.target_pages ||= {}
+              self.target_pages[page] = attrs['target_page']
+            end
+          end
+        end
+        
+        # setting content
+        blocks_to_clear = page.blocks.collect(&:identifier)
+        blocks_attributes = [ ]
+        Dir.glob("#{path}/*.html").each do |block_path|
+          identifier = block_path.split('/').last.gsub(/\.html$/, '')
+          blocks_to_clear.delete(identifier)
+          if fresh_fixture?(page, block_path)
+            blocks_attributes << {
+              :identifier => identifier,
+              :content    => File.open(block_path).read
+            }
+          end
+        end
+        
+        blocks_to_clear.each do |identifier|
+          blocks_attributes << {
+            :identifier => identifier,
+            :content    => nil
+          }
+        end
+        
+        page.blocks_attributes = blocks_attributes if blocks_attributes.present?
+        
+        # saving
+        if page.changed? || self.force_import
+          if page.save
+            save_categorizations!(page, categories)
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Imported Page \t #{page.full_path}")
+          else
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Failed to import Page \n#{page.errors.inspect}")
+          end
+        end
+        
+        self.fixture_ids << page.id
+        
+        # importing child pages
+        import!(path, page)
+      end
+      
+      # linking up target pages
+      if self.target_pages.present?
+        self.target_pages.each do |page, target|
+          if target_page = self.site.pages.where(:full_path => target).first
+            page.target_page = target_page
+            page.save
+          end
+        end
+      end
+      
+      # cleaning up
+      unless parent
+        self.site.pages.where('id NOT IN (?)', self.fixture_ids).each{ |s| s.destroy }
+      end
+    end
+  end
+
+  class Exporter < ComfortableMexicanSofa::Fixture::Exporter
+    def export!
+      prepare_folder!(self.path)
+      
+      self.site.pages.each do |page|
+        page.slug = 'index' if page.slug.blank?
+        page_path = File.join(path, page.ancestors.reverse.collect{|p| p.slug.blank?? 'index' : p.slug}, page.slug)
+        FileUtils.mkdir_p(page_path)
+
+        open(File.join(page_path, 'attributes.yml'), 'w') do |f|
+          f.write({
+            'label'         => page.label,
+            'layout'        => page.layout.try(:identifier),
+            'parent'        => page.parent && (page.parent.slug.present?? page.parent.slug : 'index'),
+            'target_page'   => page.target_page.try(:full_path),
+            'categories'    => page.categories.map{|c| c.label},
+            'is_published'  => page.is_published,
+            'position'      => page.position
+          }.to_yaml)
+        end
+        page.blocks_attributes.each do |block|
+          open(File.join(page_path, "#{block[:identifier]}.html"), 'w') do |f|
+            f.write(block[:content])
+          end
+        end
+        
+        ComfortableMexicanSofa.logger.warn("[FIXTURES] Exported Page \t #{page.full_path}")
+      end
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/fixture/snippet.rb

@@ -0,0 +1,71 @@
+module ComfortableMexicanSofa::Fixture::Snippet
+  class Importer < ComfortableMexicanSofa::Fixture::Importer
+    
+    def import!
+      Dir["#{self.path}*/"].each do |path|
+        identifier = path.split('/').last
+        snippet = self.site.snippets.find_or_initialize_by_identifier(identifier)
+        
+        # setting attributes
+        categories = []
+        if File.exists?(attrs_path = File.join(path, 'attributes.yml'))
+          if fresh_fixture?(snippet, attrs_path)
+            attrs = get_attributes(attrs_path)
+            
+            snippet.label = attrs['label']
+            categories    = attrs['categories']
+          end
+        end
+        
+        # setting content
+        if File.exists?(content_path = File.join(path, 'content.html'))
+          if fresh_fixture?(snippet, content_path)
+            snippet.content = File.open(content_path).read
+          end
+        end
+        
+        # saving
+        if snippet.changed? || self.force_import
+          if snippet.save
+            save_categorizations!(snippet, categories)
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Imported Snippet \t #{snippet.identifier}")
+          else
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Failed to import Snippet \n#{snippet.errors.inspect}")
+          end
+        end
+        
+        self.fixture_ids << snippet.id
+      end
+      
+      # cleaning up
+      self.site.snippets.where('id NOT IN (?)', fixture_ids).each{ |s| s.destroy }
+    end
+  end
+
+  class Exporter < ComfortableMexicanSofa::Fixture::Exporter
+    
+    def export!
+      prepare_folder!(self.path)
+      
+      self.site.snippets.each do |snippet|
+        snippet_path = File.join(self.path, snippet.identifier)
+        FileUtils.mkdir_p(snippet_path)
+        
+        # writing attributes
+        open(File.join(snippet_path, 'attributes.yml'), 'w') do |f|
+          f.write({
+            'label'       => snippet.label,
+            'categories'  => snippet.categories.map{|c| c.label}
+          }.to_yaml)
+        end
+        
+        # writing content
+        open(File.join(snippet_path, 'content.html'), 'w') do |f|
+          f.write(snippet.content)
+        end
+        
+        ComfortableMexicanSofa.logger.warn("[FIXTURES] Exported Snippet \t #{snippet.identifier}")
+      end
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/version.rb

@@ -1,3 +1,3 @@
 module ComfortableMexicanSofa
-  VERSION = "1.8.3"
+  VERSION = "1.8.4"
 end

data/lib/tasks/comfortable_mexican_sofa.rake

@@ -7,39 +7,36 @@ namespace :comfortable_mexican_sofa do
   namespace :fixtures do
     
     desc 'Import Fixture data into database (options: FROM=folder_name TO=site_identifier)'
-
+    
     task :import => :environment do
-      to            = ENV['TO'] || ENV['FROM']
-      from          = ENV['FROM']
-      force_reload  = ENV['FORCE'].try(:downcase) != 'false'
-
+      from  = ENV['FROM']
+      to    = ENV['TO'] || ENV['FROM']
+      
       puts "Importing CMS Fixtures from Folder [#{from}] to Site [#{to}] ..."
-
+      
       # changing so that logger is going straight to screen
-      logger_org = ComfortableMexicanSofa.logger
+      logger = ComfortableMexicanSofa.logger
       ComfortableMexicanSofa.logger = Logger.new(STDOUT)
-
-      ComfortableMexicanSofa::Fixtures.import_all(to, from, force_reload)
-
-      ComfortableMexicanSofa.logger = logger_org
+      
+      ComfortableMexicanSofa::Fixture::Importer.new(from, to, :force).import!
+      
+      ComfortableMexicanSofa.logger = logger
     end
     
-    desc 'Export database data into Fixtures (options: FROM=site_identifier.com TO=folder_name)'
+    desc 'Export database data into Fixtures (options: FROM=site_identifier TO=folder_name)'
     task :export => :environment do
-      to    = ENV['TO'] || ENV['FROM']
       from  = ENV['FROM']
+      to    = ENV['TO'] || ENV['FROM']
       
       puts "Exporting CMS data from Site [#{from}] to Folder [#{to}] ..."
-
+      
       # changing so that logger is going straight to screen
-      logger_org = ComfortableMexicanSofa.logger
+      logger = ComfortableMexicanSofa.logger
       ComfortableMexicanSofa.logger = Logger.new(STDOUT)
-
-      ComfortableMexicanSofa::Fixtures.export_all(from, to)
-
-      ComfortableMexicanSofa.logger = logger_org
       
-      puts 'Done!'
+      ComfortableMexicanSofa::Fixture::Exporter.new(from, to).export!
+      
+      ComfortableMexicanSofa.logger = logger
     end
   end
 end

data/test/fixtures/cms/files.yml

@@ -1,9 +1,9 @@
 default:
   site: default
   block:
-  label: Sample
+  label: Default File
   file_file_name: sample.jpg
   file_content_type: image/jpeg
   file_file_size: 20099
-  description: Description
+  description: Default Description
   position: 0

data/test/functional/cms_admin/base_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::BaseControllerTest < ActionController::TestCase
 

data/test/functional/cms_admin/categories_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::CategoriesControllerTest < ActionController::TestCase
   

data/test/functional/cms_admin/files_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::FilesControllerTest < ActionController::TestCase
   

data/test/functional/cms_admin/layouts_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::LayoutsControllerTest < ActionController::TestCase
 

data/test/functional/cms_admin/pages_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::PagesControllerTest < ActionController::TestCase
 

data/test/functional/cms_admin/revisions_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::RevisionsControllerTest < ActionController::TestCase
   

data/test/functional/cms_admin/sites_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::SitesControllerTest < ActionController::TestCase
 

data/test/functional/cms_admin/snippets_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', File.dirname(__FILE__))
+require_relative '../../test_helper'
 
 class CmsAdmin::SnippetsControllerTest < ActionController::TestCase
 

data/test/functional/cms_content_controller_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', File.dirname(__FILE__))
+require_relative '../test_helper'
 
 class CmsContentControllerTest < ActionController::TestCase
 

data/test/gemfiles/Gemfile.rails.3.1

@@ -14,5 +14,6 @@ group :test do
   gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
   gem 'jdbc-sqlite3',                     :platform => :jruby
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-  gem 'coveralls', :require => false
+  gem 'mocha',      :require => false
+  gem 'coveralls',  :require => false
 end

data/test/gemfiles/Gemfile.rails.3.2

@@ -14,5 +14,6 @@ group :test do
   gem 'sqlite3',                          :platform => [:ruby, :mswin, :mingw]
   gem 'jdbc-sqlite3',                     :platform => :jruby
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
-  gem 'coveralls', :require => false
+  gem 'coveralls',  :require => false
+  gem 'mocha',      :require => false
 end

data/test/integration/authentication_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', File.dirname(__FILE__))
+require_relative '../test_helper'
 
 class AuthenticationTest < ActionDispatch::IntegrationTest