squeezer 0.1.11 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.11
+0.2.0

data/app/models/permition.rb

@@ -0,0 +1,5 @@
+class Permition < ActiveRecord::base
+  belongs_to :user
+  belongs_to :role
+end
+

data/app/models/role.rb

@@ -1,4 +1,5 @@
 class Role < ActiveRecord::Base
-  has_and_belongs_to_many :users
+  has_many :permitions
+  has_many :users, :through => :permitions
 end
-	 
+

data/app/models/user.rb

@@ -14,22 +14,24 @@ class User < ActiveRecord::Base
 
   # Setup accessible (or protected) attributes for your model
   attr_accessible :email, :password, :password_confirmation,:role_ids,:username
-  has_and_belongs_to_many :roles
-  
+  has_many :permitions
+  has_many :roles, :through => :permitions
+
   def role #array con los roles del usuario
     roles.map do |role|
       role.name
     end
-  end    
-  
+  end
+
   def role?(rol) #true si el usuario tiene el rol
     role.include?(rol)
   end
-  
+
   def role_symbols
     roles.map do |role|
       role.name.underscore.to_sym
     end
-  end 
-  
+  end
+
 end
+

data/config/routes.rb

@@ -1,26 +0,0 @@
-Rails.application.routes.draw do |map|
-
-  resources :blogs
-  
-  resources :comments do
-    member do
-      get :crear
-      get :open
-      get :close
-      get :remove
-    end 
-  end
-
-  resources :users do
-    member do
-      get :roles
-    end 
-  end
-
-  resources :roles
-
-  resources :posts
-  
-  resources :pages
-
-end

data/lib/generators/squeezer/squeezer_generator.rb

@@ -4,7 +4,7 @@ require 'active_support/core_ext/object/blank'
 
 class SqueezerGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
-   
+
   source_root File.expand_path('../templates', __FILE__)
 
   def self.next_migration_number(dirname)
@@ -14,9 +14,9 @@ class SqueezerGenerator < Rails::Generators::Base
       "%.3d" % (current_migration_number(dirname) + 1 )
     end
   end
-      
+
   def squeez
-    gem "will_paginate", "~> 3.0.pre2"  
+    gem "will_paginate", "~> 3.0.pre2"
     puts "paginacion"
     gem 'haml'
     puts "para escribir en haml en lugar de html"
@@ -36,7 +36,7 @@ class SqueezerGenerator < Rails::Generators::Base
     puts "para usar mysql"
     gem "meta_search"
     puts "hace las busquedas mas faciles"
-    
+
     generate('bundler install')
     generate('jquery:install --ui')
     generate('devise:install')
@@ -59,54 +59,55 @@ class SqueezerGenerator < Rails::Generators::Base
     cf_v "layouts/_ice.haml"
     copy_file("public/javascripts/application.js","public/javascripts/application.js")
     copy_file("public/javascripts/jquery.layout.min-1.2.0.js","public/javascripts/jquery.layout.min-1.2.0.js")
-    
-    copy_file("config/devise.rb","config/initializers/devise.rb")          
-    
-    FileUtils.cp_r(File.expand_path('../templates/public/stylesheets', __FILE__),'public/')     
-    
+
+    copy_file("config/devise.rb","config/initializers/devise.rb")
+
+    FileUtils.cp_r(File.expand_path('../templates/public/stylesheets', __FILE__),'public/')
+
     migrations
-    
+
   end
-  
+
   private
 
   def migrations
-    #migraciones    
+    #migraciones
     cf_mig("create_roles")
     cf_mig("create_pages")
     cf_mig("create_blogs")
     cf_mig("create_comments")
     cf_mig("create_posts")
-    cf_mig("create_roles_users")
+    cf_mig("create_permitions")
     cf_mig("create_sites")
     cf_mig("add_username_user")
     cf_mig("squeez_data")
-    cf_mig("page_data")    
+    cf_mig("page_data")
   end
-  
-  def cf_mig(dir)  
+
+  def cf_mig(dir)
     migration_template "db/migrate/#{dir}.rb", "db/migrate/#{dir}"
     sleep 1
   end
-  
+
   def cf_js(dir)
     copy_file("public/javascripts/#{dir}","public/javascripts/#{dir}")
   end
-  
+
   def cf_h(dir)
     copy_file("app/helpers/#{dir}","app/helpers/#{dir}")
   end
-   
+
   def cf_v(dir)
     copy_file("app/views/#{dir}","app/views/#{dir}")
   end
-  
+
   def cf_m(dir)
     copy_file("app/models/#{dir}","app/models/#{dir}")
   end
-  
+
   def cf_c(dir)
     copy_file("app/controllers/#{dir}","app/controllers/#{dir}")
   end
-  
-end
+
+end
+

data/lib/generators/squeezer/templates/db/migrate/{create_roles_users.rb → create_permitions.rb}

@@ -1,6 +1,6 @@
-class CreateRolesUsers < ActiveRecord::Migration
+class CreatePermitions < ActiveRecord::Migration
   def self.up
-    create_table :roles_users,:id=>false do |t|
+    create_table :permitions,:id=>false do |t|
       t.integer :role_id
       t.integer :user_id
 
@@ -9,7 +9,7 @@ class CreateRolesUsers < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :roles_users
+    drop_table :permitions
   end
 end
 

data/squeezer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{squeezer}
-  s.version = "0.1.11"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oldani Pablo"]
-  s.date = %q{2011-02-07}
+  s.date = %q{2011-03-26}
   s.description = %q{an appliaction ready to run}
   s.email = %q{magicche@hotmail.com}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "app/models/blog.rb",
     "app/models/comment.rb",
     "app/models/page.rb",
+    "app/models/permition.rb",
     "app/models/post.rb",
     "app/models/role.rb",
     "app/models/site.rb",
@@ -201,9 +202,9 @@ Gem::Specification.new do |s|
     "lib/generators/squeezer/templates/db/migrate/create_blogs.rb",
     "lib/generators/squeezer/templates/db/migrate/create_comments.rb",
     "lib/generators/squeezer/templates/db/migrate/create_pages.rb",
+    "lib/generators/squeezer/templates/db/migrate/create_permitions.rb",
     "lib/generators/squeezer/templates/db/migrate/create_posts.rb",
     "lib/generators/squeezer/templates/db/migrate/create_roles.rb",
-    "lib/generators/squeezer/templates/db/migrate/create_roles_users.rb",
     "lib/generators/squeezer/templates/db/migrate/create_sites.rb",
     "lib/generators/squeezer/templates/db/migrate/data.rb",
     "lib/generators/squeezer/templates/db/migrate/page_data.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 11
-  version: 0.1.11
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Oldani Pablo
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -03:00
+date: 2011-03-26 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -252,6 +252,7 @@ files:
 - app/models/blog.rb
 - app/models/comment.rb
 - app/models/page.rb
+- app/models/permition.rb
 - app/models/post.rb
 - app/models/role.rb
 - app/models/site.rb
@@ -414,9 +415,9 @@ files:
 - lib/generators/squeezer/templates/db/migrate/create_blogs.rb
 - lib/generators/squeezer/templates/db/migrate/create_comments.rb
 - lib/generators/squeezer/templates/db/migrate/create_pages.rb
+- lib/generators/squeezer/templates/db/migrate/create_permitions.rb
 - lib/generators/squeezer/templates/db/migrate/create_posts.rb
 - lib/generators/squeezer/templates/db/migrate/create_roles.rb
-- lib/generators/squeezer/templates/db/migrate/create_roles_users.rb
 - lib/generators/squeezer/templates/db/migrate/create_sites.rb
 - lib/generators/squeezer/templates/db/migrate/data.rb
 - lib/generators/squeezer/templates/db/migrate/page_data.rb
@@ -483,7 +484,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 494515437
+      hash: -443749421
       segments: 
       - 0
       version: "0"