sections_rails 0.6.4 → 0.6.5

data/lib/sections_rails/section.rb

@@ -32,7 +32,7 @@ module SectionsRails
 
     def find_existing_filename basename, extensions
       extensions.each do |ext|
-        path = "#{@absolute_asset_path}.#{ext}"
+        path = "#{basename}.#{ext}"
         return path if File.exists? path
       end
       nil
@@ -43,6 +43,26 @@ module SectionsRails
       find_existing_filename @partial_path, SectionsRails.config.partial_extensions
     end
 
+    # Returns the asset_path of asset with the given extensions.
+    def find_asset_path asset_option, extensions
+      return nil if asset_option == false
+      return asset_option if asset_option
+      extensions.each do |ext|
+        file_path = "#{@absolute_asset_path}.#{ext}"
+        return @asset_path if File.exists? file_path
+      end
+      nil
+    end
+
+    # Returns the path to the JS asset of this section, or nil if the section doesn't have one.
+    def find_css_asset_path
+      find_asset_path @css, SectionsRails.config.css_extensions
+    end
+
+    # Returns the path to the JS asset of this section, or nil if the section doesn't have one.
+    def find_js_asset_path
+      find_asset_path @js, SectionsRails.config.js_extensions
+    end
 
     # TODO: replace this with find_asset.
     def has_asset? *extensions

data/lib/sections_rails/version.rb

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

data/lib/tasks/sections_rails_tasks.rake

@@ -7,8 +7,8 @@ namespace :sections do
 
     # Find all sections used in the views.
     sections = find_all_views('app/views').map do |view|
-      find_sections IO.read"app/views/#{view}"
-    end.flatten
+      find_sections IO.read "app/views/#{view}"
+    end.flatten.sort.uniq
     
     # Find all sections within the already known sections.
     i = 0
@@ -24,20 +24,20 @@ namespace :sections do
     
     # Create the require file for application.js.
     File.open "app/assets/javascripts/application_sections.js", 'w' do |file|
-      sections.each do |section|
-        if File.exists?(asset_path section, '.js') || File.exists?(asset_path section, '.js.coffee') || File.exists?(asset_path section, '.coffee')
-          file.write "//= require #{require_path section}\n"
-        end
+      sections.each do |section_name|
+        section = SectionsRails::Section.new section_name
+        js_asset = section.find_js_asset_path
+        file.write "//= require #{js_asset}\n" if js_asset
       end
     end
     
     # Create the require file for application.css.
     File.open "app/assets/stylesheets/application_sections.css", 'w' do |file|
       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"
-        end
+      sections.each do |section_name|
+        section = SectionsRails::Section.new section_name
+        js_asset = section.find_js_asset_path
+        file.write "//= require #{js_asset}\n" if js_asset
       end
       file.write " */"
     end
@@ -123,6 +123,7 @@ namespace :sections do
   def find_sections_in_section section_name
     section = SectionsRails::Section.new section_name
     partial_path = section.find_partial_filename
+    puts "section #{section_name} has partial #{partial_path}"
     if partial_path
       find_sections IO.read partial_path
     else

data/spec/sections_rails/section_spec.rb

@@ -26,24 +26,56 @@ describe SectionsRails::Section do
   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)
+      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)
+      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'
+      subject.find_partial_filename.should == '/rails_root/app/sections/folder/section/_section.html.erb'
     end
   end
 
+  describe 'find_js_asset_path' do
+    it 'tries all different JS asset file types for sections' do
+      SectionsRails.config.js_extensions.each do |ext|
+        File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.#{ext}").and_return(false)
+      end
+      subject.find_js_asset_path
+    end
+
+    it 'returns nil if there is no known JS asset file' do
+      SectionsRails.config.js_extensions.each do |ext|
+        File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.#{ext}").and_return(false)
+      end
+      subject.find_js_asset_path.should be_false
+    end
+
+    it 'returns the asset path of the JS asset' do
+      File.stub(:exists?).and_return(true)
+      subject.find_js_asset_path.should == 'folder/section/section'
+    end
+
+    it 'returns nil if the file exists but the section has JS assets disabled' do
+      File.stub(:exists?).and_return(true)
+      section = SectionsRails::Section.new 'folder/section', nil, js: false
+      section.find_js_asset_path.should be_false
+    end
+
+    it 'returns the custom JS asset path if one is set' do
+      section = SectionsRails::Section.new 'folder/section', nil, js: 'custom'
+      section.find_js_asset_path.should == 'custom'
+    end
+  end
 
   describe "#has_asset?" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sections_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   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: &70240927714140 !ruby/object:Gem::Requirement
+  requirement: &70295138811940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70240927714140
+  version_requirements: *70295138811940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240927713680 !ruby/object:Gem::Requirement
+  requirement: &70295138811220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240927713680
+  version_requirements: *70295138811220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70240927712960 !ruby/object:Gem::Requirement
+  requirement: &70295138810700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240927712960
+  version_requirements: *70295138810700
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70240927712360 !ruby/object:Gem::Requirement
+  requirement: &70295138810200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240927712360
+  version_requirements: *70295138810200
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70240927711800 !ruby/object:Gem::Requirement
+  requirement: &70295138809560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240927711800
+  version_requirements: *70295138809560
 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.