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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9b2dedae2f70f1a01c5af634dc2d3b089d0d8066
4
- data.tar.gz: be5e2c3e79c90a2eb31b31425e2c10109c904588
3
+ metadata.gz: 2f879f7d205bf4f6ad05d96df8aa753eba20fe4a
4
+ data.tar.gz: d39c215776c492932b2382f76e7c2a4b08048461
5
5
  SHA512:
6
- metadata.gz: fbe8bbbe66ce8f78dc223495368e28e517bd453efa11482153b6adfbbe7c38d5cee643389106add897561db37e49c7424234f32c436187cb334b47417b3db56f
7
- data.tar.gz: 80182d09b7ec601c5ac803d58a636ed4fb5de4f7a9b9ab4477dfbd5a64fed81202cd4b24a3615a8f0efadfb7c858b85f9164cbfba9bf371ab17c72535628ef74
6
+ metadata.gz: b5c77c56f9cdc569571fa2dd963699da8a65264cb00b4fcbb17f8b1a716ea7d7c645302008dfdfdd075525429403773695b3744470a997e13c31c586445d1ff5
7
+ data.tar.gz: 239d96d788377440ea6a2315baf5bafae813985c5db62c10c18900734c693923bc4655d32981080cb809231974c57ed2aa7714564a3bd64548fa0516f8415a35
@@ -11,13 +11,14 @@ class Lalala::Markdown::Handlers::Asset < Lalala::Markdown::Handlers::Base
11
11
 
12
12
  id_with_version = $1.split("/")
13
13
  id = id_with_version[0]
14
- version = id_with_version[1] || "original"
14
+ version = id_with_version[1]
15
15
 
16
16
  # build url
17
- url = "//" + File.join(
17
+ url = "//" + [
18
18
  "c." + Haraway.configuration.endpoint,
19
19
  id,
20
- version.to_s)
20
+ version
21
+ ].compact.join("/")
21
22
 
22
23
  # build img element
23
24
  helpers.image_tag(
@@ -11,13 +11,14 @@ class Lalala::Markdown::Handlers::LazyAsset < Lalala::Markdown::Handlers::Base
11
11
 
12
12
  id_with_version = $1.split("/")
13
13
  id = id_with_version[0]
14
- version = id_with_version[1] || "original"
14
+ version = id_with_version[1]
15
15
 
16
16
  # build url
17
- url = "//" + File.join(
17
+ url = "//" + [
18
18
  "c." + Haraway.configuration.endpoint,
19
19
  id,
20
- version.to_s)
20
+ version
21
+ ].compact.join("/")
21
22
 
22
23
  # build img element
23
24
  <<-EOS
@@ -1,6 +1,6 @@
1
1
  module Lalala
2
2
  VERSION = "4.1.0"
3
- BUILD = "358"
3
+ BUILD = "359"
4
4
 
5
5
  if BUILD != ("{{BUILD_NUMBER" + "}}") # prevent sed replacement (see script/ci)
6
6
  BUILD_VERSION = "#{VERSION}.dev.#{BUILD}"
@@ -14,7 +14,8 @@ class Article < ActiveRecord::Base
14
14
 
15
15
  # Markdown columns
16
16
  markdown :body, tables: true, link_schemes: {
17
- "youtube" => Lalala::Markdown::Handlers::YouTube.new(width: 520, height: 292)
17
+ "youtube" => Lalala::Markdown::Handlers::YouTube.new(width: 520, height: 292),
18
+ "asset" => Lalala::Markdown::Handlers::LazyAsset.new
18
19
  }
19
20
 
20
21
  # Scopes
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.0.dev.358
4
+ version: 4.1.0.dev.359
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2014-10-24 00:00:00.000000000 Z
16
+ date: 2014-10-27 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin