embarista 1.1.4 → 1.1.5

data/lib/embarista/helpers.rb

@@ -1,5 +1,9 @@
 module Embarista
   module Helpers
+    def rewrite_manifest_urls(*args, &block)
+      filter(Embarista::Filters::ManifestUrlFilter, *args, &block)
+    end
+
     def precompile_handlebars(*args, &block)
       filter(Embarista::Filters::PrecompileHandlebarsFilter, *args, &block)
     end

data/lib/embarista/manifest_builder.rb

@@ -0,0 +1,44 @@
+require 'pathname'
+require 'fileutils'
+
+module Embarista
+  class ManifestBuilder
+    include FileUtils
+
+    attr_reader :root, :tmp, :document_root, :tmp_document_root, :version, :manifest
+
+    def initialize(opts={})
+      @root = Pathname.new(opts[:root] || Dir.getwd).expand_path
+      @document_root = Pathname.new(opts[:document_root] || 'public').expand_path(@root)
+      @tmp = Pathname.new(opts[:tmp] || 'tmp').expand_path(@root)
+      @tmp_document_root =  @tmp + @document_root.relative_path_from(@root)
+      @manifest = opts[:manifest] || {}
+      @version = opts[:version]
+    end
+
+    # Pass in the file to be versioned and staged in the tmp document root.
+    def add(path, path_from_document_root=nil)
+      full_path = Pathname.new(path).expand_path(root)
+      path_from_document_root = Pathname.new(path_from_document_root || full_path.relative_path_from(document_root))
+      relative_dir = path_from_document_root.dirname
+
+      md5 = Digest::MD5.file(full_path).hexdigest
+      ext = full_path.extname
+      name_without_ext = full_path.basename.to_s.chomp(ext)
+      suffix = "-#{md5}"
+      suffix = "-#{version}#{suffix}" if version
+      versioned_file = "#{name_without_ext}#{suffix}#{ext}"
+
+      versioned_path_from_document_root = relative_dir + versioned_file
+      versioned_full_path = tmp_document_root + versioned_path_from_document_root
+
+      mkdir_p versioned_full_path.dirname
+      cp full_path, versioned_full_path
+
+      http_path =           '/' + path_from_document_root.to_s
+      versioned_http_path = '/' + versioned_path_from_document_root.to_s
+
+      manifest[http_path] = versioned_http_path
+    end
+  end
+end

data/lib/embarista/s3sync.rb

@@ -1,10 +1,11 @@
 module Embarista
   class S3sync
-    attr_reader :origin, :bucket_name, :pwd, :tmp_root, :manifest_path
+    attr_reader :origin, :bucket_name, :pwd, :tmp_root, :local_manifest_path, :remote_manifest_path
 
-    def initialize(origin, options) 
-      bucket_name = options.fetch(:bucket_name)
-      manifest_path = options.fetch(:manifest_path)
+    def initialize(origin, options)
+      @bucket_name = options.fetch(:bucket_name)
+      @local_manifest_path = options[:local_manifest_path]
+      @remote_manifest_path = options[:remote_manifest_path]
       aws_key = options.fetch(:aws_key)
       aws_secret = options.fetch(:aws_secret)
 
@@ -15,9 +16,8 @@ module Embarista
 
       @pwd = Pathname.new('').expand_path
       @origin = origin
-      @bucket_name = bucket_name
       @tmp_root = @pwd + @origin
-      @manifest_path = manifest_path
+      @age = options[:age] || 31556900
     end
 
     def self.sync(origin, options)
@@ -26,7 +26,19 @@ module Embarista
 
     def store(name, file)
       puts " -> #{name}"
-      AWS::S3::S3Object.store(name, file, bucket_name)
+
+      opts = {
+        access: :public_read
+      }
+
+      if should_gzip?(name)
+        opts[:content_encoding] = 'gzip'
+      end
+
+      opts[:cache_control] = "max-age=#{@age.to_i}"
+      opts[:expires] = (Time.now + @age).httpdate
+
+      AWS::S3::S3Object.store(name, file, bucket_name, opts)
     end
 
     def sync
@@ -38,31 +50,69 @@ module Embarista
       end
 
       delta_manifest.values.each do |file_name|
-        open(tmp_root.to_s + file_name) do |file|
+        compressed_open(file_name) do |file|
           store(file_name, file)
         end
       end
 
-      open(manifest_path) do |file|
-        store('manifest-latest.yml', file)
+      open(local_manifest_path) do |file|
+        store(remote_manifest_file_name, file)
+        store(local_manifest_file_name, file)
+      end
+    end
+
+    def compressed_open(file_name)
+      if should_gzip?(file_name)
+        str_io = StringIO.new
+        open(tmp_root.to_s + file_name) do |f|
+          streaming_deflate(f, str_io)
+        end
+        str_io.reopen(str_io.string, "r")
+        yield str_io
+        str_io.close
+      else
+        open(tmp_root.to_s + file_name) do |f|
+          yield f
+        end
+      end
+    end
+
+    def streaming_deflate(source_io, target_io, buffer_size = 4 * 1024)
+      gz = Zlib::GzipWriter.new(target_io, Zlib::BEST_COMPRESSION)
+      while(string = source_io.read(buffer_size)) do
+        gz.write(string)
       end
+      gz.close
+    end
+
+    def should_gzip?(name)
+      name =~ /\.css|\.js\Z/
+    end
+
+    def remote_manifest_file_name
+      File.basename(remote_manifest_path)
+    end
+
+    def local_manifest_file_name
+      File.basename(local_manifest_path)
     end
 
     def build_delta_manifest
       return local_manifest unless remote_manifest
 
       new_manifest_values = local_manifest.values - remote_manifest.values
-      local_manifest.invert.slice(*new_manifest_values).invert
+
+      local_manifest.select {|key, value| new_manifest_values.include? value }
     end
 
     def remote_manifest
-      @remote_manifest ||= YAML.load(AWS::S3::S3Object.find('manifest-latest.yml', bucket_name).value)
+      @remote_manifest ||= YAML.load(AWS::S3::S3Object.find(remote_manifest_file_name, bucket_name).value)
     rescue AWS::S3::NoSuchKey
       puts 'no remote existing manifest, uploading everything'
     end
 
     def local_manifest
-      @local_manifest ||= YAML.load_file('public/manifest.yml')
+      @local_manifest ||= YAML.load_file(local_manifest_path)
     end
   end
 end

data/lib/embarista/sass_functions.rb

@@ -1,7 +1,13 @@
 module Embarista
   module SassFunctions
     def manifest_url(path)
-      Sass::Script::String.new("url(#{lookup_manifest_path(path)})")
+      digested_path = lookup_manifest_path(path.value)
+      Sass::Script::String.new("url(#{digested_path})")
+    end
+
+    def manifest_path(path)
+      digested_path = lookup_manifest_path(path.value)
+      Sass::Script::String.new(digested_path)
     end
 
   private
@@ -17,7 +23,8 @@ module Embarista
 
     def lookup_manifest_path(path)
       if digest?
-        manifest.fetch(path.value)
+        raise ::Sass::SyntaxError.new "manifest-url(#{path.inspect}) missing manifest entry" unless manifest.key? path
+        manifest[path]
       else
         path
       end

data/lib/embarista/server.rb

@@ -70,25 +70,27 @@ module Embarista
     end
 
     def start_testing
-      test_thread = Thread.new do
+      Thread.new do
         while true
           test_mutex.synchronize do
             test_resource.wait(test_mutex)
           end
           puts 'RUNNING TESTS'
-          if system('rake test')
-            GNTP.notify({
-              :app_name => "yapp-dashboard",
-              :title    => "yapp-dashboard error",
-              :text     => "JS test GREEN!"
-            }) rescue nil
+          notification = if system('rake test')
+            {
+              app_name: project_name,
+              title:    "#{project_name} error",
+              text:     'JS test GREEN!'
+            }
           else
-            GNTP.notify({
-              :app_name => "yapp-dashboard",
-              :title    => "yapp-dashboard error",
-              :text     => "JS test RED!"
-            }) rescue nil
+            {
+              app_name: project_name,
+              title:    "#{project_name} error",
+              text:     'JS test RED!'
+            }
           end
+
+          GNTP.notify(notification) rescue nil
         end
       end
     end

data/lib/embarista/tasks.rb

@@ -0,0 +1,2 @@
+require 'embarista/tasks/coffeelint'
+require 'embarista/tasks/updater'

data/lib/embarista/tasks/coffeelint.rb

@@ -0,0 +1,50 @@
+module CoffeeLintHelper
+  extend Rake::DSL
+
+  def self.coffeelint(cmd_args)
+    tool = 'coffeelint'
+    cmd_args = cmd_args || ''
+
+    node = which('node')
+    if node.nil?
+      puts "Could not find node in your path."
+      return
+    end
+
+    npm = which('npm')
+    if npm.nil?
+      puts "Could not find npm in your path."
+      return
+    end
+
+    coffeelint = which('coffeelint')
+
+    if coffeelint
+      sh "coffeelint #{cmd_args}"
+
+    else
+      if !File.directory?("node_modules/#{tool}")
+        sh "\"#{npm}\" install #{tool}"
+      end
+
+      sh "\"#{node}\" node_modules/#{tool}/bin/#{tool} #{cmd_args}"
+    end
+  end
+
+  def self.which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        sep = File::ALT_SEPARATOR || File::SEPARATOR
+        exe = "#{path}#{sep}#{cmd}#{ext}"
+        return exe if File.executable? exe
+      }
+    end
+    return nil
+  end
+end
+
+desc 'run coffeelint'
+task :coffeelint do
+  CoffeeLintHelper.coffeelint '-q -f config/coffeelint.json -r app'
+end

data/lib/embarista/tasks/updater.rb

@@ -0,0 +1,121 @@
+require 'rake'
+require 'rake/tasklib'
+
+module Embarista
+  module Updater
+    extend self
+    def update_asset_file(regexp, replacement)
+      assetfile_contents = File.read('Assetfile')
+      assetfile_contents.gsub!(regexp, replacement)
+      File.open('Assetfile', 'w') do |f|
+        f.write(assetfile_contents)
+      end
+    end
+
+    class UpdateEmberTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      def initialize(name = :update_ember)
+        @name = name
+        yield self if block_given?
+        define
+      end
+
+      def define
+        task name do |t, args|
+          old_sha, new_sha = nil, nil
+          regexp = /ember-([0-9a-f]{40})/
+          app_vendor_path = File.expand_path("app/vendor")
+          cd(app_vendor_path) do
+            old_filename = Dir['*'].grep(regexp)[0]
+            old_filename =~ regexp
+            old_sha = $1
+          end
+          raise "Couldn't find current ember.js version" if old_sha.nil?
+          cd('../ember.js') do
+            new_sha = `git rev-parse HEAD`.chomp
+            `bundle && bundle exec rake dist`
+            cd('./dist') do
+              cp('ember.js', "#{app_vendor_path}/ember-#{new_sha}.js")
+              cp('ember.min.js', "#{app_vendor_path}/ember-#{new_sha}.min.js")
+            end
+          end
+          if old_sha != new_sha
+            cd(app_vendor_path) do
+              rm("ember-#{old_sha}.js")
+              rm("ember-#{old_sha}.min.js")
+            end
+            Embarista::Updater.update_asset_file(old_sha, new_sha)
+          end
+          puts "Updated from #{old_sha} to #{new_sha}"
+        end
+      end
+    end
+
+    class UpdateEmberDataTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      def initialize(name = :update_ember_data)
+        @name = name
+        yield self if block_given?
+        define
+      end
+
+      def define
+        task name do |t, args|
+          old_sha, new_sha = nil, nil
+          regexp = /ember-data-([0-9a-f]{40})/
+          app_vendor_path = File.expand_path("app/vendor")
+          cd(app_vendor_path) do
+            old_filename = Dir['*'].grep(regexp)[0]
+            old_filename =~ regexp
+            old_sha = $1
+          end
+          raise "Couldn't find current ember-data js version" if old_sha.nil?
+          cd('../ember-data') do
+            new_sha = `git rev-parse HEAD`.chomp
+            `bundle && bundle exec rake dist`
+            cd('./dist') do
+              cp('ember-data.js', "#{app_vendor_path}/ember-data-#{new_sha}.js")
+              cp('ember-data.min.js', "#{app_vendor_path}/ember-data-#{new_sha}.min.js")
+            end
+          end
+          if old_sha != new_sha
+            cd(app_vendor_path) do
+              rm("ember-data-#{old_sha}.js")
+              rm("ember-data-#{old_sha}.min.js")
+            end
+            Embarista::Updater.update_asset_file(old_sha, new_sha)
+          end
+          puts "Updated from #{old_sha} to #{new_sha}"
+        end
+      end
+    end
+
+    class UpdateJqueryTask < ::Rake::TaskLib
+      attr_accessor :name
+
+      def initialize(name = :update_jquery)
+        @name = name
+        yield self if block_given?
+        define
+      end
+
+      def define
+        task name do |t, args|
+          version = ENV['VERSION']
+          raise "please supply VERSION env var to specify jQuery version" if version.nil?
+          cd('./app/vendor') do
+            # remove old jquerys
+            rm Dir['jquery-*.js']
+            sh "curl -O http://code.jquery.com/jquery-#{version}.js"
+            sh "curl -O http://code.jquery.com/jquery-#{version}.min.js"
+          end
+          Embarista::Updater.update_asset_file(%r{JQUERY_VERSION = '\d+\.\d+\.\d+'}, "JQUERY_VERSION = '#{version}'")
+          puts "Updated to jQuery #{version}"
+        end
+      end
+    end
+
+  end
+end

data/lib/embarista/version.rb

@@ -1,3 +1,3 @@
 module Embarista
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/spec/manifest_builder_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+require 'pathname'
+require 'fileutils'
+
+describe Embarista::ManifestBuilder do
+  let(:document_root) {
+    Pathname.new('public').expand_path
+  }
+
+  let(:tmp_document_root) {
+    Pathname.new('tmp/public').expand_path
+  }
+
+  let(:options) {
+    {}
+  }
+
+  subject {
+    described_class.new(options)
+  }
+
+  its(:document_root) { should == document_root }
+
+  its(:tmp_document_root) { should == tmp_document_root }
+
+  its(:manifest) { should == {} }
+
+  its(:version) { should be_nil }
+
+
+  def make_file(path, contents)
+    FileUtils.mkdir_p File.dirname(path)
+    File.open(path, 'w') {|f| f << contents}
+  end
+
+  describe "#add" do
+    before do
+      make_file('public/foo/bar/hello.txt', <<-CONTENT)
+Hello World!
+CONTENT
+      make_file('public/foo/baz/goodbye.txt', <<-CONTENT)
+Goodbye Cruel World...
+CONTENT
+      make_file('images/foo.png', <<-CONTENT
+image
+CONTENT
+)
+    end
+
+    it 'should digest and copy the file' do
+      # echo 'Hello World!' | md5
+      # > 8ddd8be4b179a529afa5f2ffae4b9858
+
+
+      subject.add('public/foo/bar/hello.txt')
+      File.exist?('tmp/public/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt').should be_true
+      subject.manifest.should == {
+        '/foo/bar/hello.txt' => '/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt'
+      }
+
+      subject.add('public/foo/baz/goodbye.txt')
+      File.exist?('tmp/public/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt').should be_true
+      subject.manifest.should == {
+        '/foo/bar/hello.txt' => '/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt',
+        '/foo/baz/goodbye.txt' => '/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt'
+      }
+
+      subject.add('images/foo.png', 'editor/images/foo.png')
+      File.exist?('tmp/public/editor/images/foo-4802fcebd761ca4f04c9a6320330fd10.png').should be_true
+      subject.manifest.should == {
+        '/foo/bar/hello.txt' => '/foo/bar/hello-8ddd8be4b179a529afa5f2ffae4b9858.txt',
+        '/foo/baz/goodbye.txt' => '/foo/baz/goodbye-8dcca69d946ae9576734c2c91dfddec4.txt',
+        '/editor/images/foo.png' => '/editor/images/foo-4802fcebd761ca4f04c9a6320330fd10.png'
+      }
+    end
+  end
+end