active_leonardo 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,4 +1,7 @@
-0.0.3 (May 23th, 2012) Marco Mastrodonato
+0.0.4 (August 13th, 2012) Marco Mastrodonato
+* Now you can use any name instead of *User*
+
+0.0.3 (August 10th, 2012) Marco Mastrodonato
 * Improved cancan integration
 * Localization yaml file cleaned from some previous leonardo stuff
 

data/README.rdoc

@@ -139,7 +139,7 @@ PS: Of course, these options are in addition to those provided by the original s
 
 == Tutorial
 
-That what do you think is??? :)
+On my blog you can find some other info.
 
 
 

data/active_template.rb

@@ -48,8 +48,20 @@ authentication = yes?("Authentication ?")
 model_name = authorization = nil
 if authentication
   default_model_name = "User"
-  model_name = ask(" Insert model name: [#{default_model_name}] (Other names are not tested yet)")
-  model_name = default_model_name if model_name.empty?
+  model_name = ask(" Insert model name: [#{default_model_name}]")
+  if model_name.empty? || model_name == 'y'
+    model_name = default_model_name
+  else
+    model_name = model_name.classify
+    stdout = <<-REMEM.gsub(/^    /, '')
+    *************************************************************************
+    Remember to add your auth class when you use active leonardo's generator.
+    For example: 
+    rails g leosca Product name price:decimal --auth_class=#{model_name}
+    *************************************************************************
+    REMEM
+    p stdout
+  end
   
   authorization = yes?("Authorization ?")
   gem 'cancan' if authorization
@@ -60,7 +72,7 @@ home = yes?("Ok. Would you create home controller as root ?") unless dashboard_r
 
 if yes?("Bundle install ?")
   dir = ask(" Insert folder name to install locally: [blank=default gems path]")
-  run "bundle install #{"--path=#{dir}" unless dir.empty?}"
+  run "bundle install #{"--path=#{dir}" unless dir.empty? || dir=='y'}"
 end
 
 generate "active_admin:install #{authentication ? model_name : "--skip-users"}"

data/lib/generators/active_leonardo.rb

@@ -20,6 +20,10 @@ module ActiveLeonardo
     def activeadmin?
       File.exists? activeadmin_file
     end
+    def auth_class
+      return unless options[:auth_class]
+      options[:auth_class].classify
+    end
     #def formtastic?
     #  return false unless options.formtastic?
     #  File.exists? "config/initializers/formtastic.rb"

data/lib/generators/leolay/leolay_generator.rb

@@ -114,6 +114,9 @@ class LeolayGenerator < Rails::Generators::Base
         rescue_from CanCan::AccessDenied do |exception|
           redirect_to root_url, :alert => exception.message
         end
+        def current_ability
+          @current_ability ||= Ability.new(current_#{options[:auth_class].downcase})
+        end
         FILE
       end if options.authorization?
 
@@ -153,11 +156,11 @@ class LeolayGenerator < Rails::Generators::Base
   end
 
   def setup_authentication
-    file = "app/models/#{options.auth_class}.rb"
+    file = "app/models/#{options[:auth_class].downcase}.rb"
     #puts "File #{file} #{File.exists?(file) ? "" : "does not"} exists!"
     return unless options.authentication? and File.exists?(file)
 
-    inject_into_class file, options[:auth_class] do
+    inject_into_class file, auth_class do
       <<-FILE.gsub(/^    /, '')
       ROLES = %w[admin manager user guest]
       scope :with_role, lambda { |role| {:conditions => "roles_mask & \#{2**ROLES.index(role.to_s)} > 0 "} }
@@ -186,9 +189,10 @@ class LeolayGenerator < Rails::Generators::Base
   def setup_authorization
     file = "app/models/ability.rb"
     return unless File.exists?(file)
+    gsub_file file, /initialize(\s|\()user(.|)/, "initialize(#{options[:auth_class].downcase})"
     inject_into_file file, :before => "  end\nend" do
       <<-FILE.gsub(/^      /, '')
-          #{options[:auth_class].downcase} ||= #{options[:auth_class].classify}.new
+          #{options[:auth_class].downcase} ||= #{auth_class}.new
           can :manage, :all if #{options[:auth_class].downcase}.role? :admin
 
       FILE
@@ -200,13 +204,13 @@ class LeolayGenerator < Rails::Generators::Base
     file = "db/seeds.rb"
     append_file file do
       <<-FILE.gsub(/^      /, '')
-      user=#{options[:auth_class]}.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      user=#{auth_class}.new :email => 'admin@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
       #{"user.roles=['admin']" if options.authorization?}
       user.save
-      user=#{options[:auth_class]}.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      user=#{auth_class}.new :email => 'manager@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
       #{"user.roles=['manager']" if options.authorization?}
       user.save
-      user=#{options[:auth_class]}.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
+      user=#{auth_class}.new :email => 'user@#{app_name}.com', :password => 'abcd1234', :password_confirmation => 'abcd1234'
       #{"user.roles=['user']" if options.authorization?}
       user.save
       FILE

data/lib/generators/leolay/templates/app/admin/users.rb

@@ -1,11 +1,14 @@
 ActiveAdmin.register <%= options[:auth_class] %> do
+  <%- if options.authorization? -%>
   menu :if => proc{ can?(:manage, <%= options[:auth_class] %>) }
-
+  <%- end -%>
   config.sort_order = 'email_asc'
 
   controller do
+    <%- if options.authorization? -%>
     load_resource :except => :index
     authorize_resource
+    <%- end -%>
     def update
       unless params[:<%= options[:auth_class].downcase %>]['password'] && params[:<%= options[:auth_class].downcase %>]['password'].size > 0
         params[:<%= options[:auth_class].downcase %>].delete 'password'
@@ -21,9 +24,11 @@ ActiveAdmin.register <%= options[:auth_class] %> do
     id_column
     column :email
     #column :group, :sortable => :group_id
-    column :roles do |user|
-      user.roles.join ", "
+    <%- if options.authorization? -%>
+    column :roles do |<%= options[:auth_class].downcase %>|
+      <%= options[:auth_class].downcase %>.roles.join ", "
     end
+    <%- end -%>
     column :current_sign_in_at
     column :current_sign_in_ip
     column :created_at
@@ -31,16 +36,18 @@ ActiveAdmin.register <%= options[:auth_class] %> do
   end
 
   form do |f|
+    <%- if options.authorization? -%>
     input_roles = "<li>" <<
         f.label(:roles) <<
         <%= options[:auth_class] %>::ROLES.map{|role| check_box_tag("<%= options[:auth_class].downcase %>[roles][]", role, f.object.roles.include?(role)) << ' ' << role.humanize.html_safe }.join(" ") <<
         hidden_field_tag("<%= options[:auth_class].downcase %>[roles][]") <<
         "</li>"
+    <%- end -%>
     f.inputs "Account" do
       f.input :email
       f.input :password
-      f.input(:password_confirmation) <<
-          input_roles.html_safe
+      f.input(:password_confirmation) <%= "<< input_roles.html_safe" if options.authorization? %>
+          
     end
     f.buttons
   end
@@ -53,9 +60,11 @@ ActiveAdmin.register <%= options[:auth_class] %> do
       row :last_sign_in_at
       row :sign_in_count
       row :current_sign_in_ip
-      row :roles do |user|
-        user.roles.join ", "
+      <%- if options.authorization? -%>
+      row :roles do |<%= options[:auth_class].downcase %>|
+        <%= options[:auth_class].downcase %>.roles.join ", "
       end
+      <%- end -%>
       row :created_at
       row :updated_at
     end
@@ -65,7 +74,9 @@ ActiveAdmin.register <%= options[:auth_class] %> do
     column :email
     #column("Name") { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.name }
     #column("Group") { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.group.try(:name) }
+    <%- if options.authorization? -%>
     column(I18n.t('attributes.<%= options[:auth_class].downcase %>.roles')) { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.roles.join ", " }
+    <%- end -%>
     column(I18n.t('attributes.created_at')) { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.created_at.strftime("%d/%m/%Y") }
     column(I18n.t('attributes.<%= options[:auth_class].downcase %>.last_sign_in_at')) { |<%= options[:auth_class].downcase %>| <%= options[:auth_class].downcase %>.last_sign_in_at.strftime("%d/%m/%Y") if <%= options[:auth_class].downcase %>.last_sign_in_at }
   end

metadata

@@ -1,80 +1,73 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: active_leonardo
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Marco Mastrodonato
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activeadmin
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: activeadmin
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: cancan
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id003
-description: This generator help you to create new Rails applications to combine with active admin gem. It generates application structure to easily get the internationalization and authorization.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+description: This generator help you to create new Rails applications to combine with
+  active admin gem. It generates application structure to easily get the internationalization
+  and authorization.
+email:
 - m.mastrodonato@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/active_leonardo.rb
 - lib/generators/erb/leosca/leosca_generator.rb
 - lib/generators/leolay/install_generator.rb
@@ -115,36 +108,28 @@ files:
 - active_template.rb
 homepage: https://github.com/marcomd/Active_Leonardo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - Start a new app with the template.rb inside root folder
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: This gem provides a new customized scaffold generator to combine with active admin
+summary: This gem provides a new customized scaffold generator to combine with active
+  admin
 test_files: []
-