ro 1.4.2 → 1.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTIyYzhhNmViMzU2MjVlZmVlYmI4OWIyZGMwM2Y1ZWE5N2ZiNDY3MA==
+    MWE0ZWVlNDk0Nzc1YzRlMTcyNGNkYmViMWI1YmExMzYzYTE0YzU0NA==
   data.tar.gz: !binary |-
-    NGExYmE1YWE1M2FjNzJlMWViZmZlMDcxNTYwY2Y0MDk1ZTNjZmIyYw==
+    YWU4YjhhY2Y1ZWYyY2EwOTJjODQwOTlmNTZhZDkyZDcwZjhmZmQ0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MjIyNWExYTRjYzNmYmYxYzYyOGQxMWJmNDAxZjg4YjM5OWE3NDMyMmQyNzc1
-    MmQ5MjQzMGY2OTYwYzRkNDhlOTM1MjM2MjE5YWM4MmIwZDAzZjdlMGEzNDZi
-    YTEwMzEzMjJlYTI5YmRlY2NiZDMyYjg3OGJhZTljZWQxY2ZkZWI=
+    NDk4YzE1Yzc1NDM0MTJjY2QyOWM5NTU4NmM4OThlZjJmOGE1NDc3NTZkMmUz
+    Yjk1YmQyZTNhMTE4YTRjNjE4ZjQ1OTBiZTllYjYwZTY5ZDVhNTNhMzZhOTI1
+    YzFiOTlmNDQ3ZDVmN2I5ODNlNzEwYjU2OGE2NDZmNTdmZDQyZWU=
   data.tar.gz: !binary |-
-    NzJjYzc0MmI1NWVlZDI4NjcxYmVlYmQ0NzUxZWE5YzU5OTgwNmFmNWJhOTlj
-    YTdiODZiZDM1NWQzNjc4NjdjNGY1ZWM3ZTQ5MTY3NDE5MmQ0ZDVkNjgwNjU4
-    MGQ1MjcxNTczMmI5YTc3OTlkNzJmYTYzY2NmMWEzYTA0M2YyN2M=
+    N2IxNjJlNjhhMWM3YjYyNTBhNDVhZWUyMTlkYTRmN2RmNzhmMmE2ODAwYmFm
+    NjRiMDQwYjg4YWFkNjIxM2YxMTM0MGVjMzI4YWNlYzFkYjUzMjM2NzY5ZmZm
+    NTZhMDFmZTdhZGZmNDdlYmRlMjk2ODQ0YjZlMzRmNzAxZDQ4NWQ=

data/lib/ro.rb

@@ -10,7 +10,7 @@
 
 #
   module Ro
-    Version = '1.4.2' unless defined?(Version)
+    Version = '1.4.3' unless defined?(Version)
 
     def version
       Ro::Version

data/lib/ro/node.rb

@@ -101,7 +101,8 @@ module Ro
     def assets
       asset_paths.map do |path|
         name = path.sub(asset_dir + "/", "")
-        url = url_for(name)
+        path_info = path.gsub(/^#{ Regexp.escape(Ro.root) }/, '')
+        url = File.join(Ro.route, path_info)
         Asset.new(name, :path => path, :url => url)
       end
     end
@@ -110,6 +111,45 @@ module Ro
       assets.map(&:url)
     end
 
+    def asset_for(*args, &block)
+      options = Map.options_for!(args)
+
+      path_info = Ro.relative_path_for(args)
+
+      path = File.join(@path.to_s, 'assets', path_info)
+
+      glob = path_info.gsub(/[_-]/, '[_-]')
+
+      globs = 
+        [
+          File.join(@path.to_s, 'assets', "#{ glob }"),
+          File.join(@path.to_s, 'assets', "#{ glob }*"),
+          File.join(@path.to_s, 'assets', "**/#{ glob }")
+        ]
+
+      candidates = globs.map{|glob| Dir.glob(glob, ::File::FNM_CASEFOLD)}.flatten.compact.uniq
+
+      case candidates.size
+        when 0
+          raise ArgumentError.new("no asset matching #{ globs.inspect }")
+        else
+          path = candidates.first
+          name = path.sub(asset_dir + "/", "")
+          path_info = path.gsub(/^#{ Regexp.escape(Ro.root) }/, '')
+          url = File.join(Ro.route, path_info)
+      end
+
+      Asset.new(name, :path => path, :url => url)
+    end
+
+    def asset_for?(*args, &block)
+      begin
+        asset_for(*args, &block)
+      rescue
+        nil
+      end
+    end
+
     class Asset < ::String
       fattr(:path)
       fattr(:url)
@@ -141,44 +181,27 @@ module Ro
     def url_for(*args, &block)
       options = Map.options_for!(args)
 
-      timestamp = options.delete('timestamp')
+      opts = Map.new
 
-      path_info = Ro.relative_path_for(args)
+      opts[:timestamp] = options.delete(:timestamp)
 
-      path = File.join(@path.to_s, 'assets', path_info)
+      args.push(options)
 
-      glob = path_info.gsub(/[_-]/, '[_-]')
+      asset = asset_for(*args, &block)
 
-      globs = 
-        [
-          File.join(@path.to_s, 'assets', "#{ glob }"),
-          File.join(@path.to_s, 'assets', "#{ glob }*"),
-          File.join(@path.to_s, 'assets', "**/#{ glob }")
-        ]
-
-      candidates = globs.map{|glob| Dir.glob(glob, ::File::FNM_CASEFOLD)}.flatten.compact.uniq
-
-      case candidates.size
-        when 0
-          raise ArgumentError.new("no asset matching #{ globs.inspect }")
+      if ts = opts.delete(:timestamp)
+        if ts == true
+          opts[:_] = File.stat(asset.path).mtime.utc.to_i
         else
-          path = candidates.first
-          path_info = path.gsub(/^#{ Regexp.escape(Ro.root) }/, '')
-
-          if timestamp
-            #options['_'] = Ro.md5(IO.binread(path))
-            timestamp = File.stat(path).mtime.utc.to_i
-            options['_'] = timestamp
-          end
+          opts[:_] = ts
+        end
       end
 
-      url = File.join(Ro.route, path_info)
-
-      if options.empty?
-        url
+      if opts.empty?
+        asset.url
       else
-        query_string = Ro.query_string_for(options)
-        "#{ url }?#{ query_string }"
+        query_string = Ro.query_string_for(opts)
+        "#{ asset.url }?#{ query_string }"
       end
     end
 

data/notes/ara.txt

@@ -1,4 +1,6 @@
 
+-
+  node.asset_for(:name)
 
 - nodes have fields
   - fields know from whence them came

data/ro.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "ro"
-  spec.version = "1.4.2"
+  spec.version = "1.4.3"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "ro"
   spec.description = "description: ro kicks the ass"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ro
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: map