trimmer 0.0.5 → 0.0.6

data/.travis.yml

@@ -0,0 +1,24 @@
+rvm:
+  - 1.9.3
+
+branches:
+  only:
+    - master
+
+bundler_args: --deployment
+
+git:
+  depth: 10
+
+env:
+  global:
+  matrix:
+    - CMD='bundle exec ruby test/spec_trimmer_controller.rb'
+
+notifications:
+  email: false
+
+script: "$CMD"
+
+source_key: "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBck9BYXE4eVBiV0Zobng2ajlxUGhhdEUrVGh4MXRodHc4RzdxTExNZlhXZk9oeWJxCmtuYUlJcFovS00xd1VBa1l2d2diTS9BWWM2SDluNlhzcWR4SEZzeHVOSEJzTlZNMmRHN1FmN252c0N5aXBIWFAKSWRhUWlmeWVYNEx1OTFBUjdVQy9OVlBBWUhSMjVqNzBJQS9YbUlqSHBNRmZpVGdjOFlVVWkzcjZpTUw4Q1JlZwovRmMxZVBvdnBjMkZBRUc0ZmYweFpsSjVjREsraXRwVlFxZlhMMWkvV2c3VWEvWWx4YzNRZ25wdzNyektMN3VJCmg2Slo5aUlUL3N5OGRPUGg4cVVRMWtLT1RjZEtDNExDYkJsMEQ1bzNxcVRaWitaeTZNTFJhRjhVZitVRkxEQkkKQURvQUtZKzlLYTNIekVlOGYrNnlaR3U2RWFZZE1Cd3RrNUJVbFFJREFRQUJBb0lCQVFDV3M2b3NkOS9VZjE3bApvb1ZXM2RnRkVURmFVSThBMkgwazY5dXlhZGYreWg2TlRReVI3MGlQdGxoVmpubkpHNVQ1K3l3VG84cjlDb3NaCklFRG1kb04yU1hJTXZyQmw4QXQ1aHB5MXE3WmFBeDhwZFJYREx0UERwbmU5VlZ2U05uZmFObVk1SzdCNXBTMTkKWEFYZTZWQ054VGNjMWdIZGtoQVJMMjBRaG4xZXVBUzQ3WXR4NE0wQ1FGYWZnUDVaSU92S2VycGN0Wk1heFZmagprNUtrNHYrZFUwL08yS25CSllLTGtTdXphdHZ2ZVBGYjRhOHNYSFNBSkJiajFRL1pNa2ExNnhzeStMUkZoM1M3Cmg1NGhXbVAxVGU0aDdXUC82elo3SldjK1dxRStkY1pleVJIT0J2R3NhT20yV1dRODYvNzFzQnl6ZFlUekJLak0KcTRBa2ZmYmhBb0dCQU5hbDNoWFRsWHNsYnVWMjU3WTBrdDVwU255L2VpbFY3SDRTeUIraWlaNm9jV0I2SWxzeQovMUtyT2g1TUZYbXhzaC8xd0JwV29IQXdrQUhBdlYxNmx1U0VVaGs3aW9FUVk0dlVkMG1qVUhSalpqdGxsZDVVCmZrMnhqdlVHekxuSXltS0lFVlpxbXkwTHR4aGNZOEpjVkx0ZWlKcDV0cWgrWnpDQzdzNzFaeUhkQW9HQkFNNHUKRTBVeVVXVmFyMlhONmdablJ4SEZ4TVlEYlAyeE92OU1lb1A4WkJYUTlMcEh6WklCNUhEVkN3dGt6MUdlRjNJQQpKWWROWjZCY3pLQyt6Q0NMTlg4eW81Q3VlYzVZTEdGRmlmOHk2d240b1Z2RnY1eENDTS9TS2FFUVRUaEsxeGhUCll0Qk4zU29xZ0pSWjZ3M2tNNUR4WGcyS2VVOGtCK2RzWUkwM0RMNFpBb0dBY2xrQWU3NHcxdDYxT2piaTc3VUkKUE1YNHNZWkw3UE5pUGpPQk95RWFrVlFJdWkyMldjRk1OVjBVWkFtQ00wZFByaWo4QXN2OVFtY01nSEtPTHR0Ywp3VFlnaW1LbXdXVGFzeVludWludmRXRnlsOWZoUkFUZEdFU3I5S3AvcThWazA2TExJYTgvSlhzbE9pd1YxUGZkCkI4Z3ZtNk9WaENONmsyUmRGaEd6dEYwQ2dZRUFrU1FnVHFyd1g5QXAveG1vc0I5T0NYWFdZcXFRdERwcVZNUksKenRVQ3c5VFlJclpmUVhSeGt2aDJrT3ZEZ2lvdlNRSlBhT01WbXU4WTRlUE9vTzQrbDY5WE00ZVBtYkc2ZEROVwp4TDdjZEtXQk9iQ0loWUI2NFltSjRxY3VKUDJTVTc2SHBpbmFFay9mT2cvZWgyWG80eFQyNThOZVNGY045VnoyCnp4STh0eWtDZ1lCeEFNb09nSXFWU1VySmJPRDBCNmtpMlpyTGdoVk5zVnltTk42WkRiZlNadmkxRjMrOG5VeWoKUUVsV3JUTzVQaGRTdEZxR3h5RHMxbDVCTUtQdXJQWHBGSGFkL2xxNDhhRURFbFN0WHp4eVE0d1lQSXhsVjNsQQpONFhnMUR4cWZUdzFCSU5wS2grVHh1WUFqSEZFTTNRTzZzK0RaaDI1MUw1KzBqOGYvaHFmNVE9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo="
+

data/History.md

@@ -20,3 +20,8 @@
 
   * Fix /trimmer/en/{translations/templates}.js routes
 
+* Version 0.0.6
+  #####Changed
+
+  * Allow further filtering of keys via :allowed_keys param
+

data/lib/trimmer/controller.rb

@@ -26,13 +26,13 @@ module Trimmer
       case request.path
       when /\/trimmer(\/([^\/]+))*\/translations\.([js]+)$/
         validate_locale($2) if $2 || ($2 && $2.empty?)
-        response = translations($2, $3)
+        response = translations($2, $3, request.params)
       when /\/trimmer\/([^\/]+)\/templates\.([js]+)$/
         validate_locale($1)
         response = templates($1, $2)
       when /\/trimmer\/([^\.|\/]+)\.([js]+)$/
         validate_locale($1)
-        response = resources($1, $2)
+        response = resources($1, $2, request.params)
       else
         response = @app.call(env)
       end
@@ -42,18 +42,36 @@ module Trimmer
 
   protected
 
+    ##
+    # Allow passing 'allowed_keys' parameter to filter returned keys.
+    #
+    # Note: Will only ever return keys that have already been allowed in the initializer.
+    #
+    # @param [Hash] Request parameters
+    #
+    # @return [Array] List of allowed keys (either those configured or filtered list)
+    def filter_by_param(params={})
+      if (sub_keys = params["allowed_keys"])
+        sub_keys.split(',').select do |key|
+          self.allowed_keys.any? {|allowed_key| key.start_with?(allowed_key)}
+        end
+      else
+        self.allowed_keys
+      end
+    end
+
     def templates(locale, ext)
       [200, {'Content-Type' => 'text/javascript'}, [templates_to_js(locale)]]
     end
 
 
-    def translations(locale, ext)
-      [200, {'Content-Type' => 'text/javascript'}, [translations_to_js(:locale => locale, :only => allowed_keys)]]
+    def translations(locale, ext, params={})
+      [200, {'Content-Type' => 'text/javascript'}, [translations_to_js(:locale => locale, :only => filter_by_param(params))]]
     end 
 
     # Exports templates and translations in a single request
-    def resources(locale, ext)
-      opts = {:only => allowed_keys}
+    def resources(locale, ext, params={})
+      opts = {:only => filter_by_param(params)}
       opts[:locale] = locale if locale && !locale.empty?
 
       response = translations_to_js(opts)

data/lib/trimmer/version.rb

@@ -1,3 +1,3 @@
 module Trimmer
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/script/jenkins

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+bundle install --deployment
+
+echo "Running specs..."
+bundle exec ruby test/spec_trimmer_controller.rb

data/test/spec_trimmer_controller.rb

@@ -14,12 +14,17 @@ context Trimmer::Controller do
 
     @def_resources_en = <<-VALUE.strip
 if(typeof(I18n) == 'undefined') { I18n = {}; };
-I18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"}});
+I18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"},\"bif\":{\"key\":\"value\"}});
 Templates = ({"foo":{"bar":"<span>trimmer</span>\\n"}});
 VALUE
 
     @def_translations_en = <<-VALUE.strip
 if(typeof(I18n) == 'undefined') { I18n = {}; };
+I18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"},\"bif\":{\"key\":\"value\"}});
+VALUE
+
+    @def_translations_en_filtered = <<-VALUE.strip
+if(typeof(I18n) == 'undefined') { I18n = {}; };
 I18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"}});
 VALUE
 
@@ -33,13 +38,13 @@ VALUE
 
     @def_resources_es = <<-VALUE.strip
 if(typeof(I18n) == 'undefined') { I18n = {}; };
-I18n.translations = ({\"foo\":{\"trimmer\":\"recortadora\"}});
+I18n.translations = ({\"foo\":{\"trimmer\":\"recortadora\"},\"bif\":{\"key\":\"valor\"}});
 Templates = ({"foo":{"bar":"<span>recortadora</span>\\n"}});
 VALUE
 
     @def_translations_es = <<-VALUE.strip
 if(typeof(I18n) == 'undefined') { I18n = {}; };
-I18n.translations = ({\"foo\":{\"trimmer\":\"recortadora\"}});
+I18n.translations = ({\"foo\":{\"trimmer\":\"recortadora\"},\"bif\":{\"key\":\"valor\"}});
 VALUE
 
     @def_templates_es = <<-VALUE.strip
@@ -48,7 +53,7 @@ VALUE
 
     @def_resources_ca = <<-VALUE.strip
 if(typeof(I18n) == 'undefined') { I18n = {}; };
-I18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"}});
+I18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"},\"bif\":{\"key\":\"value\"}});
 Templates = ({"foo":{"bar":"<span>recortadora</span>\\n"}});
 VALUE
 
@@ -139,12 +144,17 @@ VALUE
 
   specify "should filter translations if allowed_keys option set on Trimmer::Controller instance" do
     request(:path=>'/trimmer/en/translations.js', :allowed_keys => "*.baz").body.should.equal("if(typeof(I18n) == 'undefined') { I18n = {}; };\nI18n.translations = ({});")
-    request(:path=>'/trimmer/en/translations.js', :allowed_keys => "*.foo").body.should.equal(@def_translations_en)
+    request(:path=>'/trimmer/en/translations.js', :allowed_keys => "*.foo").body.should.equal(@def_translations_en_filtered)
+    request(:path=>'/trimmer/en/translations.js', :allowed_keys => ["*.foo", "*.bif"]).body.should.equal(@def_translations_en)
+  end
+
+  specify "should further filter translations if allowed_keys is passed as a parameter" do
+    request(:path=>'/trimmer/en/translations.js?allowed_keys=*.foo', :allowed_keys => ["*.bif", "*.foo"]).body.should.equal(@def_translations_en_filtered)
   end
 
   specify "should render all translations if no locale" do
     request(:path=>'/trimmer/translations.js').body.should.equal(<<-RESP.strip)
-if(typeof(I18n) == 'undefined') { I18n = {}; };\nI18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"},\"en\":{\"foo\":{\"trimmer\":\"trimmer\"}},\"es\":{\"foo\":{\"trimmer\":\"recortadora\"}}});
+if(typeof(I18n) == 'undefined') { I18n = {}; };\nI18n.translations = ({\"foo\":{\"trimmer\":\"trimmer\"},\"bif\":{\"key\":\"value\"},\"en\":{\"foo\":{\"trimmer\":\"trimmer\"},\"bif\":{\"key\":\"value\"}},\"es\":{\"foo\":{\"trimmer\":\"recortadora\"},\"bif\":{\"key\":\"valor\"}}});
 RESP
   end
 

data/test/test_data/locales/en.yml

@@ -1,3 +1,5 @@
 en:
   foo:
     trimmer: "trimmer"
+  bif:
+    key: "value"

data/test/test_data/locales/es.yml

@@ -1,3 +1,5 @@
 es:
   foo:
     trimmer: "recortadora"
+  bif:
+    key: "valor"

data/trimmer.gemspec

@@ -4,6 +4,7 @@ require "trimmer/version"
 
 Gem::Specification.new do |s|
   s.name        = "trimmer"
+  s.license     = "MIT"
   s.version     = Trimmer::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pablo Villalba", "Saimon Moore"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -133,7 +133,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
+- Gemfile.lock
 - History.md
 - README.md
 - Rakefile
@@ -142,6 +144,7 @@ files:
 - lib/trimmer/core.rb
 - lib/trimmer/i18n.rb
 - lib/trimmer/version.rb
+- script/jenkins
 - test/spec_trimmer_controller.rb
 - test/test_data/complex_templates/bar/deportes.haml
 - test/test_data/complex_templates/foo/manchu.haml
@@ -154,7 +157,8 @@ files:
 - test/test_helper.rb
 - trimmer.gemspec
 homepage: https://github.com/teambox/trimmer
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: