ds_media_library 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08e8e9c3cc846e24f62ccbcbe842e73097651869
-  data.tar.gz: cf45e915c6f8919887bb2b9e48f7afb717e8a0cf
+  metadata.gz: 756365ace30672e2a046780b8c7123926acb967e
+  data.tar.gz: 22a096743f629de3ffebf60764ea13966aa7d3b0
 SHA512:
-  metadata.gz: 25ed42f1e044501f68aaad34d25f23011124639cacb3179d14be350f0dce6e18abbb0d622da0adc888491b8fe907d41ae808578c6f7b2fcb3bbb787aed6bc9fc
-  data.tar.gz: 2df9907a4b0fa46de097ddb69d4fa7a3a17016ea4178b811c59e7d75727282bc4a201c026c0bb8e41e28f3d05107d26046b18bda5024ec1b1c4710bf9716bcff
+  metadata.gz: 8575fc7cf04eefa3dc557f0f805ed457da8d13e855795c5ba23982fc9fb395af0dd0832bb68af9c981fc9e42a188586aae1f4dbdd20972bcf16f813ef6b6a9db
+  data.tar.gz: 61b79818139cab8eb4d80b54fb541c439c54ff44822f780cdb0141c944e09e5793a1bf0b040999359f6e01b54a415ad008c20f0998eb0e6ce8784b3a140a78c1

data/app/assets/javascripts/ds_media_library.coffee

@@ -83,9 +83,6 @@ $ ->
       $tree.find(resourceSelector).each ->
         searchText = $(this).attr("data-dsml-search-text").toLowerCase()
         isFound = searchText.indexOf(term) != -1
-        console.log searchText
-        console.log term
-        console.log isFound
         $(this).toggle isFound
 
       $tree.find(folderSelector).each ->

data/app/assets/stylesheets/_media-tree.sass

@@ -1,5 +1,29 @@
 $itemHeight: 40px
 
+.dsml-media-nav-header
+  display: flex
+  justify-content: flex-end
+  .dsml-media-file-col
+    padding: 0
+
+.dsml-media-type-col, .dsml-media-date-col
+  font-size: 0.9em
+  color: #b0b0b0
+  margin: 0 0px 0 10px
+.dsml-media-type-col
+  flex: 0 0 120px
+.dsml-media-date-col
+  flex: 0 0 120px
+  margin: 0 90px 0 10px
+
+.dsml-resource
+  .dsml-expand-label
+    max-width: calc(100% - 350px)
+    overflow: hidden
+    white-space: nowrap
+  .dsml-media-date-col
+    margin-right: 0
+
 .dsml-media-nav
   @extend %dsml-reset-list
   width: 100%
@@ -17,7 +41,7 @@ $itemHeight: 40px
   width: 100%
   border: 1px solid #e0e0e0
   line-height: $itemHeight
-  flex-wrap: wrap
+  //flex-wrap: wrap
   padding: 0 10px
   .dsml-expand-label, .dsml-media-links
     display: inline-block

data/app/views/ds_media_library/form_helper/_resource.html.slim

@@ -1,6 +1,8 @@
-li.dsml-resource class=("hidden" if resource.hidden?) data-dsml-search-text=resource.original_file_name
+li.dsml-resource class=("hidden" if resource.hidden?) data-dsml-search-text=[resource.original_file_name, resource.type_name, resource.updated_on].join(" ")
   .dsml-media-container
     label.dsml-expand-label
       input.dsml-modal-input.media-choice name="ds_media_library" type=helper.field_type value=resource.id checked=helper.ids.include?(resource.id) data=resource.attributes
       span.dsml-media-link alt=resource.original_file_name = resource.original_file_name
+    .dsml-media-type-col = resource.type_name
+    .dsml-media-date-col = resource.updated_on
 

data/app/views/ds_media_library/form_helper/show.html.slim

@@ -5,6 +5,9 @@
 label.hidden for="dsml-search-media" Search media library
 input.dsml-text#dsml-search-media type="text" placeholder="Type keywords to search media" data-dsml-search-media=".dsml-resource"
 ul.dsml-media-nav#dsml-media-tree
+  li.dsml-media-nav-header
+    .dsml-media-type-col Type
+    .dsml-media-date-col Date modified
   = render collection: helper.root_folders, partial: "ds_media_library/form_helper/folder", as: :folder, locals: { helper: helper }
   = render collection: helper.root_resources, partial: "ds_media_library/form_helper/resource", as: :resource, locals: { helper: helper }
 

data/app/views/ds_media_library/manage/index.html.slim

@@ -25,6 +25,9 @@
     label.hidden for="dsml-search-media" Search media library
     input.dsml-text#dsml-search-media type="text" placeholder="Type keywords to search media" data-dsml-search-media=".dsml-resource"
     ul.dsml-media-nav#dsml-media-tree
+      li.dsml-media-nav-header
+        .dsml-media-type-col Type
+        .dsml-media-date-col Date modified
       = render collection: root.children, partial: "ds_media_library/manage/folders/folder"
       = render collection: root.resources, partial: "ds_media_library/manage/resources/resource"
 

data/app/views/ds_media_library/manage/resources/_resource.html.slim

@@ -1,10 +1,11 @@
-li.dsml-resource class=("hidden" if resource.hidden?) data-dsml-search-text=resource.original_file_name
+li.dsml-resource class=("hidden" if resource.hidden?) data-dsml-search-text=[resource.original_file_name, resource.type_name, resource.updated_on].join(" ")
   .dsml-media-container
     input.dsml-move-input type="checkbox" name="resource_ids[]" id="media-#{resource.id}" value=resource.id
     label.dsml-expand-label for="media-#{resource.id}"
       = link_to resource.original_file_name, edit_resource_path(resource), class: resource.css_class, alt: resource.original_file_name
       span.dsml-move-span.dsml-media-link alt=resource.original_file_name = resource.original_file_name
-
+    .dsml-media-type-col = resource.type_name
+    .dsml-media-date-col = resource.updated_on
     .dsml-media-links
       = link_to "Edit media", edit_resource_path(resource), class: "dsml-edit-icon", title: "Edit media"
       = link_to "Delete media", resource_path(resource), method: :delete, class: "dsml-delete-icon", title: "Delete media",

data/ds_media_library.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "phantomjs"
   spec.add_development_dependency "capybara-screenshot"
   spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency "timecop"
   spec.add_development_dependency "byebug"
 
   spec.add_dependency "rails"

data/lib/ds_media_library/cucumber.rb

@@ -51,7 +51,12 @@ Then "I should see the following media tree:" do |table|
   def recurse_tree root, structure = [], prefix = ""
     root.all(:xpath, "./li").each do |li|
       if label = li.first("label")
-        structure << [prefix + label.text]
+        type_name, created_at = if label[:class].include?("folder")
+           2.times.map { "" }
+        else
+          li.all("div")[1..2].map(&:text)
+        end
+        structure << [prefix + label.text, type_name, created_at]
       end
       if root = li.first("ul")
         new_prefix = prefix.empty? ? "- #{prefix}" : prefix + "  "

data/lib/ds_media_library/engine.rb

@@ -21,6 +21,20 @@ module DSMediaLibrary
         def css_class
           "dsml-media-link"
         end
+
+        def type_name
+          case media_type
+          when "i" then "Image"
+          when "v" then "Video"
+          when "a" then "Audio"
+          when "p" then "PDF"
+          else "Unknown"
+          end
+        end
+
+        def updated_on
+          updated_at.try(:to_date)
+        end
       end
     end
 

data/lib/ds_media_library/version.rb

@@ -1,3 +1,3 @@
 module DSMediaLibrary
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ds_media_library
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-05 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement