lalala 4.0.0.dev.181 → 4.0.0.dev.183

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07fdbeeb9ea7cb7707da67dd9091edad5a86e80c
-  data.tar.gz: a05503c62520cf6b3c921436ea0e51cd2e57dace
+  metadata.gz: c674a8927d33f9750464b66cf35c8a53ffbbc9c0
+  data.tar.gz: 742ef49cbdd176b5c5e8cd5ed4a864aeb0b9caea
 SHA512:
-  metadata.gz: baba469ab05f2ac563b99e132fd3ef45d7c8951345ab229114455e2397a3d2673f1a93903cf34c0f339f959f1403921a807f5670ecdb26772f919f2d3190a7f3
-  data.tar.gz: 44745e35a0121a0209c4c7ed515e11d60961e29c52e62bb54a26ad2ad5a9db234dc070d654f5e2bd3cc63e2bc091b7916e04fa5fb46e97db47ce284e3fbc30dc
+  metadata.gz: 7ba71aa21ede75e186237c3bbd6de012afec3a9dfc95b53337f4be5850da98186968c142d3462fae6781767449ad7bc9b957556571c8d2a0cbb248e7163742c2
+  data.tar.gz: 6752a23b90ec9f1cbba1734930153c32e85ba73040cd388fd503853cac4a384bb2bc5d98834c4d4af8007e0607a23ba04d680d5b6de4e232c6d4dadafdfa8f8c

data/.gitignore

@@ -18,6 +18,7 @@ test/dummy/.sass-cache
 test/dummy/db/*.sqlite3
 test/dummy/log/*.log
 test/dummy/tmp/
+test/dummy/public/uploads
 test/tmp
 test/version_tmp
 tmp

data/Rakefile

@@ -24,6 +24,7 @@ end
 
 
 
+CALLED_FROM_ENGINE = true
 APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 

data/lib/formtastic/inputs/single_file_input.rb

@@ -7,9 +7,9 @@ class Formtastic::Inputs::SingleFileInput
     model_class = object.class.reflect_on_association(method).klass
 
     html = template.raw("")
-    html << template.content_tag(:label, method.to_s.humanize, class: "label")
+    html << label_html
     html << builder.fields_for(method, model_class.new) do |f|
-      f.file_field :asset, accept: model_class.extension_white_list
+      f.file_field :asset, accept: model_class.extension_white_list, id: input_html_options[:id]
     end
 
     if model_instance

data/lib/lalala/engine.rb

@@ -13,8 +13,7 @@ module Lalala
 
     initializer "lalala.migrations" do |app|
       app.class.configure do
-        if app.class.to_s == "Dummy::Application"
-        else
+        unless defined?(CALLED_FROM_ENGINE) and CALLED_FROM_ENGINE
           config.paths['db/migrate'] += Lalala::Engine.paths['db/migrate'].existent
         end
       end

data/lib/lalala/test/login_helper.rb

@@ -0,0 +1,16 @@
+module Lalala::Test::LoginHelper
+
+private
+
+  def login_as_admin!
+    AdminUser.create! name: 'Admin', email: 'admin@example.com', password: 'password', password_confirmation: 'password'
+
+    visit('/lalala')
+    assert_equal(new_admin_user_session_path, current_path)
+    fill_in('Email',    with: 'admin@example.com')
+    fill_in('Password', with: 'password')
+    click_on('Login')
+    assert_equal('/lalala', current_path)
+  end
+
+end

data/lib/lalala/test.rb

@@ -1,5 +1,8 @@
 module Lalala
   module Test
+    extend ActiveSupport::Autoload
+
+    autoload :LoginHelper
 
     def self.setup!
       require 'capybara/rails'
@@ -7,6 +10,7 @@ module Lalala
 
       Rails.backtrace_cleaner.remove_silencers!
 
+      ActionDispatch::IntegrationTest.send :include, Lalala::Test::LoginHelper
       ActionDispatch::IntegrationTest.send :include, Capybara::DSL
 
       Capybara.javascript_driver = :poltergeist

data/lib/lalala/version.rb

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

data/test/dummy/app/admin/articles.rb

@@ -0,0 +1,12 @@
+ActiveAdmin.register Article do
+
+  form do |f|
+    f.inputs do
+      f.input :title
+      f.input :body
+      f.input :image, as: :single_file
+    end
+    f.actions
+  end
+
+end

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

@@ -0,0 +1,9 @@
+class Article < ActiveRecord::Base
+  attr_accessible :body, :title
+
+  has_one_asset :image
+
+  validates :title,
+    presence: true
+
+end

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

@@ -0,0 +1,2 @@
+class FileAsset < Lalala::FileAsset
+end

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

@@ -0,0 +1,2 @@
+class ImageAsset < Lalala::ImageAsset
+end

data/test/dummy/app/uploaders/image_uploader.rb

@@ -1,2 +1,11 @@
 class ImageUploader < Lalala::Uploaders::Image
+
+  #
+  #  Versions
+  #  -- https://github.com/jnicklas/carrierwave#adding-versions
+  #
+  # version :example do
+  #   process :resize_to_fill => [420, 700]
+  # end
+
 end

data/test/dummy/db/migrate/20130528092721_create_articles.rb

@@ -0,0 +1,10 @@
+class CreateArticles < ActiveRecord::Migration
+  def change
+    create_table :articles do |t|
+      t.string :title
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130524155010) do
+ActiveRecord::Schema.define(:version => 20130528092721) do
 
   create_table "active_admin_comments", :force => true do |t|
     t.string   "resource_id",   :null => false
@@ -29,6 +29,7 @@ ActiveRecord::Schema.define(:version => 20130524155010) do
   add_index "active_admin_comments", ["resource_type", "resource_id"], :name => "index_admin_notes_on_resource_type_and_resource_id"
 
   create_table "admin_users", :force => true do |t|
+    t.string   "name",                                   :null => false
     t.string   "email",                  :default => "", :null => false
     t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
@@ -41,12 +42,18 @@ ActiveRecord::Schema.define(:version => 20130524155010) do
     t.string   "last_sign_in_ip"
     t.datetime "created_at",                             :null => false
     t.datetime "updated_at",                             :null => false
-    t.string   "name"
   end
 
   add_index "admin_users", ["email"], :name => "index_admin_users_on_email", :unique => true
   add_index "admin_users", ["reset_password_token"], :name => "index_admin_users_on_reset_password_token", :unique => true
 
+  create_table "articles", :force => true do |t|
+    t.string   "title"
+    t.text     "body"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "asset_translations", :force => true do |t|
     t.string  "locale"
     t.integer "asset_id"

data/test/integration/admin_users_test.rb

@@ -27,17 +27,4 @@ class AdminUsersTest < ActionDispatch::IntegrationTest
     assert page.has_text?('Mr. Manager')
   end
 
-private
-
-  def login_as_admin!
-    AdminUser.create! name: 'Admin', email: 'admin@example.com', password: 'password', password_confirmation: 'password'
-
-    visit('/lalala')
-    assert_equal(new_admin_user_session_path, current_path)
-    fill_in('Email',    with: 'admin@example.com')
-    fill_in('Password', with: 'password')
-    click_on('Login')
-    assert_equal('/lalala', current_path)
-  end
-
 end

data/test/integration/aricles_test.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class ArticlesTest < ActionDispatch::IntegrationTest
+
+  def setup
+    login_as_admin!
+  end
+
+  test 'list articles' do
+    Article.create!(title: "Hello World")
+
+    click_on('Articles')
+    assert_equal 200, page.status_code
+    assert page.has_text?('Hello World')
+  end
+
+  test 'create article' do
+    click_on('Articles')
+    click_on('New Article')
+    assert_equal('/lalala/articles/new', current_path)
+
+    fill_in('Title',                             with: 'My Article')
+    attach_file('Image', File.expand_path('../../fixtures/files/image.png', __FILE__))
+    click_on('Create Article')
+    page.save_page
+    assert_equal 200, page.status_code
+    assert_equal('/lalala/articles/1', current_path)
+
+    assert page.has_text?('My Article')
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lalala
 version: !ruby/object:Gem::Version
-  version: 4.0.0.dev.181
+  version: 4.0.0.dev.183
 platform: ruby
 authors:
 - Simon Menke
@@ -1425,6 +1425,7 @@ files:
 - lib/lalala/pages/path_handler.rb
 - lib/lalala/pages/route_mapper.rb
 - lib/lalala/test.rb
+- lib/lalala/test/login_helper.rb
 - lib/lalala/uploaders.rb
 - lib/lalala/uploaders/file.rb
 - lib/lalala/uploaders/image.rb
@@ -1441,6 +1442,7 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/admin/admin_pages.rb
 - test/dummy/app/admin/admin_users.rb
+- test/dummy/app/admin/articles.rb
 - test/dummy/app/admin/dashboard.rb
 - test/dummy/app/assets/javascripts/active_admin.js
 - test/dummy/app/assets/javascripts/application.js
@@ -1453,6 +1455,9 @@ files:
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/admin_user.rb
+- test/dummy/app/models/article.rb
+- test/dummy/app/models/file_asset.rb
+- test/dummy/app/models/image_asset.rb
 - test/dummy/app/pages/application_page.rb
 - test/dummy/app/uploaders/file_uploader.rb
 - test/dummy/app/uploaders/image_uploader.rb
@@ -1476,6 +1481,7 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
+- test/dummy/db/migrate/20130528092721_create_articles.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1487,8 +1493,10 @@ files:
 - test/dummy/test/fixtures/admin_users.yml
 - test/dummy/test/unit/admin_user_test.rb
 - test/dummy/tmp/cache/.gitkeep
+- test/fixtures/files/image.png
 - test/i18n/router_test.rb
 - test/integration/admin_users_test.rb
+- test/integration/aricles_test.rb
 - test/integration/login_test.rb
 - test/lalala_test.rb
 - test/test_helper.rb
@@ -1520,6 +1528,7 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/app/admin/admin_pages.rb
 - test/dummy/app/admin/admin_users.rb
+- test/dummy/app/admin/articles.rb
 - test/dummy/app/admin/dashboard.rb
 - test/dummy/app/assets/javascripts/active_admin.js
 - test/dummy/app/assets/javascripts/application.js
@@ -1532,6 +1541,9 @@ test_files:
 - test/dummy/app/mailers/.gitkeep
 - test/dummy/app/models/.gitkeep
 - test/dummy/app/models/admin_user.rb
+- test/dummy/app/models/article.rb
+- test/dummy/app/models/file_asset.rb
+- test/dummy/app/models/image_asset.rb
 - test/dummy/app/pages/application_page.rb
 - test/dummy/app/uploaders/file_uploader.rb
 - test/dummy/app/uploaders/image_uploader.rb
@@ -1555,6 +1567,7 @@ test_files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/.gitkeep
+- test/dummy/db/migrate/20130528092721_create_articles.rb
 - test/dummy/db/schema.rb
 - test/dummy/lib/assets/.gitkeep
 - test/dummy/log/.gitkeep
@@ -1566,8 +1579,10 @@ test_files:
 - test/dummy/test/fixtures/admin_users.yml
 - test/dummy/test/unit/admin_user_test.rb
 - test/dummy/tmp/cache/.gitkeep
+- test/fixtures/files/image.png
 - test/i18n/router_test.rb
 - test/integration/admin_users_test.rb
+- test/integration/aricles_test.rb
 - test/integration/login_test.rb
 - test/lalala_test.rb
 - test/test_helper.rb