lalala 4.1.0.dev.358 → 4.1.0.dev.359

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b2dedae2f70f1a01c5af634dc2d3b089d0d8066
-  data.tar.gz: be5e2c3e79c90a2eb31b31425e2c10109c904588
+  metadata.gz: 2f879f7d205bf4f6ad05d96df8aa753eba20fe4a
+  data.tar.gz: d39c215776c492932b2382f76e7c2a4b08048461
 SHA512:
-  metadata.gz: fbe8bbbe66ce8f78dc223495368e28e517bd453efa11482153b6adfbbe7c38d5cee643389106add897561db37e49c7424234f32c436187cb334b47417b3db56f
-  data.tar.gz: 80182d09b7ec601c5ac803d58a636ed4fb5de4f7a9b9ab4477dfbd5a64fed81202cd4b24a3615a8f0efadfb7c858b85f9164cbfba9bf371ab17c72535628ef74
+  metadata.gz: b5c77c56f9cdc569571fa2dd963699da8a65264cb00b4fcbb17f8b1a716ea7d7c645302008dfdfdd075525429403773695b3744470a997e13c31c586445d1ff5
+  data.tar.gz: 239d96d788377440ea6a2315baf5bafae813985c5db62c10c18900734c693923bc4655d32981080cb809231974c57ed2aa7714564a3bd64548fa0516f8415a35

data/lib/lalala/markdown/handlers/asset.rb

@@ -11,13 +11,14 @@ class Lalala::Markdown::Handlers::Asset < Lalala::Markdown::Handlers::Base
 
     id_with_version = $1.split("/")
     id = id_with_version[0]
-    version = id_with_version[1] || "original"
+    version = id_with_version[1]
 
     # build url
-    url = "//" + File.join(
+    url = "//" + [
       "c." + Haraway.configuration.endpoint,
       id,
-      version.to_s)
+      version
+    ].compact.join("/")
 
     # build img element
     helpers.image_tag(

data/lib/lalala/markdown/handlers/lazy_asset.rb

@@ -11,13 +11,14 @@ class Lalala::Markdown::Handlers::LazyAsset < Lalala::Markdown::Handlers::Base
 
     id_with_version = $1.split("/")
     id = id_with_version[0]
-    version = id_with_version[1] || "original"
+    version = id_with_version[1]
 
     # build url
-    url = "//" + File.join(
+    url = "//" + [
       "c." + Haraway.configuration.endpoint,
       id,
-      version.to_s)
+      version
+    ].compact.join("/")
 
     # build img element
     <<-EOS

data/lib/lalala/version.rb

@@ -1,6 +1,6 @@
 module Lalala
   VERSION = "4.1.0"
-  BUILD   = "358"
+  BUILD   = "359"
 
   if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
     BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"

data/test/dummy/app/models/article.rb

@@ -14,7 +14,8 @@ class Article < ActiveRecord::Base
 
   # Markdown columns
   markdown :body, tables: true, link_schemes: {
-    "youtube" => Lalala::Markdown::Handlers::YouTube.new(width: 520, height: 292)
+    "youtube" => Lalala::Markdown::Handlers::YouTube.new(width: 520, height: 292),
+    "asset" => Lalala::Markdown::Handlers::LazyAsset.new
   }
 
   # Scopes

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.358
+  version: 4.1.0.dev.359
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin