cms-fortress 1.3.0 → 1.3.1

data/Gemfile.lock

@@ -14,28 +14,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (3.2.1)
-    actionmailer (4.0.6)
-      actionpack (= 4.0.6)
-      mail (~> 2.5.4)
-    actionpack (4.0.6)
-      activesupport (= 4.0.6)
+    aasm (3.4.0)
+    actionmailer (4.0.10)
+      actionpack (= 4.0.10)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.10)
+      activesupport (= 4.0.10)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
     active_link_to (1.0.2)
       actionpack
-    activemodel (4.0.6)
-      activesupport (= 4.0.6)
+    activemodel (4.0.10)
+      activesupport (= 4.0.10)
       builder (~> 3.1.0)
-    activerecord (4.0.6)
-      activemodel (= 4.0.6)
+    activerecord (4.0.10)
+      activemodel (= 4.0.10)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.6)
+      activesupport (= 4.0.10)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.6)
+    activesupport (4.0.10)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -53,16 +53,16 @@ GEM
       activesupport (>= 3.0)
     cocaine (0.5.4)
       climate_control (>= 0.0.3, < 1.0)
-    codemirror-rails (4.2)
+    codemirror-rails (4.5)
       railties (>= 3.0, < 5)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
-    coffee-script (2.2.0)
+    coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.0)
-    comfortable_mexican_sofa (1.12.1)
+    coffee-script-source (1.8.0)
+    comfortable_mexican_sofa (1.12.2)
       active_link_to (>= 1.0.0)
       bootstrap-sass (~> 3.1.0)
       bootstrap_form (~> 2.1.1)
@@ -70,17 +70,17 @@ GEM
       coffee-rails (>= 3.1.0)
       haml-rails (>= 0.3.0)
       jquery-rails (>= 3.0.0)
-      jquery-ui-rails (>= 4.0.0)
+      jquery-ui-rails (>= 5.0.0)
       kaminari (>= 0.14.0)
       kramdown (>= 1.0.0)
       paperclip (>= 4.0.0)
       rails (>= 4.0.0)
       rails-i18n (~> 4.0.0)
-      sass-rails (>= 4.0.3)
+      sass-rails (>= 4.0.1)
       tinymce-rails (>= 4.0.0)
-    delayed_job (4.0.2)
+    delayed_job (4.0.3)
       activesupport (>= 3.0, < 4.2)
-    devise (3.2.4)
+    devise (3.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -96,24 +96,23 @@ GEM
       activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
       railties (>= 4.0.1)
-    hashie (3.1.0)
+    hashie (3.3.1)
     hike (1.2.3)
-    i18n (0.6.9)
-    jquery-rails (3.1.1)
+    i18n (0.6.11)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.2.1)
+    jquery-ui-rails (5.0.0)
       railties (>= 3.2.16)
     json (1.8.1)
     kaminari (0.16.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kramdown (1.4.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.25.1)
-    minitest (4.7.3)
+    kramdown (1.4.1)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
+    mime-types (2.3)
+    minitest (4.7.5)
     minitest-rails (1.0.1)
       minitest (~> 4.7)
       minitest-test (~> 1.0)
@@ -130,36 +129,35 @@ GEM
       minitest (~> 4.0)
     multi_json (1.10.1)
     orm_adapter (0.5.0)
-    paperclip (4.1.1)
+    paperclip (4.2.0)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       cocaine (~> 0.5.3)
       mime-types
-    polyglot (0.3.5)
     powerbar (1.0.11)
       ansi (~> 1.4.0)
       hashie (>= 1.1.0)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.6)
-      actionmailer (= 4.0.6)
-      actionpack (= 4.0.6)
-      activerecord (= 4.0.6)
-      activesupport (= 4.0.6)
+    rails (4.0.10)
+      actionmailer (= 4.0.10)
+      actionpack (= 4.0.10)
+      activerecord (= 4.0.10)
+      activesupport (= 4.0.10)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.6)
+      railties (= 4.0.10)
       sprockets-rails (~> 2.0)
-    rails-i18n (4.0.2)
+    rails-i18n (4.0.3)
       i18n (~> 0.6)
-      rails (>= 4.0)
-    railties (4.0.6)
-      actionpack (= 4.0.6)
-      activesupport (= 4.0.6)
+      railties (~> 4.0)
+    railties (4.0.10)
+      actionpack (= 4.0.10)
+      activesupport (= 4.0.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
-    rdoc (4.1.1)
+    rdoc (4.1.2)
       json (~> 1.4)
     sass (3.2.19)
     sass-rails (4.0.3)
@@ -167,7 +165,7 @@ GEM
       sass (~> 3.2.0)
       sprockets (~> 2.8, <= 2.11.0)
       sprockets-rails (~> 2.0)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
@@ -177,7 +175,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.1.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (~> 2.8)
@@ -189,10 +187,7 @@ GEM
       railties (>= 3.1.1)
     tinymce-rails-langs (4.20140129)
       tinymce-rails (~> 4.0)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.39)
+    tzinfo (0.3.41)
     warden (1.2.3)
       rack (>= 1.0)
 

data/README.rdoc

@@ -22,7 +22,7 @@ An extension for the awesome Comfortable Mexican Sofa (https://github.com/comfy/
 
 Add gem defintion to your Gemfile:
 
-  gem 'cms-fortress', '~> 1.3.0.rc3'
+  gem 'cms-fortress', '~> 1.3.0'
 
 Then from the Rails project's root run:
 

data/VERSION

@@ -1 +1 @@
-1.2.2
+1.3.1

data/cms-fortress.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name      = "cms-fortress"
-  s.version   = "1.3.0"
+  s.version   = "1.3.1"
 
   s.authors           = ["Melvin Sembrano"]
   s.date              = "2014-06-28"

data/lib/comfortable_mexican_sofa/fixture/page.rb

@@ -23,11 +23,13 @@ module ComfortableMexicanSofa::Fixture::Page
             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']
-            
+
+            page.cached_timeout = attrs['cached_timeout']
+            page.aasm_state = attrs['aasm_state']
+            page.published_date = attrs['published_date']
+
             categories        = attrs['categories']
 
-            page.page_workflow = Cms::PageWorkflow.new(attrs['page_workflow']) if page.page_workflow.nil?
-            
             if attrs['target_page']
               self.target_pages ||= {}
               self.target_pages[page] = attrs['target_page']
@@ -38,13 +40,23 @@ module ComfortableMexicanSofa::Fixture::Page
         # 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\z/, '')
+        file_extentions = %w(html haml jpg png gif)
+        Dir.glob("#{path}/*.{#{file_extentions.join(',')}}").each do |block_path|
+          extention = File.extname(block_path)[1..-1]
+          identifier = block_path.split('/').last.gsub(/\.(#{file_extentions.join('|')})\z/, '')
           blocks_to_clear.delete(identifier)
           if fresh_fixture?(page, block_path)
+            content = case extention
+            when 'jpg', 'png', 'gif'
+              ::File.open(block_path)
+            when 'haml'
+              Haml::Engine.new(::File.open(block_path).read).render.rstrip
+            else
+              ::File.open(block_path).read
+            end
             blocks_attributes << {
               :identifier => identifier,
-              :content    => read_as_haml(block_path)
+              :content    => content
             }
           end
         end
@@ -58,7 +70,7 @@ module ComfortableMexicanSofa::Fixture::Page
         if page.changed? || page.blocks_attributes_changed || self.force_import
           if page.save
             save_categorizations!(page, categories)
-            ComfortableMexicanSofa.logger.warn("[FIXTURES] Imported Page \t #{page.full_path}")
+            ComfortableMexicanSofa.logger.info("[FIXTURES] Imported Page \t #{page.full_path}")
           else
             ComfortableMexicanSofa.logger.warn("[FIXTURES] Failed to import Page \n#{page.errors.inspect}")
           end
@@ -89,7 +101,6 @@ module ComfortableMexicanSofa::Fixture::Page
 
   class Exporter < ComfortableMexicanSofa::Fixture::Exporter
     def export!
-
       prepare_folder!(self.path)
       
       self.site.pages.each do |page|
@@ -106,7 +117,9 @@ module ComfortableMexicanSofa::Fixture::Page
             'categories'    => page.categories.map{|c| c.label},
             'is_published'  => page.is_published,
             'position'      => page.position,
-            'page_workflow' => {status_id: page.page_workflow.status_id, published_date: page.page_workflow.published_date }
+            'cached_timeout' => page.cached_timeout,
+            'aasm_state' => page.aasm_state,
+            'published_date' => page.published_date
           }.to_yaml)
         end
         page.blocks_attributes.each do |block|
@@ -115,9 +128,8 @@ module ComfortableMexicanSofa::Fixture::Page
           end
         end
         
-        ComfortableMexicanSofa.logger.warn("[FIXTURES] Exported Page \t #{page.full_path}")
+        ComfortableMexicanSofa.logger.info("[FIXTURES] Exported Page \t #{page.full_path}")
       end
     end
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cms-fortress
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors: