sections_rails 0.6.3 → 0.6.4

data/lib/sections_rails/helpers.rb

@@ -25,5 +25,6 @@ module SectionsRails
       dirname = '' if dirname == '.'
       [dirname, File.basename(paths)]
     end
+
   end
 end

data/lib/sections_rails/section.rb

@@ -7,17 +7,18 @@ module SectionsRails
     include ActionView::Helpers::RenderingHelper
 
     # TODO(KG): remove unnessessary.
-    attr_reader :asset_path, :css, :directory_name, :filename, :absolute_path, :js, :locals, :partial, :partial_path, :path # NOTE (SZ): too many? :)
+    attr_reader :asset_path, :css, :directory_name, :filename, :absolute_asset_path, :js, :locals, :partial, :partial_path, :path # NOTE (SZ): too many? :)
 
-    def initialize section_name, rails_obj, options = {}
+    def initialize section_name, rails_obj = nil, options = {}
       section_name = section_name.to_s
 
       # Helpers for filenames.
-      @filename       = File.basename(section_name, '.*')
-      @directory_name = File.dirname(section_name)
-      @asset_path     = File.join(@directory_name, @filename, @filename)
-      @absolute_path  = File.join(Rails.root, SectionsRails.config.path, @directory_name, @filename, @filename)
-      @partial_path   = File.join(Rails.root, SectionsRails.config.path, @directory_name, @filename, "_#{@filename}")
+      @filename       = File.basename section_name, '.*'
+      @directory_name = File.dirname section_name
+      @directory_name = '' if @directory_name == '.'
+      @asset_path     = @directory_name != '' ? File.join(@directory_name, @filename, @filename) : File.join(@filename, @filename)
+      @absolute_asset_path  = File.join Rails.root, SectionsRails.config.path, @asset_path
+      @partial_path   = File.join Rails.root, SectionsRails.config.path, @directory_name, @filename, "_#{@filename}"
 
       # Options.
       @js             = options[:js]
@@ -29,23 +30,41 @@ module SectionsRails
       @rails_obj = rails_obj
     end
 
+    def find_existing_filename basename, extensions
+      extensions.each do |ext|
+        path = "#{@absolute_asset_path}.#{ext}"
+        return path if File.exists? path
+      end
+      nil
+    end
+
+    # Returns the filename of the partial of this section, or nil if this section has no partial.
+    def find_partial_filename
+      find_existing_filename @partial_path, SectionsRails.config.partial_extensions
+    end
+
+
+    # TODO: replace this with find_asset.
     def has_asset? *extensions
       extensions.flatten.each do |ext|
-        return true if File.exists?("#{@absolute_path}.#{ext}")
+        return true if File.exists?("#{@absolute_asset_path}.#{ext}")
       end
       false
     end
 
+    # TODO: replace this with find_asset.
     def has_default_js_asset?
       has_asset? SectionsRails.config.js_extensions
     end
 
+    # TODO: replace this with find_asset.
     def has_default_style_asset?
       has_asset? SectionsRails.config.css_extensions
     end
 
     # Returns whether this section has a template.
-    def has_template?
+    # Deprecated.
+    def has_partial?
       SectionsRails.config.partial_extensions.each do |ext|
         return true if File.exists?("#{@partial_path}.#{ext}")
       end
@@ -89,7 +108,7 @@ module SectionsRails
         when nil
           # partial: nil given --> render default partial
 
-          if self.has_template?
+          if self.has_partial?
             result << @rails_obj.render(:partial => asset_path, :locals => locals)
           else
             result << @rails_obj.content_tag(:div, '', :class => filename)

data/lib/sections_rails/version.rb

@@ -1,3 +1,3 @@
 module SectionsRails
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/tasks/sections_rails_tasks.rake

@@ -3,7 +3,7 @@ namespace :sections do
 
   desc "Prepares the assets for precompilation in a setup with a single application.js file"
   task :prepare do
-    puts "\nPreparing sections assets ..."
+    print "\nPreparing sections assets ..." ; STDOUT.flush
 
     # Find all sections used in the views.
     sections = find_all_views('app/views').map do |view|
@@ -33,7 +33,7 @@ namespace :sections do
     
     # Create the require file for application.css.
     File.open "app/assets/stylesheets/application_sections.css", 'w' do |file|
-      file.write "/* \n"
+      file.write "/*\n"
       sections.each do |section|
         if File.exists?(asset_path section, '.css') || File.exists?(asset_path section, '.css.scss') || File.exists?(asset_path section, '.css.sass') || File.exists?(asset_path section, '.scss') || File.exists?(asset_path section, '.sass')
           file.write " *= require #{require_path section}\n"
@@ -42,7 +42,7 @@ namespace :sections do
       file.write " */"
     end
     
-    puts "Preparing section assets done.\n\n"
+    puts " done.\n\n"
   end
 
   desc "Prepares the assets for precompilation in a setup with multiple files per page."
@@ -121,9 +121,13 @@ namespace :sections do
   
 
   def find_sections_in_section section_name
-    directory, filename = split_path section_name
-    section_content = IO.read "app/sections/#{directory}#{filename}/_#{filename}.html.haml"
-    find_sections section_content
+    section = SectionsRails::Section.new section_name
+    partial_path = section.find_partial_filename
+    if partial_path
+      find_sections IO.read partial_path
+    else
+      []
+    end
   end
 
   # Returns the path to the asset in the given section.

data/spec/sections_rails/section_spec.rb

@@ -3,16 +3,48 @@ require "spec_helper"
 # TODO(SZ): missing specs.
 describe SectionsRails::Section do
   before(:each) { Rails.stub(:root).and_return('/rails_root/') }
-  subject { SectionsRails::Section.new 'folder/section' }
+  subject { SectionsRails::Section.new 'folder/section', nil }
 
   describe 'initialize' do
-    its(:filename)       { should == 'section' }
-    its(:directory_name) { should == 'folder' }
-    its(:asset_path)     { should == 'folder/section/section' }
-    its(:absolute_path)  { should == '/rails_root/app/sections/folder/section/section' }
-    its(:partial_path)   { should == '/rails_root/app/sections/folder/section/_section' }
+
+    context 'with section in folder' do
+      its(:filename)       { should == 'section' }
+      its(:directory_name) { should == 'folder' }
+      its(:asset_path)     { should == 'folder/section/section' }
+      its(:absolute_asset_path)  { should == '/rails_root/app/sections/folder/section/section' }
+      its(:partial_path)   { should == '/rails_root/app/sections/folder/section/_section' }
+    end
+
+    context 'without folder' do
+      subject { SectionsRails::Section.new 'section', nil }
+      its(:filename)       { should == 'section' }
+      its(:directory_name) { should == '' }
+      its(:asset_path)     { should == 'section/section' }
+      its(:absolute_asset_path)  { should == '/rails_root/app/sections/section/section' }
+      its(:partial_path)   { should == '/rails_root/app/sections/section/_section' }
+    end
+  end
+
+  describe 'find_partial_filename' do
+    it 'looks for all known types of partials' do
+      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.html.erb").and_return(false)
+      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.html.haml").and_return(false)
+      subject.find_partial_filename
+    end
+
+    it "returns nil if it doesn't find any assets" do
+      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.html.erb").and_return(false)
+      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.html.haml").and_return(false)
+      subject.find_partial_filename.should be_false
+    end
+
+    it "returns the absolute path to the asset if it finds one" do
+      File.stub(:exists?).and_return(true)
+      subject.find_partial_filename.should == '/rails_root/app/sections/folder/section/section.html.erb'
+    end
   end
 
+
   describe "#has_asset?" do
 
     it "tries filename variations with all given extensions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sections_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70334028555560 !ruby/object:Gem::Requirement
+  requirement: &70240927714140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70334028555560
+  version_requirements: *70240927714140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70334028554660 !ruby/object:Gem::Requirement
+  requirement: &70240927713680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334028554660
+  version_requirements: *70240927713680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70334028554180 !ruby/object:Gem::Requirement
+  requirement: &70240927712960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334028554180
+  version_requirements: *70240927712960
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70334028553740 !ruby/object:Gem::Requirement
+  requirement: &70240927712360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334028553740
+  version_requirements: *70240927712360
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70334028553080 !ruby/object:Gem::Requirement
+  requirement: &70240927711800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70334028553080
+  version_requirements: *70240927711800
 description: Sections_rails adds infrastructure to the view layer of Ruby on Rails.
   It allows to define and use the HTML, CSS, and JavaScript code of dedicated sections
   of pages together in one place.