comfortable_mexican_sofa 1.8.3 → 1.8.4

data/.gitignore

@@ -13,4 +13,4 @@ Gemfile.lock
 .rvmrc
 .ruby-version
 /.sass-cache
-/coverage
+coverage/

data/Gemfile

@@ -6,6 +6,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/README.md

@@ -16,13 +16,13 @@ Features
 
 Installation for Rails 4
 ------------------------
-For Rails 4 apps feel free to use [2.0.0.beta1](https://github.com/comfy/comfortable-mexican-sofa/tree/2.0) release.
+For Rails 4 apps feel free to use [2.0.0.beta1](https://github.com/comfy/comfortable-mexican-sofa/tree/1.9) release.
 
     gem 'comfortable_mexican_sofa', '~> 2.0.0.beta1'
     
-Or even better work with the latest 2.0 branch:
+Or even better work with the latest 1.9 branch:
 
-    gem 'comfortable_mexican_sofa', :github => 'comfy/comfortable-mexican-sofa', :branch => '2.0'
+    gem 'comfortable_mexican_sofa', :github => 'comfy/comfortable-mexican-sofa', :branch => '1.9'
 
 Installation
 ------------

data/app/assets/stylesheets/comfortable_mexican_sofa/base.css.sass

@@ -54,7 +54,7 @@ body#comfy
       display: block
       height: 16px
       width: 8px
-      background: transparent url("/assets/comfortable_mexican_sofa/nav_arrow.png")
+      background: transparent url(image-path("comfortable_mexican_sofa/nav_arrow.png"))
   
   // -- Right Side Boxes ----------------------------------------------------
   .right-column-content
@@ -118,7 +118,7 @@ body#comfy
             height: 60px
             width: 80px
             float: left
-            background: url("/assets/comfortable_mexican_sofa/checkerboard.gif")
+            background: url(image-path("comfortable_mexican_sofa/checkerboard.gif"))
           .details
             margin-left: 85px
             font-size: 11px
@@ -136,11 +136,11 @@ body#comfy
     .icon
       width: 28px
       height: 28px
-      background: url("/assets/comfortable_mexican_sofa/icon_page.gif")
+      background: url(image-path("comfortable_mexican_sofa/icon_page.gif"))
       .dragger
         width: 28px
         height: 28px
-        background: url("/assets/comfortable_mexican_sofa/icon_move.gif")
+        background: url(image-path("comfortable_mexican_sofa/icon_move.gif"))
         cursor: move
         display: none
         span
@@ -244,18 +244,18 @@ body#comfy
         height: 28px
         width: 28px
         &.open a
-          background-image: url("/assets/comfortable_mexican_sofa/arrow_bottom.gif")
+          background-image: url(image-path("comfortable_mexican_sofa/arrow_bottom.gif"))
         a
           display: block
           height: 28px
           width: 28px
-          background: url("/assets/comfortable_mexican_sofa/arrow_right.gif") center center no-repeat
+          background: url(image-path("comfortable_mexican_sofa/arrow_right.gif")) center center no-repeat
           span
             display: none
       .icon
         float: left
         &.draft
-          background: url("/assets/comfortable_mexican_sofa/icon_draft.gif")
+          background: url(image-path("comfortable_mexican_sofa/icon_draft.gif"))
       .item-content
         margin-left: 60px
         a.item-label
@@ -269,14 +269,14 @@ body#comfy
   // -- Sites ---------------------------------------------------------------
   &.c-cms-admin-sites
     table .icon
-      background: url("/assets/comfortable_mexican_sofa/icon_site.gif")
+      background: url(image-path("comfortable_mexican_sofa/icon_site.gif"))
       
   // -- Layouts -------------------------------------------------------------
   &.c-cms-admin-layouts
     ul.list
       .item
         .icon
-          background: url("/assets/comfortable_mexican_sofa/icon_layout.gif")
+          background: url(image-path("comfortable_mexican_sofa/icon_layout.gif"))
         .item-content
           margin-left: 35px
       
@@ -304,12 +304,12 @@ body#comfy
   // -- Snippets ------------------------------------------------------------
   &.c-cms-admin-snippets
     table .icon
-      background: url("/assets/comfortable_mexican_sofa/icon_snippet.gif")
+      background: url(image-path("comfortable_mexican_sofa/icon_snippet.gif"))
       
   // -- Files ---------------------------------------------------------------
   &.c-cms-admin-files
     table .icon
-      background: url("/assets/comfortable_mexican_sofa/icon_file.gif")
+      background: url(image-path("comfortable_mexican_sofa/icon_file.gif"))
     
   // -- Revisions -----------------------------------------------------------
   &.c-cms-admin-revisions

data/app/assets/stylesheets/comfortable_mexican_sofa/bootstrap_overrides.css.sass

@@ -15,9 +15,9 @@ body#comfy
       text-align: right
       
   [class^="icon-"], [class*=" icon-"]
-    background-image: url("/assets/comfortable_mexican_sofa/bootstrap/glyphicons-halflings.png")
+    background-image: url(image-path("comfortable_mexican_sofa/bootstrap/glyphicons-halflings.png"))
   .icon-white
-    background-image: url("/assets/comfortable_mexican_sofa/bootstrap/glyphicons-halflings-white.png")
+    background-image: url(image-path("comfortable_mexican_sofa/bootstrap/glyphicons-halflings-white.png"))
   
   // -- Setting up border-box sizing, letting fields size themselves --------
   *

data/app/controllers/cms_admin/base_controller.rb

@@ -44,7 +44,7 @@ protected
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
     if %w(cms_admin/layouts cms_admin/pages cms_admin/snippets).member?(params[:controller])
-      ComfortableMexicanSofa::Fixtures.import_all(@site.identifier)
+      ComfortableMexicanSofa::Fixture::Importer.new(@site.identifier).import!
       flash.now[:error] = I18n.t('cms.base.fixtures_enabled')
     end
   end

data/app/controllers/cms_content_controller.rb

@@ -36,7 +36,7 @@ protected
 
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
-    ComfortableMexicanSofa::Fixtures.import_all(@cms_site.identifier)
+    ComfortableMexicanSofa::Fixture::Importer.new(@cms_site.identifier).import!
   end
   
   def load_cms_site

data/app/models/cms/block.rb

@@ -26,7 +26,7 @@ class Cms::Block < ActiveRecord::Base
   def tag
     @tag ||= page.tags(true).detect{|t| t.is_cms_block? && t.identifier == identifier}
   end
-    
+  
 protected
   
   def prepare_files

data/app/models/cms/file.rb

@@ -36,8 +36,11 @@ class Cms::File < ActiveRecord::Base
   belongs_to :block
   
   # -- Validations ----------------------------------------------------------
-  validates :site_id, :presence => true
+  validates :site_id,
+    :presence   => true
   validates_attachment_presence :file
+  validates :file_file_name,
+    :uniqueness => {:scope => :site_id}
   
   # -- Callbacks ------------------------------------------------------------
   before_save   :assign_label

data/config/database.yml

@@ -1,6 +1,6 @@
 development:
   adapter: sqlite3
-  database: ":memory:"
+  database: db/cms_development.sqlite3
   pool: 5
   timeout: 10000
 

data/db/cms_fixtures/sample-site/categories/files.yml

@@ -0,0 +1 @@
+- File Category

data/db/cms_fixtures/sample-site/categories/pages.yml

@@ -0,0 +1 @@
+- Page Category

data/db/cms_fixtures/sample-site/categories/snippets.yml

@@ -0,0 +1 @@
+- Snippet Category

data/db/cms_fixtures/sample-site/files/_sample.jpg.yml

@@ -0,0 +1,5 @@
+label: Fixture File
+description: Fixture Description
+categories:
+  - category_a
+  - category_b

data/db/cms_fixtures/sample-site/pages/index/attributes.yml

@@ -0,0 +1,6 @@
+label: Home Fixture Page
+layout: default
+target_page: '/child'
+categories:
+  - category_a
+  - category_b

data/db/cms_fixtures/sample-site/snippets/default/attributes.yml

@@ -0,0 +1,4 @@
+label: Default Fixture Snippet
+categories:
+  - category_a
+  - category_b

data/lib/comfortable_mexican_sofa.rb

@@ -1,32 +1,34 @@
 # Loading engine only if this is not a standalone installation
 unless defined? ComfortableMexicanSofa::Application
-  require File.expand_path('comfortable_mexican_sofa/engine', File.dirname(__FILE__))
+  require_relative 'comfortable_mexican_sofa/engine'
 end
 
-[ 'comfortable_mexican_sofa/version',
-  'comfortable_mexican_sofa/error',
-  'comfortable_mexican_sofa/configuration',
-  'comfortable_mexican_sofa/routing',
-  'comfortable_mexican_sofa/authentication/http_auth',
-  'comfortable_mexican_sofa/authentication/dummy_auth',
-  'comfortable_mexican_sofa/render_methods',
-  'comfortable_mexican_sofa/view_hooks',
-  'comfortable_mexican_sofa/view_methods',
-  'comfortable_mexican_sofa/form_builder',
-  'comfortable_mexican_sofa/tag',
-  'comfortable_mexican_sofa/sitemap',
-  'comfortable_mexican_sofa/fixtures',
-  'comfortable_mexican_sofa/extensions/rails',
-  'comfortable_mexican_sofa/extensions/acts_as_tree',
-  'comfortable_mexican_sofa/extensions/has_revisions',
-  'comfortable_mexican_sofa/extensions/is_mirrored',
-  'comfortable_mexican_sofa/extensions/is_categorized'
-].each do |path|
-  require File.expand_path(path, File.dirname(__FILE__))
-end
+require_relative 'comfortable_mexican_sofa/version'
+require_relative 'comfortable_mexican_sofa/error'
+require_relative 'comfortable_mexican_sofa/configuration'
+require_relative 'comfortable_mexican_sofa/routing'
+require_relative 'comfortable_mexican_sofa/authentication/http_auth'
+require_relative 'comfortable_mexican_sofa/authentication/dummy_auth'
+require_relative 'comfortable_mexican_sofa/render_methods'
+require_relative 'comfortable_mexican_sofa/view_hooks'
+require_relative 'comfortable_mexican_sofa/view_methods'
+require_relative 'comfortable_mexican_sofa/form_builder'
+require_relative 'comfortable_mexican_sofa/tag'
+require_relative 'comfortable_mexican_sofa/sitemap'
+require_relative 'comfortable_mexican_sofa/fixture'
+require_relative 'comfortable_mexican_sofa/fixture/category'
+require_relative 'comfortable_mexican_sofa/fixture/layout'
+require_relative 'comfortable_mexican_sofa/fixture/page'
+require_relative 'comfortable_mexican_sofa/fixture/snippet'
+require_relative 'comfortable_mexican_sofa/fixture/file'
+require_relative 'comfortable_mexican_sofa/extensions/rails'
+require_relative 'comfortable_mexican_sofa/extensions/acts_as_tree'
+require_relative 'comfortable_mexican_sofa/extensions/has_revisions'
+require_relative 'comfortable_mexican_sofa/extensions/is_mirrored'
+require_relative 'comfortable_mexican_sofa/extensions/is_categorized'
 
 Dir.glob(File.expand_path('comfortable_mexican_sofa/tags/*.rb', File.dirname(__FILE__))).each do |path|
-  require path
+  require_relative path
 end
 
 module ComfortableMexicanSofa

data/lib/comfortable_mexican_sofa/fixture.rb

@@ -0,0 +1,77 @@
+module ComfortableMexicanSofa::Fixture
+  
+  class Importer
+    attr_accessor :site,
+                  :path,
+                  :from,
+                  :to,
+                  :fixture_ids,
+                  :force_import
+    
+    def initialize(from, to = from, force_import = false)
+      self.from         = from
+      self.to           = to
+      self.site         = Cms::Site.where(:identifier => to).first!
+      self.fixture_ids  = []
+      self.force_import = force_import
+      
+      dir = self.class.name.split('::')[2].downcase.pluralize
+      self.path = ::File.join(ComfortableMexicanSofa.config.fixtures_path, from, dir, '/')
+    end
+    
+    def fresh_fixture?(object, file_path)
+      object.new_record? || self.force_import || ::File.mtime(file_path) > object.updated_at
+    end
+    
+    def get_attributes(file_path)
+      YAML.load_file(file_path)
+    end
+    
+    def save_categorizations!(object, categories)
+      object.categorizations.delete_all
+      [categories].flatten.compact.each do |label|
+        category = self.site.categories.find_or_create_by_label_and_categorized_type(label, object.class.to_s)
+        category.categorizations.create!(
+          :categorized => object
+        )
+      end
+    end
+    
+    def import!
+      ComfortableMexicanSofa::Fixture::Category::Importer.new(from, to, force_import).import!
+      ComfortableMexicanSofa::Fixture::File::Importer.new(    from, to, force_import).import!
+      ComfortableMexicanSofa::Fixture::Layout::Importer.new(  from, to, force_import).import!
+      ComfortableMexicanSofa::Fixture::Page::Importer.new(    from, to, force_import).import!
+      ComfortableMexicanSofa::Fixture::Snippet::Importer.new( from, to, force_import).import!
+    end
+  end
+  
+  class Exporter
+    attr_accessor :site,
+                  :path,
+                  :from,
+                  :to
+    
+    def initialize(from, to = from)
+      self.from = from
+      self.to   = to
+      self.site = Cms::Site.where(:identifier => from).first!
+      dir = self.class.name.split('::')[2].downcase.pluralize
+      self.path = ::File.join(ComfortableMexicanSofa.config.fixtures_path, to, dir)
+    end
+    
+    def prepare_folder!(path)
+      FileUtils.rm_rf(path)
+      FileUtils.mkdir_p(path)
+    end
+    
+    def export!
+      ComfortableMexicanSofa::Fixture::File::Exporter.new(    from, to).export!
+      ComfortableMexicanSofa::Fixture::Category::Exporter.new(from, to).export!
+      ComfortableMexicanSofa::Fixture::Layout::Exporter.new(  from, to).export!
+      ComfortableMexicanSofa::Fixture::Page::Exporter.new(    from, to).export!
+      ComfortableMexicanSofa::Fixture::Snippet::Exporter.new( from, to).export!
+    end
+  end
+  
+end

data/lib/comfortable_mexican_sofa/fixture/category.rb

@@ -0,0 +1,35 @@
+module ComfortableMexicanSofa::Fixture::Category
+  class Importer < ComfortableMexicanSofa::Fixture::Importer
+    def import!
+      {
+        'files'     => 'Cms::File',
+        'pages'     => 'Cms::Page',
+        'snippets'  => 'Cms::Snippet'
+      }.each do |file, type|
+        if File.exists?(attrs_path = File.join(path, "#{file}.yml"))
+          categories = get_attributes(attrs_path)
+          [categories].flatten.each do |label|
+            self.site.categories.find_or_create_by_label_and_categorized_type(label, type)
+          end
+        end
+      end
+    end
+  end
+  
+  class Exporter < ComfortableMexicanSofa::Fixture::Exporter
+    def export!
+      prepare_folder!(self.path)
+      {
+        'files'     => 'Cms::File',
+        'pages'     => 'Cms::Page',
+        'snippets'  => 'Cms::Snippet'
+      }.each do |file, type|
+        if (categories = self.site.categories.of_type(type)).present?
+          open(File.join(self.path, "#{file}.yml"), 'w') do |f|
+            f.write(categories.map{|c| c.label}.to_yaml)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/fixture/file.rb

@@ -0,0 +1,70 @@
+module ComfortableMexicanSofa::Fixture::File
+  class Importer < ComfortableMexicanSofa::Fixture::Importer
+    def import!
+      Dir["#{self.path}[^_]*"].each do |file_path|
+        filename = ::File.basename(file_path)
+        file = self.site.files.where(:file_file_name => filename).first || self.site.files.new
+        
+        # setting attributes
+        categories = []
+        if File.exists?(attrs_path = File.join(self.path, "_#{filename}.yml"))
+          if fresh_fixture?(file, attrs_path)
+            attrs = get_attributes(attrs_path)
+            file.label        = attrs['label']
+            file.description  = attrs['description']
+            categories        = attrs['categories']
+          end
+        end
+        
+        # setting actual file
+        if fresh_fixture?(file, file_path)
+          file.file = open(file_path)
+        end
+        
+        if file.changed? || self.force_import
+          if file.save
+            save_categorizations!(file, categories)
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Imported File \t #{file.file_file_name}")
+          else
+            ComfortableMexicanSofa.logger.warn("[FIXTURES] Failed to import File \n#{file.errors.inspect}")
+          end
+        end
+        
+        self.fixture_ids << file.id
+      end
+      
+      # cleaning up
+      self.site.files.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.files.each do |file|
+        file_path = File.join(self.path, file.file_file_name)
+        
+        # writing attributes
+        open(::File.join(self.path, "_#{file.file_file_name}.yml"), 'w') do |f|
+          f.write({
+            'label'       => file.label,
+            'description' => file.description,
+            'categories'  => file.categories.map{|c| c.label}
+          }.to_yaml)
+        end
+        
+        # writing content
+        data_path = file.file.options[:storage] == :filesystem ?
+          file.file.path :
+          file.file.url
+          
+        open(::File.join(self.path, ::File.basename(file_path)), 'w') do |f|
+          f.write(open(data_path))
+        end
+        
+        ComfortableMexicanSofa.logger.warn("[FIXTURES] Exported File \t #{file.file_file_name}")
+      end
+    end
+  end
+end