lalala 4.1.0.dev.316 → 4.1.0.dev.318

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 070871a64114d813c0f6a5372323bd28ef167c33
-  data.tar.gz: 6193eed2022e3ad22837b864a239dcfb3079ab0f
+  metadata.gz: 90d746cae3543059befc304bc0b773caf69df033
+  data.tar.gz: d9040701cc8bca4b4c48bdac5e9783b94c3749f4
 SHA512:
-  metadata.gz: b8bdcf3a923a4814d87c6f13b75cbf81fbb830f7eaf6bbfcef66e7878950768f40a79334dd0cf673c28eaf8ea781c61e51ea818cfe3dea727c274621d105a7e8
-  data.tar.gz: 1da4864290987e9dd87907a1597a296bf64206093a2768b76b5fcc5796541bc5b514faf03b389136e25d83ee77968220446f691def437f95ce38b7824edc7aea
+  metadata.gz: 3f142729c02d2e228a0bcf15507f9bfe4b01545881c9b672030b469af6e8ccc2e5fc126c8dcb059aab4178d792f0d2fb351d9679cbcb0260fed1ee6ecef84f56
+  data.tar.gz: 12eea2f56f1eb2cf465cd596c1d390a34e7b8075c2cfc39938d39932e929df2f29fe5ebef414a5504e60fdb3c63984259b04d175fecdbb72577242afefc521f8

data/lib/lalala/version.rb

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

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

@@ -1,6 +1,5 @@
 class Article < ActiveRecord::Base
-  attr_accessible :body, :title, :category, :tag_ids,
-                  :images, :downloads, :poster_image
+  attr_accessible :body, :title, :category, :tag_ids
 
   # Translations
   translates :title, :body
@@ -9,9 +8,9 @@ class Article < ActiveRecord::Base
   markdown :body
 
   # Assets
-  has_one_asset :poster_image, :images
-  has_many_assets :images, :images
-  has_many_assets :downloads, :downloads
+  has_one_asset :poster_image, "images"
+  has_many_assets :images, "images"
+  has_many_assets :downloads, "downloads"
 
   # Validations
   validates :title, presence: true

data/test/dummy/app/pages/application_page.rb

@@ -5,7 +5,7 @@ class ApplicationPage < Lalala::Page
   # translates :body
 
   # All page associations should be placed here:
-  has_many_assets :images, :images
+  has_many_assets :images, "images"
 
   markdown :body, tables: true, link_schemes: {
     "youtube" => Lalala::Markdown::Handlers::YouTube.new(width: 520, height: 292),

data/test/dummy/app/views/pages/articles.html.erb

@@ -0,0 +1,6 @@
+<% Article.all.each do |a| %>
+  <article>
+    <h1><%= a.title %></h1>
+    <%= a.body_html %>
+  </article>
+<% end %>

data/test/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Dummy::Application.routes.draw do
+  get '/articles', to: 'pages#articles'
+
   pages :media, to: 'pages#media'
   pages :application, to: 'pages#show'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.1.0.dev.316
+  version: 4.1.0.dev.318
 platform: ruby
 authors:
 - Simon Menke
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -1504,6 +1504,7 @@ files:
 - test/dummy/app/pages/media_page.rb
 - test/dummy/app/views/admin/_stats.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/pages/articles.html.erb
 - test/dummy/app/views/pages/media.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
@@ -1607,6 +1608,7 @@ test_files:
 - test/dummy/app/pages/media_page.rb
 - test/dummy/app/views/admin/_stats.html.erb
 - test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/pages/articles.html.erb
 - test/dummy/app/views/pages/media.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb