handlebars-rails 0.3.2 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d8995def3a47bca84c0742b7037243faba037bc
-  data.tar.gz: fc4c39725c7427b0665c6655c36ccf4ee484bd59
+  metadata.gz: c0724fd16c6efec8f6270a5ba575c6397338cd8d
+  data.tar.gz: 60824dad6a58bdf4fa88a0c158808640b005dcec
 SHA512:
-  metadata.gz: 84893458ce6576d3e747a178e54b90891c20b2109bbb7b1ee298391aa2e6a9b2edb1370198ac04c8d8fc1475edda23eb4aca37dd67e0d6c444ef5aa610815afc
-  data.tar.gz: b39c8235f3953ab2b6985b337a744bc6cccffc02a4179b36787345343bb99af96791013998d4d019f8a41ff1f941bed817cd61e52ace91c2ceaed4a803573967
+  metadata.gz: 18f8a43d3feb53336faee5fc89c9faddbc0558325a45ab36c25d836ffc07f0e90e10f97aca982b208d0725fcda33153d5adbe2b11b70a2e9a4bc607681005677
+  data.tar.gz: fa47ee77b6941c79a8d11e736f40d01958dddd086291cea63ba7ed0ac9f19357ee2d02b54958a7c523bb9cd56e2873b48dd03785f2ff854987b10c1127dbc083

data/.gitignore

@@ -1,2 +1,3 @@
 .bundle
-Gemfile.lock
+Gemfile.lock
+/pkg/*.gem

data/handlebars-rails.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.specification_version = 2
   gem.add_runtime_dependency      'rails',        '>= 3.0'
   gem.add_runtime_dependency      'handlebars', '~> 0.5.0'
+  gem.add_runtime_dependency      'barber', '~> 0.4.2'
 
   gem.add_development_dependency  'rake'
   gem.add_development_dependency  'redgreen',     '~> 1.2'

data/lib/handlebars-rails/tilt.rb

@@ -1,4 +1,5 @@
 require 'tilt'
+require 'barber'
 
 module Handlebars
   class Tilt < ::Tilt::Template
@@ -11,53 +12,12 @@ module Handlebars
     end
 
     def evaluate(scope, locals, &block)
-      scope.extend Scope
-      hbsc = Handlebars::TemplateHandler.handlebars.precompile data
-      if scope.partial?
-        <<-JS
-        // generated by handlebars-rails #{Handlebars::Rails::VERSION}
-        ;(function() {
-          var template = Handlebars.template
-          var fucknet = true
-          Handlebars.registerPartial('#{scope.partial_name}', template(#{hbsc}));
-        })()
-        JS
-      else
-        <<-JS
-        //generated by handlebars-rails #{Handlebars::Rails::VERSION}
-        ;(function() {
-          var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-          #{scope.template_path}
-          namespace['#{scope.template_name}'] = template(#{hbsc});
-        })()
-        JS
-      end
-    end
-
-    module Scope
-      def partial?
-        File.basename(logical_path).start_with?('_')
-      end
-
-      def partial_name
-        "#{File.dirname(logical_path)}/#{File.basename(logical_path, '.hbs').gsub(/^_/,'')}".gsub(/^\.+/,'')
-      end
-
-      def template_path
-        branches = File.dirname(logical_path).split('/').reject{|p| p == '.'}
-        <<-ASSIGN
-        var branches = #{branches.inspect}
-        var namespace = templates
-        for (var path = branches.shift(); path; path = branches.shift()) {
-            namespace[path] = namespace[path] || {}
-            namespace = namespace[path]
-        }
-        ASSIGN
-      end
-
-      def template_name
-        File.basename(logical_path, '.hbs')
-      end
+      source = Barber::InlinePrecompiler.call data
+      is_partial = File.basename(scope.logical_path).start_with?('_')
+      template_name = scope.logical_path.sub(%r~^templates/~, "")
+      template_name.gsub!(%r~/_~, '/') if is_partial
+      target = is_partial ?  "partials" : "templates"      
+      "if (!Handlebars.templates) Handlebars.templates = {};Handlebars.#{target}['#{template_name}']=#{source}"
     end
   end
 end

data/lib/handlebars-rails/version.rb

@@ -1,5 +1,5 @@
 module Handlebars
   module Rails
-    VERSION = "0.3.2"
+    VERSION = "0.4.2"
   end
 end

data/spec/precompile_spec.rb

@@ -19,7 +19,7 @@ describe "sprockets integration" do
     @context.runtime.eval(source).call(@context.handlebars)
   end
   it 'precompiles templates' do
-    @context.handlebars.templates['foobars']['whole'].call('thing' => 'enchilada').should match 'whole enchilada'
+    @context.handlebars.templates['foobars/whole'].call('thing' => 'enchilada').should match 'whole enchilada'
   end
   it 'precompiles partials' do
     @context.compile('{{>foobars/partial}}').call(:thing => 'enchilada').should match 'partial enchilada'

data/spec/render_spec.rb

@@ -4,9 +4,9 @@ require 'spec_helper'
 describe Handlebars::TemplateHandler do
 
   before do
-    @lookup_context = mock('ActionView::LookupContext', :prefixes => [:one])
+    @lookup_context = double('ActionView::LookupContext', :prefixes => [:one])
     @assigns = {:name => 'World'}
-    @view = mock('ActionView::Base', :lookup_context => @lookup_context, :assigns => @assigns)
+    @view = double('ActionView::Base', :lookup_context => @lookup_context, :assigns => @assigns)
   end
 
   it 'should be able to render a basic HTML template' do
@@ -19,7 +19,7 @@ describe Handlebars::TemplateHandler do
 
   describe 'an embedded handlebars partial' do
     before do
-      @lookup_context.stub(:find).with("to/hbs", [:one, ''], true) {mock(:source => "{{name}}", :handler => Handlebars::TemplateHandler)}
+      @lookup_context.stub(:find).with("to/hbs", [:one, ''], true) {double(:source => "{{name}}", :handler => Handlebars::TemplateHandler)}
     end
 
     it 'renders' do
@@ -29,7 +29,7 @@ describe Handlebars::TemplateHandler do
 
   describe 'an embedded erb partial' do
     before do
-      @lookup_context.stub(:find).with("to/erb", [:one, ''], true) {mock(:source => "<%= @name %>", :handler => mock(:ERB))}
+      @lookup_context.stub(:find).with("to/erb", [:one, ''], true) {double(:source => "<%= @name %>", :handler => double(:ERB))}
       @view.stub(:render).with(hash_including(:partial => 'to/erb')) {|options| options[:locals][:name]}
     end
     it 'renders' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handlebars-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.2
 platform: ruby
 authors:
 - James A. Rosen
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,6 +40,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: barber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement