trimmer 0.0.3 → 0.0.4

data/README.md

@@ -3,4 +3,53 @@ Trimmer Controller
 
 Rack endpoint to make templates and i18n translations available in javascript.
 
-See specs for details.
+See specs for more details.
+
+How it works
+------------
+
+Trimmer adds additional routes to your app:
+
+- /trimmer/en.js
+- /trimmer/es.js
+- etc
+
+This defines two variables in your app: I18n.translations and Templates.
+
+Translations
+------------
+
+Trimmer will serve the translations you define from your config/locales files available as a JS object.
+
+Templates
+---------
+
+This is the cool part. You can define your own structure of client-side templates which will be:
+
+1. Rendered by Rails (where you can access ERB, helpers and Rails i18n)
+2. Available in JS as templates
+
+To add templates, create a folder structure like this:
+
+    app/
+      templates/
+        users/
+          index.jade.erb
+          show.jade.erb
+        settings.jade.erb
+
+This will create a JS object with this structure:
+
+    Templates = {
+      users: {
+        index: "...",
+        show: "..."
+      },
+      settings: "..."
+    }
+
+
+          
+          
+
+

data/lib/trimmer/controller.rb

@@ -3,6 +3,7 @@ require 'rack/request'
 require 'json'
 require 'tilt'
 require 'i18n'
+require 'active_support/ordered_hash'
 
 module Trimmer
 
@@ -101,7 +102,7 @@ module Trimmer
           end
         end
       end
-      templates
+      ActiveSupport::OrderedHash[templates.sort]
     end
 
     # Dumps all the translations. Options you can pass:

data/lib/trimmer/i18n.rb

@@ -4,7 +4,7 @@ module Trimmer
   module I18n
 
     def raise_all_exceptions(*args)
-      raise args.first
+      raise args.first.to_exception
     end
 
     def with_exception_handler(tmp_exception_handler = nil)

data/lib/trimmer/version.rb

@@ -1,3 +1,3 @@
 module Trimmer
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/spec_trimmer_controller.rb

@@ -25,6 +25,10 @@ VALUE
 
     @def_templates_en = <<-VALUE.strip
 Templates = ({"foo":{"bar":"<span>trimmer</span>\\n"}});
+VALUE
+
+    @def_complex_templates_en = <<-VALUE.strip
+Templates = ({"bar":{"deportes":"ES UN BAR\\n"},"foo":{"manchu":"ES UN CHINO\\n","mar":"ES MALO\\n"}});
 VALUE
 
     @def_resources_es = <<-VALUE.strip
@@ -156,5 +160,8 @@ RESP
     end
   end
 
+  specify "should return templates in alphabetical order" do
+    request(:path=>'/trimmer/en/templates.js', :templates_dir => complex_templates_dir).body.should.equal(@def_complex_templates_en)
+  end
 end
 

data/test/test_data/complex_templates/bar/deportes.haml

@@ -0,0 +1 @@
+ES UN BAR

data/test/test_data/complex_templates/foo/manchu.haml

@@ -0,0 +1 @@
+ES UN CHINO

data/test/test_data/complex_templates/foo/mar.haml

@@ -0,0 +1 @@
+ES MALO

data/test/test_helper.rb

@@ -48,6 +48,10 @@ class Test::Unit::TestCase
     File.dirname(__FILE__) + '/test_data/templates_missing_t'
   end
 
+  def complex_templates_dir
+    File.dirname(__FILE__) + '/test_data/complex_templates'
+  end
+
 end
 
 

data/trimmer.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency 'activesupport', '>= 3.0'
   s.add_dependency 'rack', '~> 1.1'
   s.add_dependency 'i18n', '~> 0.6.0'
   s.add_dependency 'tilt', '~> 1.3.3'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: trimmer
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Pablo Villalba
@@ -16,13 +16,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +02:00
+date: 2012-01-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,11 +48,11 @@ dependencies:
         - 1
         version: "1.1"
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: i18n
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +64,11 @@ dependencies:
         - 0
         version: 0.6.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: tilt
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,11 +80,11 @@ dependencies:
         - 3
         version: 1.3.3
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: test-spec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -81,11 +96,11 @@ dependencies:
         - 0
         version: 0.9.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -97,11 +112,11 @@ dependencies:
         - 25
         version: 3.0.25
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,7 +127,7 @@ dependencies:
         - 1
         version: "1.1"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: 
 email: 
 - pablo@teambox.com
@@ -135,6 +150,9 @@ files:
 - lib/trimmer/i18n.rb
 - lib/trimmer/version.rb
 - test/spec_trimmer_controller.rb
+- test/test_data/complex_templates/bar/deportes.haml
+- test/test_data/complex_templates/foo/manchu.haml
+- test/test_data/complex_templates/foo/mar.haml
 - test/test_data/locales/ca.yml
 - test/test_data/locales/en.yml
 - test/test_data/locales/es.yml
@@ -172,12 +190,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: trimmer
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rack endpoint to make templates and i18n translations available in javascript
 test_files: 
 - test/spec_trimmer_controller.rb
+- test/test_data/complex_templates/bar/deportes.haml
+- test/test_data/complex_templates/foo/manchu.haml
+- test/test_data/complex_templates/foo/mar.haml
 - test/test_data/locales/ca.yml
 - test/test_data/locales/en.yml
 - test/test_data/locales/es.yml