dhatu 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b343ae3a364c66dccd4cb74148f2dd318f6077f9
-  data.tar.gz: ce7df95e60a1065a6974f3d343600a24f892d0aa
+  metadata.gz: a64565b15733b69599bd45a1a1f8af93c19057ee
+  data.tar.gz: 85ee2980fc41693f436a7996fd114912c56d0106
 SHA512:
-  metadata.gz: cc6449056ddd66781a63ced43d5ead0327b4f9084e7ecccdee7b2319c2a57f5705887c19c275ebfb09a1ccc597136976355d15c2b9b7bea9871e007327db4950
-  data.tar.gz: 8a01fad3e7d9218a7c7c77bd07f1250c710bc62464b1aaefc014b962c8893fcb96eda248ccab82c77676be57d83794ab2f0a2ae3d147f509ec0203d1697a99a8
+  metadata.gz: 8fa1dad1ce288a3215606a44819c5b1c539b50cf6436732fe8daa4590e08dc8aaefe55826e0dbc69101e83cda03d73448e8d50909efd376ec641965bc0e2da88
+  data.tar.gz: 9ec7b138ff2af5df71e299dccd35749982763d224e8377f958ef0d06ff20b64b0ec2d663fcb8c23fc6cd806f89880c589d20f9f3a14db2d07f0b73c8c6641395

data/README.md

@@ -29,7 +29,7 @@ Usman uses kuppayam skins and hence it requires the basic migrations from kuppay
 Run the below command to copy the migrations from the kuppayam engine.
 
 ```bash
-$ bundle exec rake railties:install:migrations
+$ bundle exec rails railties:install:migrations
 ```
 
 This will copy migrations from kuppayam, pattana and usman engines which will have migrations to create images, documents, countries, regions, cities, users, features and permissions respectively. 
@@ -59,8 +59,8 @@ config.railties_order = [:main_app, Dhatu::Engine, Usman::Engine, Pattana::Engin
 run rake task for loading dummy data for users and features to start with.
 
 ```bash
-$ bundle exec rake usman:import:dummy:all verbose=false
-$ bundle exec rake pattana:import:dummy:all verbose=false
+$ bundle exec rails usman:import:dummy:all verbose=false
+$ bundle exec rails pattana:import:dummy:all verbose=false
 ```
 
 ["users", "features", "permissions", "roles"]
@@ -68,14 +68,14 @@ $ bundle exec rake pattana:import:dummy:all verbose=false
 You could also do it individually but the above command will run in the following order - users, features, permissions, roles. This order is important as features need users to be imported first.
 
 ```bash
-$ bundle exec rake usman:import:dummy:users verbose=false
-$ bundle exec rake usman:import:dummy:features verbose=false
-$ bundle exec rake usman:import:dummy:permissions verbose=false
-$ bundle exec rake usman:import:dummy:roles verbose=false
-
-$ bundle exec rake pattana:import:dummy:countries verbose=false
-$ bundle exec rake pattana:import:dummy:regions verbose=false
-$ bundle exec rake pattana:import:dummy:cities verbose=false
+$ bundle exec rails usman:import:dummy:users verbose=false
+$ bundle exec rails usman:import:dummy:features verbose=false
+$ bundle exec rails usman:import:dummy:permissions verbose=false
+$ bundle exec rails usman:import:dummy:roles verbose=false
+
+$ bundle exec rails pattana:import:dummy:countries verbose=false
+$ bundle exec rails pattana:import:dummy:regions verbose=false
+$ bundle exec rails pattana:import:dummy:cities verbose=false
 ```
 
 # Import Data
@@ -88,7 +88,7 @@ for e.g:
 create users.csv in db/import_data/ foler and fill data in it and run 
 
 ```bash
-$ bundle exec rake usman:import:users verbose=false
+$ bundle exec rails usman:import:users verbose=false
 ```
 
 ## Testing the gem

data/app/controllers/dhatu/services_controller.rb

@@ -4,7 +4,7 @@ module Dhatu
     private
 
     def permitted_params
-      params.require("dhatu/service").permit(:name, :one_liner, :permalink, :description, :price, :duration, :category_id, :priority)
+      params.require("dhatu/service").permit(:name, :meta_description, :permalink, :description, :price, :duration, :category_id, :priority)
     end
 
     def get_collections

data/app/models/dhatu/service.rb

@@ -9,7 +9,7 @@ class Dhatu::Service < Dhatu::ApplicationRecord
 
   # Validations
   validate_string :name, mandatory: true, min_length: 2, format: /.*/i
-  validate_string :one_liner, mandatory: false, format: /.*/i
+  validate_string :meta_description, mandatory: false, format: /.*/i
   validate_string :permalink, mandatory: true, format: /.*/i, min_length: 4, max_length: 128
   
   validates :category, presence: true
@@ -24,7 +24,7 @@ class Dhatu::Service < Dhatu::ApplicationRecord
   # ------------------
 
   scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(one_liner) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(meta_description) LIKE LOWER('%#{query}%') OR\
                                         LOWER(permalink) LIKE LOWER('%#{query}%') OR\
                                         LOWER(description) LIKE LOWER('%#{query}%')")
   }
@@ -42,7 +42,7 @@ class Dhatu::Service < Dhatu::ApplicationRecord
 
     service = Dhatu::Service.find_by_name(hsh[:name].to_s.strip) || Dhatu::Service.new
     service.name = hsh[:name].to_s.strip
-    service.one_liner = hsh[:one_liner].to_s.strip
+    service.meta_description = hsh[:meta_description].to_s.strip
     service.generate_permalink
     service.description = hsh[:description].to_s.strip
     service.price = hsh[:price].to_s.strip

data/app/views/dhatu/services/_form.html.erb

@@ -18,7 +18,7 @@
           <%= theme_form_assoc_group(@service, :category_id, label: "Choose Category", form_style: "top-bottom", **options) %>
         </div>
         <div class="col-md-4 pl-20">
-          <%= theme_form_field(@service, :one_liner, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
+          <%= theme_form_field(@service, :meta_description, required: false, form_style: "top-bottom", html_options: { placeholder: "" }) %>
         </div>
         <div class="col-md-4 pl-20">
           <% if @service.new_record? || @current_user.super_admin? %>

data/app/views/dhatu/services/_index.html.erb

@@ -27,8 +27,9 @@
 					</td>
 
 					<td class="display-link">
-						<%= link_to service.name, service_path(service), remote: true %><br>
-						<%= link_to service.category.try(:display_name), service_path(service), remote: true %>
+						<%= link_to service.name, service_path(service), remote: true, style: "color: darkred;font-size:16px;" %><br>
+						<%= link_to service.category.try(:display_name), service_path(service), remote: true %><br>
+						<%= service.meta_description %>
 					</td>
 
 					<td class="hidden-sm hidden-xs"><%= display_publishable_status(service) %></td>

data/app/views/dhatu/services/_row.html.erb

@@ -9,8 +9,9 @@
   </td>
 
   <td class="display-link">
-    <%= link_to service.name, service_path(service), remote: true %><br>
-    <%= link_to service.category.try(:display_name), service_path(service), remote: true %>
+    <%= link_to service.name, service_path(service), remote: true, style: "color: darkred;font-size:16px;" %><br>
+    <%= link_to service.category.try(:display_name), service_path(service), remote: true %><br>
+    <%= service.meta_description %>
   </td>
 
   <td class="hidden-sm hidden-xs"><%= display_publishable_status(service) %></td>

data/app/views/dhatu/services/_show.html.erb

@@ -22,6 +22,12 @@
       
       <%= clear_tag(10) %>
 
+      <div class="well">
+        <%= @service.meta_description %>
+      </div>
+
+      <%= clear_tag(10) %>
+
       <%= display_publishable_status(@service) %>
       
       <%= display_featured(@service) %>

data/lib/dhatu/engine.rb

@@ -16,7 +16,7 @@ module Dhatu
 
     config.generators do |g|
       g.test_framework      :rspec,        :fixture => false
-      g.fixture_replacement :factory_girl, :dir => 'spec/dummy/spec/factories'
+      g.fixture_replacement :factory_bot, :dir => 'spec/dummy/spec/factories'
       g.assets false
       g.helper false
     end

data/lib/dhatu/version.rb

@@ -1,3 +1,3 @@
 module Dhatu
-  VERSION = '0.1.13'
+  VERSION = '0.1.14'
 end

data/spec/dummy/spec/factories/blog_post.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   sequence(:slug) {|n| "#{n}-a-sample-blog-post-title" }
   

data/spec/dummy/spec/factories/blog_post_cover_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :blog_post_cover_image, class: Image::CoverImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/blog_post_gallery_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :blog_post_gallery_image, class: Image::GalleryImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/branch.rb

@@ -1,6 +1,6 @@
 require 'usman/factories.rb'
 
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_branch, class: Dhatu::Branch do
     

data/spec/dummy/spec/factories/category.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :category, class: Dhatu::Category do
     name "Category Name"

data/spec/dummy/spec/factories/event.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_event, class: Dhatu::Event do
 

data/spec/dummy/spec/factories/event_cover_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :event_cover_image, class: Image::CoverImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/event_gallery_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :event_gallery_image, class: Image::GalleryImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/offer.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_offer, class: Dhatu::Offer do
     title "Offer Title"

data/spec/dummy/spec/factories/offer_cover_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :offer_cover_image, class: Image::CoverImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/offer_gallery_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :offer_gallery_image, class: Image::GalleryImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/promotion.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_promotion, class: Dhatu::Promotion do
     title "Offer Title"

data/spec/dummy/spec/factories/promotion_attributes.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :promotion_attribute do
     name "Attribute Name"
 

data/spec/dummy/spec/factories/promotion_cover_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :promotion_cover_image, class: Image::CoverImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/section.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_section, class: Dhatu::Section do
     title "Section Title"

data/spec/dummy/spec/factories/section_cover_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :section_cover_image, class: Image::CoverImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/section_gallery_image.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :section_gallery_image, class: Image::GalleryImage do
     image { Rack::Test::UploadedFile.new('spec/dummy/spec/factories/test.jpg', 'image.png') }

data/spec/dummy/spec/factories/section_type.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   factory :section_type, class: Dhatu::SectionType do
     name "About Us"
     code "ABOUT_US"

data/spec/dummy/spec/factories/team_member.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_team_member, class: Dhatu::TeamMember do
     

data/spec/dummy/spec/factories/testimonial.rb

@@ -1,4 +1,4 @@
-FactoryGirl.define do
+FactoryBot.define do
   
   factory :unpublished_testimonial, class: Dhatu::Testimonial do
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhatu
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-03 00:00:00.000000000 Z
+date: 2017-12-14 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.28
+        version: 0.1.30
   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.28
+        version: 0.1.30
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.22
 - !ruby/object:Gem::Dependency
   name: usman
   requirement: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.26
+        version: 0.3.33
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -157,7 +157,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.26
+        version: 0.3.33
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -337,7 +337,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.3
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"