embarista 1.1.5 → 2.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 60a6173f1e57277777c84c54f9924d09a72185fc
+  data.tar.gz: 84ea9a1867be4b34c42d963385780ee43dae0435
+SHA512:
+  metadata.gz: e66da548fa17ecf3d856785b66efbfec0079c3c1b812908a6dcfa5e4b8f67d824da2bc73438acfe1e9e26d7be661c432eaf37426cc3a7c999b57aae19296c779
+  data.tar.gz: db526b8f5f7f40a3a82faf362a78cfdac49ee13bd1b7f7c540ffd45af6ecc52a08409def6bb43ef3934d440595abb88b9c4a7775936b48044c3d8e179f60f0fa

data/.rspec

@@ -1 +1 @@
--cfs -r spec_helper.rb
+--color

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.2.5

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
+cache: bundler
 rvm:
-  - 1.9.3-p327
+  - 2.2.5
 bundler_args: --without docs
 notifications:
   tech@yapp.us

data/Gemfile

@@ -1,12 +1,7 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 
-gem 'rake-pipeline',             github: 'livingsocial/rake-pipeline'
-gem 'rake-pipeline-web-filters', github: 'wycats/rake-pipeline-web-filters'
-gem 'barber'
-gem 'aws-s3'                # Uploading data to S3
-gem 'debugger'
-gem 'pry'
-gem 'pry-debugger'
-gem 'pry-remote'
+gem 'rake-pipeline',             git: 'https://github.com/livingsocial/rake-pipeline.git'
+gem 'rake-pipeline-web-filters', git: 'https://github.com/wycats/rake-pipeline-web-filters.git'
+gem 'rspec-its'

data/embarista.gemspec

@@ -16,13 +16,12 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rake-pipeline", '> 0.6.0'
   gem.add_dependency "rake-pipeline-web-filters", '>= 0.6.0'
-  gem.add_dependency "barber"
-  gem.add_dependency "ruby_gntp"
-  gem.add_dependency "listen"
+  gem.add_dependency "execjs"
   gem.add_dependency "colored"
-  gem.add_dependency "rb-fsevent"
+  gem.add_dependency "aws-sdk-s3", '~> 1'
+  gem.add_dependency "zopfli"
+  gem.add_dependency "mime-types"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "rb-readline"
-  gem.add_development_dependency "execjs"
 end

data/lib/embarista.rb

@@ -8,11 +8,18 @@ module Embarista
   autoload :JavascriptPipeline, 'embarista/javascript_pipeline'
   autoload :Server, 'embarista/server'
 
+  autoload :App,             'embarista/app'
   autoload :Git,             'embarista/git'
+  autoload :Redis,           'embarista/redis'
+  autoload :S3,              'embarista/s3'
   autoload :S3sync,          'embarista/s3sync'
   autoload :SassFunctions,   'embarista/sass_functions'
   autoload :ManifestBuilder, 'embarista/manifest_builder'
   autoload :DynamicIndex,    'embarista/dynamic_index'
+
+  autoload :Precompiler,                   'embarista/precompiler'
+  autoload :PrecompilerError,              'embarista/precompiler'
+  autoload :PrecompilerConfigurationError, 'embarista/precompiler'
 end
 
 Rake::Pipeline::DSL::PipelineDSL.send(:include, Embarista::Helpers)

data/lib/embarista/app.rb

@@ -0,0 +1,46 @@
+module Embarista
+  module App
+    class << self
+      def env_var
+        'YAPP_ENV'
+      end
+
+      def env
+        @env ||= (ENV[env_var] || 'dev').to_sym
+      end
+
+      def config_by_env
+        @config_by_env ||= Yapp.load_config
+      end
+
+      def config
+        @config ||= config_by_env[env]
+      end
+
+      def app_base_url
+        @app_base_url ||= "https://#{config.domains.app}"
+      end
+
+      def assets_base_url
+        @assets_base_url ||= "//#{config.domains.assets_cdn}"
+      end
+
+      def assets_bucket
+        # asset config is the same on qa and prod
+        @assets_bucket ||= config_by_env[:prod].s3.assets_bucket
+      end
+
+      def latest_manifest_id
+        File.read('tmp/public/LATEST_MANIFEST_ID').chomp rescue nil
+      end
+
+      def heroku_app
+        @heroku_app ||= case env
+        when :qa then 'qa-yapp-cedar'
+        when :prod then 'yapp-cedar'
+        else nil
+        end
+      end
+    end
+  end
+end

data/lib/embarista/dynamic_index.rb

@@ -1,207 +1,3 @@
-require 'rake'
-require 'rake/tasklib'
-
-module Embarista
-  module DynamicIndex
-    # ENV.fetch does not behave as Hash#fetch,
-    # it fails to tell you which key failed.
-    def self.env_fetch(key)
-      ENV[key] or raise KeyError, "key not found: \"#{key}\""
-    end
-
-    class Generator
-      #TODO: remove YAPP reference
-      attr_reader :env_config, :yapp_env, :manifest_id, :yapp_config
-
-      def initialize(erb_path, manifest_id)
-        @erb_path = erb_path
-        #TODO: remove YAPP reference
-        @env_config = Yapp.load_config
-
-        #TODO: remove YAPP reference
-        @yapp_env = Embarista::DynamicIndex.env_fetch('YAPP_ENV').to_sym
-
-        @yapp_config = env_config.fetch(@yapp_env)
-        @manifest_id = manifest_id || @yapp_env
-        prepare_manifest
-      end
-
-      def prepare_manifest
-        if @manifest_id == 'dev'
-          @manifest = {}
-        else
-          #TODO: ensure the manifest is on s3
-          @manifest = YAML.load_file("tmp/public/#{@manifest_id}.yml")
-        end
-      end
-
-      def manifest_url(source)
-        source = @manifest[source] || source
-        "//#{yapp_config.domains.assets_cdn}#{source}"
-      end
-
-      def html
-        File.open(@erb_path) do |f|
-          erb = ERB.new(f.read, nil, '-')
-          erb.result(binding)
-        end
-      end
-
-      def preview_url(app)
-        "https://#{yapp_config.domains.app}/#{app}/?manifest_id=#{manifest_id}"
-      end
-    end
-
-    class Middleware
-      def initialize(app, opts = {})
-        @app = app
-        @erb_path = opts[:erb] || 'app/index.html.erb'
-        @path_info = opts.fetch(:path_info)
-        @generator = Embarista::DynamicIndex::Generator.new(@erb_path, 'dev')
-      end
-
-      def call(env)
-        path = env["PATH_INFO"]
-        if path == @path_info
-          [
-            200,
-            { 'Content-Type' => "text/html" },
-            [ @generator.html ]
-          ]
-        else
-          @app.call(env)
-        end
-      end
-    end
-
-    class SetCurrentTask < ::Rake::TaskLib
-      attr_accessor :name, :app
-
-      def initialize(name = :set_current_index)
-        @name = name
-
-        yield self if block_given?
-
-        raise 'app must be set' unless @app
-        define
-      end
-
-      def yapp_env
-        @yapp_env ||= Embarista::DynamicIndex.env_fetch('YAPP_ENV')
-      end
-
-      def redis_url
-        ENV['REDISTOGO_URL'] ||= begin
-
-          case yapp_env
-          when 'dev'
-            'redis://0.0.0.0:6379/'
-          when 'qa'
-            Bundler.with_clean_env do
-              `heroku config:get REDISTOGO_URL --app qa-yapp-cedar`.chomp
-            end
-          when 'prod'
-            Bundler.with_clean_env do
-              `heroku config:get REDISTOGO_URL --app yapp-cedar`.chomp
-            end
-          else
-            raise "don't know how to get redis connection for #{yapp_env}"
-          end
-        end
-      end
-
-      def redis
-        $redis ||= begin
-          require 'uri'
-          require 'redis'
-
-          uri = URI.parse(redis_url)
-
-          Redis.new(
-            :host => uri.host,
-            :port => uri.port,
-            :password => uri.password
-          )
-        end
-      end
-
-      def define
-        task name, :manifest_id do |t, args|
-          require 'redis'
-
-          manifest_id = args[:manifest_id] || yapp_env
-
-          puts "redis.set('#{app}:index:current', '#{manifest_id}')"
-          redis.set("#{app}:index:current", manifest_id)
-        end
-      end
-    end
-
-    class Task < ::Rake::TaskLib
-      attr_accessor :name, :erb_path, :app
-
-      def initialize(name = :generate_index)
-        @name = name
-        @erb_path = "app/index.html.erb"
-        yield self if block_given?
-
-        raise 'app must be set' unless @app
-        define
-      end
-
-      def yapp_env
-        @yapp_env ||= Embarista::DynamicIndex.env_fetch('YAPP_ENV')
-      end
-
-      def redis_url
-        ENV['REDISTOGO_URL'] ||= begin
-
-          case yapp_env
-          when 'dev'
-            'redis://0.0.0.0:6379/'
-          when 'qa'
-            Bundler.with_clean_env do
-              `heroku config:get REDISTOGO_URL --app qa-yapp-cedar`.chomp
-            end
-          when 'prod'
-            Bundler.with_clean_env do
-              `heroku config:get REDISTOGO_URL --app yapp-cedar`.chomp
-            end
-          else
-            raise "don't know how to get redis connection for #{yapp_env}"
-          end
-        end
-      end
-
-      def redis
-        $redis ||= begin
-          require 'uri'
-          require 'redis'
-
-          uri = URI.parse(redis_url)
-
-          Redis.new(
-            :host => uri.host,
-            :port => uri.port,
-            :password => uri.password
-          )
-        end
-      end
-
-      def define
-        task name, :manifest_id do |t, args|
-          require 'redis'
-
-          manifest_id = args[:manifest_id] || yapp_env
-          generator = Embarista::DynamicIndex::Generator.new(erb_path, manifest_id)
-          html = generator.html
-
-          puts "redis.set('#{app}:index:#{manifest_id}', '#{html[0,10].strip}...')"
-          redis.set("#{app}:index:#{manifest_id}", html)
-          puts "To preview: #{generator.preview_url(app)}"
-          puts "To activate:  YAPP_ENV=#{yapp_env} rake \"deploy:set_current_index[#{manifest_id}]\""
-        end
-      end
-    end
-  end
-end
+require 'embarista/dynamic_index/context'
+require 'embarista/dynamic_index/generator'
+require 'embarista/dynamic_index/middleware'

data/lib/embarista/dynamic_index/context.rb

@@ -0,0 +1,32 @@
+module Embarista
+  module DynamicIndex
+    class Context
+      attr_reader :app_config, :manifest_id, :manifest, :assets_base_url
+
+      def initialize(app_config, manifest_id, manifest, assets_base_url)
+        @app_config = app_config
+        @manifest_id = manifest_id
+        @manifest = manifest
+        @assets_base_url = assets_base_url
+      end
+
+      def manifest_url(source)
+        source = manifest[source] || source
+        assets_base_url + source
+      end
+
+      def self.context(manifest_id, assets_base_url=App.assets_base_url)
+        manifest = load_manifest(manifest_id)
+        self.new(App.config, manifest_id, manifest, assets_base_url)
+      end
+
+      def self.load_manifest(manifest_id)
+        if manifest_id == 'dev'
+          {}
+        else
+          YAML.load_file("tmp/public/#{manifest_id}.yml")
+        end
+      end
+    end
+  end
+end

data/lib/embarista/dynamic_index/generator.rb

@@ -0,0 +1,27 @@
+module Embarista
+  module DynamicIndex
+    class Generator
+      attr_reader :erb_path, :context
+
+      def initialize(erb_path, context)
+        @erb_path = erb_path
+        @context = context
+      end
+
+      def html
+        File.open(erb_path, 'r:UTF-8') do |f|
+          erb = ERB.new(f.read, nil, '-')
+          erb.filename = erb_path
+          context.instance_eval do
+            erb.result(binding)
+          end
+        end
+      end
+
+      def self.generator(erb_path, manifest_id, assets_base_url=App.assets_base_url)
+        context = Context.context(manifest_id, assets_base_url)
+        self.new(erb_path, context)
+      end
+    end
+  end
+end

data/lib/embarista/dynamic_index/middleware.rb

@@ -0,0 +1,25 @@
+module Embarista
+  module DynamicIndex
+    class Middleware
+      def initialize(app, opts = {})
+        @app = app
+        @erb_path = opts[:erb] || 'app/index.html.erb'
+        @path_info = opts.fetch(:path_info)
+        @generator = Embarista::DynamicIndex::Generator.generator(@erb_path, 'dev')
+      end
+
+      def call(env)
+        path = env["PATH_INFO"]
+        if path == @path_info
+          [
+            200,
+            { 'Content-Type' => "text/html" },
+            [ @generator.html ]
+          ]
+        else
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/embarista/filters/manifest_url_filter.rb

@@ -26,9 +26,21 @@ module Embarista
           code.gsub!(%r{\bmanifest_url\(\s*(["'/])([^"']+)\1\)}) do |m|
             quote_char = $1
             path = $2
+
+            # take the anchor/querystring off if there is one
+            post_path_start = path.index(/[?#]/)
+            if post_path_start
+              post_path = path[post_path_start..-1]
+              path = path[0..post_path_start-1]
+            end
+
             path = "/#{path}" unless path =~ %r{^/}
             path = "#{options[:prefix]}#{path}"
             resolved_path = urls_manifest[path] || path
+
+            # put the anchor/querystring back on, if there is one
+            resolved_path = resolved_path + post_path if post_path
+
             "(#{options[:prepend]}'#{resolved_path}')"
           end
           output.write(code)