deas-erubis 0.5.0 → 0.5.1

checksums.yaml

@@ -0,0 +1,7 @@
+--- 
+SHA1: 
+  data.tar.gz: 14a40f9a2156fb042ae7aefccadeb3e33f62c1b2
+  metadata.gz: 32bdec58016585f5f676dea9100fa80a30a236c5
+SHA512: 
+  data.tar.gz: c03d7b4af3b4cfa33b44699bc976929274e35f537b4ac9d6fbdc0653c1022345db4d6ec019f9c53604f4e21ca79a52a9322068a870647aa4fe96605f09ff09b3
+  metadata.gz: 6943df339e7905f07f7bbe17356c4f7b5f6a3af65ad42d4754f894a5279f1a201ad09d6e936302d0106dcdcd28355ecbe63b4c8933a5060962dd370e9c2c0dc5

data/Gemfile

@@ -2,5 +2,4 @@ source "https://rubygems.org"
 
 gemspec
 
-gem 'rake', "~> 10.4.0"
-gem 'pry',  "~> 0.9.0"
+gem 'pry', "~> 0.9.0"

data/deas-erubis.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |gem|
   gem.version     = Deas::Erubis::VERSION
   gem.authors     = ["Kelly Redding", "Collin Redding"]
   gem.email       = ["kelly@kellyredding.com", "collin.redding@me.com"]
-  gem.description = %q{Deas template engine for rendering erb templates using Erubis}
   gem.summary     = %q{Deas template engine for rendering erb templates using Erubis}
+  gem.description = %q{Deas template engine for rendering erb templates using Erubis}
   gem.homepage    = "http://github.com/redding/deas-erubis"
   gem.license     = 'MIT'
 
@@ -18,10 +18,10 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency("assert", ["~> 2.15"])
+  gem.add_development_dependency("assert", ["~> 2.15.1"])
 
-  gem.add_dependency("deas",        ["~> 0.39"])
+  gem.add_dependency("deas",        ["~> 0.39.2"])
   gem.add_dependency("erubis")
-  gem.add_dependency("much-plugin", ["~> 0.1"])
+  gem.add_dependency("much-plugin", ["~> 0.1.0"])
 
 end

data/lib/deas-erubis.rb

@@ -39,6 +39,8 @@ module Deas::Erubis
       self.erb_source.render(template_name, locals, &content)
     end
 
+    # this is used when chaining engines where another engine initially loads the
+    # template file
     def compile(template_name, compiled_content)
       self.erb_source.compile(template_name, compiled_content)
     end

data/lib/deas-erubis/source.rb

@@ -7,7 +7,6 @@ module Deas::Erubis
 
   class Source
 
-    EXT           = '.erb'.freeze
     BUFVAR_NAME   = '@_erb_buf'.freeze
     DEFAULT_ERUBY = ::Erubis::Eruby
 
@@ -22,12 +21,12 @@ module Deas::Erubis
       @default_source = opts[:default_source]
     end
 
-    def render(file_name, locals, &content)
-      load(file_name).evaluate(@context_class.new(@default_source, locals), &content)
+    def render(template_name, locals, &content)
+      load(template_name).evaluate(@context_class.new(@default_source, locals), &content)
     end
 
-    def compile(filename, content)
-      template(filename, content).evaluate(@context_class.new(@default_source, {}))
+    def compile(template_name, content)
+      template(template_name, content).evaluate(@context_class.new(@default_source, {}))
     end
 
     def template(filename, content)
@@ -45,16 +44,16 @@ module Deas::Erubis
 
     private
 
-    def load(file_name)
-      @cache[file_name] ||= begin
-        filename = source_file_path(file_name).to_s
+    def load(template_name)
+      @cache[template_name] ||= begin
+        filename = source_file_path(template_name).to_s
         content = File.send(File.respond_to?(:binread) ? :binread : :read, filename)
         template(filename, content)
       end
     end
 
-    def source_file_path(file_name)
-      self.root.join("#{file_name}#{EXT}").to_s
+    def source_file_path(template_name)
+      Dir.glob(self.root.join("#{template_name}*")).first
     end
 
     def build_context_class(opts)
@@ -92,9 +91,9 @@ module Deas::Erubis
     end
 
     class NullCache
-      def [](file_name);         end
-      def []=(file_name, value); end
-      def keys; [];              end
+      def [](template_name);         end
+      def []=(template_name, value); end
+      def keys; [];                  end
     end
 
   end

data/lib/deas-erubis/version.rb

@@ -1,4 +1,4 @@
 module Deas; end
 module Deas::Erubis
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/test/support/templates/basic_alt.erubis

@@ -0,0 +1,2 @@
+<h1>name: <%= name %></h1>
+<h2>local1: <%= local1 %></h2>

data/test/system/template_engine_tests.rb

@@ -10,9 +10,9 @@ class Deas::Erubis::TemplateEngine
     setup do
       @view = OpenStruct.new({
         :identifier => Factory.integer,
-        :name => Factory.string
+        :name       => Factory.string
       })
-      @locals = { 'local1' => Factory.string }
+      @locals  = { 'local1' => Factory.string }
       @content = Proc.new{ "<span>some content</span>" }
 
       @engine = Deas::Erubis::TemplateEngine.new('source_path' => TEMPLATE_ROOT)
@@ -40,12 +40,12 @@ class Deas::Erubis::TemplateEngine
     end
 
     should "compile raw template markup" do
-      file_name = 'compile'
-      file_path = TEMPLATE_ROOT.join("#{file_name}#{Deas::Erubis::Source::EXT}").to_s
-      file_content = File.read(file_path)
+      template_name = 'compile'
+      file_path     = TEMPLATE_ROOT.join("#{template_name}.erb").to_s
+      file_content  = File.read(file_path)
 
       exp = Factory.compile_erb_rendered(subject)
-      assert_equal exp, subject.compile(file_name, file_content)
+      assert_equal exp, subject.compile(template_name, file_content)
     end
 
   end

data/test/unit/source_tests.rb

@@ -12,10 +12,6 @@ class Deas::Erubis::Source
     end
     subject{ @source_class }
 
-    should "know its extension" do
-      assert_equal '.erb',   subject::EXT
-    end
-
     should "know the bufvar name to use" do
       assert_equal '@_erb_buf', subject::BUFVAR_NAME
     end
@@ -51,15 +47,6 @@ class Deas::Erubis::Source
       assert_equal eruby, source.eruby_class
     end
 
-    should "build template objects for template files" do
-      filename = 'basic'
-      template = subject.template(filename, Factory.string)
-
-      assert_equal filename,                          template.filename
-      assert_equal subject.eruby_class,               template.eruby_class
-      assert_equal Deas::Erubis::Source::BUFVAR_NAME, template.eruby_bufvar
-    end
-
     should "not cache templates by default" do
       assert_kind_of NullCache, subject.cache
     end
@@ -120,21 +107,30 @@ class Deas::Erubis::Source
       assert_equal default_source, context.instance_variable_get('@default_source')
     end
 
+    should "build template objects for template files" do
+      filename = 'basic'
+      template = subject.template(filename, Factory.string)
+
+      assert_equal filename,                          template.filename
+      assert_equal subject.eruby_class,               template.eruby_class
+      assert_equal Deas::Erubis::Source::BUFVAR_NAME, template.eruby_bufvar
+    end
+
   end
 
   class RenderTests < InitTests
     desc "`render` method"
     setup do
-      @file_name   = "basic"
+      @template_name = ['basic', 'basic_alt'].choice
       @file_locals = {
         'name'   => Factory.string,
         'local1' => Factory.integer
       }
     end
 
-    should "render a template for the given file name and return its data" do
+    should "render a template for the given template name and return its data" do
       exp = Factory.basic_erb_rendered(@file_locals)
-      assert_equal exp, subject.render(@file_name, @file_locals)
+      assert_equal exp, subject.render(@template_name, @file_locals)
     end
 
     should "pass its default source to its context class" do
@@ -144,7 +140,7 @@ class Deas::Erubis::Source
       Assert.stub(source.context_class, :new) do |s, l|
         context_class = ContextClassSpy.new(s, l)
       end
-      source.render(@file_name, @file_locals)
+      source.render(@template_name, @file_locals)
 
       assert_equal default_source, context_class.default_source
     end
@@ -157,12 +153,12 @@ class Deas::Erubis::Source
       @source = @source_class.new(@root, :cache => true)
     end
 
-    should "cache templates by their file name" do
+    should "cache templates by their template name" do
       exp = Factory.basic_erb_rendered(@file_locals)
-      assert_equal exp, @source.render(@file_name, @file_locals)
+      assert_equal exp, @source.render(@template_name, @file_locals)
 
-      assert_equal [@file_name], @source.cache.keys
-      assert_kind_of Template, @source.cache[@file_name]
+      assert_equal [@template_name], @source.cache.keys
+      assert_kind_of Template, @source.cache[@template_name]
     end
 
   end
@@ -175,7 +171,7 @@ class Deas::Erubis::Source
 
     should "not cache templates" do
       exp = Factory.basic_erb_rendered(@file_locals)
-      assert_equal exp, @source.render(@file_name, @file_locals)
+      assert_equal exp, @source.render(@template_name, @file_locals)
 
       assert_equal [], @source.cache.keys
     end
@@ -185,13 +181,13 @@ class Deas::Erubis::Source
   class RenderContentTests < RenderTests
     desc "when yielding to a given content block"
     setup do
-      @file_name = "yield"
+      @template_name = "yield"
       @content = Proc.new{ "<span>some content</span>" }
     end
 
-    should "render the template for the given file name and return its data" do
+    should "render the template for the given template name and return its data" do
       exp = Factory.yield_erb_rendered(@file_locals, &@content)
-      assert_equal exp, subject.render(@file_name, @file_locals, &@content)
+      assert_equal exp, subject.render(@template_name, @file_locals, &@content)
     end
 
   end
@@ -199,7 +195,7 @@ class Deas::Erubis::Source
   class CompileTests < InitTests
     desc "`compile` method"
 
-    should "compile raw content file name and return its data" do
+    should "evaluate raw template output and return it" do
       raw = "<p><%= 1 + 1 %></p>"
       exp = "<p>2</p>"
       assert_equal exp, subject.compile('compile', raw)
@@ -216,11 +212,11 @@ class Deas::Erubis::Source
 
     should have_imeths :[], :[]=, :keys
 
-    should "take a file name and return nothing on index" do
+    should "take a template name and return nothing on index" do
       assert_nil subject[Factory.path]
     end
 
-    should "take a file name and value and do nothing on index write" do
+    should "take a template name and value and do nothing on index write" do
       assert_nothing_raised do
         subject[Factory.path] = Factory.string
       end

data/test/unit/template_engine_tests.rb

@@ -16,7 +16,7 @@ class Deas::Erubis::TemplateEngine
     subject{ @engine }
 
     should have_imeths :erb_source, :erb_handler_local, :erb_logger_local
-    should have_imeths :render, :partial
+    should have_imeths :render, :partial, :compile
 
     should "be a Deas template engine" do
       assert_kind_of Deas::TemplateEngine, subject

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas-erubis
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,67 +10,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-11-24 00:00:00 Z
+date: 2016-04-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: assert
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 15
-        version: "2.15"
+        version: 2.15.1
   type: :development
-  name: assert
   version_requirements: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: deas
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 69
-        segments: 
-        - 0
-        - 39
-        version: "0.39"
+        version: 0.39.2
   type: :runtime
-  name: deas
   version_requirements: *id002
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: erubis
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - &id005 
+      - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
-  name: erubis
   version_requirements: *id003
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: much-plugin
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 1
-        version: "0.1"
+        version: 0.1.0
   type: :runtime
-  name: much-plugin
   version_requirements: *id004
-  prerelease: false
 description: Deas template engine for rendering erb templates using Erubis
 email: 
 - kelly@kellyredding.com
@@ -92,7 +68,6 @@ files:
 - Gemfile
 - LICENSE
 - README.md
-- Rakefile
 - deas-erubis.gemspec
 - lib/deas-erubis.rb
 - lib/deas-erubis/source.rb
@@ -104,7 +79,8 @@ files:
 - test/support/templates/_partial.erb
 - test/support/templates/_partial_no_locals.erb
 - test/support/templates/_yield_partial.erb
-- test/support/templates/basic.erb
+- test/support/templates/basic.html.erb
+- test/support/templates/basic_alt.erubis
 - test/support/templates/compile.erb
 - test/support/templates/view.erb
 - test/support/templates/with_capture_partial.erb
@@ -119,35 +95,25 @@ files:
 homepage: http://github.com/redding/deas-erubis
 licenses: 
 - MIT
+metadata: {}
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id005
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  - *id005
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Deas template engine for rendering erb templates using Erubis
 test_files: 
 - test/helper.rb
@@ -155,7 +121,8 @@ test_files:
 - test/support/templates/_partial.erb
 - test/support/templates/_partial_no_locals.erb
 - test/support/templates/_yield_partial.erb
-- test/support/templates/basic.erb
+- test/support/templates/basic.html.erb
+- test/support/templates/basic_alt.erubis
 - test/support/templates/compile.erb
 - test/support/templates/view.erb
 - test/support/templates/with_capture_partial.erb

data/Rakefile

@@ -1 +0,0 @@
-require "bundler/gem_tasks"