usman 0.3.25 → 0.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00f8b99360de48eb40662b9a493d9e2919444e23
-  data.tar.gz: 0b322710c79ca0746362c5beab0606454a118672
+  metadata.gz: 7af4414597edcc1c594ec129f781c08b1e065cf9
+  data.tar.gz: 3fc75080e583e8690c928c59dc9631bd2790b720
 SHA512:
-  metadata.gz: a65b90b6f52f4e591538db1b25ff94d2309bbb0443ca66dd13f88e1717f51365273ae6478b3a8abe954245fd7feb4f1ecde5eb6a9451b68f0fa7ecc973b6555f
-  data.tar.gz: a38a3e54a76fc1ca1c45925a58e3b91dfb5174a1d126ddd099934a09465d6ad7a8425477a70b8b344bdb8d89e22d512e7bea2bae465980e6d18780955d5fc014
+  metadata.gz: 6978436bb08a879e2083d2c6d942bbaffe3f6beb04139f6a9650beb7c32effbaa9ca9b691ac336a4c0c39aac99346216fed4d8a3bd9f652b9145d16c04b9b2db
+  data.tar.gz: 171ec6ec396622040719344ff329c983a56468cc916a50d4f480f1a5f58cdd048f0eb7170a6e3e0165e77e60424ec84aeea59c5849703947569e8e5281d714cf

data/app/models/feature.rb

@@ -30,15 +30,17 @@ class Feature < Usman::ApplicationRecord
     # Initializing error hash for displaying all errors altogether
     error_object = Kuppayam::Importer::ErrorHash.new
 
-    return error_object if hsh[:name].blank?
+    return error_object if hsh[:name].to_s.strip.blank?
 
-    feature = Feature.find_by_name(hsh[:name]) || Feature.new
-    feature.name = hsh[:name]
-    feature.status = hsh[:status]
+    feature = Feature.find_by_name(hsh[:name].to_s.strip) || Feature.new
+    feature.name = hsh[:name].to_s.strip
+    feature.status = hsh[:status].to_s.strip
+    feature.categorisable = hsh[:categorisable].to_s.strip
     
     if feature.valid?
       begin
         feature.save!
+        # puts "#{feature.name} saved".green
       rescue Exception => e
         summary = "uncaught #{e} exception while handling connection: #{e.message}"
         details = "Stack trace: #{e.backtrace.map {|l| "  #{l}\n"}.join}"

data/app/models/permission.rb

@@ -34,16 +34,21 @@ class Permission < Usman::ApplicationRecord
     # Initializing error hash for displaying all errors altogether
     error_object = Kuppayam::Importer::ErrorHash.new
 
-    user = User.find_by_username(hsh[:user])
+    user = User.find_by_username(hsh[:user].to_s.strip)
     unless user
-      summary = "User '#{hsh[:user]}' doesn't exist"
+      summary = "User '#{hsh[:user].to_s.strip}' doesn't exist"
       error_object.errors << { summary: summary }
       return error_object
     end
 
-    feature = Feature.find_by_name(hsh[:feature])
+    feature = Feature.find_by_name(hsh[:feature].to_s.strip)
+    
+    unless feature
+      binding.pry
+    end
+    
     unless feature
-      summary = "Feature '#{hsh[:feature]}' doesn't exist"
+      summary = "Feature '#{hsh[:feature].to_s.strip}' doesn't exist"
       error_object.errors << { summary: summary }
       return error_object
     end
@@ -51,10 +56,10 @@ class Permission < Usman::ApplicationRecord
     permission = Permission.where("user_id = ? AND feature_id = ?", user.id, feature.id).first || Permission.new
     permission.user = user
     permission.feature = feature
-    permission.can_create = hsh[:can_create]
-    permission.can_read = hsh[:can_read]
-    permission.can_update = hsh[:can_update]
-    permission.can_delete = hsh[:can_delete]
+    permission.can_create = hsh[:can_create].to_s.strip
+    permission.can_read = hsh[:can_read].to_s.strip
+    permission.can_update = hsh[:can_update].to_s.strip
+    permission.can_delete = hsh[:can_delete].to_s.strip
     
     if permission.valid?
       begin

data/app/views/usman/my_account/index.html.erb

@@ -1 +0,0 @@
-My Account - yet to be done

data/db/data/permissions.csv

@@ -1 +1,2 @@
-user,feature,can_create,can_read,can_update,can_delete
+user,feature,can_create,can_read,can_update,can_delete
+kpvarma,User,TRUE,TRUE,TRUE,TRUE

data/db/master_data/features.csv

@@ -1,9 +1,9 @@
-name,status
-User,published
-Registration,unpublished
-Role,published
-Permission,published
-Country,published
-Region,published
-City,published
-Locality,published
+name,status,categorisable
+User,published,FALSE
+Registration,unpublished,FALSE
+Role,published,FALSE
+Permission,published,FALSE
+Country,published,FALSE
+Region,published,FALSE
+City,published,FALSE
+Locality,published,FALSE

data/lib/tasks/usman/master_data.rake

@@ -35,7 +35,9 @@ namespace 'usman' do
           destroy_all = false
           destroy_all = true if ["true", "t","1","yes","y"].include?(ENV["destroy_all"].to_s.downcase.strip)
 
-          path = Usman::Engine.root.join('db', 'master_data', "#{cls_name.constantize.table_name}.csv")
+          path = Rails.root.join('db', 'master_data', "#{cls_name.constantize.table_name}.csv")
+          path = Usman::Engine.root.join('db', 'master_data', "#{cls_name.constantize.table_name}.csv") unless File.exists?(path)
+          
           cls_name.constantize.destroy_all if destroy_all
           cls_name.constantize.import_data_file(path, true, verbose)
           # puts "Importing Completed".green if verbose

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.3.25'
+  VERSION = '0.3.26'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.26
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-02 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.26
+        version: 0.1.27
   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.26
+        version: 0.1.27
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement