pattana 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f0498e9dae32310ed005c0d28049d0e4c08080
-  data.tar.gz: 35f26c8cb3b77755e39e9b1e88a9d27614749a07
+  metadata.gz: 8e0055c765ddac1e9e3977e5008ad323f045249a
+  data.tar.gz: 2230c9c2844a8e14966a0b7e8add341875f3692f
 SHA512:
-  metadata.gz: ef25b43c62b71683414e29898b6b26eaf046f40a04ed29880c6cc234dbba78038fee61835c8e9d729e592c9588ffa83866c0e57efdc47c5064645c729a8abb2c
-  data.tar.gz: 5189be80a84d2b997396fd7b028979de02703a5c768c2fe297120d764105d964884505f34ba7e0a0bb62e9fa527f79863026d9a70c70d93bddff5ea766a41f0b
+  metadata.gz: e03ff18b5c8029240516f13c27a6f536248c71d9c17ace3428856715b8c44def3afdc8000529559028ce0b993a11c52120f66d83bd0c4fd6b0f09a6931085be6
+  data.tar.gz: 2c4b457f52c573226d973a26506da4413c380e90a1d5e2cc3547f19c5ea2d064ff633cfa004090d27c52e9c2a9289ce843327c424bae380d1b22c4d48bc928be

data/app/models/country.rb

@@ -3,6 +3,7 @@ class Country < Pattana::ApplicationRecord
   # Associations
   has_many :regions
   has_many :cities
+  has_one :flag_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::FlagImage"
 
 	# Validations
 	validates :name, presence: true, length: {minimum: 3, maximum: 128}

data/app/models/image/flag_image.rb

@@ -0,0 +1,22 @@
+class Image::FlagImage < Image::Base
+
+	mount_uploader :image, FlagImageUploader
+
+	# Configuration
+  # -------------
+  def self.image_configuration
+    {
+      max_upload_limit: 1048576,
+      min_upload_limit: 1,
+      resolutions: [550, 275],
+      form_upload_image_label: "Upload a new Image",
+      form_title: "Upload an Image (Flag)",
+      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>"
+      ]
+    }
+  end
+end

data/app/serializers/country_preview_serializer.rb

@@ -1,4 +1,12 @@
 class CountryPreviewSerializer < ActiveModel::Serializer
   include NullAttributeReplacer
   attributes :id, :name, :iso_name, :iso_alpha_2, :dialing_prefix, :priority, :operational
+
+  has_one :flag_image, class_name: "Image::FlagImage", serializer: FlagImageSerializer do
+    if object.flag_image
+      object.flag_image
+    else
+      object.build_flag_image
+    end
+  end
 end

data/app/serializers/flag_image_serializer.rb

@@ -0,0 +1,23 @@
+class FlagImageSerializer < ActiveModel::Serializer
+  include NullAttributeReplacer
+  
+  attributes :id, :created_at
+  attributes :image_large_path, :image_medium_path, :image_small_path, :image_tiny_path
+  	
+  def image_large_path
+    object.image_url :large
+  end
+
+  def image_medium_path
+    object.image_url :medium
+  end
+
+  def image_small_path
+    object.image_url :small
+  end
+
+  def image_tiny_path
+    object.image_url :tiny
+  end
+  
+end

data/app/uploaders/flag_image_uploader.rb

@@ -0,0 +1,23 @@
+class FlagImageUploader < ImageUploader
+	
+  def store_dir
+    "uploads/flag_images/#{model.id}"
+  end
+
+  version :large do
+    process :resize_to_fill => [550, 275]
+  end
+
+	version :medium do
+    process :resize_to_fill => [250, 125]
+  end
+
+  version :small do
+    process :resize_to_fill => [100, 50]
+  end
+
+  version :tiny do
+    process :resize_to_fill => [40, 20]
+  end
+  
+end

data/app/views/pattana/countries/_index.html.erb

@@ -3,6 +3,7 @@
 	  <thead> 
 			<tr>
 				<th style="text-align:center;width:5%;">#</th> 
+				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
 				<th style="text-align:left;width:40%;">Name</th>
 				<th style="text-align:center;width:15%;">Show in API</th>
 				<th style="text-align:center;width:15%;">Operational</th>
@@ -19,6 +20,12 @@
 		    <tr id="tr_country_<%= country.id %>">
 		      
 		      <td class="text-align-center"><%= country.id %></td>
+
+		      <td class="user-image">
+		        <%= link_to(pattana.country_path(country), remote: true) do %>
+		        	<%= display_image(country, "flag_image.image.small.url", width: "120", height: "auto", class: "img-rectangle", alt: country.name) %>
+		        <% end %>
+		      </td>
 		      
 		      <td class="text-align-left"><%= link_to country.name, pattana.country_path(country), remote: true %></td>
 

data/app/views/pattana/countries/_show.html.erb

@@ -2,32 +2,40 @@
   
   <div class="row">
 
-    <div class="col-md-9 col-sm-6 col-xs-12" style="border-right:1px solid #f1f1f1;">
-
-      <div class="visible-sm visible-xs mt-50"></div>
-
-      <%= theme_panel_heading(@country.name) %>
-
-      <%= theme_panel_sub_heading("ID: #{@country.id}", "#") %><br>
-      
-      <% if @country.show_in_api? %>
-        <div class="label label-success">Show In API</div>
-      <% else %>
-        <div class="label label-danger">Hide In API</div>
-      <% end %>
-
-      <% if @country.operational? %>
-        <div class="label label-success">Operational</div>
-      <% else %>
-        <div class="label label-danger">Non Operational</div>
-      <% end %>
-
+    <div class="col-md-3 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+      <div class="m-10">
+      <%# if display_edit_links? %>
+      <%= edit_image(@country, 
+          "flag_image.image.large.url",
+          upload_image_link(@country, :flag_image, nil ),
+          remove_image_link(@country, :flag_image, nil ),
+          image_options: {assoc_name: :flag_image}) %>
+      <%# else %>
+        <%#= display_image(@country, "flag_image.image.large.url", class: "img-inline", alt: @country.display_name) %>
+      <%# end %>
+      </div>
     </div>
 
-    <div class="col-md-3 col-sm-6 col-xs-12">
+    <div class="col-md-6 col-sm-12 col-xs-12" style="border-right:1px solid #f1f1f1;">
+        <%= theme_panel_heading(@country.name) %>
+        <%= theme_panel_sub_heading(@country.id, "#") %>
+        
+        <%= clear_tag(10) %>
+        <% if @country.show_in_api? %>
+          <div class="label label-success">Show In API</div>
+        <% else %>
+          <div class="label label-danger">Hide In API</div>
+        <% end %>
+
+        <% if @country.operational? %>
+          <div class="label label-success">Operational</div>
+        <% else %>
+          <div class="label label-danger">Non Operational</div>
+        <% end %>
+        <%= clear_tag(10) %>
+    </div>
 
-      <% edit_link = edit_country_path(id: @country.id) %>
-      <% delete_link = country_path(id: @country.id) %>
+    <div class="col-md-3 col-sm-12 col-xs-12">
 
       <% if @country.show_in_api? %>
         <!-- Hide in API -->
@@ -45,6 +53,9 @@
         <%= link_to raw("<i class=\"fa fa-toggle-on mr-5\"></i> Show in API"), mark_as_operational_country_path(:id => @country.id), :remote=>true, class: "btn btn-block btn-success btn-only-hover" %>
       <% end %>
 
+      <% edit_link = edit_country_path(id: @country.id) %>
+      <% delete_link = country_path(id: @country.id) %>
+
       <!-- Edit -->
       <%= link_to raw("<i class=\"fa fa-edit mr-5\"></i> Edit"), edit_link, :remote=>true, class: "btn btn-block btn-white btn-only-hover" %>
 
@@ -52,7 +63,6 @@
       <%= link_to raw("<i class=\"linecons-trash mr-5\"></i> Delete"), delete_link, method: :delete, :remote=>true, data: { confirm: 'Are you sure?' }, class: "btn btn-block btn-danger btn-only-hover" %>
       
       <div class="visible-sm visible-xs mb-50"></div>
-
     </div>
 
   </div>

data/lib/pattana/version.rb

@@ -1,3 +1,3 @@
 module Pattana
-  VERSION = '0.1.16'
+  VERSION = '0.1.17'
 end

data/spec/dummy/spec/factories/flag_image.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :flag_image, :class => Image::FlagImage do
+    image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/flag.png', 'image/jpg') }
+    association :imageable, :factory => :country
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattana
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 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
@@ -107,7 +107,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -117,7 +117,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -383,11 +383,14 @@ files:
 - app/mailers/pattana/application_mailer.rb
 - app/models/city.rb
 - app/models/country.rb
+- app/models/image/flag_image.rb
 - app/models/pattana/application_record.rb
 - app/models/region.rb
 - app/serializers/city_preview_serializer.rb
 - app/serializers/country_preview_serializer.rb
+- app/serializers/flag_image_serializer.rb
 - app/serializers/region_preview_serializer.rb
+- app/uploaders/flag_image_uploader.rb
 - app/views/layouts/kuppayam/_footer.html.erb
 - app/views/layouts/kuppayam/_header.html.erb
 - app/views/layouts/kuppayam/_navbar.html.erb
@@ -459,6 +462,8 @@ files:
 - lib/tasks/master_data.rake
 - spec/dummy/spec/factories/city.rb
 - spec/dummy/spec/factories/country.rb
+- spec/dummy/spec/factories/flag.png
+- spec/dummy/spec/factories/flag_image.rb
 - spec/dummy/spec/factories/region.rb
 homepage: https://github.com/right-solutions/pattana
 licenses: