permissify 0.0.21 → 0.0.22

data/lib/generators/permissify/ability/template/abilities.rb

@@ -10,8 +10,8 @@ module SystemFixtures::Abilities
 
     # Can define PERMISSIFIED_ABILITY_APPLICABILITY in any model
     # users_only = [Role::PERMISSIFIED_ABILITY_APPLICABILITY]
-    # products_only  => [Product::PERMISSIFIED_ABILITY_APPLICABILITY]
-    # products_and_roles  => users_only + products_only
+    # products_only  = [Product::PERMISSIFIED_ABILITY_APPLICABILITY]
+    # products_and_roles  = users_only + products_only
     #
     # add_category('Tabs', 'Tabs', users_only, %w(Admin Dealers Corporations Brands Merchants))
     # { 'Roles'                 => 'Admin',
@@ -36,9 +36,8 @@ module SystemFixtures::Abilities
     # add_category('Facebook', 'Social Media', products_and_roles, %w(Post Comment Like Remove))
     # add_category('Twitter', 'Social Media', products_and_roles, %w(Tweet Retweet Respond Remove))
     #
-    #
-    # [ 'Online Ordering',
-    #   'Loyalty',
+    # [ 'Basic Service',
+    #   'Online Ordering',
     #   'Webpage Builder',
     #   'eGift',
     #   'Guest Management',

data/lib/generators/permissify/controller/template/permissions_controller.rb

@@ -23,8 +23,8 @@ class PermissionsController < ApplicationController
   
   def create
     @permissions_object = @permissions_class.new
-    @permissions_object.name = params[:role][:name]
-    @permissions_object.from = params[:role][:from]
+    @permissions_object.name = params[@corresponding_class_params_key][:name]
+    @permissions_object.from = params[@corresponding_class_params_key][:from]
     @permissions_object.save
     set_permissions_object
     @response_message = @permissions_object.errors.full_messages.join(', ')
@@ -38,6 +38,7 @@ class PermissionsController < ApplicationController
     class_attributes ||= {}
     # @saved = @permissions_object.update_attributes class_attributes.merge(permission_attributes)
     attrs = class_attributes.merge(permission_attributes)
+    @permissions_object.name = attrs[:name]
     @permissions_object.permissions = attrs[:permissions]
     set_permissions_object_specific_values(attrs)
     # @permissions_object.attributes = class_attributes.merge(permission_attributes)
@@ -71,7 +72,7 @@ class PermissionsController < ApplicationController
   def set_nav
     @active_tab = 'admin'
     @active_section = 'Admin'
-    @active_nav = 'Roles'
+    @active_nav = @permissions_header
     @current_entity = @entity = Admin.first
   end
 end

data/lib/generators/permissify/install/templates/create_products_tables.rb

@@ -4,18 +4,41 @@ class CreateProductsTables < ActiveRecord::Migration
     create_table  :products, :force => true do |t|
       t.string    :name
       t.text      :permissions
-      t.datetime  :deleted_at
     end
     
     create_table :merchants_products, :id => false, :force => true do |t|
       t.integer :merchant_id, :null => false
       t.integer :product_id, :null => false
     end
+    
+    create_table :brands_products, :id => false, :force => true do |t|
+      t.integer :brand_id, :null => false
+      t.integer :product_id, :null => false
+    end
+    
+    create_table :corporations_products, :id => false, :force => true do |t|
+      t.integer :corporation_id, :null => false
+      t.integer :product_id, :null => false
+    end
+    
+    create_table :dealers_products, :id => false, :force => true do |t|
+      t.integer :dealer_id, :null => false
+      t.integer :product_id, :null => false
+    end
+    
+    create_table :admins_products, :id => false, :force => true do |t|
+      t.integer :admin_id, :null => false
+      t.integer :product_id, :null => false
+    end
 
   end
 
   def down
+    drop_table :admins_products
+    drop_table :dealers_products
+    drop_table :corporations_products
+    drop_table :brands_products
+    drop_table :merchants_products
     drop_table :products
-    drop_table :businesses_products
   end
 end

data/lib/generators/permissify/product/template/controller.rb

@@ -1,5 +1,6 @@
 class ProductsController < PermissionsController
-  def set_permissions_class; set_the_permissions_class(Products, :product, 'product_', 'Product', 'Products'); end
+  def set_permissions_class; set_the_permissions_class(Product, :product, 'product_', 'Product', 'Products'); end
   def set_permissions_object; @product = @permissions_object; end
+  def set_permissions_object_specific_values(attrs); end
 end
 

data/lib/generators/permissify/product/template/interface/admin.rb

@@ -0,0 +1,12 @@
+module PermissifiedProductsInterface
+  module Admin
+    def permissible_products
+      []
+    end
+
+    include Permissify::Union
+    PERMISSIFIED_ASSOCIATION = :products
+    # PERMISSIFIED_ABILITY_APPLICABILITY = Product::PERMISSIFIED_ABILITY_APPLICABILITY
+
+  end
+end

data/lib/generators/permissify/product/template/interface/brand.rb

@@ -3,5 +3,10 @@ module PermissifiedProductsInterface
     def permissible_products
       self.corporation.products + self.products
     end
+
+    include Permissify::Union
+    PERMISSIFIED_ASSOCIATION = :products
+    # PERMISSIFIED_ABILITY_APPLICABILITY = Product::PERMISSIFIED_ABILITY_APPLICABILITY
+
   end
 end

data/lib/generators/permissify/product/template/interface/corporation.rb

@@ -3,5 +3,10 @@ module PermissifiedProductsInterface
     def permissible_products
       self.products
     end
+
+    include Permissify::Union
+    PERMISSIFIED_ASSOCIATION = :products
+    # PERMISSIFIED_ABILITY_APPLICABILITY = Product::PERMISSIFIED_ABILITY_APPLICABILITY
+
   end
 end

data/lib/generators/permissify/product/template/interface/dealer.rb

@@ -3,5 +3,10 @@ module PermissifiedProductsInterface
     def permissible_products
       self.products
     end
+
+    include Permissify::Union
+    PERMISSIFIED_ASSOCIATION = :products
+    # PERMISSIFIED_ABILITY_APPLICABILITY = Product::PERMISSIFIED_ABILITY_APPLICABILITY
+
   end
 end

data/lib/generators/permissify/product/template/interface/merchant.rb

@@ -3,5 +3,10 @@ module PermissifiedProductsInterface
     def permissible_products
       self.corporation.products + self.brand.products + self.products
     end
+
+    include Permissify::Union
+    PERMISSIFIED_ASSOCIATION = :products
+    # PERMISSIFIED_ABILITY_APPLICABILITY = Product::PERMISSIFIED_ABILITY_APPLICABILITY
+
   end
 end

data/lib/generators/permissify/product/template/product.rb

@@ -1,6 +1,12 @@
 class Product < ActiveRecord::Base
   
   include Permissify::Model
+  PERMISSIFIED_ABILITY_APPLICABILITY = 'Product'
+  has_and_belongs_to_many :admins
+  has_and_belongs_to_many :dealers
+  has_and_belongs_to_many :corporations
+  has_and_belongs_to_many :brands
+  has_and_belongs_to_many :merchants
   
   # TODO : see how much of the following stuff can be rolled into ModelClass :
   validates_presence_of   :name
@@ -11,7 +17,6 @@ class Product < ActiveRecord::Base
   class << self
     include Permissify::ModelClass
     include SystemFixtures::Products # app needs to provide this logic/specification : see example at app/models/system_fixtures/products.rb
-    PERMISSIFIED_ABILITY_APPLICABILITY = 'Product'
   end
   
 end

data/lib/generators/permissify/product/template/products.rb

@@ -6,15 +6,15 @@ module SystemFixtures::Products
     [4,   'Webpage Builder'],
     [5,   'eGift'],
     [6,   'Guest Management'],
-    [7,   'Marketing Engine']
-    [8,   'Social Media 1']
-    [9,   'Social Media 2']
-    [10,  'Social Media 3']
-    [11,  'Social Marketing Engine']
+    [7,   'Marketing Engine'],
+    [8,   'Social Media 1'],
+    [9,   'Social Media 2'],
+    [10,  'Social Media 3'],
+    [11,  'Social Marketing Engine'],
   ]
   
-  def seeded?(tier); tier.id < 8; end
-  def seed; create_seeds :products, SEED_SPECIFICATIONS; end
+  def seeded?(product); product.id <= SEED_SPECIFICATIONS.count; end
+  def seed; create_seeds SEED_SPECIFICATIONS; end
   
   def create_basic_service;           create_with 1; end
   def create_online_ordering;         create_with 2; end
@@ -26,33 +26,30 @@ module SystemFixtures::Products
   def create_social_media_1;          create_with 8; end
   def create_social_media_2;          create_with 9; end
   def create_social_media_3;          create_with 10; end
-  def create_social_marketing_engine; create_with 10; end
+  def create_social_marketing_engine; create_with 11; end
   def create_with(id); create_with_id(:product, id, SEED_SPECIFICATIONS.assoc(id)[1]); end
 
   def basic_service_permissions
-    permissions = Ability.create_permissions_hash([], [], %w(Product Role))
-    permissions
+    ph :basic_service_on
   end
   def online_ordering_permissions; ph :online_ordering_on; end
   def loyalty_permissions; ph :loyalty_on; end
-  def webpage_builder_permissions
-    permissions_hash = Ability.create_permissions_hash([], %w(email sms social_media), %w(Product Role)).merge(ph(:webpage_builder_on))
-  end
+  def webpage_builder_permissions; ph :webpage_builder_on; end
   def egift_permissions; ph :egift_on; end
   def guest_management_permissions; ph :guest_management_on; end
   def marketing_engine_permissions; ph :marketing_engine_on; end
 
   def social_media_1_permissions
     permissions = Ability.create_permissions_hash([], %w(social_media facebook twitter), %w(Product Role))
-    permissions[:social_media_setup] = {'0' => '1'}
-    permissions[:social_media_view] = {'0' => '1'}
+    permissions['social_media_setup'] = {'0' => '1'}
+    permissions['social_media_view'] = {'0' => '1'}
     permissions
   end
   def social_media_2_permissions
     permissions = social_media_1_permissions
-    permissions[:social_media_create] = {'0' => '1'}
-    permissions[:facebook_post] = {'0' => '1'}
-    permissions[:twitter_tweet] = {'0' => '1'}
+    permissions['social_media_create'] = {'0' => '1'}
+    permissions['facebook_post'] = {'0' => '1'}
+    permissions['twitter_tweet'] = {'0' => '1'}
     permissions
   end
   def social_media_3_permissions
@@ -60,7 +57,8 @@ module SystemFixtures::Products
   end
   def social_marketing_engine_permissions
     permissions = social_media_3_permissions
-    permissions[:marketing_engine_on] = {'0' => '1'}
+    permissions['marketing_engine_on'] = {'0' => '1'}
+    permissions['social_media_repeat'] = {'0' => '1'}
     permissions
   end
   

data/lib/generators/permissify/product/template/views/_permissions_fields.html.erb

@@ -1,24 +1,4 @@
 <tr>
   <td ><%= label :product, :name, "Name"%></td>
   <td><%= text_field :product, :name, :maxlength => 255, :size => 46 %></td>
-  <td style="vertical-align:bottom;"><%= required_field %></td>
-</tr>
-
-<tr>
-  <td style="vertical-align:text-top;"><%= label :product, :description, "Description" %></td>
-  <td colspan="2"><%= text_area :product, :description, :rows => 2, :columns => 60 %></td>
-</tr>
-
-<tr>
-  <td style="vertical-align:text-top;"><%= "revenuePWR Instances" %></td>
-  <td>
-	<div class="checkCont">
-		<% Instance.find(:all, :conditions => ["id in (?)", @current_user.instances.collect(&:id)]).each do |i| %>
-			<label>
-			<%= check_box_tag "#{@permissions_object.class.to_s.underscore}[instance_ids][]", i.id, @permissions_object.instances.include?(i) %>
-			<%= i.name %>
-			</label><br/>
-		<% end %>
-	</div>
-	</td>
 </tr>

data/lib/generators/permissify/role/template/role.rb

@@ -1,7 +1,10 @@
 class Role < ActiveRecord::Base
   DOMAIN_TYPES = %w(Admin Dealer Corporation Brand Merchant)
   # DOMAIN_TYPES = %w(Admin Operations CallCenter)
+  
   include Permissify::Model
+  PERMISSIFIED_ABILITY_APPLICABILITY = 'Role'
+  
   # is_paranoid
   # default_scope :conditions => {:deleted_at => nil}, :order => "roles.name"
   has_and_belongs_to_many :users
@@ -16,7 +19,6 @@ class Role < ActiveRecord::Base
   class << self
     include Permissify::ModelClass
     include SystemFixtures::Roles
-    PERMISSIFIED_ABILITY_APPLICABILITY = 'Role'
     
     def force_seed_id(table, permissions_model, id)
       # not sure if this is still needed, may differ depending on db adapter (written against mysql)

data/lib/generators/permissify/views/template/permissions/_copy_controls.erb

@@ -1,4 +1,4 @@
-<%= form_for Role.new, :remote => true do |f| %>
+<%= form_for @permissions_class.new, :remote => true do |f| %>
   <div id="copy_form_<%= @permissions_object.id %>" style="display:none;background-color:#fffff0;padding:3px;" class="copy_form">
     <%= f.hidden_field :from, :value => @permissions_object.id %>
     <%= f.text_field :name, :value => @permissions_object.name + ' copy', :maxlength => 31, :size => 17 %>

data/lib/generators/permissify/views/template/permissions/_list_header.erb

@@ -1 +1 @@
-<%= "#{permissions_group.size} #{@permissions_header}#{permissions_group.size == 1 ? '' : 's'}" %>
+<%= "#{permissions_group.size} #{@permissions_header.singularize}#{permissions_group.size == 1 ? '' : 's'}" %>

data/lib/generators/permissify/views/template/permissions/destroy_response.js.erb

@@ -1,5 +1,5 @@
-$("#permissions_header").html("<%= "#{permissions_group.size} #{@permissions_header}#{permissions_group.size == 1 ? '' : 's'}" %>");
-$("#delete_role_<%= @permissions_object.id.to_s %>").html("DELETED");
-$("#data_role_<%= @permissions_object.id.to_s %>").addClass('deletedRole');
-$("#data_role_<%= @permissions_object.id.to_s %>").slideUp(3000);
-// $("#errors_role_<%= @permissions_object.id.to_s %>").remove();
+$("#permissions_header").html("<%= "#{permissions_group.size} #{@permissions_header.singularize}#{permissions_group.size == 1 ? '' : 's'}" %>");
+$("#delete_<%= @corresponding_class_params_key %>_<%= @permissions_object.id.to_s %>").html("DELETED");
+$("#data_<%= @corresponding_class_params_key %>_<%= @permissions_object.id.to_s %>").addClass('deletedRole');
+$("#data_<%= @corresponding_class_params_key %>_<%= @permissions_object.id.to_s %>").slideUp(3000);
+// $("#errors_<%= @corresponding_class_params_key %>_<%= @permissions_object.id.to_s %>").remove();

data/lib/generators/permissify/views/template/permissions/update_response.js.erb

@@ -1 +1 @@
-window.location = "/roles?id=<%= @permissions_object.id %>"
+window.location = "/<%= @permissions_object.class.name.downcase.pluralize %>?id=<%= @permissions_object.id %>"

data/lib/generators/permissify/views/template/permissions_helper.rb

@@ -73,11 +73,9 @@ module PermissionsHelper
                       'Brand Admin',
                       'Merchant Admin'
                     ],
-      # 'products' => [ 'Branch and Location Portals : Settings',
-      #                 'Branch and Location Portals : Social Media',
-      #                 'Branch and Location Portals : Web Page',
-      #                 'Solutions'
-      #               ]
+      'product' =>  [ 'Social Media',
+                      'Solutions',
+                    ]
     }[@permissions_name]
   end
   

data/lib/permissify/model_class.rb

@@ -19,6 +19,11 @@ module Permissify
       find(id)
     end
   
+    def force_seed_id(table, permissions_model, id)
+      # not sure if this is still needed, may differ depending on db adapter (written against mysql)
+      ActiveRecord::Base.connection.execute "UPDATE #{table}s SET id=#{id} WHERE id=#{permissions_model.id};"
+    end
+
     def locate(id, name)
       model_with_id   = find_by_id(id) # interface method : ActiveRecord::Base.find_by_id
       model_with_id ||= send("create_#{underscored_name_symbol(name)}") # interface methods needed for each seeded model

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: permissify
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Frederick Fix
@@ -72,6 +72,7 @@ files:
 - lib/generators/permissify/product/product_generator.rb
 - lib/generators/permissify/product/template/controller.rb
 - lib/generators/permissify/product/template/helper.rb
+- lib/generators/permissify/product/template/interface/admin.rb
 - lib/generators/permissify/product/template/interface/brand.rb
 - lib/generators/permissify/product/template/interface/corporation.rb
 - lib/generators/permissify/product/template/interface/dealer.rb