symphonia 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f11e4c634f33feaaed8c452d7bea7a3c16b8402ad58227f60f99c8ef91c8fe2
-  data.tar.gz: ecb67096fcba06756c84c8e21144dfe0149a6d7a1cb5268b051219dad82d39d4
+  metadata.gz: 6da447b65e8df134e762dd99e232857836329c8a242d16566c6ef5f1d8295d2f
+  data.tar.gz: de6d595aade9877cc75469461c0224f9b1b9ed4835aa165a1be27882fa2718ad
 SHA512:
-  metadata.gz: 3130915024e08e2963761800157c54bde18544a2df52b932b5419118ea170f457b2d279dbeb99164acbccaa5da42ef32942ae56dd41e7403325d25434f3045a1
-  data.tar.gz: f9dce86610580b43089b8df943d4f928288d152375f50314c4fe3142ce512b974ef6c4cf9ce811a51f751e08560c093a40472ffbd2e1762f7283a7910e37abdc
+  metadata.gz: 229511c5b388840de246acec21ffb3051628a5fa54627745fa8806e766071078d38bc5c5087a15c0d78a1d163bdef4df49bb39f2c44521817c2105a7520ff7f2
+  data.tar.gz: 6fa7d0ccde1636f9098cc0b472fb2dd166261607d2be17953cdc9df092d99aa5bffa03adefd123231a2dba6c9fb61e28737a24bdd0de7a9ffb2e7a6e013ff8cd

data/app/assets/stylesheets/symphonia/basic.scss

@@ -191,8 +191,10 @@ table.table {
       content: "\2193";
     }
   }
-  tr.lock, tr.inactive, tr.archived {
-    @include inactive-row;
+  tr.status {
+    &--lock, &--inactive, &--archived {
+      @include inactive-row;
+    }
   }
   .buttons {
     text-align: right;

data/app/helpers/symphonia/bootstrap_modal_helper.rb

@@ -19,7 +19,6 @@ module Symphonia
     # <% end -%>
 
 
-
     #
     def render_modal(options = {}, &block)
       opts = options.slice(:id, :title, :submit, :large)
@@ -33,9 +32,10 @@ module Symphonia
           var renderModal = {}
         if (renderModal["#{id}"])
           renderModal["#{id}"].destroy();
-
-        renderModal["#{id}"] = new SymphoniaDialog("#{id}", #{raw opts.to_json});
-        renderModal["#{id}"].body.innerHTML = "#{j(capture(&block))}";
+ renderModal["#{id}"] = new SymphoniaDialog("#{id}", #{raw opts.to_json});
+SCRIPT
+      script << %Q{        renderModal["#{id}"].body.innerHTML = "#{j(capture(&block))}"; } if block_given?
+      script << <<SCRIPT
         var submitButton = renderModal["#{id}"].body.querySelector("input[type=submit]")
         if (submitButton)
           submitButton.remove()
@@ -50,7 +50,7 @@ SCRIPT
         }
 EOF
       end
-      # script << %q{}
+
       script << %Q{renderModal["#{id}"].show();} unless opts.has_key?(:render_only)
       script.html_safe
     end

data/app/helpers/symphonia/renderer_helper.rb

@@ -74,6 +74,12 @@ module Symphonia
         @_c.link_to title, query.to_params.merge(sort_params), options.merge({ class: css_class })
       end
 
+      def css_classes(entity)
+        css = []
+        css << "status--#{entity.status}" if entity.respond_to?(:status)
+        css.join("__") + entity.try(:css_classes).to_s
+      end
+
       private
 
       def t(*args)

data/app/views/layouts/symphonia/_query.html.erb

@@ -31,7 +31,7 @@
       </thead>
       <tbody>
         <% entities.each do |entity| %>
-          <tr id="<%= dom_id(entity) %>" class="<%= cycle('odd', 'even') %> <%= entity.try(:css_classes) %>">
+          <tr id="<%= dom_id(entity) %>" class="<%= cycle('odd', 'even') %> <%= renderer.css_classes(entity) %>">
             <%= content_tag(:td, check_box_tag('ids[]', entity.id), class: "px-0") if renderer.show_checkboxes? %>
             <%= content_tag(:td, radio_button_tag('id', entity.id)) if renderer.show_radios? %>
             <% renderer.query.columns.each do |column| %>

data/lib/symphonia/base_controller.rb

@@ -44,7 +44,7 @@ module Symphonia
       @entity ||= instance_variable_set(:"@#{model_name}", model.new(entity_params))
       respond_to do |format|
         if @entity.save
-          format.html { redirect_to @entity, notice: t(:text_created) }
+          format.html { redirect_back_or_default @entity, notice: t(:text_created) }
           format.json { render json: @entity, status: :created, location: @entity }
         else
           format.html { render action: 'new' }
@@ -56,7 +56,7 @@ module Symphonia
     def update
       respond_to do |format|
         if @entity.update(entity_params)
-          format.html { redirect_to @entity, notice: t(:text_updated) }
+          format.html { redirect_back_or_default @entity, notice: t(:text_updated) }
           format.json { head :no_content }
         else
           format.html { render action: 'edit' }
@@ -68,7 +68,7 @@ module Symphonia
     def destroy
       @entity.destroy
       respond_to do |format|
-        format.html { redirect_to(action: :index, notice: t(:text_destroyed)) }
+        format.html { redirect_back_or_default(action: :index, notice: t(:text_destroyed)) }
         format.json { head :no_content }
         format.js { render js: "Symphonia.filters.removeRow('#{view_context.dom_id(@entity)}')"}
       end

data/lib/symphonia/user_management.rb

@@ -47,12 +47,6 @@ module Symphonia
 
       alias_method :activate!, :unarchive!
 
-      def css_classes
-        css = ''
-        css << ' -active' if self.active?
-        css << ' lock' if self.lock?
-        css
-      end
     end
   end
 end

data/lib/symphonia/version.rb

@@ -1,4 +1,3 @@
 module Symphonia
-  VERSION = '2.1.7'
-  VERSION_NAME = '2019.03.31'
+  VERSION = '2.1.8'
 end

data/spec/helpers/symphonia/application_helper_spec.rb

@@ -1,11 +1,11 @@
 RSpec.describe Symphonia::ApplicationHelper do
   describe "#title" do
     it "returns the default title" do
-      expect(helper.title("Holub")).to match /<(h1)\s.*id=\Wpage_header\W\s.*Holub<\/\1>/
+      expect(helper.title("Holub")).to match /<(h1)\s.*id=\Wpage_header\W.*Holub<\/\1>/
     end
 
     it "with symbol" do
-      expect(helper.title(:title)).to match /<(h1)\s.*id=\Wpage_header\W\s.*Title<\/\1>/
+      expect(helper.title(:title)).to match /<(h1)\s.*id=\Wpage_header\W.*Title<\/\1>/
     end
 
     it "with back" do
@@ -18,7 +18,7 @@ RSpec.describe Symphonia::ApplicationHelper do
 
     it "xhr without back" do
       allow(helper.request).to receive(:xhr?).and_return true
-      expect(helper.title("Head", back: true)).to match /<(h5)\s.*id=\Wpage_header\W\s.*Head<\/\1>/
+      expect(helper.title("Head", back: true)).to match /<(h5)\s.*id=\Wpage_header\W.*Head<\/\1>/
     end
   end
 

data/spec/helpers/symphonia/renderer_helper_spec.rb

@@ -0,0 +1,11 @@
+RSpec.describe Symphonia::RendererHelper::QueryRender do
+  let(:user) { FactoryBot.create :user }
+  let(:query) { spy("Query") }
+  subject { described_class.new helper, query }
+  describe "#css_classes" do
+    it "active" do
+      expect(subject.css_classes(user)).to eq "status--active"
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphonia
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Lukas Pokorny
@@ -614,6 +614,7 @@ files:
 - spec/controllers/users_controller_spec.rb
 - spec/factories/factories.rb
 - spec/helpers/symphonia/application_helper_spec.rb
+- spec/helpers/symphonia/renderer_helper_spec.rb
 - spec/mailers/previews/symphonia/notifier_preview.rb
 - spec/mailers/symphonia/notifier_spec.rb
 - spec/models/attachment_spec.rb
@@ -695,3 +696,4 @@ test_files:
 - spec/views/filters/options.html.erb_spec.rb
 - spec/rails_helper.rb
 - spec/helpers/symphonia/application_helper_spec.rb
+- spec/helpers/symphonia/renderer_helper_spec.rb