wake-assets 0.2.0 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 44c5c197971626d1bf3ba093f1a86f0118a783dc
+  data.tar.gz: ac83070891e3a16829f468d6747fa473d44fe37f
+SHA512:
+  metadata.gz: b85685b5a106a2f5ceb6f5c84f5a46315bf58d0d658af08d7259a304c1c3b4a154dd2e1995bbdc9a961f3bf8da31749fb66f4d30b7f65e38f58773fcc167b2fb
+  data.tar.gz: 18176ade3766d0816cc2b00b1cb0501a31848f942d64788281f965d9f7e10a811cdb9aca99ee0cc4902020fb011e04257ae7bc578cbc48ef1ce2cfea987f1955

data/README.md

@@ -28,10 +28,10 @@ require 'wake/assets'
 dev = Rails.env.development?
 
 $wake = Wake::Assets.new(
-  :wake    => File.expand_path('node_modules/.bin/wake', Rails.root),
-  :root    => File.expand_path('public', Rails.root),
-  :mode    => dev ? :sources : :targets,
-  :monitor => dev
+  :wake  => File.expand_path('node_modules/.bin/wake', Rails.root),
+  :root  => File.expand_path('public', Rails.root),
+  :mode  => dev ? :sources : :targets,
+  :cache => !dev
 )
 ```
 
@@ -41,8 +41,8 @@ The options are:
 * `:root` - the document root of your application
 * `:mode` - `:sources` if you want to render links to source files, `:targets`
   if you want optimised files
-* `:monitor` - whether to monitor the filesystem for changes, recommended in
-  development but not in production
+* `:cache` - whether to cache `wake` metadata files in memory, recommended in
+  production but not in development
 
 #### At request time
 

data/lib/wake/assets.rb

@@ -1,7 +1,6 @@
 require 'base64'
 require 'erb'
 require 'json'
-require 'listen'
 require 'mime/types'
 require 'pathname'
 require 'set'
@@ -10,13 +9,13 @@ module Wake
   class Assets
 
     DEFAULT_BUILD = 'min'
+    DEFAULT_CACHE = true
     DEFAULT_MODE  = :targets
     DEFAULT_WAKE  = './node_modules/wake/bin/wake'
     CACHE_FILE    = '.wake.json'
     MANIFEST      = '.manifest.json'
     PACKAGE_FILE  = 'package.json'
     WAKE_FILE     = 'wake.json'
-    CONFIG_FILES  = Set.new([CACHE_FILE, MANIFEST, PACKAGE_FILE, WAKE_FILE])
 
     CSS = 'css'
     JS  = 'javascript'
@@ -27,38 +26,51 @@ module Wake
 
     autoload :Renderer, File.expand_path('../assets/renderer', __FILE__)
 
-    def initialize(options)
-      @pwd      = File.expand_path(options.fetch(:pwd, Dir.pwd))
-      @wake     = options.fetch(:wake, File.expand_path(DEFAULT_WAKE, @pwd))
-      @root     = Pathname.new(File.expand_path(options.fetch(:root, @pwd)))
-      @mode     = options.fetch(:mode, DEFAULT_MODE)
-      @manifest = new_manifest_cache
-      @paths    = new_path_cache
+    def initialize(options = {})
+      @pwd   = File.expand_path(options.fetch(:pwd, Dir.pwd))
+      @cache = options.fetch(:cache, DEFAULT_CACHE)
+      @wake  = options.fetch(:wake, File.expand_path(DEFAULT_WAKE, @pwd))
+      @root  = Pathname.new(File.expand_path(options.fetch(:root, @pwd)))
+      @mode  = options.fetch(:mode, DEFAULT_MODE)
 
-      system(@wake, '--cache')
-      read_config
+      clear_cache
+    end
 
-      return unless options[:monitor]
+    def clear_cache
+      system(@wake, '--cache') unless @cache
 
-      listener = Listen.to(@pwd).change do |modified, added, removed|
-        all = (modified + added + removed).map &File.method(:basename)
-        system(@wake, '--cache') if (added.any? or removed.any?) and not all.include?(CACHE_FILE)
-        update! if (CONFIG_FILES & all).any?
-      end
-      listener.force_polling(true)
-      listener.start
+      @config   = nil
+      @index    = nil
+      @manifest = {}
+      @paths    = {}
     end
 
-    def deployment?
-      @mode == :targets
+    def generated_file_paths
+      index = read_index
+      paths = Set.new([File.join(@pwd, CACHE_FILE)])
+      index.each do |group_name, group|
+        group.each do |bundle_name, bundles|
+          bundles['targets'].each_value do |path|
+            paths.add(path)
+            manifest   = File.join(File.dirname(path), MANIFEST)
+            source_map = path + '.map'
+            [manifest, source_map].each do |file|
+              paths.add(file) if File.file?(file)
+            end
+          end
+        end
+      end
+      paths.map(&method(:resolve))
     end
 
     def paths_for(group, names, options = {})
+      config = read_config
+
       build = options.fetch(:build, DEFAULT_BUILD)
-      unless @config[group].fetch('builds', {}).has_key?(build)
+      unless config.fetch(group).fetch('builds', {}).has_key?(build)
         build = DEFAULT_BUILD
       end
-      names.map { |name| @paths[group][name][build] }.flatten
+      names.map { |name| read_paths(group, name, build) }.flatten
     end
 
     def relative(path)
@@ -66,81 +78,76 @@ module Wake
     end
 
     def renderer(options = {})
+      clear_cache unless @cache
       Renderer.new(self, options)
     end
 
   private
 
-    def find_paths_for(group, name, build)
-      absolute_paths = begin
-        cache = @cache[group][name]
+    def find_paths_for(key)
+      group, name, build = *key
+
+      begin
+        index = read_index.fetch(group).fetch(name)
         if @mode.to_s == 'sources'
-          cache.fetch('sources')
+          absolute_paths = index.fetch('sources')
         else
-          [cache.fetch('targets').fetch(build)]
+          absolute_paths = [index.fetch('targets').fetch(build)]
         end
-      rescue
-        nil
+      rescue KeyError
+        raise InvalidReference, "Could not find assets: group: '#{group}', name: '#{name}', build: '#{build}'"
       end
 
-      if absolute_paths.nil?
-        raise InvalidReference, "Could not find assets, group: #{group}, name: #{name}, build: #{build}"
-      end
+      absolute_paths.map(&method(:resolve))
+    end
 
-      absolute_paths.map do |path|
-        basename = File.basename(path)
-        dirname  = File.dirname(path)
-        manifest = File.join(dirname, MANIFEST)
+    def read_config
+      return @config if @config
 
-        File.join(dirname, @manifest[manifest].fetch(basename, basename))
-      end
-    end
+      wake    = File.join(@pwd, WAKE_FILE)
+      package = File.join(@pwd, PACKAGE_FILE)
 
-    def new_manifest_cache
-      Hash.new do |hash, path|
-        hash[path] = File.file?(path) ? JSON.parse(File.read(path)) : {}
+      if File.file?(wake)
+        config = JSON.parse(File.read(wake))
+      elsif File.file?(package)
+        config = JSON.parse(File.read(package))['wake']
+      else
+        config = {}
       end
-    end
 
-    def new_path_cache
-      Hash.new do |h, group|
-        h[group] = Hash.new do |i, name|
-          i[name] = Hash.new do |j, build|
-            j[build] = find_paths_for(group, name, build)
-          end
-        end
-      end
+      @config = config if @cache
+      config
     end
 
-    def read_config
-      cache   = File.join(@pwd, CACHE_FILE)
-      wake    = File.join(@pwd, WAKE_FILE)
-      package = File.join(@pwd, PACKAGE_FILE)
-
-      @config = if File.file?(wake)
-                  JSON.parse(File.read(wake))
-                elsif File.file?(package)
-                  JSON.parse(File.read(package))['wake']
-                else
-                  {}
-                end
+    def read_index
+      return @index if @index
+      path = File.join(@pwd, CACHE_FILE)
+      index = JSON.parse(File.read(path))
+      @index = index if @cache
+      index
+    end
 
-      @cache = JSON.parse(File.read(cache))
+    def read_manifest(path)
+      return @manifest[path] if @manifest.has_key?(path)
+      mapping = File.file?(path) ? JSON.parse(File.read(path)) : {}
+      @manifest[path] = mapping if @cache
+      mapping
     end
 
-    def update!
-      paths = new_path_cache
-      read_config
+    def read_paths(group, name, build)
+      key = [group, name, build]
+      return @paths[key] if @paths.has_key?(key)
+      paths = find_paths_for(key)
+      @paths[key] = paths if @cache
+      paths
+    end
 
-      @paths.each do |group, a|
-        a.each do |name, b|
-          b.each do |build, files|
-            paths[group][name][build]
-          end
-        end
-      end
-      @manifest = new_manifest_cache
-      @paths    = paths
+    def resolve(path)
+      path     = File.join(@pwd, path)
+      basename = File.basename(path)
+      dirname  = File.dirname(path)
+      manifest = File.join(dirname, MANIFEST)
+      File.join(dirname, read_manifest(manifest).fetch(basename, basename))
     end
 
   end

data/lib/wake/assets/renderer.rb

@@ -30,9 +30,7 @@ module Wake
 
         tags = if options.fetch(:inline, @inline)
                  paths_for(IMG, names, options).map do |path|
-                   base64 = Base64.strict_encode64(File.read(path))
-                   mime   = MIME::Types.type_for(path).first
-                   tag :img, options, :src => "data:#{mime};base64,#{base64}"
+                   tag :img, options, :src => base64_file(path)
                  end
                else
                  urls_for(IMG, names, options).map { |url| tag :img, options, :src => url }
@@ -73,6 +71,12 @@ module Wake
 
     private
 
+      def base64_file(path)
+        base64 = Base64.strict_encode64(File.read(path))
+        mime   = MIME::Types.type_for(path).first
+        "data:#{mime};base64,#{base64}"
+      end
+
       def extract_options(names)
         [names.grep(String), names.grep(Hash).first || {}]
       end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: wake-assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - James Coglan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -55,7 +50,9 @@ files:
 - lib/wake/assets.rb
 - lib/wake/assets/renderer.rb
 homepage: http://github.com/jcoglan/wake-assets
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -65,21 +62,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Renders links to assets managed by wake
 test_files: []