cadmus_files 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bb30739f67050580cdc34306a443a103009b8b7f
-  data.tar.gz: ae0f9f9bb0855f9d93f6fddde7cd22fff02df114
+SHA256:
+  metadata.gz: b66960b34fb7cfe8ec30d47bc293ecb0346d22ae2d2cc1af3392833e4dd090cd
+  data.tar.gz: '05934849c9e3b843f6cad133bc49196968d29ffbc90c3ec82f25ee0f0c43141c'
 SHA512:
-  metadata.gz: a8ce7909deb16aae83534260e270e95d8b0fc89fa407a35a15ac7bceb618f2645b49027b24f60b2e6f3a72c6b087e20cfac46faab2ee219592a65d349d698a89
-  data.tar.gz: 5943e016986d994e8fd7c32c80293990a47f3676e3fd4dbb1cf0db81139231b047f9246f0a88242e7965e980792b0c466f8c87392a8006c80a2b36533e7eae07
+  metadata.gz: 5b066dedb5bcf6ff6bcd318a180c6b0b605a0e1823b17940c324e0cd45c59cafc88878789ef1ddd24890da923028a196818f2ae0ea62ccd183e7565d7905a4af
+  data.tar.gz: 016e24731fd5e9ed78bf2e85f6ecf42e2bddf588a555d72710a1bf558f760bf6e8d0faa959ca6c0c896b7a5ebd58c5d2af2f5a8999e88419372dad832e454e21

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# Version 0.2.0 - not yet released
+
+* Internal refactor for Cadmus 0.6.0 support
+* BUGFIX: Admin controller now correctly scopes to the parent you're using

data/app/views/cadmus/files/_file_card.html.erb

@@ -0,0 +1,28 @@
+      <% file = cms_file.public_send(cms_file.class.cadmus_file_field) -%>
+
+      <div class="card">
+        <div class="card-header">
+          <div class="float-right">
+            <%= link_to url_for(action: 'destroy', id: cms_file), class: 'btn btn-secondary px-2 py-1', method: 'DELETE', "data-confirm" => "Are you sure you want to delete #{cms_file.filename}?" do %>
+              <i class="fa fa-trash" aria-hidden="true"></i>
+            <% end -%>
+          </div>
+          <small style="font-weight: bold; word-wrap: break-word;">
+            <%= cms_file.filename %>
+          </small>
+        </div>
+        <div class="card-block text-center">
+          <%= link_to file.url do %>
+            <% if cms_file.is_image? -%>
+              <%= image_tag file.url, class: 'img-responsive', style: 'max-height: 100px; max-width: 100px;' %>
+            <% else -%>
+              <i class="fa fa-<%= icon_for_content_type(file.content_type) %>" style="font-size: 100px" aria-hidden="true"></i>
+            <% end -%>
+          <% end %>
+        </div>
+        <div class="card-footer text-right">
+          <small>
+            <%= number_to_human_size file.size %>
+          </small>
+        </div>
+      </div>

data/app/views/cadmus/files/_grid.html.erb

@@ -0,0 +1,7 @@
+<% cms_files.each_slice(4) do |slice| -%>
+  <div class="card-deck mb-4">
+    <% slice.each do |cms_file| -%>
+      <%= render partial: 'cadmus/files/file_card', locals: { cms_file: cms_file } %>
+    <% end -%>
+  </div>
+<% end -%>

data/app/views/cadmus/files/_upload_form.html.erb

@@ -0,0 +1,11 @@
+<div class="card">
+  <div class="card-header">Upload a file</div>
+  <div class="card-block">
+    <%= form_for :cms_file, url: url_for(action: 'create'), method: 'POST', multipart: true do |f| %>
+      <div class="form-group">
+        <%= f.file_field :file, class: 'form-control-file' %>
+      </div>
+      <%= f.submit "Upload", class: 'btn btn-primary' %>
+    <% end %>
+  </div>
+</div>

data/app/views/cadmus/files/index.html.erb

@@ -1,48 +1,4 @@
 <h1 class="mb-4">Files</h1>
 
-<% @cms_files.each_slice(4) do |slice| -%>
-  <div class="card-deck mb-4">
-    <% slice.each do |cms_file| -%>
-      <% file = cms_file.public_send(cms_file.class.cadmus_file_field) -%>
-
-      <div class="card">
-        <div class="card-header">
-          <div class="float-right">
-            <%= link_to url_for(action: 'destroy', id: cms_file), class: 'btn btn-secondary px-2 py-1', method: 'DELETE', "data-confirm" => "Are you sure you want to delete #{cms_file.filename}?" do %>
-              <i class="fa fa-trash" aria-hidden="true"></i>
-            <% end -%>
-          </div>
-          <small style="font-weight: bold; word-wrap: break-word;">
-            <%= cms_file.filename %>
-          </small>
-        </div>
-        <div class="card-block text-center">
-          <%= link_to file.url do %>
-            <% if cms_file.is_image? -%>
-              <%= image_tag file.url, class: 'img-responsive', style: 'max-height: 100px; max-width: 100px;' %>
-            <% else -%>
-              <i class="fa fa-<%= icon_for_content_type(file.content_type) %>" style="font-size: 100px" aria-hidden="true"></i>
-            <% end -%>
-          <% end %>
-        </div>
-        <div class="card-footer text-right">
-          <small>
-            <%= number_to_human_size file.size %>
-          </small>
-        </div>
-      </div>
-    <% end -%>
-  </div>
-<% end -%>
-
-<div class="card">
-  <div class="card-header">Upload a file</div>
-  <div class="card-block">
-    <%= form_for :cms_file, url: url_for(action: 'create'), method: 'POST', multipart: true do |f| %>
-      <div class="form-group">
-        <%= f.file_field :file, class: 'form-control-file' %>
-      </div>
-      <%= f.submit "Upload", class: 'btn btn-primary' %>
-    <% end %>
-  </div>
-</div>
+<%= render partial: 'cadmus/files/grid', locals: { cms_files: @cms_files } %>
+<%= render partial: 'cadmus/files/upload_form' %>

data/lib/cadmus_files.rb

@@ -1,24 +1,13 @@
 require "cadmus_files/version"
+
+require "cadmus"
+
 require "cadmus_files/engine"
 require "cadmus_files/file"
 require "cadmus_files/file_url_tag"
 require "cadmus_files/admin_controller"
 
 module CadmusFiles
-  class << self
-    def file_model
-      @_file_model ||= @_file_model_name.safe_constantize
-    end
-
-    def file_model=(file_model)
-      @_file_model_name = case file_model
-      when Class then file_model.name
-      else file_model
-      end
-    end
-
-    def clear_file_model_cache!
-      @_file_model = nil
-    end
-  end
+  extend Cadmus::Concerns::OtherClassAccessor
+  other_class_accessor :file_model
 end

data/lib/cadmus_files/admin_controller.rb

@@ -1,6 +1,7 @@
 module CadmusFiles
   module AdminController
     extend ActiveSupport::Concern
+    include Cadmus::Concerns::ControllerWithParent
 
     included do
       helper 'cadmus_files/admin'
@@ -28,7 +29,7 @@ module CadmusFiles
     protected
 
     def cms_file_scope
-      CadmusFiles.file_model.all
+      @cms_file_scope = parent_model ? parent_model.cms_files : CadmusFiles.file_model.global
     end
 
     def cms_file_params

data/lib/cadmus_files/file.rb

@@ -1,6 +1,7 @@
 module CadmusFiles
   module File
     extend ActiveSupport::Concern
+    include Cadmus::Concerns::ModelWithParent
 
     module ClassMethods
       def cadmus_file(file_field = 'file')
@@ -9,7 +10,7 @@ module CadmusFiles
         end
         self.cadmus_file_field = file_field
 
-        belongs_to :parent, polymorphic: true
+        model_with_parent
 
         validates_integrity_of file_field
         validates_processing_of file_field
@@ -32,7 +33,8 @@ module CadmusFiles
         define_method :validate_file_name_is_unique do
           the_filename = send(file_field).filename
 
-          if self.class.base_class.where(file_field => the_filename).any?
+          scope = parent ? self.class.base_class.where(parent: parent) : self.class.global
+          if scope.where(file_field => the_filename).any?
             errors.add file_field, "'#{the_filename}' already exists"
           end
         end
@@ -40,5 +42,3 @@ module CadmusFiles
     end
   end
 end
-
-ActiveRecord::Base.send :include, CadmusFiles::File

data/lib/cadmus_files/file_url_tag.rb

@@ -16,10 +16,14 @@ module CadmusFiles
         return "Error: CadmusFiles.file_model not set.  Please set it to your file model in an initializer."
       end
 
-      parent = context.registers['parent']
-      cms_file = file_model.find_by(file_model.cadmus_file_field => filename, parent: parent)
+      cache = context.registers[:cached_files] || {}
+      cms_file = cache[filename]
       unless cms_file
-        return "Error: file #{filename} not found"
+        parent = context.registers['parent']
+        cms_file = file_model.find_by(file_model.cadmus_file_field => filename, parent: parent)
+        unless cms_file
+          return "Error: file #{filename} not found"
+        end
       end
 
       cms_file.file.url
@@ -28,4 +32,3 @@ module CadmusFiles
 
   Liquid::Template.register_tag('file_url', FileUrlTag)
 end
-

data/lib/cadmus_files/version.rb

@@ -1,3 +1,3 @@
 module CadmusFiles
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cadmus_files
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nat Budin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2018-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -117,10 +117,14 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - app/helpers/cadmus_files/admin_helper.rb
+- app/views/cadmus/files/_file_card.html.erb
+- app/views/cadmus/files/_grid.html.erb
+- app/views/cadmus/files/_upload_form.html.erb
 - app/views/cadmus/files/index.html.erb
 - bin/console
 - bin/setup
@@ -150,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: File uploads for Cadmus sites