tkh_illustrations 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23ad9a15fc2dd3c607295a2973845c533960a532
-  data.tar.gz: 924f5d4dc52a2bd0ecaefb432a4832d9f08c1951
+  metadata.gz: 9c784f4e79e12e75ab93035079b68cc3cb88140e
+  data.tar.gz: 1f943c41f92685c3f05b6a2ded82cf9858fb1d00
 SHA512:
-  metadata.gz: f3092f303488f82cb3af338cb104d4462eb60a5fc9a57fcbb46fcac8e43c03867bea41bfc4c49b6fe42cb6f9ca07bd7d256ce5066fcbf0a81ed51f3d8bb59aa9
-  data.tar.gz: e2ebc05c51c57eb10e6c28a3b75fc8aa94ff2fe48c138efd0eed499e0516ede74e79ee04c541aae387065a219873b1285b7cf97d81390e063202c3416ee30311
+  metadata.gz: d5382ff5352759cd67e73365185da7f1216e9797010127eef69c6a6ce6598194d795ce273fb036a471f9d99b8d3e427f8134089a7f38bb7b90e536511f6d99f5
+  data.tar.gz: ac7a004da61c65e2f81aeb0eeddb762dc7a3913948dbabd2a3063e0fe24b9be91e01164bac9a517ed868cb596e700891eb710362513e6e071fd472f724750e93

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.9.4
+
+* Added a Downloads resource for MP3 sound files and PDF documents
+* Added an XXL size to image uploader connected with illustrations
+
+
 ## 0.9.3
 
 * Fixed up and improved paginators

data/app/controllers/downloads_controller.rb

@@ -0,0 +1,52 @@
+class DownloadsController < ApplicationController
+
+  before_filter :authenticate
+  before_filter :authenticate_with_admin
+
+  def index
+    @downloads = Download.by_recent.paginate(:page => params[:page], :per_page => 50)
+    switch_to_admin_layout
+  end
+
+  def new
+    @download = Download.new
+    switch_to_admin_layout
+  end
+
+  def edit
+    @download = Download.find(params[:id])
+    switch_to_admin_layout
+  end
+
+  def create
+    @download = Download.new(download_params)
+    if @download.save
+      redirect_to downloads_path, notice: 'Your asset has been saved.'
+    else
+      render action: "new", layout: 'admin'
+    end
+  end
+
+  def update
+    @download = Download.find(params[:id])
+    if @download.update_attributes(download_params)
+      redirect_to downloads_path, notice: 'Your asset has been saved.'
+    else
+      render action: "edit", layout: 'admin'
+    end
+  end
+
+  def destroy
+    @download = Download.find(params[:id])
+    @download.destroy
+    redirect_to downloads_url
+  end
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def download_params
+    params.require(:download).permit(:name, :thing)
+  end
+
+end

data/app/models/download.rb

@@ -0,0 +1,14 @@
+class Download < ActiveRecord::Base
+
+  validates_presence_of :name
+  translates :name
+
+  mount_uploader :thing, ThingUploader
+
+  def to_param
+    name ? "#{id}-#{name.to_url}" : id
+  end
+
+  scope :by_recent, -> { order('updated_at desc') }
+  scope :alphabetically, -> { order('name') }
+end

data/app/models/header.rb

@@ -5,8 +5,6 @@
 
 class Header < ActiveRecord::Base
 
-  # attr_accessible :photo, :name
-
   validates_presence_of :name
 
   translates :name

data/app/models/illustration.rb

@@ -5,8 +5,6 @@
 
 class Illustration < ActiveRecord::Base
 
-  # attr_accessible :image, :name
-
   validates_presence_of :name
 
   translates :name

data/app/uploaders/image_uploader.rb

@@ -48,6 +48,7 @@ class ImageUploader < CarrierWave::Uploader::Base
   version(:medium) { process :resize_to_limit => [350, 350] }
   version(:large) { process :resize_to_limit => [450, 450] }
   version(:xl) { process :resize_to_limit => [550, 550] }
+  version(:xxl) { process :resize_to_limit => [900, 900] }
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
@@ -60,7 +61,7 @@ class ImageUploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # end
-  
+
   # got this from http://stackoverflow.com/questions/9561641/carrierwave-temp-directory-set-to-uploads-tmp-folder
   # without this all tmp files would go to /public/uploads/tmp which is not cool at all.
   def cache_dir

data/app/uploaders/thing_uploader.rb

@@ -0,0 +1,68 @@
+class ThingUploader < CarrierWave::Uploader::Base
+
+  # Include RMagick or MiniMagick support:
+  include CarrierWave::RMagick
+  # include CarrierWave::MiniMagick
+
+  # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
+  # include Sprockets::Helpers::RailsHelper
+  # include Sprockets::Helpers::IsolatedHelper
+
+  # Choose what kind of storage to use for this uploader:
+  storage :file
+  # storage :fog
+
+  # 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}"  --- that was the suggested one
+    "system/things/#{model.class.to_s.underscore}/#{model.id}"
+  end
+
+  # Provide a default URL as a default if there hasn't been a file uploaded:
+  # def default_url
+  #   # For Rails 3.1+ asset pipeline compatibility:
+  #   # asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
+  #
+  #   "/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
+
+  # Create different versions of your uploaded files:
+  # version :thumb do
+  #   process :scale => [50, 50]
+  # end
+  # version :thumbnail do
+  #   process :resize_to_limit => [125, 125]
+  # end
+  # version(:thumbnail) { process :resize_to_limit => [125, 125] }
+  # version(:small) { process :resize_to_limit => [225, 225] }
+  # version(:medium) { process :resize_to_limit => [350, 350] }
+  # version(:large) { process :resize_to_limit => [450, 450] }
+  # version(:xl) { process :resize_to_limit => [550, 550] }
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  def extension_white_list
+    %w(mp3 pdf)
+  end
+
+  # Override the filename of the uploaded files:
+  # Avoid using model.id or version_name here, see uploader/store.rb for details.
+  # def filename
+  #   "something.jpg" if original_filename
+  # end
+
+  # got this from http://stackoverflow.com/questions/9561641/carrierwave-temp-directory-set-to-uploads-tmp-folder
+  # without this all tmp files would go to /public/uploads/tmp which is not cool at all.
+  def cache_dir
+    # should return path to cache dir
+    Rails.root.join 'tmp/uploads'
+  end
+
+end

data/app/views/downloads/_form.html.erb

@@ -0,0 +1,8 @@
+<%= simple_form_for @download, :html => { multipart: true, class: 'form-horizontal' } do |f| %>
+  <%= f.error_notification %>
+
+    <%= f.input :thing, label: 'select document or asset' %><br />
+    <%= f.input :name, label: 'name' %><br />
+    <%= f.button :submit, :class => 'btn btn-primary' %>
+
+<% end %>

data/app/views/downloads/_section_header.html.erb

@@ -0,0 +1,2 @@
+<h1>Asset Downloads</h1>
+<%= render 'tab_admin_menu' %>

data/app/views/downloads/_tab_admin_menu.html.erb

@@ -0,0 +1,5 @@
+<ul class="nav nav-tabs" id="admin-menu-tab">
+	<%= content_tag :li, link_to(t('new'), new_download_path), ({ class: 'active' } if controller.action_name.to_s == 'new' ) %>
+	<%= content_tag :li, link_to(t('list'), downloads_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+	<%= content_tag :li, link_to(t('edit'), downloads_path), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>
+</ul>

data/app/views/downloads/edit.html.erb

@@ -0,0 +1,4 @@
+<%= render 'section_header' %>
+
+<%= render 'form' %>
+<%= render 'shared/admin_sidebar' %>

data/app/views/downloads/index.html.erb

@@ -0,0 +1,31 @@
+<%= render 'section_header' %>
+
+<%= will_paginate @downloads, inner_window: 2 %>
+
+<table class='table table-striped'>
+	<thead>
+  <tr>
+	    <th>name</th>
+	    <th>path</th>
+	  </tr>
+	</thead>
+
+	<tbody>
+		<% @downloads.each do |download| %>
+		  <tr>
+		    <td><%= download.name %></td>
+		    <td><%= link_to download.thing.url, download.thing.url %></td>
+		    <td>
+		    	<%= link_to t('edit'), edit_download_path(download), class: 'btn btn-xs btn-default' %>
+					<%= link_to t('delete'), download, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %>
+				</td>
+		  </tr>
+		<% end %>
+	</tbody>
+</table>
+
+<%= will_paginate @downloads, inner_window: 2 %>
+
+<%= link_to 'upload new asset', new_download_path, class: 'btn btn-default' %>
+
+<%= render 'shared/admin_sidebar' %>

data/app/views/downloads/new.html.erb

@@ -0,0 +1,4 @@
+<%= render 'section_header' %>
+
+<%= render 'form' %>
+<%= render 'shared/admin_sidebar' %>

data/app/views/illustrations/index.html.erb

@@ -21,7 +21,8 @@
 					<b>Small</b> path: <%= illustration.image.small %><br />
 					<b>Medium</b> path: <%= illustration.image.medium %><br />
 					<b>Large</b> path: <%= illustration.image.large %><br />
-					<b>XL</b> path: <%= illustration.image.xl %>
+					<b>XL</b> path: <%= illustration.image.xl %><br />
+					<b>XXL</b> path: <%= illustration.image.xxl %>
 				</td>
 		    <td><%= link_to t('edit'), edit_illustration_path(illustration), class: 'btn btn-xs btn-default' %>
 					<%= link_to t('delete'), illustration, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %></td>

data/app/views/illustrations/show.html.erb

@@ -9,7 +9,8 @@
 	<%= image_tag @illustration.image.small %><br /><%= @illustration.image.small %><br /><br />
 	<%= image_tag @illustration.image.medium %><br /><%= @illustration.image.medium %><br /><br />
 	<%= image_tag @illustration.image.large %><br /><%= @illustration.image.large %><br /><br />
-	<%= image_tag @illustration.image.xl %><br /><%= @illustration.image.xl %>
+	<%= image_tag @illustration.image.xl %><br /><%= @illustration.image.xl %><br /><br />
+  <%= image_tag @illustration.image.xxl %><br /><%= @illustration.image.xxl %>
 </p>
 <br />
 <%= link_to t('edit'), edit_illustration_path(@illustration), :class => 'btn btn-primary' %><%= link_to t('illustrations.all'), illustrations_path, class: 'btn btn-default' %>

data/config/routes.rb

@@ -6,5 +6,6 @@ Rails.application.routes.draw do
       end
     end
     resources :headers
+    resources :downloads
   end
 end

data/lib/generators/tkh_illustrations/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -1,5 +1,5 @@
 require 'rails/generators/migration'
- 
+
 module TkhIllustrations
   module Generators
     class CreateOrUpdateMigrationsGenerator < ::Rails::Generators::Base
@@ -14,7 +14,7 @@ module TkhIllustrations
         end
         @prev_migration_nr.to_s
       end
- 
+
       def create_or_update_migrations
         puts 'Creating the illustrations table'
         migration_template "create_illustrations.rb", "db/migrate/create_illustrations.rb"
@@ -22,8 +22,10 @@ module TkhIllustrations
         migration_template "add_translation_of_name_to_illustrations.rb", "db/migrate/add_translation_of_name_to_illustrations.rb"
         puts 'Creating the headers table'
         migration_template "create_headers.rb", "db/migrate/create_headers.rb"
+        puts 'Creating the downloads table'
+        migration_template "create_downloads.rb", "db/migrate/create_downloads.rb"
       end
- 
+
     end
   end
-end
+end

data/lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_downloads.rb

@@ -0,0 +1,15 @@
+class CreateDownloads < ActiveRecord::Migration
+  def up
+    create_table :downloads do |t|
+      t.string :name
+      t.string :thing
+      t.timestamps
+    end
+    Download.create_translation_table!({ name: :string })
+  end
+
+  def down
+    drop_table :downnloads
+    Download.drop_translation_table!
+  end
+end

data/lib/tkh_illustrations/version.rb

@@ -1,3 +1,3 @@
 module TkhIllustrations
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_illustrations
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,12 +119,21 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/controllers/downloads_controller.rb
 - app/controllers/headers_controller.rb
 - app/controllers/illustrations_controller.rb
+- app/models/download.rb
 - app/models/header.rb
 - app/models/illustration.rb
 - app/uploaders/image_uploader.rb
 - app/uploaders/photo_uploader.rb
+- app/uploaders/thing_uploader.rb
+- app/views/downloads/_form.html.erb
+- app/views/downloads/_section_header.html.erb
+- app/views/downloads/_tab_admin_menu.html.erb
+- app/views/downloads/edit.html.erb
+- app/views/downloads/index.html.erb
+- app/views/downloads/new.html.erb
 - app/views/headers/_form.html.erb
 - app/views/headers/_tab_admin_menu.html.erb
 - app/views/headers/edit.html.erb
@@ -148,6 +157,7 @@ files:
 - lib/generators/tkh_illustrations/create_or_update_locales/templates/it.yml
 - lib/generators/tkh_illustrations/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/add_translation_of_name_to_illustrations.rb
+- lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_downloads.rb
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_headers.rb
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_illustrations.rb
 - lib/tasks/tkh_illustrations_tasks.rake
@@ -203,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails engine for carrierwave illustrations.