assetable 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDE0MDczY2NjOGI4Njk3MTZjNDMxMjAwNzFjMDhjYmQxNDUxY2JjMQ==
+    MjZiYTU5Zjc1OTk0NTE2MzFhZWRlMjdlYzVmZmMyOTMzYWNmMzM1Mg==
   data.tar.gz: !binary |-
-    ZWU0OTBhNzFkNTJjOTczNzEyN2I3OTMwYjkxNWU2MmNhNDNjYmI5YQ==
+    ZDIxMWU0MjMyYTdhZDQ5NTM2NzJmOTViY2ViYTdmMTNhM2E5NjExOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWNlOGVmMzU3M2NiZjhmOGIxMzg4N2Y5ZjYwYjNmOWIyYWFjNWU5ZjBlMmVm
-    NzUwZTNlMzkzNjI4MTRkMTVlMjljOWQ3YTI5ODkwYjk3ZmVlZDk2ZDg0MmM5
-    OWRmNzJiMTFhYzI4NDRiNjFmZjc3MDkxYTFkMmM1MjNkODFmYjA=
+    YmIwNWJjOGE2ZTNmMzhlMjdhNGU5ZmE0MTIyMjM1NzIwOTI2OGQ4YzIwZDhj
+    ZmE3OTRmY2FjYmY2YjFhY2FhNjMyOGM2MzRhNzc1MWYzNzUyZGM4ZWY4YWRh
+    NmJmMTU2NTliNDMyMWViMDE3YTgwMTYxMTU1MThjZGUxNmU4ODk=
   data.tar.gz: !binary |-
-    ODc2NTJjNjM3YzczYjY4ZDQ3M2Y1YTkwODdkMjhmNDM4YjhhYjg3MjU3N2U3
-    Y2E1ZDgzNWFmYWM0NDJmMWM4ZTg1ZGNhNTM4YzBlMWE0YjQzZjY1ZWQ1Y2Jk
-    NGY4NWE3MmI1ZWJhYzM3OWZlNTk4Mjk0ZWUxOTdjNjBiZGYyODQ=
+    OTAxYjQ3ZWUwMDA2MWE4ZmM2ZmRhZjUyOWYxNzY4NDcyZWQ5OTcyYmE3NzY2
+    YjhjNTgwMTQ2NWM4MTA2YTJkNjc0NTEwZGVkZmRkOWM0YjU3NTYwNzkxMWNk
+    MTAyNzMwZWFmNDU2MWY3MmIyZDZkOGUyNGVhN2JhYmZiNGZjYzA=

data/app/assets/stylesheets/assetable/components/_forms.css.sass

@@ -214,6 +214,7 @@ input[type="checkbox"],
     cursor: not-allowed
 
 
-input.input-fluid
+input.input-fluid,
+textarea.input-fluid
   +box-sizing(border-box)
   width: 100%

data/app/controllers/assetable/external_services_controller.rb

@@ -28,8 +28,11 @@ class Assetable::ExternalServicesController < ActionController::Base
   def permitted_params
     params.require(:external_service).permit(
       :name,
+      :filename,
       :body,
-      :content_type
+      :content_type,
+      :width,
+      :height
     )
   end
 

data/app/models/asset.rb

@@ -1,3 +1,19 @@
+# Base Asset Class
+# ---------------------------------------
+# Available Attributes:
+# :type
+# :name
+# :body
+# :filename
+# :checksum
+# :path
+# :content_type
+# :file_size
+# :width
+# :height
+# :duration
+# :bit_rate
+
 class Asset < ActiveRecord::Base
 
   has_many :asset_attachments, :as => :assetable, :dependent => :destroy

data/app/models/external_service.rb

@@ -2,7 +2,6 @@ class ExternalService < Asset
 
   validates_presence_of :name, :body
 
-  # G
   def self.possible_content_types
     if user_defined_document_types = Assetable.external_document_types
       return user_defined_document_types
@@ -11,4 +10,13 @@ class ExternalService < Asset
     end
   end
 
+  def has_icon?
+    available_icons = Assetable.external_document_icons.collect{|k, v| k}
+    available_icons.include? self.content_type.to_sym if self.content_type.present?
+  end
+
+  def icon
+    Assetable.external_document_icons[self.content_type.to_sym].to_s if self.has_icon?
+  end
+
 end

data/app/views/assetable/assets/_asset.html.haml

@@ -8,7 +8,10 @@
     - elsif asset.video?
       = image_tag "assetable/icons/icon-mp4.png", class: "uploader-preview"
     - elsif asset.external_service?
-      = image_tag "assetable/icons/icon-document.png", class: "uploader-preview"
+      - if asset.has_icon?
+        = image_tag "assetable/icons/#{asset.icon}", class: "uploader-preview"
+      - else
+        = image_tag "assetable/icons/icon-document.png", class: "uploader-preview"
   
   %span.uploader-name= asset.name
   .uploader-size-and-actions

data/app/views/assetable/external_services/new.html.haml

@@ -11,10 +11,13 @@
 
           .form-group
             = f.label :name
-            = f.text_field :name, class: "form-control inpu-fluid", required: true
+            = f.text_field :name, class: "form-control input-fluid", required: true
           .form-group
             = f.label :content_type
             = f.select :content_type, ExternalService.possible_content_types
+          .form-group
+            = f.label :filename
+            = f.text_field :filename, class: "form-control input-fluid"
           .form-group
             = f.label :body
             = f.text_area :body, class: "form-control input-fluid", required: true

data/config/initializers/uploader_input.rb

@@ -52,7 +52,11 @@ class ActionView::Helpers::FormBuilder
     elsif asset.video?
       preview_image_tag = image_tag(ActionController::Base.helpers.asset_path("assetable/icons/icon-mp4.png"), class: "uploader-preview")
     elsif asset.external_service?
-      preview_image_tag = image_tag(ActionController::Base.helpers.asset_path("assetable/icons/icon-document.png"), class: "uploader-preview")
+      if asset.has_icon?
+        preview_image_tag = image_tag(ActionController::Base.helpers.asset_path("assetable/icons/#{asset.icon}"), class: "uploader-preview")
+      else
+        preview_image_tag = image_tag(ActionController::Base.helpers.asset_path("assetable/icons/icon-document.png"), class: "uploader-preview")
+      end
     end
 
     return link_to preview_image_tag, asset.filename.to_s, target: "_blank"

data/lib/assetable/config.rb

@@ -3,7 +3,8 @@ module Assetable
 
     VALID_OPTION_KEYS = [
       :storage,
-      :external_document_types
+      :external_document_types,
+      :external_document_icons
     ]
     
     attr_accessor *VALID_OPTION_KEYS

data/lib/assetable/version.rb

@@ -1,3 +1,3 @@
 module Assetable
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: assetable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - John Koht
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails