kuppayam 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51d6eb55c8430b0caaecb27c7e149aabe0813fb2
-  data.tar.gz: 115e42565357390c76c66805ce8af86aedfb82b4
+  metadata.gz: be6cbb25ee32833e06b3e99c4f554775348d805d
+  data.tar.gz: a84d5028640bc8be933ff4b523d35ebd054717ce
 SHA512:
-  metadata.gz: d194134231f2b3ecab6fd99725ebeb389bea243b86c06d982386999f73691d47d612c53119c28241d5406a8f630c550bd869ea514ce9ce071914f247b3042c76
-  data.tar.gz: 713ec7ef49b7970178bc9f31e1db2a1b0047a67b54b6939701bc78df53d8014cdffc57fd8d475c85fc7e91687cb5f1f58f5ef5e21e9b8b24a0a618aae71b85eb
+  metadata.gz: a37a44f8feeea1709bd235ce270fc4c9403c6e38619828706a8f1a35b5078db30920d2474af6ab0d77ef2a78aa5f2938bd98e467c77c309326c376f39f22693e
+  data.tar.gz: e536eb62ca62ca2c6d18b2fffb66f56e3e2d67f24761df91a8117ece4bd3bd0d6d576ab0fd3c85bd765eb16ea112b8c162b163afcd8fe41f289783320f3f17ac

data/app/helpers/resource_view_helper.rb

@@ -31,7 +31,7 @@ module ResourceViewHelper
 
 	def display_featured(object, **options)
     options.reverse_merge!(
-      span_class: 'ml-5 mt-5 label',
+      span_class: 'mr-5 mt-5 label',
     )
     if object.featured?
       content_tag(:span, "Featured", class: "#{options[:span_class]} label-warning")
@@ -42,12 +42,20 @@ module ResourceViewHelper
 
 	def display_publishable_status(object, **options)
 		options.reverse_merge!(
-      span_class: 'ml-5 mt-5 label',
+      span_class: 'mr-5 mt-5 label',
     )
     label_class = Publishable::STATUS_UI_CLASS[object.status]
 		content_tag(:span, object.display_status, class: "#{options[:span_class]} label-#{label_class}")
 	end
 
+  def display_readable_status(object, **options)
+    options.reverse_merge!(
+      span_class: 'mr-5 mt-5 label',
+    )
+    label_class = Readable::STATUS_UI_CLASS[object.status]
+    content_tag(:span, object.display_status, class: "#{options[:span_class]} label-#{label_class}")
+  end
+
   def display_publishable_links(object, **options)
     options.reverse_merge!(
         publish_icon: 'fa fa-check-square',
@@ -85,6 +93,43 @@ module ResourceViewHelper
     raw(links.join(""))
   end
 
+  def display_readable_links(object, **options)
+    options.reverse_merge!(
+        read_icon: 'fa fa-check-square-o',
+        unread_icon: 'fa fa-square-o',
+        remove_icon: 'fa fa-trash',
+        archive_icon: 'fa fa-archive',
+        
+        read_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "read"),
+        unread_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "unread"),
+        remove_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "removed"),
+        archive_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "archived"),
+        
+        read_text: "Read",
+        unread_text: "Unread",
+        remove_text: "Remove",
+        archive_text: "Archive",
+        
+        read_class: "",
+        unread_class: "",
+        remove_class: "delete",
+        archive_class: "",
+
+        has_permission_to_edit: true
+    )
+    
+    if @current_permission
+      options[:has_permission_to_edit] = @current_permission.can_update?
+    end
+
+    links = []
+    links << link_to(raw("<i class=\"#{options[:read_icon]} mr-5\"></i> #{options[:read_text]}"), options[:read_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:read_class]) if object.can_read? && options[:has_permission_to_edit]
+    links << link_to(raw("<i class=\"#{options[:unread_icon]} mr-5\"></i> #{options[:unread_text]}"), options[:unread_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:unread_class]) if object.can_unread? && options[:has_permission_to_edit]
+    links << link_to(raw("<i class=\"#{options[:remove_icon]} mr-5\"></i> #{options[:remove_text]}"), options[:remove_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:remove_class]) if object.can_remove? && options[:has_permission_to_edit]
+    links << link_to(raw("<i class=\"#{options[:archive_icon]} mr-5\"></i> #{options[:archive_text]}"), options[:archive_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:archive_class]) if object.can_archive? && options[:has_permission_to_edit]
+    raw(links.join(""))
+  end
+
   def display_featurable_links(object, **options)
     options.reverse_merge!(
         feature_icon: 'fa fa-star',
@@ -178,6 +223,43 @@ module ResourceViewHelper
     raw(links.join(""))
   end
 
+  def display_readable_buttons(object, **options)
+    options.reverse_merge!(
+        read_icon: 'fa fa-check-square-o',
+        unread_icon: 'fa fa-square-o',
+        remove_icon: 'fa fa-trash',
+        archive_icon: 'fa fa-archive',
+        
+        read_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "read"),
+        unread_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "unread"),
+        remove_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "removed"),
+        archive_link: url_for(action: 'update_status', controller: object.class.to_s.tableize, id: object.id, status: "archived"),
+        
+        read_text: "Mark as Read",
+        unread_text: "Mark as Unread",
+        remove_text: "Remove",
+        archive_text: "Archive",
+        
+        read_class: "btn btn-block btn-success btn-only-hover",
+        unread_class: "btn btn-block btn-gray btn-only-hover",
+        remove_class: "btn btn-block btn-danger btn-only-hover",
+        archive_class: "btn btn-block btn-gray btn-only-hover",
+
+        has_permission_to_edit: true
+    )
+    
+    if @current_permission
+      options[:has_permission_to_edit] = @current_permission.can_update?
+    end
+
+    links = []
+    links << link_to(raw("<i class=\"#{options[:read_icon]} mr-5\"></i> #{options[:read_text]}"), options[:read_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:read_class]) if object.can_read? && options[:has_permission_to_edit]
+    links << link_to(raw("<i class=\"#{options[:unread_icon]} mr-5\"></i> #{options[:unread_text]}"), options[:unread_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:unread_class]) if object.can_unread? && options[:has_permission_to_edit]
+    links << link_to(raw("<i class=\"#{options[:remove_icon]} mr-5\"></i> #{options[:remove_text]}"), options[:remove_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:remove_class]) if object.can_remove? && options[:has_permission_to_edit]
+    links << link_to(raw("<i class=\"#{options[:archive_icon]} mr-5\"></i> #{options[:archive_text]}"), options[:archive_link], method: 'PUT', remote: true, role: "menuitem", tabindex: "-1", class: options[:archive_class]) if object.can_archive? && options[:has_permission_to_edit]
+    raw(links.join(""))
+  end
+
   def display_featurable_buttons(object, **options)
     options.reverse_merge!(
       feature_icon: 'fa fa-star',

data/app/models/concerns/readable.rb

@@ -0,0 +1,48 @@
+module Readable
+  
+  extend ActiveSupport::Concern
+
+  # Constants
+  NEW = "new"
+  UNREAD = "unread"
+  READ = "read"
+  ARCHIVED = "archived"
+  REMOVED = "removed"
+  
+  STATUS = {"New" => NEW, "Unread" => UNREAD, "Read" => READ, "Archived" => ARCHIVED, "Removed" => REMOVED}
+  STATUS_REVERSE = {NEW => "New", UNREAD => "Unread", READ => "Read",ARCHIVED => "Archived", REMOVED => "Removed"}
+  STATUS_UI_CLASS = {NEW => "success", UNREAD => "info", READ => "default", ARCHIVED => "default", REMOVED => "danger"}
+
+  included do
+
+	  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+	  
+    state_machine :status, initial: NEW do
+      event :read do
+	      transition [NEW, UNREAD] => READ
+	    end
+	    event :unread do
+	      transition [READ, ARCHIVED, REMOVED] => UNREAD
+	    end
+	    event :remove do
+	      transition [NEW, READ, UNREAD, ARCHIVED] => REMOVED
+	    end
+	    event :archive do
+        transition [NEW, READ, UNREAD, REMOVED] => ARCHIVED
+	    end
+    end
+
+    scope :new_ones, -> { where(status: NEW) }
+    scope :read, -> { where(status: READ) }
+	  scope :unread, -> { where(status: UNREAD) }
+	  scope :removed, -> { where(status: REMOVED) }
+	  scope :archived, -> { where(status: ARCHIVED) }
+
+	  scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
+  end
+
+  def display_status
+    STATUS_REVERSE[self.status]
+  end
+
+end

data/app/models/image/base.rb

@@ -50,7 +50,7 @@ class Image::Base < Kuppayam::ApplicationRecord
   def self.image_configuration
     {
       max_upload_limit: 10485760,
-      min_upload_limit: 100000,
+      min_upload_limit: 1,
       resolutions: [550, 275],
       form_upload_image_label: "Upload a new Image",
       form_title: "Upload an Image",

data/lib/kuppayam/action_view/form_helper.rb

@@ -247,10 +247,10 @@ module Kuppayam
       #     <%= f.select("proposal[:plan]", options_for_select(options_list, :selected => f.object.name), {:prompt=>true}, {:class => 'form-control'}) %>
       #   </div>
       # </div>
-      def theme_form_select_group(form, object, field_name, options_list, **options)
+      def theme_form_select_group(object, field_name, options_list, **options)
         options.reverse_merge!(
-          label: "Label",
-          param_name: "desired_attribute",
+          label: field_name.to_s.titleize,
+          param_name: field_name,
           prompt: true,
           error_class: "has-error",
           required: false,
@@ -266,7 +266,7 @@ module Kuppayam
         end
 
         theme_form_group(options[:label], required: options[:required], error_class: error_class, form_style: options[:form_style]) do
-          form.select(options[:param_name], options_for_select(options_list, :selected => object.send(field_name)), {:prompt=>options[:prompt]}, {:class => 'form-control'}) + error_message
+          select_tag(options[:param_name], options_for_select(options_list, :selected => object.send(field_name)), {:prompt=>options[:prompt], :class => 'form-control'}) + error_message
         end
       end
 

data/lib/kuppayam/version.rb

@@ -1,3 +1,3 @@
 module Kuppayam
-  VERSION = '0.1.21'
+  VERSION = '0.1.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuppayam
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2017-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -428,6 +428,7 @@ files:
 - app/models/concerns/approvable.rb
 - app/models/concerns/featureable.rb
 - app/models/concerns/publishable.rb
+- app/models/concerns/readable.rb
 - app/models/document/base.rb
 - app/models/document/import_data_file.rb
 - app/models/document/import_report_file.rb