curupira 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d98c87ceff0b90c91a113a0b4f9e76b9a653dd5a
-  data.tar.gz: ac0828d2f4c76b0ff16736c039238001c308d64f
+  metadata.gz: 629cf0ce02edf0ffc9eac62be232bcbed54f7761
+  data.tar.gz: 422e25f7a5554fde550ae3cea1708e740f1facf6
 SHA512:
-  metadata.gz: 10d5bca583f38e6f517c988c25ac5f6874762d735e00a005511d6a49669f27c13da0b52c1fe768d0dd455c26dc9386f3085d6b1ac213c31714382191431cc2ec
-  data.tar.gz: f0c0d4a748ddeefe1d535a26567b695cfb807df29bdec30cc4b63fbf0666a2eb8e8ddc75dd191fb5a31b7d54dc79326142a8361551f9b55eeaa3380082fc0bdc
+  metadata.gz: 2fd99c051f4be4ce32c9063b9dc163acbd29f7db11d383b1269ec076231ae0286dc8388e9bd3add8f90b40eb321b25d996c53f8d302b74907f0871198973cffe
+  data.tar.gz: a0bc4d7597fdd0af5810ad735a7d8588dffff4f524d6cfba4119b020a1d9dd6f3db11e0066ca3b9f8f554f8393c80dc2b407161d6f4125fb4b61ba7079942128

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    curupira (0.1.0)
+    curupira (0.1.1)
       cocoon
       jquery-rails
       rails (~> 4.2.0)

data/README.md

@@ -63,6 +63,20 @@ If the customization at the views level is not enough, you can customize each co
 rails generate curupira:controllers
 ```
 
+## Partials
+
+You should add in application.html.erb partials for menu, and helper for dispaly flash messages:
+
+```ruby
+<%- flash.each do |name, msg| -%>
+  <%= content_tag :div, msg, id: "flash_#{name}" %>
+<%- end -%>
+
+<%= render "curupira/shared/session_links" %>
+<%= render "curupira/shared/model_links" %>
+<%= yield %>
+```
+
 * Add to your application.js
 //= require jquery
 //= require cocoon

data/app/controllers/curupira/users_controller.rb

@@ -40,7 +40,7 @@ class Curupira::UsersController < Curupira::AuthorizedController
   end
 
   private
-  
+
   def user_params
     params.require(:user).permit(:email, :name, :username, :password, group_users_attributes: [:id, :group_id, :_destroy, role_group_users_attributes: [:id, :role_id]])
   end

data/app/helpers/curupira/relationship_select_options_helper.rb

@@ -1,6 +1,6 @@
 module Curupira::RelationshipSelectOptionsHelper
   def active_user_groups_select_options(user)
-    [["Selecione um grupo", nil]] + Group.joins(:users).where(users: { id: user }, active: true).map { |g| [g.name, g.id] }
+      [["Selecione um grupo", nil]] + groups_by(user).map { |g| [g.name, g.id] }
   end
 
   def active_features_select_options
@@ -14,4 +14,14 @@ module Curupira::RelationshipSelectOptionsHelper
   def active_role_groups_select_options(group)
     [["Selecione um perfil", nil]] + Role.joins(:groups).where(groups:{id:group}).map { |r| [r.name, r.id] }
   end
+
+  private 
+
+  def groups_by(user)
+    if user.admin
+      Group.all
+    else
+      Group.joins(:users).where(users: { id: user }, active: true)
+    end 
+  end
 end

data/app/views/curupira/users/show.html.erb

@@ -16,7 +16,7 @@
 
   <ul>
     <% @user.group_users.each do |group_user| %>
-      <li><%= group_user.group.name %>
+      <li><%= group_user.group.name %> <%= link_to "Editar grupo", edit_user_path(@user) %>
         <% group_user.role_group_users.each do |role_group_user|%>
           <p><%= role_group_user.role.name %></p>
         <% end %>

data/lib/curupira/version.rb

@@ -1,3 +1,3 @@
 module Curupira
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/generators/curupira/install/model_generators_helper.rb

@@ -206,11 +206,7 @@ module Curupira
 
       def feature_model_content
         <<-CONTENT
-          validates_presence_of :name
-          has_many :feature_services
-          has_many :services, through: :feature_services
-          has_many :feature_action_labels
-          has_many :action_labels, through: :feature_action_labels
+          has_many :action_labels
         CONTENT
       end
 

data/spec/helpers/relationship_select_options_helper_spec.rb

@@ -2,17 +2,42 @@ require "rails_helper"
 
 describe Curupira::RelationshipSelectOptionsHelper do
   describe "#active_user_groups_select_options" do
-    let!(:active_group1) { FactoryGirl.create(:group, active: true) }
-    let!(:active_group2) { FactoryGirl.create(:group, active: true) }
-    let!(:inactive_group) { FactoryGirl.create(:group, active: false) }
-    let!(:user) { FactoryGirl.create(:user, groups: [active_group1, active_group2]) }
 
-    it "returns default with active groups" do
-      expect(helper.active_user_groups_select_options(user)).to eql [
-        ["Selecione um grupo", nil],
-        [active_group1.name, active_group1.id],
-        [active_group2.name, active_group2.id]
-      ]
+    context 'when user is admin' do
+      let!(:user){FactoryGirl.create(:user, admin:true)}
+      let!(:active_group1) { FactoryGirl.create(:group, active: true) }
+      let!(:active_group2) { FactoryGirl.create(:group, active: true) }
+
+      it "return groups" do
+        expect(helper.active_user_groups_select_options(user)).to eql [
+          ["Selecione um grupo", nil],
+          [active_group1.name, active_group1.id],
+          [active_group2.name, active_group2.id]
+        ]
+      end      
+    end
+
+    context 'when user is not admin' do
+      let!(:active_group1) { FactoryGirl.create(:group, active: true) }
+      let!(:active_group2) { FactoryGirl.create(:group, active: true) }
+      let!(:inactive_group) { FactoryGirl.create(:group, active: false) }
+      let!(:user) { FactoryGirl.create(:user, groups: [active_group1, active_group2]) }
+
+      it "returns default with active groups" do
+        expect(helper.active_user_groups_select_options(user)).to eql [
+          ["Selecione um grupo", nil],
+          [active_group1.name, active_group1.id],
+          [active_group2.name, active_group2.id]
+        ]
+      end
+      context "when doesnt belongs to any group" do
+        let!(:user2) { FactoryGirl.create(:user)}
+        it "doesnt return any groups" do
+          expect(helper.active_user_groups_select_options(user2)).to eql [
+            ["Selecione um grupo", nil]
+          ]
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: curupira
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Paulo Moura
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-18 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -349,15 +349,15 @@ files:
 - spec/tmp/app/models/user.rb
 - spec/tmp/config/initializers/sorcery.rb
 - spec/tmp/config/routes.rb
-- spec/tmp/db/migrate/20150318190312_create_role_group_users.rb
-- spec/tmp/db/migrate/20150318190313_create_authorizations.rb
-- spec/tmp/db/migrate/20150318190314_create_features.rb
-- spec/tmp/db/migrate/20150318190315_create_groups.rb
-- spec/tmp/db/migrate/20150318190316_create_roles.rb
-- spec/tmp/db/migrate/20150318190317_sorcery_core.rb
-- spec/tmp/db/migrate/20150318190318_create_group_users.rb
-- spec/tmp/db/migrate/20150318190319_create_role_groups.rb
-- spec/tmp/db/migrate/20150318190320_create_action_labels.rb
+- spec/tmp/db/migrate/20150319143755_create_role_group_users.rb
+- spec/tmp/db/migrate/20150319143756_create_authorizations.rb
+- spec/tmp/db/migrate/20150319143757_create_features.rb
+- spec/tmp/db/migrate/20150319143758_create_groups.rb
+- spec/tmp/db/migrate/20150319143759_create_roles.rb
+- spec/tmp/db/migrate/20150319143760_sorcery_core.rb
+- spec/tmp/db/migrate/20150319143761_create_group_users.rb
+- spec/tmp/db/migrate/20150319143762_create_role_groups.rb
+- spec/tmp/db/migrate/20150319143763_create_action_labels.rb
 homepage: https://rubygems.org/gems/curupira
 licenses:
 - MIT
@@ -528,12 +528,12 @@ test_files:
 - spec/tmp/app/models/user.rb
 - spec/tmp/config/initializers/sorcery.rb
 - spec/tmp/config/routes.rb
-- spec/tmp/db/migrate/20150318190312_create_role_group_users.rb
-- spec/tmp/db/migrate/20150318190313_create_authorizations.rb
-- spec/tmp/db/migrate/20150318190314_create_features.rb
-- spec/tmp/db/migrate/20150318190315_create_groups.rb
-- spec/tmp/db/migrate/20150318190316_create_roles.rb
-- spec/tmp/db/migrate/20150318190317_sorcery_core.rb
-- spec/tmp/db/migrate/20150318190318_create_group_users.rb
-- spec/tmp/db/migrate/20150318190319_create_role_groups.rb
-- spec/tmp/db/migrate/20150318190320_create_action_labels.rb
+- spec/tmp/db/migrate/20150319143755_create_role_group_users.rb
+- spec/tmp/db/migrate/20150319143756_create_authorizations.rb
+- spec/tmp/db/migrate/20150319143757_create_features.rb
+- spec/tmp/db/migrate/20150319143758_create_groups.rb
+- spec/tmp/db/migrate/20150319143759_create_roles.rb
+- spec/tmp/db/migrate/20150319143760_sorcery_core.rb
+- spec/tmp/db/migrate/20150319143761_create_group_users.rb
+- spec/tmp/db/migrate/20150319143762_create_role_groups.rb
+- spec/tmp/db/migrate/20150319143763_create_action_labels.rb