yarrow 0.2.7 → 0.2.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjkyNjg4NmRiYzY3OTc4YTI2ZTMxYjhjZjZjMDFkMDY0YmFhMDlhYQ==
+    NzRkODFhYjRmMDAyMTQ1OWJiOTdiYmJiNTZkMmJkOWM1NWEyODFmZQ==
   data.tar.gz: !binary |-
-    Yjc1NzE0YzRiYzQzNjk5OTFiNjQ2MzQ3ZWU2ZWQzODc2MWI3NGRkNQ==
+    MmZhNjI3NGRlMGI2ZGY5YTQ3ZmVhMTMyOWQ1YzZmNTg2NzEyYTQ5Yg==
 SHA512:
   metadata.gz: !binary |-
-    OGE5NTdmNDViN2MwY2JmMGQyY2Y5ZGM2OTAyNmNmNTZjZjg1Y2E1Mjg5OGM5
-    YWVlZDUzOTg4ZDM2OTM0MmM3Y2VjMDA5YTI4MmNkYmVlYmNhNTEyNDg2MmI5
-    NThkZDM4YjQ4NTk4OTVhMzg4Yjk4OTVjOTJmODRjMzVlNmU3ZmY=
+    YTI2ZGMwNmMzOTg3N2Q0YTAxNmEyYzI3YWU4ZDE5YTAwMjM5YjJjYmQxZDMy
+    NzI2YjRhNjA4YTVkYTU1ZDkyMTU1M2YwNzJmMGZhZDYyOTc0ODg4YjliOWEy
+    MTNkYTYyZDE4YWI0MmU0NjdiNmU4Y2MwZGQ3MWE3ZmZjMGUzNWM=
   data.tar.gz: !binary |-
-    ZjVmZGY3ZDBiOGE5MjI5YmFhOWZiZWViNzM3MjhmZGM3NDAwYjAwMGJlNmU3
-    NGM3NDA1YTliNDVhNzg5MjRhNzk1OTlmZjY1ODJmZTA3MTM0ZWU0OTU3ZDBk
-    YzhiOTZiMzA5NWMwNzdjNDcyZjIwNWQ1ZjgxMjFjZTZiMzAzNGQ=
+    ZjgyYjU1NWM4OWQ0YTdjYjUwYWY4ODFkYzA4MWJlMzMzMDM4YmJmMTUwMjYx
+    YmEyZjA0YjhhNjE4NDVmOGU3ZjE3YTBjOTM4MGYwZGViYmI0YzA2ZWI2ZDhm
+    MzYxMzg5MGVkMDUwNzkyNjYwMGU0ODdhY2ZmNDg5NTE0ZmZkYjI=

data/lib/yarrow/assets/manifest.rb

@@ -50,6 +50,28 @@ module Yarrow
       	@manifest_index['files'].values
       end
 
+      def css_logical_paths
+        select_by_extension(logical_paths, '.css')
+      end
+
+      def js_logical_paths
+        select_by_extension(logical_paths, '.js')
+      end
+
+      def css_digest_paths
+        select_by_extension(digest_paths, '.css')
+      end
+
+      def js_digest_paths
+        select_by_extension(digest_paths, '.js')
+      end
+
+      private
+
+      def select_by_extension(collection, ext)
+        collection.select { |asset| asset.end_with?(ext) }
+      end
+
     end
   end
 end

data/lib/yarrow/html/asset_tags.rb

@@ -1,27 +1,23 @@
 module Yarrow
   module HTML
-    module AssetTags
-      
-      def config
-        Yarrow::Configuration.instance
-      end
+    module AssetTags     
+      include Yarrow::Configurable
 
       # TODO: make sprockets manifest optional/pluggable
       def manifest
         Yarrow::Assets::Manifest.new(config || {})
       end
 
-      def all_script_tags
-        out = []
-        manifest.digest_paths.each do |asset|
-          out << script_tag(:asset => asset)
-        end
-        out.join["\n"]
+      def script_tags
+        manifest.js_logical_paths.map { |asset_path| script_tag(asset: asset_path) }.join("\n")
       end
 
+      # TODO: support asset path option?
       def script_tag(options)
-        if options.has_key? :asset and manifest.exists?(options[:asset])
-          src_path = manifest.digest_path(options[:asset])
+        if options.has_key? :asset and manifest.exists? options[:asset]
+          script_path = manifest.digest_path(options[:asset])
+          assets_path = config.assets_path || ''
+          src_path = [assets_path, script_path].join('/')
         else
           src_path = options[:src]
         end
@@ -29,9 +25,12 @@ module Yarrow
         "<script src=\"#{src_path}\"></script>"
       end
 
+      # TODO: support asset path option?
       def link_tag(options)
-        if options.has_key? :asset and manifest.exists?(options[:asset])
-          href_path = manifest.digest_path(options[:asset])
+        if options.has_key? :asset and manifest.exists? options[:asset]
+          stylesheet_path = manifest.digest_path(options[:asset])
+          assets_path = config.assets_path || ''
+          href_path = [assets_path, stylesheet_path].join('/')      
         else
           href_path = options[:href]
         end

data/lib/yarrow/version.rb

@@ -1,4 +1,4 @@
 module Yarrow
   APP_NAME = "Yarrow"
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/lib/yarrow.rb

@@ -1,20 +1,22 @@
-require "hashie"
-require "yaml"
+require 'hashie'
+require 'yaml'
 
-require_relative "yarrow/version"
-require_relative "yarrow/logging"
-require_relative "yarrow/configuration"
-require_relative "yarrow/console_runner"
-require_relative "yarrow/generator"
-require_relative "yarrow/model/index"
-require_relative "yarrow/model/base"
-require_relative "yarrow/output/mapper"
-require_relative "yarrow/output/generator"
-require_relative "yarrow/content_map"
-require_relative "yarrow/assets"
-require_relative "yarrow/html"
-require_relative "yarrow/tools/front_matter"
+require 'yarrow/version'
+require 'yarrow/logging'
+require 'yarrow/configuration'
+require 'yarrow/console_runner'
+require 'yarrow/generator'
+require 'yarrow/model/index'
+require 'yarrow/model/base'
+require 'yarrow/html/asset_tags'
+require 'yarrow/output/mapper'
+require 'yarrow/output/generator'
+require 'yarrow/output/context'
+require 'yarrow/content_map'
+require 'yarrow/assets'
+require 'yarrow/html'
+require 'yarrow/tools/front_matter'
 
-# Dir[File.dirname(__FILE__) + "/yarrow/generators/*.rb"].each do |generator|
+# Dir[File.dirname(__FILE__) + '/yarrow/generators/*.rb'].each do |generator|
 #   require generator
 # end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie