bhf 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb67ca0285c67ab14c38924a9155bb202501b5b
-  data.tar.gz: cdaabaadf3e5efcd91d5a4064e76895fa2db1f64
+  metadata.gz: 2bc3e48804cadcd8f1238bf2e2c7ba8af1c341dd
+  data.tar.gz: eaab323959a550d24df7c3926d5dec7f61ebfe7c
 SHA512:
-  metadata.gz: 3881d098482897fd0d275067eff3820e4365516c3563e1cda9215a4e0874d6e6fe40d6ffe91e1cd284acbdd09f0eba66eb98f4b3e85bae11b2a1fe3bbda4ea57
-  data.tar.gz: 9ba56eea1635a5655f812ca33c9882a6a888a935aef98303f7bae1602831e8969f74a7e1cfca0841708fd078f016f054eb97339f4bd4bd28c54d9249277a9764
+  metadata.gz: f247f71c9f92453185f0e9af2883a8e7dccc76bf5fa3e2735a1d1abed743be8ef279c6c0831c2cdc4c3dacb5100efc7dda26b31f6daa7024286946e801de8be0
+  data.tar.gz: 40e10a43e86556a4fe52573a3268af39cc008ef43e1e59ae15021cea99d5961ee32d7bd0b8d4a10dd09c2a4d822635a9cf92d91475a2511389925f5bdf77a522

data/app/controllers/bhf/application_controller.rb

@@ -65,13 +65,13 @@ class Bhf::ApplicationController < ActionController::Base
           t("bhf.areas.page_title.#{params[:bhf_area]}", 
             area: params[:bhf_area],
             title: @app_title,
-            default: t('bhf.areas.default_page_title', 
+            default: t('bhf.areas.page_title', 
               title: @app_title,
               area: t("bhf.areas.links.#{params[:bhf_area]}", default: params[:bhf_area])
             )
           )
         else
-          t('bhf.default_page_title', title: @app_title)
+          t('bhf.page_title', title: @app_title)
         end
       end.html_safe
     end

data/app/views/bhf/entries/_form.haml

@@ -17,5 +17,5 @@
     .node
       .label
       .input
-        = f.submit f.object.new_record? ? new_t(@platform) : edit_t(@platform)
+        = f.submit t('bhf.helpers.form.submit.button', default: f.object.new_record? ? new_t(@platform) : edit_t(@platform))
         = link_to t('bhf.helpers.entry.cancel'), page_path(@platform.page_name), class: 'cancel'

data/app/views/bhf/entries/form/column/_paperclip.haml

@@ -1,12 +1,17 @@
-= node f, field do
-  - file = f.object.send(field.name)
-  - if file.file?
-    - if ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif'].include?(f.object.send("#{field.name}_content_type"))
-      = image_tag file.url, class: 'uploaded_image'
-    - else
-      = link_to f.object.send("#{field.name}_file_name"), file.url, class: 'uploaded_file'
-    .file_delete
-      = f.check_box "#{field.name}_destroy"
-      = f.label "#{field.name}_destroy", t('bhf.helpers.file.delete')
-  - unless @quick_edit
-    = f.file_field field.name
+- # no file upload on ajax submit :(
+- unless @quick_edit
+  = node f, field do
+    - file = f.object.send(field.name)
+    - if file.file?
+      - if ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif'].include?(f.object.send("#{field.name}_content_type"))
+        = image_tag file.url, class: 'uploaded_image'
+      - else
+        = link_to f.object.send("#{field.name}_file_name"), file.url, class: 'uploaded_file'
+
+      - if f.object.respond_to?(:"#{field.name}_destroy")
+        .file_delete
+          = f.check_box "#{field.name}_destroy"
+          = f.label "#{field.name}_destroy", t('bhf.helpers.file.delete')
+
+    - unless @quick_edit
+      = f.file_field field.name

data/app/views/bhf/pages/macro/column/_paperclip.haml

@@ -0,0 +1,5 @@
+- unless object.send(column.name).blank?
+  - if ['image/jpeg', 'image/pjpeg', 'image/jpg', 'image/png', 'image/tif', 'image/gif'].include?(object.send("#{column.name}_content_type"))
+    = image_tag object.send(column.name), alt: object.send(column.name), class: 'preview_image'
+  - else
+    = link_to object.send("#{column.name}_file_name"), object.send(column.name).url

data/config/locales/en.yml

@@ -1,8 +1,8 @@
 en:  
   bhf:
-    default_page_title: "%{title} – Admin"
+    page_title: "%{title} – Admin"
     areas:
-      default_page_title: "%{area} – %{title} – Admin"
+      page_title: "%{area} – %{title} – Admin"
     helpers:
       boolean:
         a: yes

data/lib/bhf.rb

@@ -41,7 +41,6 @@ module Bhf
 end
 
 require 'bhf/active_record/active_record'
-require 'bhf/active_record/upload'
 require 'bhf/mongoid/document'
 require 'bhf/data'
 require 'bhf/platform'

data/lib/bhf/pagination.rb

@@ -8,6 +8,7 @@ Kaminari::Helpers::Tag.class_eval do
     @template.url_for @params.merge(@param_name => (page <= 1 ? 1 : page))
   end
 end
+# TODO: monitor https://github.com/amatsuda/kaminari/issues/542#issuecomment-40294388
 
 module Bhf
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bhf
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Anton Pawlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,7 +153,6 @@ files:
 - app/views/bhf/entries/form/column/_static.haml
 - app/views/bhf/entries/form/column/_string.haml
 - app/views/bhf/entries/form/column/_text.haml
-- app/views/bhf/entries/form/column/_upload_file.haml
 - app/views/bhf/entries/form/column/_wysiwyg.haml
 - app/views/bhf/entries/form/embeds_many/_static.haml
 - app/views/bhf/entries/form/embeds_one/_static.haml
@@ -183,6 +182,7 @@ files:
 - app/views/bhf/pages/macro/column/_hash.haml
 - app/views/bhf/pages/macro/column/_image.haml
 - app/views/bhf/pages/macro/column/_number.haml
+- app/views/bhf/pages/macro/column/_paperclip.haml
 - app/views/bhf/pages/macro/column/_primary_key.haml
 - app/views/bhf/pages/macro/column/_string.haml
 - app/views/bhf/pages/macro/column/_text.haml
@@ -204,7 +204,6 @@ files:
 - config/routes.rb
 - lib/bhf.rb
 - lib/bhf/active_record/active_record.rb
-- lib/bhf/active_record/upload.rb
 - lib/bhf/config_parser.rb
 - lib/bhf/data.rb
 - lib/bhf/form.rb

data/app/views/bhf/entries/form/column/_upload_file.haml

@@ -1,22 +0,0 @@
-- # no file upload on ajax submit :(
-- unless @quick_edit
-  = node f, field do
-    = f.fields_for field.name do |f_file|
-      - file = f.object.send(:read_attribute, field.name)
-      - if file.is_a? Hash
-        %p.warning= t('bhf.helpers.file.reselect')
-      - else
-        - file = f.object.send(field.name)
-        - if file.is_a? ActionDispatch::Http::UploadedFile
-          - file = f.object.send("#{field.name}_was")
-        - if file.is_a?(String)
-          - if is_image?(file)
-            = image_tag file, class: 'uploaded_image'
-          - else
-            = link_to file, file, class: 'uploaded_file'
-        - unless file.blank?
-          .file_delete
-            = f_file.check_box :delete
-            = f_file.label :delete, t('bhf.helpers.file.delete')
-
-      = f_file.file_field :file

data/lib/bhf/active_record/upload.rb

@@ -1,46 +0,0 @@
-module Bhf
-  module ActiveRecord
-    module Upload
-      extend ActiveSupport::Concern
-
-      included do
-        before_save :bhf_upload
-        cattr_accessor :bhf_upload_settings
-      end
-
-      def bhf_upload
-        self.class.bhf_upload_settings.each do |settings|
-          name_was = send("#{settings[:name]}_was")
-          param_name = read_attribute(settings[:name]) || send(settings[:name])
-          next if param_name.blank? or param_name.is_a?(String)
-          file_string = if param_name && param_name[:delete].to_i != 0
-            # File.delete(settings[:path] + name_was.to_s) if File.exist?(settings[:path] + name_was.to_s)
-            nil
-          else
-            file = param_name && param_name[:file]
-            if file.is_a? ActionDispatch::Http::UploadedFile
-              # File.delete(settings[:path] + name_was.to_s) if File.exist?(settings[:path] + name_was.to_s)
-
-              filename = Time.now.to_i.to_s+'_'+file.original_filename.downcase.gsub(/[^\w\.\-]/, '_')
-              path = File.join(settings[:path], filename)
-              File.open(path, 'wb') { |f| f.write(file.read) }
-              filename
-            else
-              name_was
-            end
-          end
-          write_attribute settings[:name], file_string
-        end
-      end
-
-      module ClassMethods
-        def setup_upload(settings)
-          self.bhf_upload_settings = settings.each_with_object([]) do |s, obj|
-            obj << {path: '', name: :file}.merge(s)
-          end
-        end
-      end
-
-    end
-  end
-end