inline_template_loader 0.2.0 → 0.3.0

data/lib/inline_template_loader/version.rb

@@ -1,3 +1,3 @@
 module InlineTemplateLoader
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/inline_template_loader.rb

@@ -1,9 +1,17 @@
 require "inline_template_loader/version"
 
 module InlineTemplateLoader
-  def self.load(file = nil)
-    if file.nil?
-      file = caller.first.split(':').first
+  def self.load(arg = nil)
+    if arg.is_a? ::Integer
+      caller_pos = arg
+    elsif
+      caller_pos = 0
+    end
+
+    if arg.is_a? ::String
+      file = arg
+    elsif
+      file = caller[caller_pos].split(':').first
     end
 
     templates = {}
@@ -11,15 +19,17 @@ module InlineTemplateLoader
 
     app, data = ::IO.read(file).gsub("\r\n", "\n").split(/^__END__$/, 2)
 
-    data.each_line do |line|
-      if line =~ /^@@\s*(.*\S)\s*$/
-        sym = $1.to_sym
-      else
-        if sym
-          unless templates[sym]
-            templates[sym] = line
-          else
-            templates[sym] += line
+    if data
+      data.each_line do |line|
+        if line =~ /^@@\s*(.*\S)\s*$/
+          sym = $1.to_sym
+        else
+          if sym
+            unless templates[sym]
+              templates[sym] = line
+            else
+              templates[sym] += line
+            end
           end
         end
       end

data/spec/fixtures/dsl_uses_inline_template_loader.rb

@@ -0,0 +1,21 @@
+require 'inline_template_loader'
+
+class DslUsesInlineTemplateLoader
+  def self.load_template
+    # 0: dsl_uses_inline_template_loader.rb: load_templates
+    # 1: external_file.rb: &block passed for dsl
+    # 2: dsl_uses_inline_template_loader.rb: class_eval
+    # 3: dsl_uses_inline_template_loader.rb: dsl
+    # 4: external_file.rb: top
+
+    @@templates = InlineTemplateLoader.load 4
+  end
+
+  def self.dsl(&block)
+    class_eval &block
+  end
+
+  def self.templates
+    @@templates
+  end
+end

data/spec/fixtures/external_file.rb

@@ -0,0 +1,9 @@
+require File.expand_path('./dsl_uses_inline_template_loader', File.dirname(__FILE__))
+
+DslUsesInlineTemplateLoader.dsl do
+  load_template
+end
+
+__END__
+@@ foo
+This is an external file

data/spec/lib/inline_template_loader_spec.rb

@@ -1,21 +1,56 @@
 require 'inline_template_loader'
 
 describe 'InlineTemplateLoader' do
+  let(:fixtures_dir)  { File.expand_path('../fixtures', File.dirname(__FILE__)) }
+  let(:external_file) { fixtures_dir + '/external_file.rb' }
+  let(:external_file) { fixtures_dir + '/external_file.rb' }
+  let(:external_file_without_templates) { fixtures_dir + '/external_file_without_templates.rb' }
+
   describe '#load' do
-    shared_examples_for 'load templates correctly from this file' do
-      it { should == {foo: "Here is template named foo.\n\n", bar: "Here is template named bar.\n"} }
+    context 'from this file' do
+      shared_examples_for 'load templates correctly from this file' do
+        it { should == {foo: "Here is template named foo.\n\n", bar: "Here is template named bar.\n"} }
+      end
+
+      context 'with filepath' do
+        subject { InlineTemplateLoader.load(__FILE__) }
+
+        it_behaves_like 'load templates correctly from this file'
+      end
+
+      context 'without filepath' do
+        subject { InlineTemplateLoader.load }
+
+        it_behaves_like 'load templates correctly from this file'
+      end
     end
 
-    context 'with filepath' do
-      subject { InlineTemplateLoader.load(__FILE__) }
+    context 'from external file' do
+      shared_examples_for 'load templates correctly from external file' do
+        it { should == {foo: "This is an external file\n"} }
+      end
+
+      context 'with filepath' do
+        subject { InlineTemplateLoader.load(external_file) }
+
+        it_behaves_like 'load templates correctly from external file'
+      end
+
+      context 'with module uses inline template loader' do
+        before do
+          require external_file
+        end
+
+        subject { DslUsesInlineTemplateLoader.templates }
 
-      it_behaves_like 'load templates correctly from this file'
+        it_behaves_like 'load templates correctly from external file'
+      end
     end
 
-    context 'without filepath' do
-      subject { InlineTemplateLoader.load }
+    context 'from external file without templates' do
+      subject { InlineTemplateLoader.load(external_file_without_templates) }
 
-      it_behaves_like 'load templates correctly from this file'
+      it { should == {} }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_template_loader
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -94,6 +94,9 @@ files:
 - inline_template_loader.gemspec
 - lib/inline_template_loader.rb
 - lib/inline_template_loader/version.rb
+- spec/fixtures/dsl_uses_inline_template_loader.rb
+- spec/fixtures/external_file.rb
+- spec/fixtures/external_file_without_templates.rb
 - spec/lib/inline_template_loader_spec.rb
 homepage: ''
 licenses: []
@@ -109,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3902848851121274865
+      hash: 2025653954573289953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3902848851121274865
+      hash: 2025653954573289953
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -126,4 +129,7 @@ signing_key:
 specification_version: 3
 summary: Loads inline template as a Hash
 test_files:
+- spec/fixtures/dsl_uses_inline_template_loader.rb
+- spec/fixtures/external_file.rb
+- spec/fixtures/external_file_without_templates.rb
 - spec/lib/inline_template_loader_spec.rb