liquid_cms 0.3.0.7 → 0.3.0.8

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+== 0.3.0.8
+
+* Enhancements
+  * Allow text based assets to be editable inline.
+
+* Bug Fixes
+  * Fix errors with editing and listing uploaded components.
+  * Fix translation issues making hint text html_safe.
+
 == 0.3.0.2
 
 Updated codemirror to 0.9

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    liquid_cms (0.3.0.6)
+    liquid_cms (0.3.0.7)
       bundler (>= 1.0.0)
       formatize
       paperclip (~> 2.3.1)
@@ -68,6 +68,7 @@ GEM
       mime-types
       treetop (>= 1.4.5)
     mime-types (1.16)
+    mocha (0.9.12)
     paperclip (2.3.4)
       activerecord
       activesupport
@@ -110,6 +111,7 @@ DEPENDENCIES
   factory_girl_rails
   formatize
   liquid_cms!
+  mocha
   paperclip (~> 2.3.1)
   rails (~> 3.0.0)
   rubyzip (~> 0.9.1)

data/README.rdoc

@@ -62,6 +62,12 @@ In order to expose data in your application in the templates, liquid filters, dr
 
 A set of filters, drops and tags are provided in addition to the defaults provided by liquid.  The documentation link accessible in the CMS provides additional details.
 
+= Upgrading
+
+To upgrade the liquid_cms engine once you've installed a newer gem, simply re-run the liquid_cms generator. If any differences are found in files, you'll be prompted to overwrite or compare versions.
+
+If you're upgrading to the rails 3 version of the gem from the rails 2 version of the gem, it's recommended that you run the generator with the previous CMS generated files removed from your app and then integrate any customizations back into the application.
+
 = Contribution
 
 If you experience any issues with this CMS engine, please open a bug report.  Contributions to improve this engine are extremely welcome.  A 1.0 release will be made when the engine has a bit more _polish_ on it.

data/Rakefile

@@ -7,13 +7,23 @@ require 'rake/testtask'
 desc 'Default: run tests.'
 task :default => :test
 
+test_types = %w(unit functional integration)
+
 desc 'Test the liquid_cms gem.'
-task :test => ['test:unit', 'test:functional', 'test:integration']
+task :test => test_types.collect{|t| ["test:#{t}", "test:#{t}:no_context"]}.flatten
 
-%w(unit functional integration).each do |test|
-  desc "Run the #{test} tests for the liquid_cms gem."
+test_types.each do |test|
+  desc "Run the #{test} tests for the liquid_cms gem"
   Rake::TestTask.new("test:#{test}") do |t|
     t.pattern = "test/#{test}/*_test.rb"
     t.verbose = true
   end
 end
+
+test_types.each do |test|
+  desc "Run the #{test} tests for the liquid_cms gem (no context)"
+  Rake::TestTask.new("test:#{test}:no_context") do |t|
+    t.pattern = "test/#{test}/*_test_no_context.rb"
+    t.verbose = true
+  end
+end

data/TODO.rdoc

@@ -4,4 +4,5 @@
 * Implement caching and expiration logic.
 * Provide example apache/nginx/etc. conf files that properly scope cms assets for each context.
 * Generate CMS documentation from rdoc comments in source files.
+* Search functions.  Find templates based on search text.
 * Missing tests... add more coverage.

data/app/controllers/cms/assets_controller.rb

@@ -25,7 +25,14 @@ class Cms::AssetsController < Cms::MainController
 
   def update
     @asset = @context.assets.find params[:id]
-    if @asset.update_attributes params[:cms_asset]
+
+    success = if params[:file_content].present?
+      @asset.write params[:file_content]
+    else
+      @asset.update_attributes params[:cms_asset]
+    end
+
+    if success
       flash[:notice] = t('assets.flash.updated')
       redirect_to cms_root_path
     else

data/app/controllers/cms/components_controller.rb

@@ -15,13 +15,13 @@ class Cms::ComponentsController < Cms::MainController
   def update
     if Cms::Component.editable?(@path)
       @component = Cms::Component.new(@context, @path)
-      @component.write params[:contents]
+      @component.write params[:file_content]
 
       flash[:notice] = "Component file updated."
-      redirect_to :controller => 'cms/components', :action => 'edit', :url => @path
+      redirect_to cms_root_path
     else
       flash[:error] = "Not an editable file."
-      redirect_to cms_root_path
+      redirect_to :controller => 'cms/components', :action => 'edit', :url => @path
     end
   end
 
@@ -50,7 +50,7 @@ class Cms::ComponentsController < Cms::MainController
 
 protected
   def load_component_path
-    @path = params[:url].first
+    @path = params[:url]
     @path = CGI::unescape(@path) if @path.present?
   end
 end

data/app/helpers/cms/components_helper.rb

@@ -10,26 +10,26 @@ module Cms::ComponentsHelper
   end
 
   def list_files(path, hidden = false)
-    ''.tap do |html|
-      html += hidden ? %[<ul class="tree" style="display:none">] : %[<ul class="tree">]
-      for file in Dir[File.expand_path(path)+"/*"] do
-        html += "<li>"
-        if File.directory?(file)
-          html += cms_icon('folder.png', :class => 'folder') + ' ' + component_delete_link(file) + ' '
-          html += content_tag(:span, File.basename(file), :title => Cms::Component.component_path(@context, file))
-          html += list_files(file, true)
+    html = ''
+    html += hidden ? %[<ul class="tree" style="display:none">] : %[<ul class="tree">]
+    for file in Dir[File.expand_path(path)+"/*"] do
+      html += "<li>"
+      if File.directory?(file)
+        html += cms_icon('folder.png', :class => 'folder') + ' ' + component_delete_link(file) + ' '
+        html += content_tag(:span, File.basename(file), :title => Cms::Component.component_path(@context, file))
+        html += list_files(file, true)
+      else
+        html += file_type_icon(File.basename(file)) + ' '
+        html += component_delete_link(file) + ' '
+        if Cms::Component.editable?(file)
+          html += component_edit_link(file)
         else
-          html += file_type_icon(File.basename(file)) + ' '
-          html += component_delete_link(file) + ' '
-          if Cms::Component.editable?(file)
-            html += component_edit_link(file)
-          else
-            html += content_tag(:span, truncate(File.basename(file), :length => 15), :title => Cms::Component.component_path(@context, file))
-          end
+          html += content_tag(:span, truncate(File.basename(file), :length => 15), :title => Cms::Component.component_path(@context, file))
         end
-        html += "</li>"
       end
-      html += "</ul>"
-    end.html_safe
+      html += "</li>"
+    end
+    html += "</ul>"
+    html.html_safe
   end
 end

data/app/liquid/cms_paperclip_extension.rb

@@ -6,8 +6,8 @@ module Paperclip
       {}.tap do |h|
         all_styles = self.styles.keys + ['original']
         all_styles.each do |style|
-          g = Paperclip::Geometry.from_file(self.path(style))
-          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)}
+          g = Paperclip::Geometry.from_file(self.path(style)) rescue nil
+          h[style] = {'width' => g.width.to_i, 'height' => g.height.to_i, 'url' => self.url(style)} unless g.nil?
         end
       end
     end

data/app/models/cms/asset.rb

@@ -18,11 +18,32 @@ module Cms
     end
 
     def image?
-      !(asset_content_type =~ /^image.*/).nil?
+      !(asset_content_type =~ /^image.*/).blank?
     end
 
     def icon?
-      !(asset_content_type =~ /icon$/).nil?
+      # accepts ico or icon
+      !(asset_content_type =~ /icon?$/).blank?
+    end
+
+    def editable?
+      !(asset_content_type =~ /(javascript|css|xml|html)$/).blank?
+    end
+
+    def read
+      return '' if !editable?
+      asset.to_file(:original).read
+    end
+
+    def write(content)
+      return false if content.blank? || !editable?
+
+      fname = asset.path(:original)
+      File.exist?(fname).tap do |exist|
+        File.open(fname, 'w') do |f|
+          f.puts content
+        end if exist
+      end
     end
 
   protected

data/app/models/cms/component.rb

@@ -42,9 +42,9 @@ class Cms::Component
   def read
     return '' if @path.blank? || !self.class.editable?(@path)
 
-    base = self.class.full_path(@context).join(@path).to_s
-    if File.exist?(base)
-      File.open(base).readlines
+    fname = self.class.full_path(@context).join(@path).to_s
+    if File.exist?(fname)
+      File.open(fname).read
     else
       ''
     end
@@ -53,30 +53,25 @@ class Cms::Component
   def write(content)
     return false if content.blank? || @path.blank? || !self.class.editable?(@path)
 
-    base = self.class.full_path(@context).join(@path).to_s
-    if File.exist?(base)
-      File.open(base, 'w') do |f|
+    fname = self.class.full_path(@context).join(@path).to_s
+    File.exist?(fname).tap do |exist|
+      File.open(fname, 'w') do |f|
         f.puts content
-      end
-    else
-      ''
+      end if exist
     end
   end
   
   def delete
     return false if @path.blank?
 
-    base = self.class.full_path(@context).join(@path)
-    if File.exist?(base)
-      FileUtils.rm_rf base
-      true
-    else
-      false
+    fname = self.class.full_path(@context).join(@path)
+    File.exist?(fname).tap do |exist|
+      FileUtils.rm_rf fname if exist
     end
   end
 
   def self.editable?(file)
-    !(file =~ /\.(js|css|html|xml)$/).nil?
+    !(file =~ /\.(js|css|html|xml)$/).blank?
   end
 
 protected

data/app/models/cms/page.rb

@@ -98,7 +98,7 @@ module Cms
 
     def content=(text)
       write_attribute :content, text
-      self.is_layout_page = !(text =~ /\{\{\s?content_for_layout\s?\}\}/).nil?
+      self.is_layout_page = !(text =~ /\{\{\s?content_for_layout\s?\}\}/).blank?
     end
 
   protected

data/app/views/cms/assets/_form.html.erb

@@ -1,6 +1,18 @@
-<div class="formContainer form">
-  <%= simple_form_for @asset, :html => {:multipart => true} do |f| %>
-    <%= f.input :asset, :as => :file %>
-    <%= f.commit_button_or_cancel %>
+<%= simple_form_for @asset, :html => {:multipart => true} do |f| %>
+  <%= f.input :asset, :as => :file %>
+
+  <% if f.object.editable? %>
+    <p class="break">
+      <em>or edit the contents...</em>
+    </p>
+
+    <div class="text required">
+      <%= label_tag :file_content, 'Content', :class => 'text required' %> <%= text_area_tag :file_content, f.object.read, :rows => 40, :class => 'text required' %>
+      <span class="hint"><%= t('simple_form.hints.cms_asset.file_content').html_safe %></span>
+    </div>
+
+    <%= codemirror_edit Cms::Editable::content_type(@asset.asset_file_name), 'form.simple_form', 'file_content' %>
   <% end %>
-</div>
+
+  <%= f.commit_button_or_cancel %>
+<% end %>

data/app/views/cms/assets/show.html.erb

@@ -1,12 +1,14 @@
-<h2><%= @asset.asset_file_name %></h2>
+<div class="basic">
+  <h2><%= @asset.asset_file_name %></h2>
 
-<% if @asset.image? %>
-  <%= image_tag @asset.asset.url %>
-<% else %>
-  <p>Open: <%= link_to @asset.asset_file_name, @asset.asset.url %></p>
-<% end %>
+  <% if @asset.image? %>
+    <%= image_tag @asset.asset.url %>
+  <% else %>
+    <p>Open: <%= link_to @asset.asset_file_name, @asset.asset.url %></p>
+  <% end %>
 
-<p>Filesize: <%= number_to_human_size(@asset.asset_file_size) %></p>
-<p>Last Updated: <%= @asset.asset_updated_at.to_formatted_s(:long) %></p>
+  <p>Filesize: <%= number_to_human_size(@asset.asset_file_size) %></p>
+  <p>Last Updated: <%= @asset.asset_updated_at.to_formatted_s(:long) %></p>
 
-<p><%= link_to 'Edit Asset', edit_cms_asset_path(@asset) %></p>
+  <p><%= link_to 'Edit Asset', edit_cms_asset_path(@asset) %></p>
+</div>

data/app/views/cms/components/edit.html.erb

@@ -1,18 +1,17 @@
 <h2>Edit Component File</h2>
 
-<p>No liquid support currently for editing components.</p>
-
 <% form_tag({:controller => 'cms/components', :action => 'update', :url => CGI::escape(@component.path)}, :class => 'simple_form') do %>
   <div class="string required">
     <%= label_tag :name, nil, :class => 'string required' %> <%= text_field_tag :name, @component.path, :readonly => true, :class => 'string required' %>
   </div>
   <div class="text required">
-    <%= label_tag :contents, nil, :class => 'text required' %> <%= text_area_tag :contents, @component.read, :rows => 40, :class => 'text required' %>
+    <%= label_tag :file_content, 'Content', :class => 'text required' %> <%= text_area_tag :file_content, @component.read, :rows => 40, :class => 'text required' %>
+    <span class="hint"><%= t('simple_form.hints.cms_component.file_content').html_safe %></span>
   </div>
 
   <div class="buttons">
-    <%= submit_tag 'Update', :class => 'update' %> or <%= link_to 'Cancel', :back, :class => 'cancel' %>
+    <%= submit_tag 'Update', :class => 'update' %> or <%= link_to t('simple_form.buttons.cancel').html_safe, :back, :class => 'cancel' %>
   </div>
 <% end %>
 
-<%= codemirror_edit Cms::Editable::content_type(@component.path), 'form.simple_form', 'contents' %>
+<%= codemirror_edit Cms::Editable::content_type(@component.path), 'form.simple_form', 'file_content' %>

data/app/views/cms/pages/_form.html.erb

@@ -1,14 +1,12 @@
-<div class="formContainer form">
-  <%= simple_form_for @page do |f| %>
-    <%= f.input :name %>
-    <%= f.input :slug, :required => false %>
-    <%= f.input :content, :input_html => {:rows => 30, :spellcheck => false} %>
-    <%= f.input :layout_page_id, :collection => layouts_for_page(@page).collect{|pg| [pg.to_s, pg.id]}, :include_blank => '-- layout file --', :required => false unless layouts_for_page(@page).empty? %>
-    <%= f.input :published, :required => false %>
-    <%= f.input :root, :required => false %>
+<%= simple_form_for @page do |f| %>
+  <%= f.input :name %>
+  <%= f.input :slug, :required => false %>
+  <%= f.input :content, :input_html => {:rows => 30, :spellcheck => false} %>
+  <%= f.input :layout_page_id, :collection => layouts_for_page(@page).collect{|pg| [pg.to_s, pg.id]}, :include_blank => '-- layout file --', :required => false unless layouts_for_page(@page).empty? %>
+  <%= f.input :published, :required => false %>
+  <%= f.input :root, :required => false %>
 
-    <%= f.commit_button_or_cancel %>
-  <% end %>
-</div>
+  <%= f.commit_button_or_cancel %>
+<% end %>
 
 <%= codemirror_edit @page.content_type, 'form.simple_form.cms_page', 'cms_page_content' %>

data/config/initializers/cms/simple_form_updates.rb

@@ -4,8 +4,14 @@ class SimpleForm::FormBuilder
       String.new.tap do |html|
         html << button(:submit)
         html << " or "
-        html << template.link_to('Cancel', :back, :class => 'cancel')
+        html << template.link_to(@template.t('simple_form.buttons.cancel'), :back, :class => 'cancel')
       end.html_safe
     end
   end
 end
+
+module SimpleForm::Components::Hints
+  def hint_text
+    @hint_text ||= (options[:hint] || translate(:hints)).html_safe
+  end
+end

data/config/locales/cms/en.yml

@@ -38,6 +38,7 @@ en:
     "yes": 'Yes'
     "no": 'No'
     buttons:
+      cancel: 'Cancel'
       create: 'Create %{model}'
       update: 'Update %{model}'
       submit: 'Submit %{model}'
@@ -60,3 +61,10 @@ en:
         content: 'To create a layout page, add the <em>{{ content_for_layout }}</em> tag which will act as a placeholder for the contents of another page.  Use ctrl+s to save.'
         slug: 'The url path that will be used to access this page.  Defaults to the page name if not provided. ie. /name.<br/> Ex. /home_page'
         layout_page_id: 'Optional page that will be used as this pages layout.  Ie. This pages content will be inserted into the layout page where the <em>{{ content_for_layout }}</em> tag is specified.'
+      cms_component:
+        file_content: '<em>No liquid support for editing components.</em> Use ctrl+s to save.'
+      cms_asset:
+        asset: 'Upload an asset file.'
+        file_content: '<em>No liquid support for editing assets.</em> Use ctrl+s to save.'
+        edit:
+          asset: 'An existing file has been uploaded.  Upload a new file to replace it.'

data/lib/generators/liquid_cms/templates/public/cms/stylesheets/simple_form.css

@@ -43,7 +43,7 @@ form.simple_form a.cancel:hover {
   background: -webkit-gradient(linear, left top, left bottom, color-stop(0,#F55), color-stop(1.0,#C11));
 }
 
-form.simple_form div.string, form.simple_form div.text, form.simple_form div.boolean, div.select {
+form.simple_form div.string, form.simple_form div.text, form.simple_form div.boolean, form.simple_form div.select, form.simple_form div.file {
   margin-bottom: 1.3em;
 }
 form.simple_form label {

data/lib/generators/liquid_cms/templates/public/cms/stylesheets/themes/dark.css

@@ -12,10 +12,10 @@ body {
 .cms_documentation #content {
   color: #EEE;
 }
-.cms_documentation #content a {
+#content .basic a, .cms_documentation #content a {
   color: #FFE900;
 }
-.cms_components #content p {
+#content .basic p, .cms_components #content p {
   color: white;
 }
 .cms_documentation span.function {

data/lib/liquid_cms/configuration.rb

@@ -6,7 +6,7 @@ module Cms
   mattr_reader :context_class
   def self.context_class=(klass)
     @@context_class = klass
-    return if klass.nil?
+    return if klass.nil? || ENV['NO_CONTEXT'] == 'true'
 
     eval(klass.to_s).extend Cms::ContextAssociation
 

data/lib/liquid_cms/version.rb

@@ -1,3 +1,3 @@
 module Cms
-  VERSION = "0.3.0.7"
+  VERSION = "0.3.0.8"
 end

data/liquid_cms.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'sqlite3-ruby'
   s.add_development_dependency 'factory_girl', "~> 1.3.0"
   s.add_development_dependency 'shoulda', "~> 2.10.3"
+  s.add_development_dependency 'mocha'
 
   test_files = `git ls-files test/`.split("\n")
   all_files  = `git ls-files`.split("\n")

data/test/factories/asset.rb

@@ -11,3 +11,10 @@ Factory.define :pdf_asset, :class => Cms::Asset do |a|
   a.asset_file_size 1.megabyte
   a.asset_updated_at Time.now
 end
+
+Factory.define :js_asset, :class => Cms::Asset do |a|
+  a.asset_file_name 'test.js'
+  a.asset_content_type 'text/javascript'
+  a.asset_file_size 1.megabyte
+  a.asset_updated_at Time.now
+end

data/test/functional/assets_controller_test.rb

@@ -7,81 +7,119 @@ class Cms::AssetsControllerTest < ActionController::TestCase
   end
 
   context "actions" do
-    should "show the image asset" do
-      asset = Factory(:image_asset, :context => @company)
-      get :show, :id => asset
-      assert_response :success
-      assert_select '#content img'
-      assert_select 'p', :text => /Open/, :count => 0
-      assert_select 'p', /Filesize/
-      assert_select 'p', /Last Updated/
+    context "new" do
+      should "show the new form" do
+        get :new
+        assert_select 'div.text', false
+        #assert_select 'div.file .hint', 'Upload an asset file.'
+      end
     end
 
-    should "show the non-image asset" do
-      asset = Factory(:pdf_asset, :context => @company)
-      get :show, :id => asset
-      assert_response :success
-      assert_select '#content img', false
-      assert_select 'p', :text => /Open/, :count => 1
-      assert_select 'p', /Filesize/
-      assert_select 'p', /Last Updated/
+    context "show" do
+      should "show an image asset" do
+        asset = Factory(:image_asset, :context => @company)
+        get :show, :id => asset
+        assert_response :success
+        assert_select '#content img'
+        assert_select 'p', :text => /Open/, :count => 0
+        assert_select 'p', /Filesize/
+        assert_select 'p', /Last Updated/
+      end
+
+      should "show a non-image asset" do
+        asset = Factory(:pdf_asset, :context => @company)
+        get :show, :id => asset
+        assert_response :success
+        assert_select '#content img', false
+        assert_select 'p', :text => /Open/, :count => 1
+        assert_select 'p', /Filesize/
+        assert_select 'p', /Last Updated/
+      end
     end
 
-    should "edit asset" do
-      asset = Factory(:pdf_asset, :context => @company)
-      assert_equal 'test.pdf', asset.asset_file_name
+    context "edit" do
+      should "show form for an editable asset with a textarea" do
+        Cms::Asset.any_instance.stubs(:asset).returns(stub(:to_file => stub(:read => 'test contents')))
+        asset = Factory(:js_asset, :context => @company)
+
+        get :edit, :id => asset.id
+        assert_select 'div.text', true
+        assert_select 'p.break', :text => 'or edit the contents...', :count => 1
+        #assert_select 'div.file .hint', 'An existing file has been uploaded.  Upload a new file to replace it.'
+      end
+
+      should "show form for an editable asset without a textarea" do
+        asset = Factory(:pdf_asset, :context => @company)
+
+        get :edit, :id => asset.id
+        assert_select 'div.text', false
+        assert_select 'p.break', :text => 'or edit the contents...', :count => 0
+        #assert_select 'div.file .hint', 'An existing file has been uploaded.  Upload a new file to replace it.'
+      end
+    end
 
-      new_asset_file = 'new_test.pdf'
-      setup_asset new_asset_file
+    context "update" do
+      teardown do
+        cleanup_assets
+      end
 
-      put :update, :id => asset, :cms_asset => {:asset => fixture_file_upload(File.join(ASSET_PATH, new_asset_file))}
-      assert_response :redirect
-      assert_redirected_to cms_root_path
+      should "upload a new asset file" do
+        asset = Factory(:pdf_asset, :context => @company)
+        assert_equal 'test.pdf', asset.asset_file_name
 
-      # check that the file name updated
-      assert_equal new_asset_file, asset.reload.asset_file_name
+        new_asset_file = asset_file('new_test.pdf')
+        setup_asset new_asset_file
 
-      cleanup_assets
-    end
+        put :update, :id => asset, :cms_asset => {:asset => fixture_file_upload(File.join('assets', File.basename(new_asset_file)))}
+        assert_response :redirect
+        assert_redirected_to cms_root_path
 
-    should "destroy asset via HTML :DELETE" do
-      asset = Factory(:pdf_asset, :context => @company)
-      assert_not_nil @company.assets.find_by_id(asset.id)
+        # check that the file name updated
+        assert_equal File.basename(new_asset_file), asset.reload.asset_file_name
+      end
 
-      delete :destroy, :id => asset
-      assert_response :redirect
-      assert_redirected_to cms_root_path
-      assert_nil @company.assets.find_by_id(asset.id)
-    end
+      should "modify the contents of an editable asset file" do
+        asset = Factory(:pdf_asset, :context => @company)
+        put :update, :id => asset, :file_content => 'new content'
+        assert_response :success
+        assert_template 'edit'
+      end
+
+      should "modify the contents of an non-editable asset file" do
+        asset = Factory(:js_asset, :context => @company)
+
+        asset_file = asset_file(asset.asset_file_name)
+        setup_asset asset_file
 
-    should "destroy asset via XHR :DELETE" do
-      asset = Factory(:pdf_asset, :context => @company)
-      assert_not_nil @company.assets.find_by_id(asset.id)
+        Cms::Asset.any_instance.stubs(:asset => stub(:path => asset_file))
+        Cms::Asset.any_instance.expects(:write).with('new content').returns(true)
 
-      xhr :delete, :destroy, :id => asset
-      assert_response :success
-      assert_nil @company.assets.find_by_id(asset.id)
+        put :update, :id => asset, :file_content => 'new content'
+        assert_response :redirect
+      end
     end
-  end
 
-protected
-  def setup_asset(file_name)
-    FileUtils.mkdir_p asset_path
-    FileUtils.touch asset_file(file_name)
-  end
+    context "destroy" do
+      setup do
+        @asset = Factory(:pdf_asset, :context => @company)
+      end
 
-  def cleanup_assets
-    FileUtils.rm_rf TestConfig.paperclip_test_root
-    FileUtils.rm_rf Rails.root.join('public', 'cms', 'assets')
-  end
+      should "destroy asset via HTML :DELETE" do
+        assert_not_nil @company.assets.find_by_id(@asset.id)
 
-  ASSET_PATH = 'assets'
+        delete :destroy, :id => @asset
+        assert_response :redirect
+        assert_redirected_to cms_root_path
+        assert_nil @company.assets.find_by_id(@asset.id)
+      end
 
-  def asset_path
-    File.join(TestConfig.paperclip_test_root, ASSET_PATH)
-  end
+      should "destroy asset via XHR :DELETE" do
+        assert_not_nil @company.assets.find_by_id(@asset.id)
 
-  def asset_file(file_name)
-    File.join(asset_path, file_name)
+        xhr :delete, :destroy, :id => @asset
+        assert_response :success
+        assert_nil @company.assets.find_by_id(@asset.id)
+      end
+    end
   end
 end

data/test/no_context_test_helper.rb

@@ -0,0 +1,3 @@
+ENV['NO_CONTEXT'] = 'true'
+
+require File.dirname(__FILE__) + '/test_helper'

data/test/test_helper.rb

@@ -10,6 +10,12 @@ require "rails_app/config/environment"
 require 'rails/test_help'
 require 'ostruct'
 
+if ENV['NO_CONTEXT'] == 'true'
+  Cms.setup do |config|
+    config.context_class = nil
+  end
+end
+
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new(nil)
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
@@ -25,6 +31,15 @@ module TestConfig
 end
 
 require 'test_helpers/login_methods'
+require 'test_helpers/asset_helpers'
+
+class ActionController::TestCase
+  include AssetHelpers
+end
+class ActiveSupport::TestCase
+  include AssetHelpers
+end
+
 
 class ActiveSupport::TestCase
   include ActionDispatch::TestProcess

data/test/test_helpers/asset_helpers.rb

@@ -0,0 +1,19 @@
+module AssetHelpers
+  def setup_asset(file_name)
+    FileUtils.mkdir_p File.dirname(file_name)
+    FileUtils.touch file_name
+  end
+
+  def cleanup_assets
+    FileUtils.rm_rf TestConfig.paperclip_test_root
+    FileUtils.rm_rf Rails.root.join('public', 'cms', 'assets')
+  end
+
+  def asset_path
+    TestConfig.paperclip_test_root + '/assets'
+  end
+
+  def asset_file(file_name)
+    asset_path + "/" + file_name
+  end
+end

data/test/test_helpers/cache_helper.rb

@@ -0,0 +1,14 @@
+class ActionController::IntegrationTest
+  def assert_cache_key(key, clear = true)
+    assert_equal key, Rails.cache.instance_variable_get(:@data).to_a.try(:first).try(:first)
+    Rails.cache.clear if clear == true
+  end
+
+  def assert_cache_present
+    assert Rails.cache.instance_variable_get(:@data).present?
+  end
+
+  def assert_cache_empty
+    assert Rails.cache.instance_variable_get(:@data).blank?
+  end
+end

data/test/unit/asset_test.rb

@@ -1,8 +1,93 @@
 require File.expand_path('../../test_helper', __FILE__)
 
 class Cms::AssetTest < ActiveSupport::TestCase
-  # Replace this with your real tests.
-  test "the truth" do
-    assert true
+  def setup
+    @context = Factory(:company)
+  end
+
+  def teardown
+    cleanup_assets
+  end
+
+  context "type checks" do
+    setup do
+      @asset = Factory(:image_asset, :context => @context)
+    end
+
+    context "new image" do
+      setup do
+        @asset = Cms::Asset.new
+      end
+
+      should "not be an image" do
+        assert !@asset.image?
+      end
+      should "not be an icon" do
+        assert !@asset.icon?
+      end
+      should "not be editable" do
+        assert !@asset.editable?
+      end
+      should "not be able to read or write" do
+        assert_equal '', @asset.read
+        assert_equal false, @asset.write('test')
+      end
+    end
+
+    context "image" do
+      should "be an image" do
+        assert @asset.image?
+      end
+      should "not be an icon" do
+        assert !@asset.icon?
+      end
+      should "not be editable" do
+        assert !@asset.editable?
+      end
+      should "not be able to read or write" do
+        assert_equal '', @asset.read
+        assert_equal false, @asset.write('test')
+      end
+    end
+
+    context "icon" do
+      setup do
+        @asset.update_attribute :asset_content_type, 'image/ico'
+      end
+      should "be an image" do
+        assert @asset.image?
+      end
+      should "be an icon" do
+        assert @asset.icon?
+      end
+      should "not be editable" do
+        assert !@asset.editable?
+      end
+      should "not be able to read or write" do
+        assert_equal '', @asset.read
+        assert_equal false, @asset.write('test')
+      end
+    end
+
+    context "javascript" do
+      setup do
+        @asset.update_attribute :asset_content_type, 'text/javascript'
+        setup_asset @asset.asset.path(:original)
+      end
+
+      should "not be an image" do
+        assert !@asset.image?
+      end
+      should "not be an icon" do
+        assert !@asset.icon?
+      end
+      should "be editable" do
+        assert @asset.editable?
+      end
+      should "be able to read or write" do
+        assert_equal true, @asset.write("alert('test')")
+        assert_equal "alert('test')\n", @asset.read
+      end
+    end
   end
 end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 3
   - 0
-  - 7
-  version: 0.3.0.7
+  - 8
+  version: 0.3.0.8
 platform: ruby
 authors: 
 - Andrew Kaspick
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -06:00
+date: 2011-02-25 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,6 +165,19 @@ dependencies:
         version: 2.10.3
   type: :development
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id011
 description: "  A context aware Rails CMS engine using the Liquid template library.\n  Use the 0.3.x series for Rails 3 compatibility and the 0.2.x version for Rails 2 compatibility.\n"
 email: 
 - andrew@redlinesoftware.com
@@ -1417,6 +1430,7 @@ files:
 - test/functional/main_controller_test.rb
 - test/functional/pages_controller_test.rb
 - test/integration/pages_test.rb
+- test/no_context_test_helper.rb
 - test/rails_app/Gemfile
 - test/rails_app/Gemfile.lock
 - test/rails_app/Rakefile
@@ -1464,6 +1478,8 @@ files:
 - test/rails_app/public/robots.txt
 - test/rails_app/script/rails
 - test/test_helper.rb
+- test/test_helpers/asset_helpers.rb
+- test/test_helpers/cache_helper.rb
 - test/test_helpers/login_methods.rb
 - test/unit/asset_test.rb
 - test/unit/component_test.rb
@@ -1514,6 +1530,7 @@ test_files:
 - test/functional/main_controller_test.rb
 - test/functional/pages_controller_test.rb
 - test/integration/pages_test.rb
+- test/no_context_test_helper.rb
 - test/rails_app/Gemfile
 - test/rails_app/Gemfile.lock
 - test/rails_app/Rakefile
@@ -1561,6 +1578,8 @@ test_files:
 - test/rails_app/public/robots.txt
 - test/rails_app/script/rails
 - test/test_helper.rb
+- test/test_helpers/asset_helpers.rb
+- test/test_helpers/cache_helper.rb
 - test/test_helpers/login_methods.rb
 - test/unit/asset_test.rb
 - test/unit/component_test.rb