polygallery 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e53abf70dea958b1911dffc06743aae8a92948b
-  data.tar.gz: 0fa8fa8287038e637bd081ef22f1f8d59c2d0c00
+  metadata.gz: 5dee9c9d0bf44f68e1cc707295d0638826ee6884
+  data.tar.gz: ee7a7264e8d8bb90a9183ead4f8a21ae365c7fd0
 SHA512:
-  metadata.gz: 99f20772f457715d3fb8bebf7c59a9e771efc7c1e14d905abd2bb7f19df390d4f6f123066bfe993b293d4f128c49f2b42a462df218ba781ef5b8dea3e7f666f1
-  data.tar.gz: a313adf8bda7f3cc1087e2bb2da79f1c89aa83544eca49ae83f8e075608f6adaded514dc1c1ff4ce26b81cdbdb404572b74ba2c79b2fe47609a99f49da5f10ce
+  metadata.gz: 174326ff6c8045018740f033347dcf20671cb9425ed6acfe6692971ba66f8bbc7dc8707abe861b803bf8610dbf91f352d02e726c370c802cdd9f1d3cc023c977
+  data.tar.gz: a2c34fccea0d228992037ef4b65895c6875a735876b21b1b1fa3d645425407b09b9c59d7eb8e4abd4ab44dc8581ead8751d0016d60730f35a48d28e5ff816fa6

data/app/views/polygallery/galleries/_fields_for.html.haml

@@ -1,5 +1,5 @@
 = fields_for gallery.title.to_sym do |ff|
-  = ff.hidden_field :title, :value => gallery.title.to_s
+  = ff.hidden_field :title, value: gallery.title.to_s
 
   -#= fields_for_polygallery_photo
-  -#= ff.cktext_area :content, options.merge(name.is_a?(String) ? {:value => pb.content} : {})
+  -#= ff.cktext_area :content, options.merge(name.is_a?(String) ? {value: pb.content} : {})

data/app/views/polygallery/galleries/_simple_fields_for.html.haml

@@ -1,18 +1,20 @@
 - photo_association_name = f.object.polygallery_settings[:association_names][:photos]
-= f.input_field :title, :as => :hidden, :value => f.object.title
-= f.input_field :galleryable_id, :as => :hidden
-= f.input_field :galleryable_type, :as => :hidden
+= f.input_field :title, as: :hidden, value: f.object.title
+= f.input_field :galleryable_id, as: :hidden
+= f.input_field :galleryable_type, as: :hidden
+- add_settings = settings[:add_btn].except(:text)
+- add_settings[:render_options] = { locals: { settings: settings } }
 
 %h3.lead
-  = link_to_add_association 'Add Photo', f, :photos, partial: 'polygallery/photos/simple_fields_for', class: 'btn btn-default btn-sm pull-right', data: {association_insertion_node: "##{photo_association_name} .photo-receptacle", association_insertion_method: 'append'}
+  = link_to_add_association settings[:add_btn][:text], f, :photos, add_settings
   = settings[:label] || f.object.title.titleize
-.polygallery-cocoon-table{:id => photo_association_name.to_s}
+.polygallery-cocoon-table{id: photo_association_name.to_s}
   %table.table.table-bordered.table-striped.table-condensed.polygallery-photos-table
     %thead
       %tr
-        %th.text-center{:style => 'width:85px;'} Photo
+        %th.text-center{style: 'width:85px;'} Photo
         %th File
         %th.text-center Actions
     %tbody.photo-receptacle
       = f.simple_fields_for :photos do |pf| # photo_association_name do |pf|
-        = render 'polygallery/photos/simple_fields_for', f: pf
+        = render 'polygallery/photos/simple_fields_for', f: pf, settings: settings

data/app/views/polygallery/photos/_simple_fields_for.html.haml

@@ -1,14 +1,14 @@
 %tr{class: "nested-fields #{f.object.new_record? ? 'new-polyphoto' : ''}",
     data: { new: f.object.new_record? }}
   %td.text-center
-    = f.input_field :gallery_title, :as => :hidden
-    = f.input_field :gallery_id, :as => :hidden
-    = f.input_field :galleryable_id, :as => :hidden
-    = f.input_field :galleryable_type, :as => :hidden
+    = f.input_field :gallery_title, as: :hidden
+    = f.input_field :gallery_id, as: :hidden
+    = f.input_field :galleryable_id, as: :hidden
+    = f.input_field :galleryable_type, as: :hidden
     = image_tag f.object.photo.file? ? f.object.photo.url(:thumb) : 'polygallery/thumbnail-missing.jpg', class: 'img-responsive'
   %td
     = f.input_field :photo
-    = f.input_field :caption, :placeholder => "Caption... (optional)", :style => "margin-top:5px;", :as => :string
-  %td.text-center{:style => "width:51px;"}
-    = link_to_remove_association f, :class => 'btn btn-default btn-sm' do
+    = f.input_field :caption, placeholder: 'Caption... (optional)', style: 'margin-top:5px;', as: :string
+  %td.text-center{style: 'width:51px;'}
+    = link_to_remove_association f, settings[:remove_btn]  do
       %span.glyphicon.glyphicon-trash

data/lib/polygallery.rb

@@ -1,5 +1,5 @@
 require 'polygallery/engine'
-require 'polygallery/paperclip_integration' # <-- Try removing this monstrosity
+require 'polygallery/paperclip_integration'
 # require 'polygallery/railtie' if defined? Rails
 
 module Polygallery

data/lib/polygallery/simple_form_helper.rb

@@ -8,9 +8,17 @@ module Polygallery
           fb.simple_fields_for(title, *args, &block) << '</div>' ).html_safe
     end
     def simple_fields_for_polygallery(fb, title=:gallery, *args, &block)
-      defaults = { label: nil }
+      defaults = {
+        label: nil,
+        add_btn: {
+          text: 'Add Photo',
+          partial: 'polygallery/photos/simple_fields_for',
+          class: 'btn btn-default btn-sm pull-right',
+          data: { association_insertion_method: 'append',
+                  association_insertion_node: "##{fb.object.send(title).polygallery_settings[:association_names][:photos]} .photo-receptacle" }},
+        remove_btn: { class: 'btn btn-default btn-sm' }}
       settings = if (options = args.find{|a| a.is_a? Hash }).nil? then defaults
-                 else defaults.merge options end
+                 else defaults.deep_merge options end
       new_block = block_given? ? block : ->(fb2) {
         render partial: 'polygallery/galleries/simple_fields_for',
                locals: { f: fb2, settings: settings } }

data/lib/polygallery/version.rb

@@ -1,3 +1,3 @@
 module Polygallery
-  VERSION = '0.4.5'
+  VERSION = '0.4.6'
 end

data/lib/polygallery/view_helpers.rb

@@ -2,10 +2,11 @@ module Polygallery
   module ViewHelpers
 
     def fields_for_polygallery(title, f, options={})
-      settings = { label: nil }.merge(options)
+      settings = { label: nil, button: nil }.merge(options)
       raise "Polygallery #{title} not found for #{f.object.class.name}" unless f.object.class.has_polygallery?(title)
       gallery = f.object.send(title)
-      render partial: 'polygallery/galleries/fields_for', locals: {f: f, gallery: gallery, settings: settings}
+      render partial: 'polygallery/galleries/fields_for',
+             locals: { f: f, gallery: gallery, settings: settings }
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polygallery
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - MacKinley Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -290,6 +290,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Polymorphic galleries made simple.
 email:
 - smit1625@msu.edu