fingerjam 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/fingerjam.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fingerjam}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Hoeksema"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     "lib/fingerjam.rb",
     "lib/fingerjam/base.rb",
     "lib/fingerjam/capistrano.rb",
+    "lib/fingerjam/fix_jammit_encoding.rb",
     "lib/fingerjam/helpers.rb",
     "lib/fingerjam/jammit.rb",
     "lib/fingerjam/railtie.rb",

data/lib/fingerjam/capistrano.rb

@@ -3,7 +3,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :fingerjam do
 
     desc "Package, lock and upload assets"
-    task :upload, { :roles => :web } do
+    task :upload_public, { :roles => :web } do
       run_locally "rake fingerjam:package"
       run_locally "rake fingerjam:lock"
 
@@ -20,8 +20,15 @@ Capistrano::Configuration.instance(:must_exist).load do
       top.upload(lockfile, File.join(release_path, "config", "assets.lock.yml"))
     end
 
+    desc "Upload lockfile"
+    task :upload_lockfile, { :roles => :app } do
+      lockfile = File.realpath(File.join("config", "assets.lock.yml"))
+      top.upload(lockfile, File.join(release_path, "config", "assets.lock.yml"))
+    end
+
   end
 
-  after "deploy:finalize_update", "fingerjam:upload"
+  after "deploy:finalize_update", "fingerjam:upload_public"
+  after "deploy:finalize_update", "fingerjam:upload_lockfile"
 
 end

data/lib/fingerjam/fix_jammit_encoding.rb

@@ -0,0 +1,18 @@
+# Monkey patch Jammit to fix encoding issue
+module Jammit
+
+  class Compressor
+
+    def compress_js(paths)
+      if (jst_paths = paths.grep(Jammit.template_extension_matcher)).empty?
+        js = concatenate(paths)
+      else
+        js = concatenate(paths - jst_paths) + compile_jst(jst_paths)
+      end
+      js = js.force_encoding('utf-8')
+      Jammit.compress_assets ? @js_compressor.compress(js) : js
+    end
+    
+  end
+  
+end

data/lib/fingerjam.rb

@@ -1,4 +1,5 @@
 require "fingerjam/base"
 require "fingerjam/helpers"
 require "fingerjam/jammit"
-require "fingerjam/railtie.rb"
+require "fingerjam/railtie"
+require "fingerjam/fix_jammit_encoding"

data/lib/tasks/fingerjam.rake

@@ -6,8 +6,7 @@ namespace :fingerjam do
 
   desc "Package assets with Jammit"
   task :package => :environment do
-    # Jammit.package!(:force => true)
-    `jammit -f`
+    Jammit.package!(:force => true)
   end
 
   desc "Lock packages to assets.lock.yml"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Steve Hoeksema
@@ -139,6 +139,7 @@ files:
 - lib/fingerjam.rb
 - lib/fingerjam/base.rb
 - lib/fingerjam/capistrano.rb
+- lib/fingerjam/fix_jammit_encoding.rb
 - lib/fingerjam/helpers.rb
 - lib/fingerjam/jammit.rb
 - lib/fingerjam/railtie.rb
@@ -159,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3010274029174475206
+      hash: -2735618090215588831
       segments: 
       - 0
       version: "0"