sections_rails 0.7.1 → 0.7.2

data/lib/sections_rails/view_finder.rb

@@ -19,14 +19,16 @@ module SectionsRails
     end
 
     # Used for :prepare_pages. Not used right now.
-    def self.parse_views views
-      result = {}
-      views_to_parse.each do |view_to_parse|
-        view_text = IO.read(File.join root, view_to_parse)
-        result[view_to_parse] = find_sections_in_text view_text
-      end
-      result
-    end
+    # def self.parse_views views
+    #   result = {}
+    #   views_to_parse.each do |view_to_parse|
+    #     puts root
+
+    #     view_text = IO.read(File.join root, view_to_parse)
+    #     result[view_to_parse] = find_sections_in_text view_text
+    #   end
+    #   result
+    # end
 
   end
 end

data/lib/sections_rails.rb

@@ -1,7 +1,7 @@
 module SectionsRails
   require 'action_view'
   require "sections_rails/section"
-  require "sections_rails/railtie" if defined?(Rails)
+  require "sections_rails/railtie" #if defined?(Rails)
 
   def section name, options = {}, &block
     SectionsRails::Section.new(name, self, options).render &block

data/spec/controllers/image_assets_controller_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+describe ImageAssetsController do
+  render_views
+
+  before :each do
+    RSpec::Matchers.define :have_image_tag do |tag_name|
+      match do |body|
+        body =~ Regexp.new("<img.*src=\"#{tag_name}\"")
+      end
+    end
+  end
+
+  after :each do
+    expect(response).to be_success
+  end
+
+  it 'supports GIF images' do
+    get :gif
+    expect(response.body).to have_image_tag '/assets/image_assets/gif/pic.gif'
+  end
+
+  it 'supports JPG images' do
+    get :jpg
+    expect(response.body).to have_image_tag '/assets/image_assets/jpg/pic.jpg'
+  end
+
+  it 'supports JPEG images' do
+    get :jpeg
+    expect(response.body).to have_image_tag '/assets/image_assets/jpeg/pic.jpeg'
+  end
+
+  it 'supports PNG images' do
+    get :png
+    expect(response.body).to have_image_tag '/assets/image_assets/png/pic.png'
+  end
+end
+

data/spec/controllers/partials_controller_spec.rb

@@ -5,24 +5,31 @@ describe PartialsController do
 
   describe 'supported partial types' do
     after :each do
-      response.should be_success
+      expect(response).to be_success
     end
 
     it 'allows to use ERB partials' do
       get :erb_section
-      response.body.strip.should == 'ERB partial content'
+      expect(response.body.strip).to eql 'ERB partial content'
     end
 
     it 'allows to use HAML partials' do
       get :haml_section
-      response.body.strip.should == 'HAML partial content'
+      expect(response.body.strip).to eql 'HAML partial content'
     end
   end
 
   context 'no partial options given' do
     it 'renders the default partial' do
       get :no_options
-      response.body.strip.should == 'default partial content'
+      expect(response.body.strip).to eql 'default partial content'
+    end
+  end
+
+  context 'partial with tag option given' do
+    it 'renders an empty tag even though the section contains a partial' do
+      get :tag_option
+      expect(response.body.strip).to eql '<div class="tag_option"></div>'
     end
   end
 
@@ -32,11 +39,11 @@ describe PartialsController do
     end
 
     it 'renders the given partial' do
-      response.body.should include 'custom partial content'
+      expect(response.body).to include 'custom partial content'
     end
 
     it "doesn't render the default partial" do
-      response.body.should_not include 'default partial content'
+      expect(response.body).to_not include 'default partial content'
     end
   end
 
@@ -46,11 +53,11 @@ describe PartialsController do
     end
 
     it "doesn't render the partial tag" do
-      response.body.strip.should_not include '<div class="disabled">'
+      expect(response.body.strip).to_not include '<div class="disabled">'
     end
 
     it "doesn't render the partial" do
-      response.body.strip.should_not include 'disabled partial content'
+      expect(response.body.strip).to_not include 'disabled partial content'
     end
   end
 
@@ -66,14 +73,21 @@ describe PartialsController do
 
     it 'renders partials normally' do
       get :production_mode
-      response.body.strip.should include 'partial content'
+      expect(response.body.strip).to include 'partial content'
     end
   end
 
   describe 'partial with block' do
-    it 'allows to render the block inside the partial' do
+    it 'renders the block inside the partial' do
       get :partial_with_block
-      response.body.strip.should == "partial line 1.\nblock content.\npartial line 2."
+      expect(response.body.strip).to match /partial line 1.\n+block content.\n+partial line 2./
+    end
+  end
+
+  describe 'partial with custom partial name and block' do
+    it 'renders the block inside the custom partial' do
+      get :custom_partial_with_block
+      expect(response.body.strip).to match /custom partial line 1.\n+\s*block content\n+custom partial line 2./
     end
   end
 end

data/spec/controllers/script_assets_controller_spec.rb

@@ -12,18 +12,18 @@ describe ScriptAssetsController do
   end
 
   after :each do
-    response.should be_success
+    expect(response).to be_success
   end
 
   describe 'supported script languages' do
     it 'allows to use JavaScript assets' do
       get :javascript
-      response.body.should have_script_tag '/assets/script_assets/javascript/javascript.js'
+      expect(response.body).to have_script_tag '/assets/script_assets/javascript/javascript.js'
     end
 
     it 'allows to use CoffeeScript assets' do
       get :coffeescript
-      response.body.should have_script_tag '/assets/script_assets/coffeescript/coffeescript.js'
+      expect(response.body).to have_script_tag '/assets/script_assets/coffeescript/coffeescript.js'
     end
   end
 
@@ -33,18 +33,18 @@ describe ScriptAssetsController do
     end
 
     it 'includes the given script file into the page' do
-      response.body.should have_script_tag '/assets/script_assets/custom_script/different_name.js'
+      expect(response.body).to have_script_tag '/assets/script_assets/custom_script/different_name.js'
     end
 
     it "doesn't include the default script file into the page" do
-      response.body.should_not have_script_tag '/assets/script_assets/custom_script/custom_script.js'
+      expect(response.body).to_not have_script_tag '/assets/script_assets/custom_script/custom_script.js'
     end
   end
 
   context 'setting the script configuration option to false' do
     it "doesn't include any script tag into the page" do
       get :no_script
-      response.body.should_not match /<script/
+      expect(response.body).to_not match /<script/
     end
   end
 
@@ -59,7 +59,7 @@ describe ScriptAssetsController do
 
     it "doesn't render script assets" do
       get :production_mode
-      response.should_not have_script_tag '/assets/script_assets/production_mode/production_mode.js'
+      expect(response).to_not have_script_tag '/assets/script_assets/production_mode/production_mode.js'
     end
   end
 end

data/spec/controllers/style_assets_controller_spec.rb

@@ -12,33 +12,33 @@ describe StyleAssetsController do
   end
 
   after :each do
-    response.should be_success
+    expect(response).to be_success
   end
 
   describe 'supported style languages' do
     it 'CSS assets' do
       get :css
-      response.body.should have_style_tag '/assets/style_assets/css/css.css'
+      expect(response.body).to have_style_tag '/assets/style_assets/css/css.css'
     end
 
     it 'SASS assets' do
       get :sass
-      response.body.should have_style_tag '/assets/style_assets/sass/sass.css'
+      expect(response.body).to have_style_tag '/assets/style_assets/sass/sass.css'
     end
 
     it 'CSS.SASS assets' do
       get :css_sass
-      response.body.should have_style_tag '/assets/style_assets/css_sass/css_sass.css'
+      expect(response.body).to have_style_tag '/assets/style_assets/css_sass/css_sass.css'
     end
 
     it 'SCSS assets' do
       get :scss
-      response.body.should have_style_tag '/assets/style_assets/scss/scss.css'
+      expect(response.body).to have_style_tag '/assets/style_assets/scss/scss.css'
     end
 
     it 'CSS.SCSS assets' do
       get :css_scss
-      response.body.should have_style_tag '/assets/style_assets/css_scss/css_scss.css'
+      expect(response.body).to have_style_tag '/assets/style_assets/css_scss/css_scss.css'
     end
   end
 
@@ -48,18 +48,18 @@ describe StyleAssetsController do
     end
 
     it 'includes the given style file into the page' do
-      response.body.should have_style_tag '/assets/style_assets/custom_style/different_name.css'
+      expect(response.body).to have_style_tag '/assets/style_assets/custom_style/different_name.css'
     end
 
     it "doesn't include the default script file into the page" do
-      response.body.should_not have_style_tag '/assets/style_assets/custom_style/custom_style.css'
+      expect(response.body).to_not have_style_tag '/assets/style_assets/custom_style/custom_style.css'
     end
   end
 
   context 'setting the script configuration option to false' do
     it "doesn't include any script tag into the page" do
       get :no_style
-      response.body.should_not have_style_tag '/assets/style_assets/no_style/no_style.css'
+      expect(response.body).to_not have_style_tag '/assets/style_assets/no_style/no_style.css'
     end
   end
 
@@ -75,7 +75,7 @@ describe StyleAssetsController do
 
     it "doesn't render style assets" do
       get :production_mode
-      response.body.should_not have_style_tag '/assets/style_assets/production_mode/production_mode.css'
+      expect(response.body).to_not have_style_tag '/assets/style_assets/production_mode/production_mode.css'
     end
   end
 end

data/spec/controllers/view_types_controller_spec.rb

@@ -5,17 +5,17 @@ describe ViewTypesController do
 
   describe 'supported view types' do
     after :each do
-      response.should be_success
+      expect(response).to be_success
     end
 
     it 'allows to use the section helper in ERB views' do
       get :erb
-      response.body.strip.should == 'Foo partial content'
+      expect(response.body.strip).to eql 'Foo partial content'
     end
 
     it 'allows to use the section helper in HAML views' do
       get :haml
-      response.body.strip.should == 'Foo partial content'
+      expect(response.body.strip).to eql 'Foo partial content'
     end
   end
 end

data/spec/dummy/app/controllers/image_assets_controller.rb

@@ -0,0 +1,14 @@
+class ImageAssetsController < ApplicationController
+
+  def gif
+  end
+
+  def jpg
+  end
+
+  def jpeg
+  end
+
+  def png
+  end
+end

data/spec/dummy/app/controllers/partials_controller.rb

@@ -20,4 +20,10 @@ class PartialsController < ApplicationController
 
   def partial_with_block
   end
+
+  def tag_option
+  end
+
+  def custom_partial_with_block
+  end
 end

data/spec/dummy/app/views/image_assets/gif.html.erb

@@ -0,0 +1 @@
+<%= image_tag 'image_assets/gif/pic.gif' %>

data/spec/dummy/app/views/image_assets/jpeg.html.erb

@@ -0,0 +1 @@
+<%= image_tag 'image_assets/jpeg/pic.jpeg' %>

data/spec/dummy/app/views/image_assets/jpg.html.erb

@@ -0,0 +1 @@
+<%= image_tag 'image_assets/jpg/pic.jpg' %>

data/spec/dummy/app/views/image_assets/png.html.erb

@@ -0,0 +1 @@
+<%= image_tag 'image_assets/png/pic.png' %>

data/spec/dummy/app/views/partials/custom_partial_with_block.html.erb

@@ -0,0 +1,3 @@
+<%= section 'partials/custom_partial_with_block', partial: 'different_name' do %>
+  block content
+<% end %>

data/spec/dummy/app/views/partials/tag_option.html.erb

@@ -0,0 +1 @@
+<%= section 'partials/tag_option', partial: :tag %>

data/spec/dummy/config/application.rb

@@ -3,10 +3,11 @@ require File.expand_path('../boot', __FILE__)
 require "action_controller/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
+# require 'rails/all'
+require 'haml'
 
-if defined?(Bundler)
-  Bundler.require(*Rails.groups(:assets => %w(development test)))
-end
+Bundler.require(*Rails.groups(:assets => %w(development test)))
+# require 'sections_rails'
 
 module Dummy
   class Application < Rails::Application

data/spec/dummy/config/boot.rb

@@ -1,7 +1,11 @@
 require 'rubygems'
+gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+if File.exist?(gemfile)
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+end
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+$:.unshift File.expand_path('../../../../lib', __FILE__)
 

data/spec/dummy/config/environments/test.rb

@@ -27,10 +27,7 @@ Dummy::Application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  #config.action_mailer.delivery_method = :test
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr