kuhsaft 1.2.9 → 1.2.10

data/app/models/kuhsaft/asset_brick.rb

@@ -0,0 +1,25 @@
+module Kuhsaft
+  class AssetBrick < Brick
+    attr_accessible :caption, :link_style, :asset
+
+    mount_uploader :asset, Kuhsaft::AssetBrickAssetUploader
+
+    validates :caption, :asset, :presence => true
+
+    def self.styles
+      %w(pdf word excel button)
+    end
+
+    def to_style_class
+      [super, link_style.presence].join(' ')
+    end
+
+    def collect_fulltext
+      [super, caption].join(' ')
+    end
+
+    def user_can_add_childs?
+      false
+    end
+  end
+end

data/app/models/kuhsaft/link_brick.rb

@@ -1,6 +1,6 @@
 module Kuhsaft
   class LinkBrick < Brick
-    attr_accessible :href, :caption, :link_style
+    attr_accessible :href, :caption, :link_style, :open_in_new_window
 
     validates :href, :caption, :presence => true
 

data/app/uploaders/kuhsaft/asset_brick_asset_uploader.rb

@@ -0,0 +1,42 @@
+# encoding: utf-8
+
+class Kuhsaft::AssetBrickAssetUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or ImageScience support:
+  # include CarrierWave::MiniMagick
+  #include CarrierWave::ImageScience
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :s3
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+  # end
+
+  # Process files as they are uploaded:
+  # process :scale => [200, 300]
+  #
+  # def scale(width, height)
+  #   # do something
+  # end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_white_list
+    %w(pdf doc docx xls xlsx ppt pptx)
+  end
+
+  # Override the filename of the uploaded files:
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+end

data/app/views/kuhsaft/asset_bricks/_asset_brick.html.haml

@@ -0,0 +1,2 @@
+%div{ :class => asset_brick.to_style_class }
+  = link_to asset_brick.caption, asset_brick.asset.url, :target => '_blank'

data/app/views/kuhsaft/asset_bricks/asset_brick/_edit.html.haml

@@ -0,0 +1,7 @@
+= form.input :caption, :as => :string, :input_html => { :class => 'span6' }
+= form.input :asset
+- if brick.asset.present?
+  .countrol-group
+    %label
+      = link_to File.basename(brick.asset.url), brick.asset.url
+= form.input :link_style, :collection => Kuhsaft::AssetBrick.styles

data/app/views/kuhsaft/link_bricks/_link_brick.html.haml

@@ -1,3 +1,2 @@
 %div{ :class => link_brick.to_style_class }
-  %a{ :href => link_brick.href }
-    = link_brick.caption
+  = link_to link_brick.caption, link_brick.href, :target => link_brick.open_in_new_window? ? '_blank' : ''

data/app/views/kuhsaft/link_bricks/link_brick/_edit.html.haml

@@ -1,3 +1,4 @@
 = form.input :href, :as => :string, :input_html => { :class => 'span6' }
 = form.input :caption, :as => :string, :input_html => { :class => 'span6' }
+= form.input :open_in_new_window
 = form.input :link_style, :collection => Kuhsaft::LinkBrick.styles

data/config/locales/models/kuhsaft/asset_brick/de.yml

@@ -0,0 +1,9 @@
+de:
+  activerecord:
+    models:
+      kuhsaft/asset_brick: 'Datei'
+    attributes:
+      kuhsaft/asset_brick:
+        caption: 'Anzeigetext'
+        link_style: 'Stil'
+        asset: 'Datei'

data/config/locales/models/kuhsaft/link_brick/de.yml

@@ -7,3 +7,4 @@ de:
         caption: 'Linktext'
         href: 'Link'
         link_style: 'Stil'
+        open_in_new_window: 'In neuem Fenster öffnen?'

data/config/locales/views/kuhsaft/cms/bricks/de.yml

@@ -7,3 +7,8 @@ de:
           saved: 'Gespeichert! ✔'
           confirm: 'Wirklich löschen?'
           empty: 'Hier ist noch nichts.'
+
+    image_bricks:
+      image_brick:
+        edit:
+          image_preview: 'Vorschau'

data/db/migrate/09_add_additional_fields_to_kuhsaft_bricks.rb

@@ -0,0 +1,6 @@
+class AddAdditionalFieldsToKuhsaftBricks < ActiveRecord::Migration
+  def change
+    add_column :kuhsaft_bricks, :asset, :string
+    add_column :kuhsaft_bricks, :open_in_new_window, :boolean
+  end
+end

data/db/seeds.rb

@@ -10,3 +10,4 @@ Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::SliderBrick', :group => 'elem
 Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::ImageBrick', :group => 'elements')
 Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::PlaceholderBrick', :group => 'elements')
 Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::AnchorBrick', :group => 'elements')
+Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::AssetBrick', :group => 'elements')

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.2.9"
+  VERSION = "1.2.10"
 end

data/spec/models/asset_brick_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe Kuhsaft::AssetBrick do
+
+  let :asset_brick do
+    Kuhsaft::AssetBrick.new
+  end
+
+  describe '#valid' do
+    before do
+      asset_brick.valid?
+    end
+
+    context 'without a #caption' do
+      it 'has an error' do
+        asset_brick.should have(1).error_on(:caption)
+      end
+    end
+  end
+
+  describe '#bricks' do
+    it 'can not have childs' do
+      asset_brick.should_not respond_to(:bricks)
+    end
+  end
+
+  describe '.styles' do
+    it 'returns the available link styles' do
+      Kuhsaft::AssetBrick.styles.should == %w(pdf word excel button)
+    end
+  end
+
+  describe '#to_style_class' do
+    it 'includes the link style' do
+      asset_brick.stub(:link_style).and_return('pdf')
+      asset_brick.to_style_class.should == 'kuhsaft-asset-brick pdf'
+    end
+  end
+
+  describe '#user_can_add_childs?' do
+    it 'returns false' do
+      asset_brick.user_can_add_childs?.should be_false
+    end
+  end
+end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
   prerelease: 
 platform: ruby
 authors:
 - Immanuel Häussermann
 - Felipe Kaufmann
 - Phil Schilter
+- Donat Baier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-06 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -328,6 +329,7 @@ files:
 - app/models/kuhsaft/accordion_item_brick.rb
 - app/models/kuhsaft/anchor_brick.rb
 - app/models/kuhsaft/asset.rb
+- app/models/kuhsaft/asset_brick.rb
 - app/models/kuhsaft/brick.rb
 - app/models/kuhsaft/brick_type.rb
 - app/models/kuhsaft/brick_type_filter.rb
@@ -345,6 +347,7 @@ files:
 - app/models/kuhsaft/text_brick.rb
 - app/models/kuhsaft/two_column_brick.rb
 - app/models/kuhsaft/video_brick.rb
+- app/uploaders/kuhsaft/asset_brick_asset_uploader.rb
 - app/uploaders/kuhsaft/asset_uploader.rb
 - app/uploaders/kuhsaft/image_brick_image_uploader.rb
 - app/views/kuhsaft/accordion_bricks/_accordion_brick.html.haml
@@ -353,6 +356,8 @@ files:
 - app/views/kuhsaft/accordion_item_bricks/accordion_item_brick/_edit.html.haml
 - app/views/kuhsaft/anchor_bricks/_anchor_brick.html.haml
 - app/views/kuhsaft/anchor_bricks/anchor_brick/_edit.html.haml
+- app/views/kuhsaft/asset_bricks/_asset_brick.html.haml
+- app/views/kuhsaft/asset_bricks/asset_brick/_edit.html.haml
 - app/views/kuhsaft/cms/admin/_brick_type_dropdown.html.haml
 - app/views/kuhsaft/cms/admin/_content_language_switch.html.haml
 - app/views/kuhsaft/cms/admin/_empty_state.html.haml
@@ -401,6 +406,7 @@ files:
 - config/locales/models/kuhsaft/accordion_brick/de.yml
 - config/locales/models/kuhsaft/accordion_item_brick/de.yml
 - config/locales/models/kuhsaft/anchor_brick/de.yml
+- config/locales/models/kuhsaft/asset_brick/de.yml
 - config/locales/models/kuhsaft/column_brick/de.yml
 - config/locales/models/kuhsaft/image_brick/de.yml
 - config/locales/models/kuhsaft/image_size/de.yml
@@ -423,10 +429,11 @@ files:
 - db/migrate/02_create_kuhsaft_bricks.rb
 - db/migrate/03_create_kuhsaft_brick_types.rb
 - db/migrate/04_create_kuhsaft_assets.rb
+- db/migrate/05_remove_cms_admin.rb
 - db/migrate/06_add_template_name_to_kuhsaft_bricks.rb
 - db/migrate/07_add_default_value_to_brick_type_enabled.rb
-- db/migrate/20130206141601_remove_cms_admin.rb
-- db/migrate/8_add_display_styles_to_bricks.rb
+- db/migrate/08_add_display_styles_to_bricks.rb
+- db/migrate/09_add_additional_fields_to_kuhsaft_bricks.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/assets/install_generator.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
@@ -487,6 +494,7 @@ files:
 - spec/models/accordion_brick_spec.rb
 - spec/models/accordion_item_brick_spec.rb
 - spec/models/anchor_brick_spec.rb
+- spec/models/asset_brick_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/brick_spec.rb
 - spec/models/brick_type_filter_spec.rb
@@ -517,7 +525,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4300874740520236236
+      hash: 2082020547520561498
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -526,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4300874740520236236
+      hash: 2082020547520561498
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24
@@ -576,6 +584,7 @@ test_files:
 - spec/models/accordion_brick_spec.rb
 - spec/models/accordion_item_brick_spec.rb
 - spec/models/anchor_brick_spec.rb
+- spec/models/asset_brick_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/brick_spec.rb
 - spec/models/brick_type_filter_spec.rb