concerto_manykinds 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b08e62b4c867de70d4ea56f4b081c4b26514c25
-  data.tar.gz: 01a713f1bf602d80e8825f82f0f7239f4c1d0525
+  metadata.gz: 5e16d5aaaa5da2429a7cd060f68bb323757e0b93
+  data.tar.gz: da4116c271a11e927f9327bde59836aeb46f4acd
 SHA512:
-  metadata.gz: 41cc8fd2088c68eb2f3d7f65f9d2c0cb4f424b5808845e7b6d79a89d72960b327106862ed6e66427096c08b7388391242019ba1705679b5ebcb774f635f61ca8
-  data.tar.gz: 410b212f6948f3fa070cfe2dcf4f9ac20cdcef43ae23ba1465431c3d80fb62ea3d47cf477dad86096a967591fbc08303a9994ec25a6526a915951fe3940beff9
+  metadata.gz: 848ddbaca59a72d0bf5af9611c9527f9755a86360a3a486234acd56889941a451dfb1166dee8169d8f44480dfdc9ae86bbc2f6610d36557d0e6689d9e7765957
+  data.tar.gz: 95ea846fe59ca8841944e3c735c3e694e4ce828969271dabd23aa901378b7362596da8ec8ef5bb5c34a7e7c22c847f7edc3762a15af2ca69e215bd4d06d00cf6

data/README.md

@@ -1,6 +1,6 @@
 # Concerto Manykinds
 
-A Rails Engine for displaying multiple types of content in the same template field in Concerto.
+A Rails Engine for displaying multiple types of content in the same template field in Concerto. An example usage scenario is where you have a screen with one field that covers the entire screen-- you can add the other types to that field so that is also shows Text, and Ticker content.
 
 To use this engine, add the following to the Concerto Gemfile-plugins, or use the UI to add the plugin: 
 ```

data/app/assets/javascripts/concerto_manykinds/manykinds.js

@@ -1,24 +1,41 @@
-// Place all the behaviors and hooks related to the matching controller here.
-// All this logic will automatically be available in application.js.
-var manykinds_handlers_initialized = false;
+var ConcertoManykinds = {
+  _initialized: false,
 
-function attachConcertoManykindsHandlers() {
-  if (!manykinds_handlers_initialized) {
-    $('ul.manykinds-list').on('ajax:success', 'a[data-method="delete"]', function (e, data, status, xhr) {
-console.debug('firing');
-      $(this).parent('li').hide();
-    });
+  clearAlert: function() {
+    $('#manykind-alert').addClass('hide');
+    $('#manykind-alert h4').innerText = '';
+  },
 
-    $('form[id="new_manykind"]').on('ajax:success', function (e, data, status, xhr) {
-      // show the new item
-      $("#manykinds_fld" + data["field_id"]).append(data["item_html"]);
-    });
+  initHandlers: function () {
+    if (!ConcertoManykinds._initialized) {
+      // clear alerts on button/link
+      $(document).on('click', 'ul.manykinds-list .mk-delete', ConcertoManykinds.clearAlert);
+      $(document).on('click', 'form[id="new_manykind"] .mk-add', ConcertoManykinds.clearAlert);
 
-    console.debug('manykinds handlers initialized');
-    manykinds_handlers_initialized = true;
+      $('ul.manykinds-list').on('ajax:success', 'a[data-method="delete"]', function (e, data, status, xhr) {
+        console.debug('firing');
+        $(this).parent('li').hide();
+      });
+
+      $('form[id="new_manykind"]').on('ajax:success', function (e, data, status, xhr) {
+        // show the new item
+        $("#manykinds_fld" + data["field_id"]).append(data["item_html"]);
+      });
+      $('form[id="new_manykind"]').on('ajax:error', function (e, data, status, xhr) {
+        console.debug(data.responseJSON.kind_id.join(', '));
+        ConcertoManykinds.showAlert(data.responseJSON.kind_id.join(', '));
+      });
+
+      console.debug('manykinds handlers initialized');
+      ConcertoManykinds._initialized = true;
+    }
+  },
+
+  showAlert: function (msg) {
+    $('#manykind-alert h4').text(msg);
+    $('#manykind-alert').removeClass('hide');
   }
 }
 
-$(document).ready(attachConcertoManykindsHandlers);
-$(document).on('page:change', attachConcertoManykindsHandlers);
-
+$(document).ready(ConcertoManykinds.initHandlers);
+$(document).on('page:change', ConcertoManykinds.initHandlers);

data/app/controllers/concerto_manykinds/manykinds_controller.rb

@@ -1,104 +1,29 @@
-require_dependency "concerto_manykinds/application_controller"
+require_dependency 'concerto_manykinds/application_controller'
 
 module ConcertoManykinds
   class ManykindsController < ApplicationController
-
-    # # GET /schedules
-    # # GET /schedules.json
-    # def index
-    #   @schedules = Schedule.all
-    #   # ignore the schedules that belong to screens we cant read
-    #   # or schedules where the template has been deleted
-    #   @schedules.reject! { |s| !can?(:read, s.screen) || s.template.nil? }
-  
-    #   respond_to do |format|
-    #     format.html # index.html.erb
-    #     format.json { render json: @schedules }
-    #   end
-    # end
-  
-    # # GET /schedules/1
-    # # GET /schedules/1.json
-    # def show
-    #   @schedule = Schedule.find(params[:id])
-    #   auth! :action => :read, :object => @schedule.screen
-
-    #   respond_to do |format|
-    #     format.html # show.html.erb
-    #     format.json { render json: @schedule }
-    #   end
-    # end
-  
-    # # GET /schedules/new
-    # # GET /schedules/new.json
-    # def new
-    #   @schedule = Schedule.new
-    #   if !params[:screen_id].nil?
-    #     # TODO: Error handling
-    #     @schedule.screen = Screen.find(params[:screen_id])
-    #   end
-    #   auth! :action => :update, :object => @schedule.screen
-
-    #   respond_to do |format|
-    #     format.html # new.html.erb
-    #     format.json { render json: @schedule }
-    #   end
-    # end
-  
-    # # GET /schedules/1/edit
-    # def edit
-    #   @schedule = Schedule.find(params[:id])
-    #   auth! :action => :update, :object => @schedule.screen
-    # end
-  
-    # POST /schedules
-    # POST /schedules.json
     def create
       @manykind = Manykind.new(manykind_params)
-      auth! :action => :update, :object => @manykind.template
+      auth! action: :update, object: @manykind.template
       respond_to do |format|
         if @manykind.save
           format.html { redirect_to @manykind, notice: 'Kind was successfully created.' }
-          #format.json { render json: @manykind, status: :created, location: @manykind }
-          format.json do 
-            item_html = render_to_string(:partial => 'concerto_manykinds/templates/item', :object => @manykind, :formats => [:html])
-            render json: { :field_id => @manykind.field.id, :item_html => item_html }, status: :created, location: @manykind 
+          format.json do
+            item_html = render_to_string(partial: 'concerto_manykinds/templates/item', object: @manykind, formats: [:html])
+            render json: { field_id: @manykind.field.id, item_html: item_html }, status: :created, location: @manykind
           end
         else
-          format.html { render action: "new" }
+          format.html { render action: 'new' }
           format.json { render json: @manykind.errors, status: :unprocessable_entity }
         end
       end
     end
-  
-    # # PUT /schedules/1
-    # # PUT /schedules/1.json
-    # def update
-    #   @schedule = Schedule.find(params[:id])
-    #   auth! :action => :update, :object => @schedule.screen
 
-    #   respond_to do |format|
-    #     if @schedule.update_attributes(schedule_params)
-    #       process_notification(@schedule, {:screen_id => @schedule.screen_id, :screen_name => @schedule.screen.name,
-    #         :template_id => @schedule.template.id, :template_name => @schedule.template.name }, 
-    #         :key => 'concerto_template_scheduling.schedule.update', :owner => current_user, :action => 'update')
-
-    #       format.html { redirect_to @schedule, notice: 'Schedule was successfully updated.' }
-    #       format.json { head :no_content }
-    #     else
-    #       format.html { render action: "edit" }
-    #       format.json { render json: @schedule.errors, status: :unprocessable_entity }
-    #     end
-    #   end
-    # end
-  
-    # DELETE /schedules/1
-    # DELETE /schedules/1.json
     def destroy
       @manykind = Manykind.find(params[:id])
-      auth! :action => :update, :object => @manykind.template
+      auth! action: :update, object: @manykind.template
       @manykind.destroy
-  
+
       respond_to do |format|
         format.html { redirect_to manykindsengine.manykinds_url }
         format.json { head :no_content }

data/app/models/concerto_manykinds/manykind.rb

@@ -5,31 +5,30 @@ module ConcertoManykinds
     belongs_to :field
     belongs_to :kind
     belongs_to :template
-    
-    validates :field_id, :presence => true
-    validates :kind_id, :presence => true
-    validates :template_id, :presence => true
-    validates_uniqueness_of :kind_id, :scope => [:template_id, :field_id]
+
+    validates :field_id, presence: true
+    validates :kind_id, presence: true
+    validates :template_id, presence: true
+    validates_uniqueness_of :kind_id, scope: [:template_id, :field_id], message: I18n.t('concerto_manykinds.already_mapped')
 
     # TODO dont allow record if already exists in position field mapping
     validate :cannot_be_same_as_primary
 
     def cannot_be_same_as_primary
       if template_id.present? && field_id.present? && kind_id.present?
-        p = Position.where(:template_id => template_id, :field_id => field_id).first
-        if !p.nil? and p.field.kind_id == kind_id
-          errors.add(:kind_id, 'already mapped via template definition')
+        p = Position.where(template_id: template_id, field_id: field_id).first
+        if !p.nil? && p.field.kind_id == kind_id
+          errors.add(:kind_id, I18n.t('concerto_manykinds.already_mapped_via_template', kind: kind.name, field: field.name))
         end
       end
     end
 
     def self.form_attributes
-      attributes = [:field_id, :template_id,  :kind_id]
+      attributes = [:field_id, :template_id, :kind_id]
     end
 
     def self.kinds_for(template_id, field_id)
-      Manykind.where(:template_id => template_id, :field_id => field_id)
+      Manykind.where(template_id: template_id, field_id: field_id)
     end
-
   end
 end

data/app/views/concerto_manykinds/manykinds/index.html.erb

@@ -5,7 +5,7 @@
       </div>
     </div>
     <h1 class="default-padding">
-      <%= t(:all_model, :model => ConcertoManykinds::Manykind.model_name.human.pluralize) %>
+      <%= t(:all_model, model: ConcertoManykinds::Manykind.model_name.human.pluralize) %>
     </h1>
   </header>
   <div class="viewblock-cont">

data/app/views/concerto_manykinds/templates/_details.html.erb

@@ -1,5 +1,6 @@
 <%= stylesheet_link_tag "concerto_manykinds/application" %>
 <%= javascript_include_tag "concerto_manykinds/application" %>
+
 <section class="viewblock">
   <header class="viewblock-header">
 
@@ -18,6 +19,10 @@
   <div class="viewblock-cont">
     <div class="row-fluid">
       <div class="span12">
+        <div id="manykind-alert" class="alert alert-banner alert-error hide">
+            <button type="button" class="close" data-dismiss="alert">×</button>
+            <h4></h4>
+        </div>
         <div class="default-padding">
           <div class="subblock">
             <div class="default-padding clearfix">
@@ -27,7 +32,7 @@
                 <li><%= p.field.kind.name %> <i class='icon-star' title="<%=t('.fundamental_kind')%>"></i></li>
                 <% @manykinds.each do |m| %>
                   <% if m.field.id == p.field.id %>
-                    <%= render :partial => 'concerto_manykinds/templates/item', :object => m %>
+                    <%= render partial: 'concerto_manykinds/templates/item', object: m %>
                   <% end %>
                 <% end %>
               </ul>
@@ -35,8 +40,8 @@
 
               <% if can? :update, @template %>
                 <div class="row-fluid">
-                  <%= form_for(@manykind_new, :url => manykindsengine.manykinds_path, :html => { 'data-type' => 'json'}, :remote => true, :class => 'form', :format => 'json') do |f| %>
-                    <%= f.hidden_field :template_id, :value => @template.id %>
+                  <%= form_for(@manykind_new, url: manykindsengine.manykinds_path, html: { 'data-type' => 'json'}, remote: true, class: 'form', format: 'json') do |f| %>
+                    <%= f.hidden_field :template_id, value: @template.id %>
                     <div class="span4">
                       <%= f.label :field_id %>
                       <%= f.collection_select :field_id, Field.all, :id, :name %>
@@ -47,13 +52,11 @@
                     </div>
                     <div class="span2">
                       <label>&nbsp;</label>
-                      <%= f.button t(:add), :class => 'btn btn-small' %>
+                      <%= f.button t(:add), class: 'mk-add btn btn-default' %>
                     </div>
                 </div>
                   <% end %>
               <% end %>
-
-
             </div>
           </div>
         </div>

data/app/views/concerto_manykinds/templates/_item.html.erb

@@ -1,6 +1,6 @@
 <li>
   <%= item.kind.name %>
   <% if can? :update, item.template %>
-    <%= link_to t(:destroy), manykindsengine.manykind_path(item), :data => { :confirm => t(:are_you_sure_delete_model_key, :model => ConcertoManykinds::Manykind.model_name.human, :key => item.kind.name), :type => 'json' }, :method => :delete, :class => "btn btn-small", :remote => true %>
+    <%= link_to t(:destroy), manykindsengine.manykind_path(item), data: { confirm: t('concerto_manykinds.are_you_sure_delete', kind: item.kind.name, field: item.field.name), type: 'json' }, method: :delete, class: "mk-delete btn btn-small", remote: true %>
   <% end %>
 </li>

data/config/locales/en.yml

@@ -9,6 +9,8 @@ en:
         kind_id: 'Kind'
 
   concerto_manykinds:
+    already_mapped: 'That kind is already mapped to that field'
+    already_mapped_via_template:  'The %{kind} kind is already mapped to field %{field} via the template definition'
     are_you_sure_delete: 'Are you sure you want to remove the mapping of the %{kind} from the %{field} field?'
 
     templates:

data/lib/concerto_manykinds/version.rb

@@ -1,3 +1,3 @@
 module ConcertoManykinds
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: concerto_manykinds
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Marvin Frederickson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-15 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ files:
 - test/test_helper.rb
 - test/unit/concerto_template_scheduling/schedule_test.rb
 - test/unit/helpers/concerto_template_scheduling/schedules_helper_test.rb
-homepage: https://github.com/mfrederickson/concerto_manykinds
+homepage: https://github.com/concerto-addons/concerto-manykinds
 licenses: []
 metadata: {}
 post_install_message: 
@@ -125,46 +125,46 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Allow multiple kinds (content types) per template field
 test_files:
+- test/fixtures/concerto_template_scheduling/schedules.yml
+- test/test_helper.rb
+- test/integration/navigation_test.rb
+- test/functional/concerto_template_scheduling/schedules_controller_test.rb
 - test/concerto_template_scheduling_test.rb
+- test/dummy/bin/rake
+- test/dummy/bin/rails
+- test/dummy/bin/bundle
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/404.html
+- test/dummy/public/500.html
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/assets/javascripts/application.js
 - test/dummy/app/assets/stylesheets/application.css
-- test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/helpers/application_helper.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/bin/bundle
-- test/dummy/bin/rails
-- test/dummy/bin/rake
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
+- test/dummy/README.rdoc
+- test/dummy/Rakefile
 - test/dummy/config/environment.rb
+- test/dummy/config/environments/test.rb
 - test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/application.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/initializers/secret_token.rb
 - test/dummy/config/initializers/filter_parameter_logging.rb
 - test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/initializers/mime_types.rb
-- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
 - test/dummy/config/initializers/session_store.rb
-- test/dummy/config/initializers/wrap_parameters.rb
 - test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
 - test/dummy/config.ru
-- test/dummy/public/404.html
-- test/dummy/public/422.html
-- test/dummy/public/500.html
-- test/dummy/public/favicon.ico
-- test/dummy/Rakefile
-- test/dummy/README.rdoc
-- test/fixtures/concerto_template_scheduling/schedules.yml
-- test/functional/concerto_template_scheduling/schedules_controller_test.rb
-- test/integration/navigation_test.rb
-- test/test_helper.rb
 - test/unit/concerto_template_scheduling/schedule_test.rb
 - test/unit/helpers/concerto_template_scheduling/schedules_helper_test.rb