i18n-assets 0.0.1 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRhZjRlMjIxODI2MzI2NjUwYzQ0M2UwZjQwOTNjYTgwNjlmNzQwZg==
+    MWE5NDUyNWQxMGQ1MmIzYmY4YjMxMWI4NTJkZWJlMTQ1OTVkZjg1OQ==
   data.tar.gz: !binary |-
-    Yzg4ZWEzZWQ4ZWE0NDZhODZlYzhiZGQwYzQwYWNkODcxYWNjNzExNA==
+    NzUxNjFkNTVhZDQ5YTIwN2RhZjNhMjA1NTI3ZTA1NDVlYjRmZjMyOQ==
 SHA512:
   metadata.gz: !binary |-
-    YTE0MGE0NTk4Y2VhOTRjYzE4NDljZmNiNWI3NDE5YzY0MjAxNWEwMGZlMDEy
-    ODg4ZDExMmQ1ODY0NmVjYzk4MzJhYjQ3OGMwMmVkN2M0YTU5ZjZmM2U5NGIz
-    ZTJiYWQ2YjhkMjEwY2QyZDFhYmVlN2M5MmE2OWQyZTVmNjUzNmY=
+    OTRmNTZmNjIwNmEwOGVhMzQyNmU0MTM2M2VhMjdkYjBkY2MwNjY0MDg2NDg1
+    MTM0NTNmNWVjMzJkYTNmZDk0YTVkYWExMjA4ZDFiODBkM2U0NmNkZDVlMTYx
+    NDExZTA3ZmIxOTg0OTU3M2VhZDViZTY0NTJmMTA1MjQ2NDFhNjI=
   data.tar.gz: !binary |-
-    OGExYWFmMTA1NWIyZTI1NmM3OGJkZDBiMDRlY2YwZjAzY2RmODQ0MTdhNzU3
-    MjhkNDhiMDUzOTYwNjRjODViMjAwNWRmZDQ1YTgwYjc1ODFhNzIzZDY3ZDNk
-    MTZkMzAzNTc5NDM5MTFhNDQ1NjJjMzc0ZDIwNWJiZDkwZWNmOTA=
+    ZmU4ZDk3YTdlN2EyNTRlNmJhMmQyYTBjNjk2OTg4MjI2NjdmY2IxZTA5Y2Y1
+    NDJmM2JkNzVkYzZkMTdhMjNjYTRkNDNiYWE2ZDIwYTk4NTI2MGYzY2Y0NmMy
+    OWUzNWY4YTE2YWQ1NDM1MjljYWNmZDlhNThjMjYxMWVkYTUwY2M=

data/.gitignore

@@ -22,3 +22,5 @@ config/secrets.yml
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+/pkg

data/Gemfile.lock

@@ -0,0 +1,52 @@
+PATH
+  remote: .
+  specs:
+    i18n-assets (0.0.3)
+      actionpack (~> 3.2.18)
+      sprockets (~> 2.2.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (3.2.18)
+      activemodel (= 3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.18)
+      activesupport (= 3.2.18)
+      builder (~> 3.0.0)
+    activesupport (3.2.18)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    builder (3.0.4)
+    erubis (2.7.0)
+    hike (1.2.3)
+    i18n (0.6.9)
+    journey (1.0.4)
+    multi_json (1.10.1)
+    rack (1.4.5)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    sprockets (2.2.2)
+      hike (~> 1.2)
+      multi_json (~> 1.0)
+      rack (~> 1.0)
+      tilt (~> 1.1, != 1.3.0)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.5)
+  i18n-assets!
+  rake

data/README.md

@@ -22,6 +22,8 @@ Just add `.erb` extension to your `.js` and `.css` files and use standard I18n h
 
 On assets precompilation localized versions of your files will be generated.
 
+If you need to prevent `.js.erb` or `.css.erb` files from caching, you can add `config.assets.prevent_caching = true` to the `environments/development.rb` file.
+
 ## Example
 
 You can check an example usage here: https://github.com/maximgladkov/localized_assets_precompilation_example_app

data/i18n-assets.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
 
   spec.add_dependency 'sprockets', "~> 2.2.2"
+  spec.add_dependency 'actionpack', "~> 3.2.18"
 end

data/lib/i18n/assets/sprockets.rb

@@ -0,0 +1,140 @@
+unless defined?(Sprockets::LOCALIZABLE_ASSETS_REGEX)
+  require 'sprockets'
+
+  module Sprockets
+    LOCALIZABLE_ASSETS_EXT = %w( js css )
+    LOCALIZABLE_ASSETS_REGEX = Regexp.new("\\.(?:#{ LOCALIZABLE_ASSETS_EXT * '|' })")
+    LOCALIZABLE_COMPILABLE_ASSETS_REGEX = Regexp.new("\\.(?:#{ LOCALIZABLE_ASSETS_EXT * '|' })\\..+$")
+
+    module Helpers
+      module RailsHelper
+
+        alias_method :asset_path_without_locale, :asset_path
+
+        # prevent asset from caching by adding timestamp
+        def asset_path(source, options = {})
+          path = asset_path_without_locale(source, options)
+
+          if path =~ LOCALIZABLE_ASSETS_REGEX
+            separator = path =~ /\?/ ? '&' : '?'
+            "#{ path }#{ separator }t=#{ Time.now.to_i }"
+          else
+            path
+          end
+        end
+
+        alias_method :path_to_asset, :asset_path
+
+      end
+    end
+
+    class StaticCompiler
+
+      def compile
+        manifest = {}
+        env.each_logical_path(paths) do |logical_path|
+          process = lambda do
+            if asset = env.find_asset(logical_path)
+              digest_path = write_asset(asset)
+              manifest[asset.logical_path] = digest_path
+              manifest[aliased_path_for(asset.logical_path)] = digest_path
+            end
+          end
+
+          if logical_path =~ LOCALIZABLE_ASSETS_REGEX
+            I18n.available_locales.each do |locale|
+              I18n.locale = locale
+              process.call
+            end
+          else
+            process.call
+          end
+        end
+
+        I18n.locale = I18n.default_locale
+
+        write_manifest(manifest) if @manifest
+      end
+
+    end
+
+    class Asset
+
+      alias_method :logical_path_without_locale, :logical_path
+
+      # add locale for css and js files
+      def logical_path
+        path = logical_path_without_locale
+        if !Rails.env.development? && path =~ LOCALIZABLE_ASSETS_REGEX
+          "#{ I18n.locale }/#{ path }"
+        else
+          path
+        end
+      end
+
+      protected
+
+        alias_method :dependency_fresh_without_check?, :dependency_fresh?
+        def dependency_fresh?(environment, dep)
+          return false if Rails.configuration.assets.prevent_caching && dep.pathname.to_s =~ LOCALIZABLE_COMPILABLE_ASSETS_REGEX
+          dependency_fresh_without_check?(environment, dep)
+        end
+
+    end
+
+    class Base
+
+      # set locale for asset request
+      def call(env)
+        locale = extract_locale(env['PATH_INFO'])
+        env['PATH_INFO'].gsub!(Regexp.new("^/#{ locale }"), '') if locale
+        I18n.locale = Rack::Request.new(env).params['locale'] || locale || I18n.default_locale
+        super
+      end
+
+      # add locale to assets cache key
+      def cache_key_for(path, options)
+        "#{path}:#{I18n.locale}:#{options[:bundle] ? '1' : '0'}"
+      end
+
+      private
+
+        def extract_locale(path)
+          locale = path[/^\/([a-z\-_]+?)\//, 1]
+          if I18n.available_locales.map(&:to_s).include? locale
+            locale
+          else
+            nil
+          end
+        end
+
+    end
+
+  end
+
+  module ActionView
+    class AssetPaths
+      alias_method :compute_public_path_without_locale, :compute_public_path
+
+      def compute_public_path(source, dir, options = nil)
+        source = prepend_locale(source) if file_localizable?(source, options) && !file_already_localized?(source)
+        compute_public_path_without_locale(source, dir, options)
+      end
+
+      private
+
+        def prepend_locale(source)
+          "#{ I18n.locale }/#{ source }"
+        end
+
+        def file_localizable?(source, options)
+          source =~ Sprockets::LOCALIZABLE_ASSETS_REGEX || Sprockets::LOCALIZABLE_ASSETS_EXT.include?(options.try(:[], :ext))
+        end
+
+        def file_already_localized?(source)
+          source.starts_with?("#{ I18n.locale }/")
+        end
+
+    end
+  end
+end

data/lib/i18n/assets/version.rb

@@ -1,5 +1,5 @@
 module I18n
   module Assets
-    VERSION = "0.0.1"
+    VERSION = "0.0.3"
   end
 end

data/lib/i18n/assets.rb

@@ -1,5 +1,5 @@
 require "i18n/assets/version"
-require "i18n/assets/manifest"
+require "i18n/assets/sprockets"
 
 module I18n
   module Assets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-assets
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Maxim Gladkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.18
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.18
 description: Ever wanted to use rails localization helpers inside your assets? Your
   dream just came true!
 email:
@@ -62,12 +76,13 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - i18n-assets.gemspec
 - lib/i18n/assets.rb
-- lib/i18n/assets/manifest.rb
+- lib/i18n/assets/sprockets.rb
 - lib/i18n/assets/version.rb
 homepage: https://github.com/maximgladkov/i18n-assets
 licenses:
@@ -94,4 +109,3 @@ signing_key:
 specification_version: 4
 summary: Rails assets localization made easy
 test_files: []
-has_rdoc: 

data/lib/i18n/assets/manifest.rb

@@ -1,89 +0,0 @@
-require 'sprockets'
-
-module Sprockets
-  LOCALIZABLE_ASSETS_REGEX = /\.(?:js|css)/
-
-  module Helpers
-    module RailsHelper
-
-      # add locale to asset_prefix, if assets compiled
-      def asset_prefix_with_locale
-        if Rails.env.development?
-          Rails.application.config.assets.prefix
-        else
-          "#{ Rails.application.config.assets.prefix }/#{ I18n.locale }"
-        end
-      end
-
-      alias_method :asset_path_without_locale, :asset_path
-
-      # prevent asset from caching by adding timestamp
-      def asset_path(source, options = {})
-        assert_prefix = asset_prefix_with_locale
-        asset_path = asset_path_without_locale(source, options)
-
-        if asset_path =~ LOCALIZABLE_ASSETS_REGEX
-          separator = asset_path =~ /\?/ ? '&' : '?'
-          "#{ asset_path }#{ separator }locale=#{ I18n.locale }&t=#{ Time.now.to_i }"
-        else
-          asset_path
-        end
-      end
-      
-      alias_method :path_to_asset, :asset_path
-
-    end
-  end
-
-  class StaticCompiler
-
-    alias_method :compile_without_manifest, :compile
-
-    # run compile for each available locale
-    def compile(*paths)
-      I18n.available_locales.each do |locale|
-        env.logger.info "Compiling assets for #{ locale.upcase } locale..."
-
-        I18n.locale = locale
-
-        manifest = Sprockets::Manifest.new(env, target)
-        manifest.compile *paths
-      end
-
-      I18n.locale = I18n.default_locale
-    end
-
-  end
-
-  class Asset
-
-    alias_method :digest_path_without_locale, :digest_path
-
-    # add locale for css and js files
-    def digest_path
-      digest_path = digest_path_without_locale
-      if digest_path =~ LOCALIZABLE_ASSETS_REGEX
-        "#{ I18n.locale }/#{ digest_path }"
-      else
-        digest_path
-      end
-    end
-
-  end
-
-  class Base
-
-    # set locale for asset request
-    def call(env)
-      I18n.locale = Rack::Request.new(env).params['locale'] || I18n.default_locale
-      super
-    end
-
-    # add locale to assets cache key
-    def cache_key_for(path, options)
-      "#{path}:#{I18n.locale}:#{options[:bundle] ? '1' : '0'}"
-    end
-  
-  end
-
-end