gluey 0.2.3 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13441ecaca9c252379a8d03b9e759fb5331cd0db
-  data.tar.gz: 7aeb4c4ac3185ce2fc80896e682b43363aaa2d5c
+  metadata.gz: 06efa92dcd6fd292dd71faf95ac07ce0dd921fdd
+  data.tar.gz: ea74e55f880c37e08b24a0002c8c243a5839016a
 SHA512:
-  metadata.gz: 921626be9a86eabc724300b3edcb455a05cc585a7d520497ba1d2ed48b69db7336609ae3dd2e8b7edd2f08745a5f3d6ec5f7e73374124ef212aa7c993598fd75
-  data.tar.gz: dac291204e1f5121badb9929f33d96fe1861add5b6a3cb185ee272a3ca7d2805234b1cf446de28fb168d2e8f242de1104a2d557959a4e6356d3a6b24513ef90a
+  metadata.gz: 39c68be866dbfc940bb6841075474b39735174cf76048992827ce8b870d045881bf83b46304f0cc0a62bf4b4f7623d23301235b47fdc9d78ebb20af08b54b9a7
+  data.tar.gz: 11c54bcc7c1c2875d54f2246c849216ef9a9c9889a6942881bf5d4188d9777a350e76372b52165c899b50cc57616ab427816615183941badfe9306d111e362d1

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+.idea

data/lib/gluey/dependencies/directory.rb

@@ -25,5 +25,9 @@ module Gluey::Dependencies
       Dir[@dir_pattern]
     end
 
+    def mark
+      ''
+    end
+
   end
 end

data/lib/gluey/dependencies/handlebars_bundle.rb

@@ -19,6 +19,10 @@ module Gluey::Dependencies
       @dependencies.any?{|d| d.changed?} || @dir_dep.changed? || (File.mtime(@file).to_i != @mtime rescue true)
     end
 
+    def mark
+      @dependencies.map(&:mark).join
+    end
+
     def actualize
       # remove deleted files
       @dependencies.delete_if{|dep| !dep.exists? }

data/lib/gluey/dependencies/single_file.rb

@@ -25,5 +25,9 @@ module Gluey::Dependencies
       @file == other.file
     end
 
+    def mark
+      File.mtime(@file).to_i.to_s
+    end
+
   end
 end

data/lib/gluey/dependencies/texts_bundle.rb

@@ -26,6 +26,10 @@ module Gluey::Dependencies
       @dependencies.any?{|d| d.changed?} || @dir_dep.changed? || (File.mtime(@file).to_i != @mtime rescue true)
     end
 
+    def mark
+      @dependencies.map(&:mark).join
+    end
+
     def actualize
       # remove deleted files
       @dependencies.delete_if{|dep| !dep.exists? }

data/lib/gluey/glues/base.rb

@@ -16,7 +16,7 @@ module Gluey::Glues
 
     def read_base_file(file)
       raw_content = File.read(file)
-      file[-4..-1]=='.erb' ? ERB.new(raw_content).result : raw_content
+      file[-4..-1]=='.erb' ? ERB.new(raw_content).result(@context.get_binding) : raw_content
     end
 
   end
@@ -24,6 +24,8 @@ module Gluey::Glues
   def self.load(name, *addons_names)
     require_relative name
     addons_names.flatten.each{|an| require_relative "#{name}/#{an}_addons" }
+  rescue LoadError => e
+    raise e.message
   end
 
 end

data/lib/gluey/glues/sass.rb

@@ -1,8 +1,9 @@
 require 'sass'
+require_relative 'script'
 require_relative '../dependencies/single_file'
 
 module Gluey::Glues
-    class Sass < Base
+    class Sass < Script
 
       def process(base_file, deps)
         opts = {
@@ -12,7 +13,7 @@ module Gluey::Glues
             filename: base_file,
             line_comments: true
         }
-        engine = ::Sass::Engine.new(read_base_file(base_file), opts)
+        engine = ::Sass::Engine.new super(base_file, deps), opts
         output = engine.render
 
         engine.dependencies.each do |dependency|

data/lib/gluey/glues/script.rb

@@ -3,8 +3,8 @@ require_relative '../dependencies/single_file'
 module Gluey::Glues
   class Script < Base
 
-    PREFIXES = ['//'].map{|p| Regexp.escape(p)}
-    DIRECTIVES_REGEXP = Regexp.compile "\\A(?:\\s*#{PREFIXES.map{|p| "(?:#{p}=.*\\n?)+"}.join '|'})+"
+    PREFIXES = ['//', '#'].map{|p| Regexp.escape(p)}
+    DIRECTIVES_REGEXP = Regexp.compile "\\A(?:\\s*#{PREFIXES.map{|p| "(?:#{p}>.*\\n?)+"}.join '|'})+"
 
     def process(base_file, deps)
       @script, @directives = strip_directives read_base_file(base_file)
@@ -46,7 +46,7 @@ module Gluey::Glues
       if directives
         script = $'
         directives = directives.split("\n").reject{|dir| dir.empty?}.map do |dir|
-          dir.strip[/(?:#{PREFIXES.join '|'}=)\s*(.+)/, 1].split (' ')
+          dir.strip[/(?:#{PREFIXES.join '|'})>\s*(.+)/, 1].split (' ')
         end
       end
       return script, directives

data/lib/gluey/material.rb

@@ -2,7 +2,7 @@ require_relative 'exceptions/file_not_found'
 
 class Gluey::Material
 
-  attr_reader :name, :glue
+  attr_reader :name, :glue, :paths, :items
   attr_accessor :asset, :file_extension, :public_dir
 
   def initialize(name, glue, context)
@@ -24,17 +24,20 @@ class Gluey::Material
     @items << declaration
   end
 
-  def is_listed?(path, file=nil)
-    @items.any? do |items_declaration|
-      case items_declaration
-        when String
-          path == items_declaration
-        when Regexp
-          path =~ items_declaration
-        when Proc
-          items_declaration[path, file]
-      end
-    end
+  def is_listed?(path, file)
+    file[/\.(\w+)(?:\.erb)?$/, 1]==@file_extension &&
+        @items.any? do |items_declaration|
+          case items_declaration
+            when :all, :any
+              true
+            when String
+              path == items_declaration
+            when Regexp
+              path =~ items_declaration
+            when Proc
+              items_declaration[path, file]
+          end
+        end
   end
 
   def to_s
@@ -42,18 +45,18 @@ class Gluey::Material
   end
 
   def find_base_file(path)
-    paths.each do |base_path|
+    full_paths.each do |base_path|
       p = "#{base_path}/#{path}.#{@file_extension}"; return p if File.exists? p
       p = "#{p}.erb"; return p if File.exists? p
       p = "#{base_path}/#{path}/index.#{@file_extension}"; return p if File.exists? p
       p = "#{p}.erb"; return p if File.exists? p
-      end
+    end
     raise(::Gluey::FileNotFound.new "#{to_s} cannot find base file for #{path}")
   end
 
   def list_all_items
     list = []
-    paths.map do |base_path|
+    full_paths.map do |base_path|
       glob_path = "#{base_path}/**/*.#{@file_extension}"
       files = Dir[glob_path] + Dir["#{glob_path}.erb"]
       files.select do |file|
@@ -67,7 +70,7 @@ class Gluey::Material
 
   private
 
-  def paths
+  def full_paths
     @paths.map{|p| "#{@context.root_path}/#{p}"}
   end
 

data/lib/gluey/url.rb

@@ -0,0 +1,9 @@
+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 +1,3 @@
 module Gluey
-  VERSION = '0.2.3'
+  VERSION = '0.2.7'
 end

data/lib/gluey/warehouse.rb

@@ -1,8 +1,10 @@
 require_relative '../gluey'
+require_relative 'url'
 require_relative 'exceptions/item_not_listed'
 require 'json'
 
 class Gluey::Warehouse
+  include Gluey::Url
 
   attr_reader :assets
 
@@ -11,7 +13,7 @@ class Gluey::Warehouse
     read_listing
   end
 
-  def real_path(asset_type, path)
+  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?)")
@@ -38,7 +40,7 @@ class Gluey::Warehouse
   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
+        h[path] = workshop.real_path material.name, path, true
         h
       end
       listing[material.name.to_sym] = list

data/lib/gluey/workshop.rb

@@ -1,4 +1,6 @@
+require 'digest'
 require_relative '../gluey'
+require_relative 'url'
 
 require_relative 'exceptions/item_not_listed'
 
@@ -6,8 +8,10 @@ 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
@@ -20,12 +24,13 @@ class Gluey::Workshop
   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 = "lump:#{material}:#{path}"
+    cache_key = chache_asset_key material, path
     file, dependencies = @cache[cache_key]
     if file && File.exists?(file) && !dependencies.any?{|d| d.changed?}
       return file
@@ -46,19 +51,37 @@ class Gluey::Workshop
     file
   end
 
-  def real_path(material, path)
+  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
-    "#{path}.#{File.mtime(file).to_i}.#{material.asset}"
+    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}"
+    end
   end
 
   def try_real_path(path)
-    path.match /^(.+)\.\d+\.(\w+)$/ do |m|
+    path.match /^(.+)\.(?:[a-f0-9]{32}\.)(\w+)$/ do |m|
       yield m[1], m[2]
     end
   end
 
+  def get_binding
+    binding
+  end
+
+  private
+
+  def chache_asset_key(material, path)
+    "lump:#{material}:#{path}"
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gluey
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.7
 platform: ruby
 authors:
 - doooby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-02 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - 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/warehouse.rb
 - lib/gluey/workshop.rb