gluey 0.2.7 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06efa92dcd6fd292dd71faf95ac07ce0dd921fdd
-  data.tar.gz: ea74e55f880c37e08b24a0002c8c243a5839016a
+  metadata.gz: 48c9c7072ee094bafc30aaff125545851b59fecc
+  data.tar.gz: 33d09cc9e4f936ca60e63ea9d452dc8091d0865f
 SHA512:
-  metadata.gz: 39c68be866dbfc940bb6841075474b39735174cf76048992827ce8b870d045881bf83b46304f0cc0a62bf4b4f7623d23301235b47fdc9d78ebb20af08b54b9a7
-  data.tar.gz: 11c54bcc7c1c2875d54f2246c849216ef9a9c9889a6942881bf5d4188d9777a350e76372b52165c899b50cc57616ab427816615183941badfe9306d111e362d1
+  metadata.gz: 86ee61effd7c25c684611a43883fada8270262cfa1eb0685c0e63f2d7e712933cf91c3b97598d3853aa3643d32e8065f16b6bd9f5f56fbb121b48c2b0f3ce978
+  data.tar.gz: 56846446df80b66aaacf8a61ea41f2fd87c01430238bd98122b1de2d0cee762a4e5606d4bb0a3dd6ea5dac78d91e47bb548da103e265469eac045862ec15bf33

data/gluey.gemspec

@@ -1,6 +1,6 @@
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'gluey/version'
+require 'gluey/base/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'gluey'

data/lib/gluey.rb

@@ -1,2 +1,11 @@
 
-require_relative 'gluey/version'
+require_relative 'gluey/base/version'
+require_relative 'gluey/base/exceptions'
+
+# environments
+require_relative 'gluey/base/environment'
+require_relative 'gluey/workshop'
+require_relative 'gluey/warehouse'
+
+# addons
+require_relative 'gluey/base/rack_mountable'

data/lib/gluey/base/environment.rb

@@ -0,0 +1,34 @@
+module Gluey
+
+  class Environment
+
+    attr_reader :root, :base_url, :path_prefix
+    attr_accessor :mark_versions
+
+    def initialize(**opts, &block)
+      opts = {
+          base_url: nil,
+          path_prefix: '/assets'
+      }.merge! opts
+
+      opts.each do |k, value|
+        next unless k.is_a? Symbol
+        instance_variable_set "@#{k}", value
+      end
+      instance_exec &block if block
+
+      root || raise('Root directory not defined!')
+    end
+
+    def asset_url(material, path)
+      "#{base_url}#{path_prefix}/#{material}/#{real_path material, path}"
+    end
+
+    def [](material, path, mark=nil)
+      fetch(material, path, mark)[0]
+    end
+    alias_method :find_asset_file, :[]
+
+  end
+
+end

data/lib/gluey/base/exceptions.rb

@@ -0,0 +1,5 @@
+module Gluey
+  class UnregisteredMaterial < StandardError; end
+  class FileNotFound < StandardError; end
+  class ListingError < StandardError; end
+end

data/lib/gluey/base/rack_mountable.rb

@@ -0,0 +1,87 @@
+require 'rack/utils'
+
+module Gluey
+  class RackMountable
+    ALLOWED_HEADERS = %w[GET HEAD].freeze
+    PATH_PARSER = %r_^/(\w+)/([^\.]+)\.(?:([a-f0-9]{32})\.)?\w+$_
+
+    def initialize(env, logger)
+      @environment = env
+      @logger = logger
+    end
+
+    def call(env)
+      material = nil
+      path = nil
+      start_time = Time.now.to_f
+      time_elapsed = lambda { ((Time.now.to_f - start_time) * 1000).to_i }
+
+      unless ALLOWED_HEADERS.include? env['REQUEST_METHOD']
+        return method_not_allowed_response
+      end
+
+      # Extract the path from everything after the leading slash
+      _, material, path, mark = env['PATH_INFO'].to_s.match(PATH_PARSER).to_a
+      unless path
+        return bat_path_response
+      end
+
+      file = @environment[material, path, mark]
+      unless file
+        @logger.info "Not found glued asset #{path} (material=#{material}) - 404 (#{time_elapsed.call}ms)"
+        return not_found_response
+      end
+
+      @logger.info "Served glued asset #{path} (material=#{material}) - 200 (#{time_elapsed.call}ms)"
+      ok_response file, (mark && @environment.mark_versions)
+
+    rescue => e
+      @logger.error "Error gluying asset #{path}  (material=#{material}):"
+      @logger.error "#{e.class.name}: #{e.message}"
+      raise
+    end
+
+    def inspect
+      '#<Gluey::RackMountable>'
+    end
+
+    private
+
+    # Returns a 200 OK response tuple
+    def ok_response(file, to_cache)
+      headers = {
+          'Content-Length' => File.stat(file).size,
+          'Content-Type' => Rack::Mime.mime_type(File.extname(file), 'text/plain')
+      }
+      if to_cache
+        headers['Cache-Control'] = "public, max-age=31536000"
+      end
+
+      [200, headers, FileBody.new(file)]
+    end
+
+    def method_not_allowed_response
+      [405, {'Content-Type' => "text/plain", 'Content-Length' => "18"}, ['Method Not Allowed']]
+    end
+
+    def bat_path_response
+      [400, {'Content-Type' => "text/plain", 'Content-Length' => "8"}, ['Bad Path']]
+    end
+
+    # Returns a 404 Not Found response tuple
+    def not_found_response
+      [404, {'Content-Type' => "text/plain", 'Content-Length' => "9"}, ['Not found']]
+    end
+
+    class FileBody < Struct.new(:file_path)
+      def each
+        File.open(file_path, 'rb') do |file|
+          while chunk = file.read(16384)
+            yield chunk
+          end
+        end
+      end
+    end
+
+  end
+end

data/lib/gluey/base/version.rb

@@ -0,0 +1,3 @@
+module Gluey
+  VERSION = '0.3.3'
+end

data/lib/gluey/tools/local_make.rb

@@ -0,0 +1,83 @@
+
+module Gluey::Tools
+
+  def self.make_into_assets_dir(workshop, warehouse)
+    made = []
+
+    warehouse.each_listed_asset workshop do |cache_file, path, material|
+      file = "#{warehouse.assets_path}/#{material.name}/#{path}"
+      next if File.exists? file
+
+      FileUtils.mkdir_p file[0..(file.rindex('/')-1)]
+      FileUtils.cp cache_file, file
+
+      made << file
+      puts "created #{file}"
+    end
+
+    made
+  end
+
+  # def self.clear_public_dir(workshop, warehouse, versions=3, public_dir='public/assets')
+  #   public_dirs = workshop.materials.values.inject({}) do |h, m|
+  #     h[m.name] = "#{workshop.root_path}/#{m.public_dir || public_dir}"
+  #     h
+  #   end
+  #
+  #   # process existing files into assets
+  #   eas_regexp = /^#{workshop.root_path}\/(.+)$/
+  #   assets = public_dirs.values.uniq.map{|dir| Dir["#{dir}/**/*.*.*"]}.flatten.
+  #       map{|f| Asset.try_create f[eas_regexp, 1], f}.compact
+  #   assets = assets.inject({}){|h, asset| (h[asset.path] ||= []) << asset; h }
+  #
+  #   # items not on list
+  #   on_list = []
+  #   warehouse.assets.each do |type, mater_assets|
+  #     mater_assets.each do |_, real_path|
+  #       file = "#{public_dirs[type]}/#{real_path}"
+  #       asset = Asset.try_create file[eas_regexp, 1], f
+  #       on_list << asset
+  #     end
+  #   end
+  #   on_list.map! &:path
+  #   assets.delete_if do |path, asseets_arr|
+  #     unless on_list.include? path
+  #       asseets_arr.each do |some_asset|
+  #         file = "#{workshop.root_path}/#{some_asset.orig_path}"
+  #         File.delete file
+  #         puts "deleted unknown #{file}"
+  #       end
+  #       true
+  #     end
+  #     false
+  #   end
+  #
+  #   # older versions
+  #   assets.values.select{|arr| arr.length > versions}.
+  #       map{|arr| arr.sort.slice 0..(-versions-1) }.compact.flatten.each do |old_asset|
+  #     file = "#{workshop.root_path}/#{old_asset.orig_path}"
+  #     File.delete file
+  #     puts "deleted old #{file}"
+  #   end
+  # end
+  #
+  # class Asset < Struct.new(:path, :time_stamp)
+  #
+  #   def self.try_create(path, file)
+  #     path.match /^([^\.]+)\.(?:[a-f0-9]{32}\.)?(\w+)$/ do |m|
+  #       new "#{m[1]}.#{m[2]}", File.mtime(file).to_i
+  #     end
+  #   end
+  #
+  #   def <=>(other)
+  #     time_stamp <=> other.time_stamp
+  #   end
+  #
+  #   def orig_path
+  #     ret = path.dup
+  #     ret.insert ret.rindex('.'), ".#{time_stamp}"
+  #   end
+  #
+  # end
+
+end

data/lib/gluey/warehouse.rb

@@ -1,52 +1,52 @@
-require_relative '../gluey'
-require_relative 'url'
-require_relative 'exceptions/item_not_listed'
 require 'json'
+require_relative 'warehouse/asset_retrieving'
 
-class Gluey::Warehouse
-  include Gluey::Url
+module Gluey
+  class Warehouse < Environment
+    include ::Gluey::AssetRetrieving
 
-  attr_reader :assets
+    attr_reader :listing
 
-  def initialize(root, listing_file='assets/gluey_listing.json')
-    @listing_file = "#{root}/#{listing_file}"
-    read_listing
-  end
-
-  def real_path(asset_type, path, mark=nil)
-    listing = @assets[asset_type]
-    unless listing
-      raise ::Gluey::ItemNotListed.new("Asset type #{asset_type} is not defined! (listing file problem?)")
+    def initialize(root, listing_path='assets/gluey_listing.json', **opts, &block)
+      super opts.merge!(
+                root: root,
+                listing_file: "#{root}/#{listing_path}",
+            ), &block
+      @assets_path = "#{root}/#{@assets_path.chomp '/'}#{path_prefix}" if @assets_path && @assets_path[0]!='/'
+      read_listing
     end
 
-    real_path = listing[path]
-    unless real_path
-      raise ::Gluey::ItemNotListed.new("Unknown asset: #{path}, type=#{asset_type}! (listing file problem?)")
+    def read_listing
+      @listing = if File.exists? @listing_file
+                   @listing = JSON.parse File.read(@listing_file) rescue nil
+                   unless @listing.is_a? Hash
+                     raise ::Gluey::ListingError.new("Corrupted listing file at #{@listing_file} !")
+                   end
+                   Hash[@listing.map{|k, v| [k.to_sym, v]}]
+                 else
+                   {}
+                 end
     end
 
-    real_path
-  end
-
-  def read_listing
-    assets = if File.exists? @listing_file
-               JSON.parse File.read(@listing_file) rescue {}
-             else
-               {}
-             end
-    raise "corrupted listing file at #{@listing_file}" unless assets.is_a? Hash
-    @assets = assets.keys.inject({}){|h, asset_type| h[asset_type.to_sym] = assets[asset_type]; h }
-  end
+    def write_listing(workshop)
+      @listing = workshop.materials.values.inject({}) do |listing, material|
+        list = material.list_all_items.inject({}) do |h, path|
+          h[path] = workshop.real_path material.name, path
+          h
+        end
+        listing[material.name] = list
+        listing
+      end
+      File.write @listing_file, JSON.pretty_generate(@listing)
+    end
 
-  def write_listing(workshop)
-    @assets = workshop.materials.values.inject({}) do |listing, material|
-      list = material.list_all_items.inject({}) do |h, path|
-        h[path] = workshop.real_path material.name, path, true
-        h
+    def each_listed_asset(workshop)
+      @listing.each do |asset_type, list|
+        list.each do |path, real_path|
+          yield workshop[asset_type, path], real_path, workshop.material(asset_type)
+        end
       end
-      listing[material.name.to_sym] = list
-      listing
     end
-    File.write @listing_file, JSON.pretty_generate(@assets)
-  end
 
+  end
 end

data/lib/gluey/warehouse/asset_retrieving.rb

@@ -0,0 +1,31 @@
+module Gluey
+  module AssetRetrieving
+    MARK_PARSER = %r_^[^\.]+\.(?:([a-f0-9]{32})\.)?\w+$_
+
+    def real_path(asset_type, path)
+      list = @listing[asset_type]
+      raise ::Gluey::ListingError.new("Asset type #{asset_type} is not defined!") unless list
+
+      real_path = list[path]
+      raise ::Gluey::ListingError.new("Unknown asset: #{path}, type=#{asset_type}!") unless real_path
+
+      real_path
+    end
+
+    def fetch(asset_type, path, mark=nil)
+      extant_path = real_path asset_type, path
+      return unless mark == extant_path.match(MARK_PARSER)[1]
+
+      file = "#{assets_path}/#{asset_type}/#{extant_path}"
+      file if File.exists? file
+
+    rescue ::Gluey::ListingError
+      nil
+    end
+
+    def assets_path
+      @assets_path ||= "#{root}/public#{path_prefix}"
+    end
+
+  end
+end

data/lib/gluey/workshop.rb

@@ -1,87 +1,40 @@
 require 'digest'
-require_relative '../gluey'
-require_relative 'url'
-
-require_relative 'exceptions/item_not_listed'
-
-require_relative 'material'
-require_relative 'glues/base'
-
-class Gluey::Workshop
-  include Gluey::Url
-
-  attr_reader :root_path, :tmp_path, :materials, :cache
-  attr_accessor :base_url
-
-  def initialize(root, tmp_dir='tmp/gluey')
-    @root_path = root
-    @tmp_path = "#{root}/#{tmp_dir}"
-    Dir.mkdir @tmp_path unless Dir.exists? @tmp_path
-    @materials = {}
-    @cache = {}
-  end
-
-  def register_material(name, glue=::Gluey::Glues::Base, &block)
-    name = name.to_sym
-    material = ::Gluey::Material.new name, glue, self, &block
-    material.items << :any if material.items.empty?
-    @materials[name] = material
-  end
-
-  def fetch_file(material, path)
-    # check cache
-    cache_key = chache_asset_key material, path
-    file, dependencies = @cache[cache_key]
-    if file && File.exists?(file) && !dependencies.any?{|d| d.changed?}
-      return file
+require_relative 'workshop/material'
+require_relative 'workshop/glues/base'
+require_relative 'workshop/asset_processing'
+
+module Gluey
+  class Workshop < Environment
+    include ::Gluey::AssetProcessing
+
+    attr_reader :cache_path, :cache, :materials
+
+    def initialize(root, cache_path='tmp/gluey', **opts, &block)
+      super opts.merge!(
+                root: root,
+                cache_path: "#{root}/#{cache_path}",
+                materials: {},
+                cache: {}
+            ), &block
+      FileUtils.mkdir_p @cache_path
     end
 
-    # prepare for processing
-    material = @materials[material.to_sym]
-    base_file = material.find_base_file path
-    file = "#{@tmp_path}/#{path}.#{material.asset}"
-    dependencies = [::Gluey::Dependencies::SingleFile.new(base_file).actualize]
-    # process
-    glue = material.glue.new self, material
-    FileUtils.mkdir_p file[0..(file.rindex('/')-1)]
-    glue.make file, base_file, dependencies
+    def material(name)
+      @materials[name.to_sym] || raise(UnregisteredMaterial.new "Unknown material #{name}.")
+    end
 
-    # save and return
-    @cache[cache_key] = [file, dependencies]
-    file
-  end
+    def register_material(name, glue=::Gluey::Glues::Base, &block)
+      name = name.to_sym
+      raise "Material #{name} already registered!" if @materials[name]
 
-  def real_path(material, path, digest_mark=false)
-    material = @materials[material.to_sym]
-    file = material.find_base_file path
-    unless material.is_listed? path, file
-      raise ::Gluey::ItemNotListed.new("#{material.to_s} doesn't have enlisted item #{path} (file=#{file}).")
-    end
-    if digest_mark
-      fetch_file material.name, path
-      cache_key = chache_asset_key material.name, path
-      file, dependencies = @cache[cache_key]
-      digested_mark = Digest::MD5.new.digest dependencies.map(&:mark).join
-      "#{path}.#{Digest.hexencode digested_mark}.#{material.asset}"
-    else
-      "#{path}.#{material.asset}"
+      material = ::Gluey::Material.new name, glue, self, &block
+      material.items << :any if material.items.empty?
+      @materials[name] = material
     end
-  end
 
-  def try_real_path(path)
-    path.match /^(.+)\.(?:[a-f0-9]{32}\.)(\w+)$/ do |m|
-      yield m[1], m[2]
+    def get_binding
+      binding
     end
-  end
 
-  def get_binding
-    binding
   end
-
-  private
-
-  def chache_asset_key(material, path)
-    "lump:#{material}:#{path}"
-  end
-
 end

data/lib/gluey/workshop/asset_processing.rb

@@ -0,0 +1,52 @@
+module Gluey
+  module AssetProcessing
+
+    def fetch(material, path, mark=nil)
+      material = material.is_a?(::Gluey::Material) ? material : self.material(material)
+      raise("Unknown material #{material}!") unless material
+      cache_key = "lump:#{material}:#{path}"
+
+      # check cache
+      file, dependencies = @cache[cache_key]
+      if file && File.exists?(file) && !dependencies.any?{|d| d.changed?}
+        return file, dependencies
+      end
+
+      # make / remake
+      file, dependencies = make_asset material, path
+      cache[cache_key] = [file, dependencies]
+      return file, dependencies
+    end
+
+    def real_path(material_name, path)
+      material = self.material material_name
+
+      file = material.find_base_file path
+      unless material.is_listed? path, file
+        msg = "#{material.to_s} doesn't have enlisted item #{path} (#{file})."
+        raise ::Gluey::ListingError.new(msg)
+      end
+
+      if mark_versions
+        _, dependencies = fetch material, path
+        digested_mark = Digest::MD5.new.digest dependencies.map(&:mark).join
+        "#{path}.#{Digest.hexencode digested_mark}.#{material.asset_extension}"
+      else
+        "#{path}.#{material.asset_extension}"
+      end
+    end
+
+    def make_asset(material, path)
+      # prepare for processing
+      base_file = material.find_base_file path
+      file = "#{cache_path}/#{path}.#{material.asset_extension}"
+      dependencies = [::Gluey::Dependencies::SingleFile.new(base_file).actualize]
+      # process
+      glue = material.glue.new self, material
+      FileUtils.mkdir_p file[0..(file.rindex('/')-1)]
+      glue.make file, base_file, dependencies
+      return file, dependencies
+    end
+
+  end
+end

data/lib/gluey/{dependencies → workshop/dependencies}/handlebars_bundle.rb

@@ -5,7 +5,7 @@ module Gluey::Dependencies
   class Handlebars_bundle < SingleFile
 
     def initialize(dir, logical_path, context)
-      tmp_dir = "#{context.tmp_path}/.texts_bundle"
+      tmp_dir = "#{context.cache_path}/.texts_bundle"
       Dir.mkdir tmp_dir unless Dir.exists? tmp_dir
       @cache_path = "#{tmp_dir}/#{logical_path.gsub '/', '-'}"
       Dir.mkdir @cache_path unless Dir.exists? @cache_path

data/lib/gluey/{dependencies → workshop/dependencies}/texts_bundle.rb

@@ -12,7 +12,7 @@ module Gluey::Dependencies
     }
 
     def initialize(dir, logical_path, context)
-      tmp_dir = "#{context.tmp_path}/.texts_bundle"
+      tmp_dir = "#{context.cache_path}/.texts_bundle"
       Dir.mkdir tmp_dir unless Dir.exists? tmp_dir
       @cache_path = "#{tmp_dir}/#{logical_path.gsub '/', '-'}"
       Dir.mkdir @cache_path unless Dir.exists? @cache_path

data/lib/gluey/{glues → workshop/glues}/base.rb

@@ -22,10 +22,12 @@ module Gluey::Glues
   end
 
   def self.load(name, *addons_names)
-    require_relative name
-    addons_names.flatten.each{|an| require_relative "#{name}/#{an}_addons" }
+    glue = File.expand_path("../#{name}", __FILE__)
+    require glue
+    addons_names.flatten.each{|an| require "#{glue}/#{an}_addons" }
+    ::Gluey::Glues.const_get name.split('_').map(&:capitalize).join
   rescue LoadError => e
-    raise e.message
+    raise "#{e.message}\n -- missing dependency? (are you using Gemfile?)"
   end
 
 end

data/lib/gluey/{glues → workshop/glues}/js_script.rb

@@ -31,23 +31,22 @@ module Gluey::Glues
       @output = "(function(){\n#{@output}\n}())"
     end
 
-  end
-
-  def pre_replace_with_texts_bundle(args)
-    dir = File.expand_path("../#{args[1]}", @base_file)
-    raise "cannot find relative path #{args[1]} for script=#{@base_file}" unless dir && Dir.exists?(dir)
-
-    logical_path = dir[/(?:^#{@context.root_path}\/)?(.+)$/, 1]
-    key = "dep:txt_bundle:#{logical_path}:#{@material.name}"
-    hb_dep = @context.cache[key]
-    unless hb_dep
-      hb_dep = ::Gluey::Dependencies::TextsBundle.new dir, logical_path, @context
-      @context.cache[key] = hb_dep
+    def pre_replace_with_texts_bundle(args)
+      dir = File.expand_path("../#{args[1]}", @base_file)
+      raise "cannot find relative path #{args[1]} for script=#{@base_file}" unless dir && Dir.exists?(dir)
+
+      logical_path = dir[/(?:^#{@context.root}\/)?(.+)$/, 1]
+      key = "dep:txt_bundle:#{logical_path}:#{@material.name}"
+      hb_dep = @context.cache[key]
+      unless hb_dep
+        hb_dep = ::Gluey::Dependencies::TextsBundle.new dir, logical_path, @context
+        @context.cache[key] = hb_dep
+      end
+
+      hb_dep.actualize if hb_dep.changed?
+      @dependencies << hb_dep
+      @script.gsub! /"%#{args[0]}%"/, File.read(hb_dep.file)
     end
 
-    hb_dep.actualize if hb_dep.changed?
-    @dependencies << hb_dep
-    @script.gsub! /"%#{args[0]}%"/, File.read(hb_dep.file)
   end
-
 end

data/lib/gluey/{glues → workshop/glues}/js_script/handlebars_addons.rb

@@ -7,7 +7,7 @@ module Gluey::Glues
       dir = File.expand_path("../#{args[1]}", @base_file)
       raise "cannot find dir containing handlebars templates for script=#{@base_file}" unless dir && Dir.exists?(dir)
 
-      logical_path = dir[/(?:^#{@context.root_path}\/)?(.+)$/, 1]
+      logical_path = dir[/(?:^#{@context.root}\/)?(.+)$/, 1]
       key = "dep:hb_bundle:#{logical_path}:#{@material.name}"
       hb_dep = @context.cache[key]
       unless hb_dep

data/lib/gluey/workshop/glues/js_script/uglifier_addons.rb

@@ -0,0 +1,19 @@
+require 'uglifier'
+
+module Gluey::Glues
+  class JsScript < Script
+
+    def self.set_uglifier_options(**opts)
+      @uglifier_options = {copyright: :none}.merge! opts
+    end
+
+    def self.uglifier
+      @uglifier ||= ::Uglifier.new(@uglifier_options || set_uglifier_options)
+    end
+
+    def process(base_file, deps)
+      JsScript.uglifier.compile super
+    end
+
+  end
+end

data/lib/gluey/{glues → workshop/glues}/sass.rb

@@ -1,18 +1,20 @@
 require 'sass'
 require_relative 'script'
-require_relative '../dependencies/single_file'
 
 module Gluey::Glues
     class Sass < Script
 
+      class << self
+        attr_accessor :engine_opts
+      end
+      self.engine_opts = {line_comments: true}
+
       def process(base_file, deps)
-        opts = {
-            syntax: @material.file_extension.to_sym,
+        opts = self.class.engine_opts.merge syntax: @material.file_extension.to_sym,
             load_paths: [File.expand_path('..', base_file)],
-            cache_store: ::Sass::CacheStores::Filesystem.new("#{@context.tmp_path}/.sass"),
-            filename: base_file,
-            line_comments: true
-        }
+            cache_store: ::Sass::CacheStores::Filesystem.new("#{@context.cache_path}/.sass"),
+            filename: base_file
+
         engine = ::Sass::Engine.new super(base_file, deps), opts
         output = engine.render
 

data/lib/gluey/{glues → workshop/glues}/script.rb

@@ -64,13 +64,13 @@ module Gluey::Glues
     end
 
     def get_nested_piece(file)
-      path = file[/(?:^#{@context.root_path}\/)?(.+)$/, 1]
+      path = file[/(?:^#{@context.root}\/)?(.+)$/, 1]
       key = "script_piece:#{@material.name}:#{path}"
       cache_file, dependencies = @context.cache[key]
       return cache_file, dependencies if cache_file && File.exists?(cache_file) && !dependencies.any?{|dep| dep.changed?}
 
       glue = self.class.new @context, @material
-      cache_dir = "#{@context.tmp_path}/.script"
+      cache_dir = "#{@context.cache_path}/.script"
       Dir.mkdir cache_dir unless Dir.exists? cache_dir
       cache_file = "#{cache_dir}/#{path}.#{@material.name}"
       dependencies = [::Gluey::Dependencies::SingleFile.new(file).actualize]

data/lib/gluey/{material.rb → workshop/material.rb}

@@ -1,27 +1,25 @@
-require_relative 'exceptions/file_not_found'
 
 class Gluey::Material
 
   attr_reader :name, :glue, :paths, :items
-  attr_accessor :asset, :file_extension, :public_dir
+  attr_accessor :asset_extension, :file_extension
 
   def initialize(name, glue, context)
     @name = name.to_sym
     @glue = glue
     @context = context
-    @asset = name.to_s
-    @paths = []
-    @items = []
-    yield self if block_given?
-    @file_extension ||= @asset.dup
-  end
 
-  def add_path(path)
-    @paths << path
+    set({asset_extension: name.to_s, paths: [], items: []})
+    yield self if block_given?
+    @file_extension ||= @asset_extension.dup
   end
 
-  def add_item(declaration)
-    @items << declaration
+  def set(**opts)
+    allowed_options = %i(paths items asset_extension file_extension)
+    opts.each do |k, value|
+      next unless allowed_options.include? k
+      instance_variable_set "@#{k}", value
+    end
   end
 
   def is_listed?(path, file)
@@ -71,7 +69,7 @@ class Gluey::Material
   private
 
   def full_paths
-    @paths.map{|p| "#{@context.root_path}/#{p}"}
+    @paths.map{|p| "#{@context.root}/#{p}"}
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gluey
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.3
 platform: ruby
 authors:
 - doooby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,25 +52,27 @@ files:
 - Rakefile
 - gluey.gemspec
 - lib/gluey.rb
-- lib/gluey/dependencies/directory.rb
-- lib/gluey/dependencies/handlebars_bundle.rb
-- lib/gluey/dependencies/single_file.rb
-- lib/gluey/dependencies/texts_bundle.rb
-- lib/gluey/exceptions/file_not_found.rb
-- lib/gluey/exceptions/item_not_listed.rb
-- lib/gluey/glues/base.rb
-- lib/gluey/glues/copy.rb
-- lib/gluey/glues/js_script.rb
-- lib/gluey/glues/js_script/handlebars_addons.rb
-- lib/gluey/glues/sass.rb
-- lib/gluey/glues/script.rb
-- lib/gluey/material.rb
-- lib/gluey/tools/local_build.rb
-- lib/gluey/tools/tools.rb
-- lib/gluey/url.rb
-- lib/gluey/version.rb
+- lib/gluey/base/environment.rb
+- lib/gluey/base/exceptions.rb
+- lib/gluey/base/rack_mountable.rb
+- lib/gluey/base/version.rb
+- lib/gluey/tools/local_make.rb
 - lib/gluey/warehouse.rb
+- lib/gluey/warehouse/asset_retrieving.rb
 - lib/gluey/workshop.rb
+- lib/gluey/workshop/asset_processing.rb
+- lib/gluey/workshop/dependencies/directory.rb
+- lib/gluey/workshop/dependencies/handlebars_bundle.rb
+- lib/gluey/workshop/dependencies/single_file.rb
+- lib/gluey/workshop/dependencies/texts_bundle.rb
+- lib/gluey/workshop/glues/base.rb
+- lib/gluey/workshop/glues/copy.rb
+- lib/gluey/workshop/glues/js_script.rb
+- lib/gluey/workshop/glues/js_script/handlebars_addons.rb
+- lib/gluey/workshop/glues/js_script/uglifier_addons.rb
+- lib/gluey/workshop/glues/sass.rb
+- lib/gluey/workshop/glues/script.rb
+- lib/gluey/workshop/material.rb
 homepage: 
 licenses:
 - MIT

data/lib/gluey/exceptions/file_not_found.rb

@@ -1,4 +0,0 @@
-module Gluey
-  class FileNotFound < StandardError
-  end
-end

data/lib/gluey/exceptions/item_not_listed.rb

@@ -1,4 +0,0 @@
-module Gluey
-  class ItemNotListed < StandardError
-  end
-end

data/lib/gluey/tools/local_build.rb

@@ -1,86 +0,0 @@
-require_relative 'tools'
-
-module Gluey::Tools
-
-  def self.build_into_public_dir(workshop, warehouse, public_dir='public/assets', **builders)
-    public_dirs = workshop.materials.values.inject({}) do |h, m|
-      h[m.name] = "#{workshop.root_path}/#{m.public_dir || public_dir}"
-      h
-    end
-
-    built = []
-    move_it = -> (cache_file, file) { FileUtils.mv cache_file, file }
-    self.each_asset_file workshop, warehouse do |cache_file, type, path|
-      file = "#{public_dirs[type]}/#{path}"
-      next if File.exists? file
-      FileUtils.mkdir_p file[0..(file.rindex('/')-1)]
-      (builders[type] || move_it)[cache_file, file]
-      built << file
-      puts "created #{file}"
-    end
-    return built
-  end
-
-  def self.clear_public_dir(workshop, warehouse, versions=2, public_dir='public/assets')
-    public_dirs = workshop.materials.values.inject({}) do |h, m|
-      h[m.name] = "#{workshop.root_path}/#{m.public_dir || public_dir}"
-      h
-    end
-
-    # process existing files into assets
-    eas_regexp = /^#{workshop.root_path}\/(.+)$/
-    assets = public_dirs.values.uniq.map{|dir| Dir["#{dir}/**/*.*.*"]}.flatten.
-        map{|f| Asset.try_create f[eas_regexp, 1]}.compact
-    assets = assets.inject({}){|h, asset| (h[asset.path] ||= []) << asset; h }
-
-    # items not on list
-    on_list = []
-    warehouse.assets.each do |type, mater_assets|
-      mater_assets.each do |_, real_path|
-        file = "#{public_dirs[type]}/#{real_path}"
-        asset = Asset.try_create file[eas_regexp, 1]
-        on_list << asset
-      end
-    end
-    on_list.map! &:path
-    assets.delete_if do |path, asseets_arr|
-      unless on_list.include? path
-        asseets_arr.each do |some_asset|
-          file = "#{workshop.root_path}/#{some_asset.orig_path}"
-          File.delete file
-          puts "deleted unknown #{file}"
-        end
-        true
-      end
-      false
-    end
-
-    # older versions
-    assets.values.select{|arr| arr.length > versions}.
-        map{|arr| arr.sort.slice 0..(-versions-1) }.compact.flatten.each do |old_asset|
-      file = "#{workshop.root_path}/#{old_asset.orig_path}"
-      File.delete file
-      puts "deleted old #{file}"
-    end
-  end
-
-  class Asset < Struct.new(:path, :time_stamp)
-
-    def self.try_create(file)
-      file.match /^([^\.]+)\.(\d+)\.(\w+)$/ do |m|
-        new "#{m[1]}.#{m[3]}", m[2]
-      end
-    end
-
-    def <=>(other)
-      time_stamp <=> other.time_stamp
-    end
-
-    def orig_path
-      ret = path.dup
-      ret.insert ret.rindex('.'), ".#{time_stamp}"
-    end
-
-  end
-
-end

data/lib/gluey/tools/tools.rb

@@ -1,19 +0,0 @@
-require 'gluey/warehouse'
-
-module Gluey::Tools
-
-  def self.each_asset_file(workshop, warehouse)
-    warehouse.assets.each do |type, assets|
-      assets.each do |path, real_path|
-        cache_file = workshop.fetch_file type, path
-        yield cache_file, type, real_path
-      end
-    end
-  end
-
-  def self.create_uglifier_builder(**opts)
-    require 'uglifier'
-    ->(a, b){File.write b, ::Uglifier.new(opts.merge! copyright: :none).compile(File.read a)}
-  end
-
-end

data/lib/gluey/url.rb

@@ -1,9 +0,0 @@
-module Gluey::Url
-
-  attr_accessor :base_url
-
-  def asset_url(material, path, mark=false)
-    "#{base_url}/#{material}/#{real_path material, path, mark}"
-  end
-
-end

data/lib/gluey/version.rb

@@ -1,3 +0,0 @@
-module Gluey
-  VERSION = '0.2.7'
-end