sinatra-ember 0.0.1 → 0.0.2

data/README.md

@@ -2,12 +2,14 @@
 
 Helpers for serving an [Ember.js][ember] app from [Sinatra][sinatra].
 
-- Pre-compile handlebars templates from separate view files rather than littering them throughout your html.
+- Pre-compile handlebars templates from separate view files rather than
+  littering them throughout your html.
 
 
 ## Installation
 
-You can install Sinatra Ember as a Ruby gem. You can install it via `gem install`.
+You can install Sinatra Ember as a Ruby gem. You can install it via `gem
+install`.
 
 ``` console
 $ gem install sinatra-ember
@@ -31,13 +33,69 @@ require 'sinatra/ember'
 
 class App < Sinatra::Base
   register Sinatra::Ember
-  serve_templates '/js/templates.js'
+  ember {
+    templates '/js/templates.js', ['app/templates/**/*.hbs'], :relative_to => 'app/templates'
+
+    # optional; defaults to :path
+    template_name_style :path
+  }
 end
 ```
 
+
+## API reference
+
+### ember.templates
+
+Combines templates in the given paths into a single asset of those templates in
+javascript form.
+
+```ruby
+# Usage:
+ember {
+  templates 'URI', [PATH, PATH, ...], OPTIONS_HASH
+}
+```
+
+`URI`
+> a string defining where the templates will be served.
+
+`PATH`
+> a string or glob pattern describing a file or files that should be included
+
+#### Options
+
+`:relative_to`
+> a string describing a path relative to the Sinatra root from which the
+> template names should be made relative to when using the `:path` template
+> name style. For example, if `:relative_to` is `app/templates` and the `PATH`
+> `app/templates/views/post.hbs` will be named `views/post`.
+
+
+### ember.template\_name\_style
+
+Defines the style by which template names will be derived from the paths.
+
+```ruby
+# Usage:
+ember {
+  template_name_style :basename
+}
+```
+
+Valid options include:
+
+`:path`
+> the template will be named as a relative path to the template file
+
+`:basename`
+> the template will be named as the basename of the template file
+
+
 ## Sinatra AssetPack
 
-If you're using the [sinatra-assetpack][assetpack] gem, add your served templates to a package.
+If you're using the [sinatra-assetpack][assetpack] gem, add your served
+templates to a package.
 
 
 [assetpack]: https://github.com/rstacruz/sinatra-assetpack

data/lib/sinatra/ember.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module Ember
     def self.version
-      "0.0.1"
+      "0.0.2"
     end
 
     def self.registered(app)
@@ -17,26 +17,39 @@ module Sinatra
       end
 
       def ember_init!
-        ember.template_packages.each do |route, globs|
+        ember.template_packages.each do |route, spec|
           get route do
             mtime, output = @template_cache.fetch(route) do
               # find all the template files
-              paths = globs.map do |glob|
+              paths = spec.globs.map do |glob|
                 glob = File.expand_path(File.join(settings.root, glob))
                 Dir[glob].map { |x| x.squeeze('/') }
               end
-              paths = paths.flatten.uniq
 
-              # build up template hash
-              template_paths = {}
-              paths.each do |path|
-                template_paths[File.basename(path, '.hbs')] = path
+              # define the portion of the path to remove
+              remove = settings.root
+              if spec.opts[:relative_to].empty?
+                remove = settings.root
+              else
+                remove = File.join(remove, spec.opts[:relative_to])
               end
+              remove = File.expand_path(remove)
 
               # build up the javascript
-              templates = template_paths.map do |(name, path)|
-                content = File.read(path)
-                "Ember.TEMPLATES[#{name.inspect}] = Ember.Handlebars.compile(#{content.inspect});"
+              templates = paths.map do |files|
+                files.map do |file|
+                  # derive the template name
+                  tmpl_name = file.sub(/\.(handlebars|hbs|hjs)$/, '')
+                  if settings.ember.template_name_style == :path
+                    tmpl_name.sub!(/^#{Regexp.quote(remove)}\//, '')
+                  else
+                    tmpl_name = File.basename(tmpl_name)
+                  end
+
+                  # add the template content
+                  content = File.read(file)
+                  "Ember.TEMPLATES[#{tmpl_name.inspect}] = Ember.Handlebars.compile(#{content.inspect});"
+                end
               end
 
               # wrap it up in a closure
@@ -48,7 +61,7 @@ module Sinatra
               output = output.strip.gsub(/^ {16}/, '')
 
               # compute the maximum mtime for all paths
-              mtime = paths.map do |path|
+              mtime = paths.flatten.map do |path|
                 if File.file?(path)
                   File.mtime(path).to_i
                 end
@@ -70,13 +83,37 @@ module Sinatra
 
       def initialize(app, &block)
         @app = app
+        @template_name_style = :path
         @template_packages = {}
 
         instance_eval(&block)
       end
 
-      def templates(route, files=[])
-        @template_packages[route] = files
+      def templates(route, files=[], opts={})
+        opts_defaults = {
+          :relative_to => '',
+        }
+        opts = opts_defaults.merge(opts)
+        @template_packages[route] = TemplateSpec.new(route, files, opts)
+      end
+
+      def template_name_style(*args)
+        val = args.first
+        if not val.nil?
+          @template_name_style = val
+        end
+        return @template_name_style
+      end
+      alias :template_name_style= :template_name_style
+    end
+
+    class TemplateSpec
+      attr_accessor :route, :globs, :opts
+
+      def initialize(route, globs, opts)
+        @route = route
+        @globs = globs
+        @opts = opts
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-ember
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70219783856880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70219783856880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serves Ember Handlebars pages.
 email:
 - gamepoet@gmail.com
@@ -53,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Helpers for serving an Ember.js app from Sinatra.