kuppayam 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bb65251c46a6fd13aa91b87b1a885ccfa293f5b
-  data.tar.gz: c1933eca8006da8da626437ec1d4381ad72bc21b
+  metadata.gz: 51d6eb55c8430b0caaecb27c7e149aabe0813fb2
+  data.tar.gz: 115e42565357390c76c66805ce8af86aedfb82b4
 SHA512:
-  metadata.gz: 5d1a9fcfb4117eda53364986bc736ac76bcb5618e382018851121f82f5ac91b57ccdfddc454d6b4f7934ecd417a2a2878a5fc22df7f24b382857f5ba12f5378f
-  data.tar.gz: 260e9aa8b403d82f1ef7de3fdea737367bc444f97ea354af09f24a3df166560bf4abadfa53e4c45c4e87878313398d70e9c582b932488ab782aeed3bddb9844d
+  metadata.gz: d194134231f2b3ecab6fd99725ebeb389bea243b86c06d982386999f73691d47d612c53119c28241d5406a8f630c550bd869ea514ce9ce071914f247b3042c76
+  data.tar.gz: 713ec7ef49b7970178bc9f31e1db2a1b0047a67b54b6939701bc78df53d8014cdffc57fd8d475c85fc7e91687cb5f1f58f5ef5e21e9b8b24a0a618aae71b85eb

data/app/controllers/kuppayam/images_controller.rb

@@ -3,13 +3,14 @@ module Kuppayam
 
     before_action :get_image_class
     before_action :get_resource
-
+    
     def index
       get_collections
     end
 
     def show
       @image = Image::Base.find(params[:id])
+      get_image_configuration
       @r_object = @image = Image::Base.find(params[:id])
       unless @r_object
         set_notification(false, I18n.t('status.error'), I18n.t('status.not_found', item: "Image"))
@@ -18,15 +19,18 @@ module Kuppayam
     end
 
     def new
-      @image = @image_class.new
+      @image = @image_class.new(imageable: @resource)
+      get_image_configuration
     end
 
     def edit
       @image = @image_class.find(params[:id])
+      get_image_configuration
     end
 
     def create
       @image = @image_class.new
+      get_image_configuration
       @image.imageable = @resource
       @image.image = params[:image]
       # @image.image_type = @image_class.name
@@ -37,6 +41,7 @@ module Kuppayam
 
     def update
       @image = @image_class.find(params[:id])
+      get_image_configuration
       @image.image = params[:image]
       @image.save
       set_flash_message("Image has been updated successfully", :success)
@@ -140,5 +145,21 @@ module Kuppayam
       @filter_ui_settings = {}
     end
 
+    def get_image_configuration
+      imageable = @image.imageable
+      hsh = {}
+      if imageable.respond_to?(:image_configuration)
+        hsh = imageable.image_configuration[@image_type]
+      elsif @image.class.respond_to?(:image_configuration)
+        hsh = @image.class.image_configuration
+      else
+        hsh = Image::Base.image_configuration  
+      end
+      @form_upload_image_label = hsh[:form_upload_image_label]
+      @form_title = hsh[:form_title]
+      @form_sub_title = hsh[:form_sub_title]
+      @form_instructions = hsh[:form_instructions]
+    end
+
   end
 end

data/app/models/image/base.rb

@@ -2,15 +2,6 @@ require 'filesize'
 
 class Image::Base < Kuppayam::ApplicationRecord
 
-  # Constants
-  UPLOAD_LIMIT = 1048576 # this is in bytes which is equivalent to 1 megabyte
-
-  INSTRUCTIONS = [
-    "the filename should be in .jpg / .jpeg or .png format",
-    "the image dimensions are smaller than <strong>750 x 368 Pixels</strong>, (Portrait Format). (most cameras and camera phones will produce images bigger than this)",
-    "the file size is less than 20 Kb,  or bigger than <strong>1 MB</strong>"
-  ]
-
   self.table_name = "images"
   self.inheritance_column = :image_type
 
@@ -40,8 +31,13 @@ class Image::Base < Kuppayam::ApplicationRecord
   end
 
   def check_file_size
-    if image && image.file && image.file.size.to_f > self.class::UPLOAD_LIMIT
-      errors.add(:image, "You cannot upload an image greater than #{Filesize.from(self.class::UPLOAD_LIMIT.to_s+ " b").pretty}")
+    if image && image.file 
+      if image.file.size.to_f > self.max_upload_limit
+        errors.add(:image, "You cannot upload an image greater than #{Filesize.from(self.max_upload_limit.to_s+ " b").pretty}")
+      end
+      if image.file.size.to_f < self.min_upload_limit
+        errors.add(:image, "You cannot upload an image lesser than #{Filesize.from(self.min_upload_limit.to_s+ " b").pretty}")
+      end
     end
   end
 
@@ -49,4 +45,44 @@ class Image::Base < Kuppayam::ApplicationRecord
     "#{id} - #{self.class.name.split('::').last.titleize}"
   end
 
+  # Configuration
+  # -------------
+  def self.image_configuration
+    {
+      max_upload_limit: 10485760,
+      min_upload_limit: 100000,
+      resolutions: [550, 275],
+      form_upload_image_label: "Upload a new Image",
+      form_title: "Upload an Image",
+      form_sub_title: "Please read the instructions below:",
+      form_instructions: [
+        "the filename should be in .jpg / .jpeg or .png format",
+        "the image resolutions should be <strong>550 x 275 Pixels</strong>",
+        "the file size should be greater than 100 Kb and or lesser than <strong>10 MB</strong>",
+        "Note: most cameras and camera phones will produce images bigger than this"
+      ]
+     }
+  end
+
+  def get_image_configuration
+    imageable = self.imageable
+    hsh = {}
+    if imageable.respond_to?(:image_configuration)
+      hsh = imageable.image_configuration[self.image_type]
+    elsif self.class.respond_to?(:image_configuration)
+      hsh = self.class.image_configuration
+    else
+      hsh = Image::Base.image_configuration  
+    end
+    hsh
+  end
+
+  def max_upload_limit
+    get_image_configuration[:max_upload_limit]
+  end
+
+  def min_upload_limit
+    get_image_configuration[:min_upload_limit]
+  end
+
 end

data/app/views/kuppayam/images/_form.html.erb

@@ -5,31 +5,20 @@
 
   <div class="modal-body">
 
+    <!-- Display Instructions - Get instructions from the imageable settings else display default instructions -->
+    <blockquote class="blockquote blockquote-red">
+      <p><strong><i class="linecons-lightbulb"></i><%= @form_sub_title %></strong></p>
+      <ul>
+        <% @form_instructions.each do |i| %>
+          <li><%= raw i %></li>
+        <% end %>
+      </ul>
+    </blockquote>
+
     <div id="image_form_error">
       <%= @image.errors[:base].to_sentence %>
     </div>
 
-    <!-- <div style="padding:20px;background-color: yellow;">
-      <strong><%#= @image.imageable.class.name %></strong>
-    </div> -->
-
-    <% begin %>
-      <% if @image_type %>
-
-      <blockquote class="blockquote blockquote-red">
-        <p><strong><i class="linecons-lightbulb"></i> Please read the instructions below:</strong></p>
-
-        <ul>
-          <% eval("#{@image_type}::INSTRUCTIONS").each do |i| %>
-            <li><%= raw i %></li>
-          <% end %>
-        </ul>
-      </blockquote>
-      
-      <% end %>
-    <% rescue %>
-    <% end %>
-
     <%= hidden_field_tag :faction, @image.new_record? ? main_app.images_path : main_app.image_path(@image) %>
     
     <%= hidden_field_tag :fmethod, @image.new_record? ? "POST" : "PUT" %>
@@ -44,7 +33,7 @@
 
     <%= hidden_field_tag :multiple, params[:multiple] %>
     
-    <%= theme_form_field(@image, :image, html_options: {type: 'file'}, label: "Upload New Image", param_name: "image") %>
+    <%= theme_form_field(@image, :image, html_options: {type: 'file'}, label: @form_upload_image_label, param_name: "image") %>
 
   </div>
 

data/app/views/kuppayam/images/new.js.erb

@@ -1,8 +1,3 @@
-<% if @image_type %>
-	heading = "Add <%= @image_type.split('::').last.titleize %>";
-<% else %>
-	heading = "Add Image";
-<% end %>
-
+heading = "<%= @form_title %>";
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showImageUploadModal(heading, bodyContent);
+showImageUploadModal(heading, bodyContent, true);

data/lib/kuppayam/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuppayam
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-08 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails