usman 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94f0975fd0fa28f10f87c0c643e54dc3015967d
-  data.tar.gz: 1fd689c72b2e93164649248a4d6147f2a60fe2f2
+  metadata.gz: ff2c2e73b9c8b00c581ef971d7cd6c127670ddda
+  data.tar.gz: 8e668968dffd496acf7ec1c25b201c6661bf3a3b
 SHA512:
-  metadata.gz: c6f2a9c9de37d681ce5cfb3c88a7b2ebc14446a3c70fac683ee79a27d9e6821bb7d2285d1a67b211cd401003a5c70692bd816973e7aa9d8685e2b65599d01e06
-  data.tar.gz: 4b34bc3cc5e41ecd998da6ff9d897c8b1424bbbb55752415541e0f6cff04744fa6de5c3257715e1c3cf83e29d103c74c33bdd5c8b8ffa446d3ac20faa7e28b63
+  metadata.gz: 8634420f0fb667e93af6eaf54b3d0ab0d180635bc722f8bb8a6b761244bff0d8e1984e6d1b17d5e4f4a6eda23ac3ce71d0fa4d9e9c926019b07a293fe87658d5
+  data.tar.gz: 2c00c51c0e6fa9f2357eb9a710af0527f58aee79c55afec461c3282309b5e6354ef58cbb427499c122273cdf8208b894fef6737a314293fd1e17094588455a65

data/app/controllers/usman/api/v1/profile_controller.rb

@@ -4,8 +4,7 @@ module Usman
       class ProfileController < Usman::Api::V1::BaseController
 
         def create_profile
-          #proc_code = Proc.new do
-            #binding.pry
+          proc_code = Proc.new do
             if @current_registration
               if @current_user
                 @success = false
@@ -56,7 +55,6 @@ module Usman
                 message: I18n.translate("api.profile.registration_details_missing.message")
               }
             end
-          proc_code = Proc.new do
           end
           render_json_response(proc_code)
         end

data/app/controllers/usman/registrations_controller.rb

@@ -49,10 +49,10 @@ module Usman
     def breadcrumbs_configuration
       {
         heading: "Manage Registrations",
-        icon: "fa-lock",
+        icon: "linecons-mobile",
         description: "Listing all Registrations",
         links: [{name: "Home", link: dashboard_path, icon: 'fa-home'}, 
-                  {name: "Manage Registrations", link: registrations_path, icon: 'fa-calendar', active: true}]
+                  {name: "Manage Registrations", link: registrations_path, icon: 'linecons-mobile', active: true}]
       }
     end
 

data/app/models/feature.rb

@@ -46,15 +46,15 @@ class Feature < Usman::ApplicationRecord
 
   def self.save_row_data(hsh)
 
-    return if hsh[:name].blank?
+    # Initializing error hash for displaying all errors altogether
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    return error_object if hsh[:name].blank?
 
     feature = Feature.find_by_name(hsh[:name]) || Feature.new
     feature.name = hsh[:name]
     feature.status = Feature::UNPUBLISHED
     
-    # Initializing error hash for displaying all errors altogether
-    error_object = Kuppayam::Importer::ErrorHash.new
-
     if feature.valid?
       begin
         feature.save!

data/app/views/usman/features/_index.html.erb

@@ -19,7 +19,7 @@
 		      
 		      <td class="feature-image"></td>
 		      
-		      <td class="feature-image">
+		      <td class="feature-image" style="text-align: center;">
 		        <%= link_to(feature_path(feature), remote: true) do %>
 		        	<%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
 		        <% end %>

data/app/views/usman/features/_row.html.erb

@@ -2,7 +2,9 @@
 <% delete_link = feature_path(id: feature.id) %>
 
 <tr id="tr_feature_<%= feature.id %>">
-
+  
+  <td class="feature-image"></td>
+  
   <td class="feature-image">
     <%= link_to(feature_path(feature), remote: true) do %>
       <%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>
@@ -41,7 +43,7 @@
       <!-- Approve -->
       <%= link_to raw("<i class=\"fa fa-circle-o mr-5\"></i> Publish"), update_status_feature_path(:id =>feature.id, :status =>'published'), :method =>'PUT', :remote=>true, role: "menuitem", tabindex: "-1",:class=>"feature_status" %>
     <% end %>
-
+    
   </td>
 
   <td class="action-links" style="width:10%">

data/config/routes.rb

@@ -14,30 +14,34 @@ Usman::Engine.routes.draw do
   get   '/my_account',        to: "my_account#index",  as:   :my_account
   get   '/dashboard/usman',   to: "dashboard#index",  as:   :dashboard
   
-  resources :registrations, only: [:index, :show] do
-    resources :devices, :controller => "registration_devices"
-  end
+  scope :admin do
 
-  resources :users do
-    member do
-      put :masquerade, as: :masquerade
-      put :update_status, as:  :update_status
-      put :make_super_admin, as:  :make_super_admin
-      put :remove_super_admin, as:  :remove_super_admin
+    resources :registrations, only: [:index, :show] do
+      resources :devices, :controller => "registration_devices"
     end
-  end
 
-  resources :roles do
-    resources :users, :controller => "user_roles"
-  end
+    resources :users do
+      member do
+        put :masquerade, as: :masquerade
+        put :update_status, as:  :update_status
+        put :make_super_admin, as:  :make_super_admin
+        put :remove_super_admin, as:  :remove_super_admin
+      end
+    end
 
-  resources :features do
-    member do
-      put :update_status, as:  :update_status
+    resources :roles do
+      resources :users, :controller => "user_roles"
+    end
+  
+    resources :features do
+      member do
+        put :update_status, as:  :update_status
+      end
     end
-  end
 
-  resources :permissions
+    resources :permissions
+
+  end
   
   namespace :api do
     namespace :v1 do

data/lib/usman/factories.rb

@@ -0,0 +1,7 @@
+# This is to expose the factories in this gem
+# By default, only files in /lib is exported
+# hence this hack.
+# Read More: https://stackoverflow.com/questions/31700345/how-can-i-share-the-factories-that-i-have-in-a-gem-and-use-it-in-other-project
+
+GEM_USMAN_ROOT = File.dirname(File.dirname(File.dirname(__FILE__)))
+Dir[File.join(GEM_USMAN_ROOT, 'spec', 'dummy', 'spec', 'factories', '*.rb')].each { |file| require(file) }

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,28 +90,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.10
+        version: 0.1.11
 - !ruby/object:Gem::Dependency
   name: pattana
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -486,6 +486,7 @@ files:
 - lib/temp/users.rake
 - lib/usman.rb
 - lib/usman/engine.rb
+- lib/usman/factories.rb
 - lib/usman/version.rb
 homepage: https://github.com/right-solutions/usman
 licenses: