appetizer-ui 0.2.1 → 0.3.0

data/appetizer-ui.gemspec

@@ -10,13 +10,14 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- test/*`.split("\n")
   gem.name          = "appetizer-ui"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.1"
+  gem.version       = "0.3.0"
 
   gem.required_ruby_version = ">= 1.9.2"
 
   gem.add_dependency "appetizer",      "~> 0.0"
   gem.add_dependency "coffee-script",  "~> 2.2"
   gem.add_dependency "eco",            "~> 1.0"
+  gem.add_dependency "rack-contrib",   "~> 1.1"
   gem.add_dependency "rack-ssl",       "~> 1.3"
   gem.add_dependency "sass",           "~> 3.1"
   gem.add_dependency "sinatra",        "~> 1.3"

data/lib/appetizer/ui/assets.rb

@@ -11,7 +11,7 @@ require "yui/compressor"
 module App
   def self.assets
     @sprockets ||= Sprockets::Environment.new.tap do |s|
-      if App.production? || ENV["APPETIZER_MINIFY_ASSETS"]
+      if Appetizer::UI::Assets.compiled?
         s.register_bundle_processor "application/javascript", :uglifier do |ctx, data|
           Uglifier.compile data
         end
@@ -26,7 +26,7 @@ module App
       # don't understand it yet), so we're manually creating the
       # over-nested directory for the moment.
 
-      unless App.production?
+      unless Appetizer::UI::Assets.compiled?
         FileUtils.mkdir_p "tmp/sprockets/sprockets"
         s.cache = Sprockets::Cache::FileStore.new "tmp/sprockets"
       end
@@ -44,6 +44,10 @@ end
 module Appetizer
   module UI
     module Assets
+      def self.compiled?
+        App.production? or ENV["APPETIZER_USE_COMPILED_ASSETS"]
+      end
+
       def self.manifest
         return @manifest if defined? @manifest
 
@@ -60,7 +64,7 @@ module Appetizer
       def self.registered app
         app.helpers do
           def asset name
-            if App.production?
+            if Appetizer::UI::Assets.compiled?
               return cdnify "/assets/#{Appetizer::UI::Assets.manifest[name]}"
             end
 
@@ -69,7 +73,7 @@ module Appetizer
 
           def assets *names
             names.flat_map do |name|
-              next asset name if App.production?
+              next asset name if Appetizer::UI::Assets.compiled?
 
               asset = App.assets[name]
 
@@ -89,3 +93,8 @@ module Appetizer
 end
 
 Sinatra.register Appetizer::UI::Assets
+
+# Required at the bottom so it can conditionally require a few things
+# based on Appetizer::UI::Assets.compiled?.
+
+require "appetizer/ui/assets/delivery"

data/lib/appetizer/ui/assets/delivery.rb

@@ -0,0 +1,29 @@
+module Appetizer
+  module UI
+    module Assets
+      class Delivery < Struct.new(:app)
+        require "rack/contrib/static_cache" if Assets.compiled?
+
+        STATIC = {
+          root: "public",
+          urls: Dir["public/*"].map { |s| s[6..-1] }
+        }
+
+        def call env
+          cached(env) || asset(env) || app.call(env)
+        end
+
+        def asset env
+          if !Assets.compiled? and env["PATH_INFO"].start_with? "/assets"
+            env["PATH_INFO"] = env["PATH_INFO"][7..-1]
+            App.assets.call env
+          end
+        end
+
+        def cached env
+          Rack::StaticCache.new(app, STATIC).call env if Assets.compiled?
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appetizer-ui
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appetizer
-  requirement: &70117728740140 !ruby/object:Gem::Requirement
+  requirement: &70355474646500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728740140
+  version_requirements: *70355474646500
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70117728739100 !ruby/object:Gem::Requirement
+  requirement: &70355474645960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728739100
+  version_requirements: *70355474645960
 - !ruby/object:Gem::Dependency
   name: eco
-  requirement: &70117728738120 !ruby/object:Gem::Requirement
+  requirement: &70355474636360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728738120
+  version_requirements: *70355474636360
+- !ruby/object:Gem::Dependency
+  name: rack-contrib
+  requirement: &70355474635400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70355474635400
 - !ruby/object:Gem::Dependency
   name: rack-ssl
-  requirement: &70117728737340 !ruby/object:Gem::Requirement
+  requirement: &70355474634520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728737340
+  version_requirements: *70355474634520
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70117728736820 !ruby/object:Gem::Requirement
+  requirement: &70355474633540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728736820
+  version_requirements: *70355474633540
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70117728736340 !ruby/object:Gem::Requirement
+  requirement: &70355474632920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728736340
+  version_requirements: *70355474632920
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70117728735860 !ruby/object:Gem::Requirement
+  requirement: &70355474632060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728735860
+  version_requirements: *70355474632060
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70117728735360 !ruby/object:Gem::Requirement
+  requirement: &70355474630720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728735360
+  version_requirements: *70355474630720
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70117728734860 !ruby/object:Gem::Requirement
+  requirement: &70355474618200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728734860
+  version_requirements: *70355474618200
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &70117728734280 !ruby/object:Gem::Requirement
+  requirement: &70355474616500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +131,7 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70117728734280
+  version_requirements: *70355474616500
 description: A painfully opinionated Appetizer extension for web apps.
 email:
 - tech@audiosocket.com
@@ -142,6 +153,7 @@ files:
 - lib/appetizer/ui/app/js/appetizer/xdr.coffee
 - lib/appetizer/ui/app/views/client/appetizer/missing.jst.eco
 - lib/appetizer/ui/assets.rb
+- lib/appetizer/ui/assets/delivery.rb
 - lib/appetizer/ui/jasmine/css/jasmine.css
 - lib/appetizer/ui/jasmine/js/jasmine-html.js
 - lib/appetizer/ui/jasmine/js/jasmine-jquery-matchers.js