sections_rails 0.6.6 → 0.6.7

data/lib/generators/section_generator.rb

@@ -32,7 +32,7 @@ class SectionGenerator < Rails::Generators::Base
   def directory_path
     @directory_path ||= begin
       directory, filename = split_path(name)
-      "app/sections/#{directory}/#{filename}"
+      File.join 'app/sections', directory, filename
     end
   end
 

data/lib/sections_rails/section.rb

@@ -1,49 +1,31 @@
 module SectionsRails
   require "sections_rails/config"
-  require "action_view"
 
   class Section
-    include ActionView::Helpers::AssetTagHelper
-    include ActionView::Helpers::RenderingHelper
+    attr_reader :asset_path, :css, :directory_name, :filename, :absolute_asset_path, :js, :locals, :partial, :partial_path
 
-    # TODO(KG): remove unnessessary.
-    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 = nil, options = {}
+    def initialize section_name, view = nil, options = {}
       section_name = section_name.to_s
 
       # Helpers for filenames.
-      @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}"
+      @filename            = File.basename section_name, '.*'
+      @directory_name      = File.dirname(section_name).gsub(/^\.$/, '')
+      @asset_path          = File.join(@directory_name, @filename, @filename).gsub(/^\//, '')
+      @absolute_asset_path = File.join SectionsRails.config.path, @asset_path
+      @partial_path        = File.join(@directory_name, @filename, "_#{@filename}").gsub(/^\//, '')
 
       # Options.
-      @js             = options[:js]
-      @css            = options[:css]
-      @partial        = options[:partial]
-      @locals         = options[:locals]
+      @js      = options[:js]
+      @css     = options[:css]
+      @partial = options[:partial]
+      @locals  = options[:locals]
 
       # For running view helper methods.
-      @rails_obj = rails_obj
-    end
-
-    def find_existing_filename basename, extensions
-      extensions.each do |ext|
-        path = "#{basename}.#{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
+      @view = view
     end
 
     # Returns the asset_path of asset with the given extensions.
+    # Helper method.
     def find_asset_path asset_option, extensions
       return nil if asset_option == false
       return asset_option if asset_option
@@ -64,6 +46,15 @@ module SectionsRails
       find_asset_path @js, SectionsRails.config.js_extensions
     end
 
+    # Returns the filename of the partial of this section, or nil if this section has no partial.
+    def find_partial_filename
+      SectionsRails.config.partial_extensions.each do |ext|
+        path = File.join SectionsRails.config.path, "#{@partial_path}.#{ext}"
+        return path if File.exists? path
+      end
+      nil
+    end
+
     # TODO: replace this with find_asset.
     def has_asset? *extensions
       extensions.flatten.each do |ext|
@@ -85,10 +76,7 @@ module SectionsRails
     # Returns whether this section has a template.
     # Deprecated.
     def has_partial?
-      SectionsRails.config.partial_extensions.each do |ext|
-        return true if File.exists?("#{@partial_path}.#{ext}")
-      end
-      false
+      @view.lookup_context.template_exists? @partial_path
     end
 
     # TODO(SZ): missing specs.
@@ -100,27 +88,27 @@ module SectionsRails
 
         # Include JS assets.
         if js
-          result << @rails_obj.javascript_include_tag(File.join(path, js))
+          result << @view.javascript_include_tag(File.join(path, js))
         elsif js == false
           # ":js => false" given --> don't include any JS.
         elsif has_default_js_asset?
-          result << @rails_obj.javascript_include_tag(asset_path)
+          result << @view.javascript_include_tag(asset_path)
         end
 
         # Include CSS assets.
         if css
-          result << @rails_obj.stylesheet_link_tag(File.join(path, css))
+          result << @view.stylesheet_link_tag(File.join(path, css))
         elsif css == false
           # ":css => false" given --> don't include any CSS.
         elsif has_default_style_asset?
-          result << @rails_obj.stylesheet_link_tag(@asset_path)
+          result << @view.stylesheet_link_tag(@asset_path)
         end
       end
 
       # Render the section partial into the view.
       case partial
         when :tag
-          result << @rails_obj.content_tag(:div, '', :class => filename)
+          result << @view.content_tag(:div, '', :class => filename)
 
         when false
           # partial: false given --> render nothing
@@ -129,15 +117,15 @@ module SectionsRails
           # partial: nil given --> render default partial
 
           if self.has_partial?
-            result << @rails_obj.render(:partial => asset_path, :locals => locals)
+            result << @view.render(:partial => asset_path, :locals => locals)
           else
-            result << @rails_obj.content_tag(:div, '', :class => filename)
+            result << @view.content_tag(:div, '', :class => filename)
           end
 
         else
           # partial: custom path given --> render custom partial
 
-          result << @rails_obj.render("#{path}/#{partial}", locals)
+          result << @view.render("#{path}/#{partial}", locals)
       end
 
       result.join("\n").html_safe

data/lib/sections_rails/version.rb

@@ -1,3 +1,3 @@
 module SectionsRails
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/lib/sections_rails.rb

@@ -1,7 +1,7 @@
-require 'sections_rails/helpers'
-require "sections_rails/section"
-
 module SectionsRails
+  require 'action_view'
+  require 'sections_rails/helpers'
+  require "sections_rails/section"
   require "sections_rails/railtie" if defined?(Rails)
 
   def section name, options = {}

data/spec/sections_rails/section_spec.rb

@@ -8,54 +8,34 @@ describe SectionsRails::Section do
   describe 'initialize' do
 
     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' }
+      its(:filename)            { should == 'section' }
+      its(:directory_name)      { should == 'folder' }
+      its(:asset_path)          { should == 'folder/section/section' }
+      its(:absolute_asset_path) { should == 'app/sections/folder/section/section' }
+      its(:partial_path)        { should == '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'
+      its(:filename)            { should == 'section' }
+      its(:directory_name)      { should == '' }
+      its(:asset_path)          { should == 'section/section' }
+      its(:absolute_asset_path) { should == 'app/sections/section/section' }
+      its(:partial_path)        { should == 'section/_section' }
     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)
+        File.should_receive(:exists?).with("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)
+        File.should_receive(:exists?).with("app/sections/folder/section/section.#{ext}").and_return(false)
       end
       subject.find_js_asset_path.should be_false
     end
@@ -77,31 +57,53 @@ describe SectionsRails::Section do
     end
   end
 
+
+  describe 'find_partial_filename' do
+
+    it 'looks for all known types of partials' do
+      File.should_receive(:exists?).with("app/sections/folder/section/_section.html.erb").and_return(false)
+      File.should_receive(:exists?).with("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("app/sections/folder/section/_section.html.erb").and_return(false)
+      File.should_receive(:exists?).with("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 == 'app/sections/folder/section/_section.html.erb'
+    end
+  end
+
+
   describe "#has_asset?" do
 
     it "tries filename variations with all given extensions" do
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.one").and_return(false)
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.two").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.one").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.two").and_return(false)
       subject.has_asset? ['one', 'two']
     end
 
     it "returns false if the files don't exist" do
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.one").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.one").and_return(false)
       subject.has_asset?(['one']).should be_false
     end
 
     it "returns true if one of the given extensions matches a file" do
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.one").and_return(false)
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.two").and_return(true)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.one").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.two").and_return(true)
       subject.has_asset?(['one', 'two']).should be_true
     end
   end
 
   describe "#has_default_js_asset" do
     it 'looks for all different types of JS file types' do
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.js").and_return(false)
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.coffee").and_return(false)
-      File.should_receive(:exists?).with("/rails_root/app/sections/folder/section/section.js.coffee").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.js").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.coffee").and_return(false)
+      File.should_receive(:exists?).with("app/sections/folder/section/section.js.coffee").and_return(false)
       subject.has_default_js_asset?.should be_false
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sections_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   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: &70346083211320 !ruby/object:Gem::Requirement
+  requirement: &70275409137460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70346083211320
+  version_requirements: *70275409137460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70346083210700 !ruby/object:Gem::Requirement
+  requirement: &70275409136460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346083210700
+  version_requirements: *70275409136460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70346083209960 !ruby/object:Gem::Requirement
+  requirement: &70275409135640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346083209960
+  version_requirements: *70275409135640
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70346083209360 !ruby/object:Gem::Requirement
+  requirement: &70275409134400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346083209360
+  version_requirements: *70275409134400
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70346083079900 !ruby/object:Gem::Requirement
+  requirement: &70275409133660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70346083079900
+  version_requirements: *70275409133660
 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.