prologue 0.3.0 → 0.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prologue (0.2.0)
+    prologue (0.3.1)
       rails (>= 3.0.0)
       thor
 
@@ -102,7 +102,7 @@ PLATFORMS
 
 DEPENDENCIES
   aruba
-  bundler (>= 1.0.0)
+  bundler (~> 1.0.0)
   cucumber
   prologue!
   rails (>= 3.0.0)

data/bin/prologue

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
 require 'prologue/cli'
 Prologue::CLI.start

data/features/new.feature

@@ -1,9 +1,9 @@
+@disable-bundler
 Feature: Generate new prologue app
   In order to start a new project with prologue
   As a CLI
   I want to generate a rails3 app with prologue
 
-  @disable-bundler
   Scenario: Run prologue new my_app
     When I run "prologue new my_app"
     Then the output should contain "Building authentication"
@@ -11,7 +11,6 @@ Feature: Generate new prologue app
     And the output should contain "Building admin"
     And the output should contain "Prologue just added like 6 hours to your life."
 
-  @disable-bundler
   Scenario: Run prologue new my_app --no-auth
     When I run "prologue new my_app --no-auth"
     Then the output should not contain "Building authentication"
@@ -19,7 +18,6 @@ Feature: Generate new prologue app
     And the output should not contain "Building admin"
     And the output should contain "Prologue just added like 6 hours to your life."
 
-  @disable-bundler
   Scenario: Run prologue new my_app --no-roles
     When I run "prologue new my_app --no-roles"
     Then the output should contain "Building authentication"
@@ -27,7 +25,6 @@ Feature: Generate new prologue app
     And the output should contain "Building admin"
     And the output should contain "Prologue just added like 6 hours to your life."
 
-  @disable-bundler
   Scenario: Run prologue new my_app --no-admin
     When I run "prologue new my_app --no-admin"
     Then the output should contain "Building authentication"
@@ -35,7 +32,6 @@ Feature: Generate new prologue app
     And the output should not contain "Building admin"
     And the output should contain "Prologue just added like 6 hours to your life."
 
-  @disable-bundler
   Scenario: Run prologue new my_app --no-admin --no-roles
     When I run "prologue new my_app --no-admin --no-roles"
     Then the output should contain "Building authentication"

data/lib/prologue/cli.rb

@@ -1,7 +1,6 @@
 require 'thor'
 require 'thor/actions'
 require 'active_support/secure_random'
-require 'prologue/version'
 
 module Prologue
   class CLI < Thor

data/lib/prologue/version.rb

@@ -1,3 +1,3 @@
 module Prologue
-  VERSION = "0.3.0"
+  VERSION = "0.3.6"
 end

data/lib/prologue.rb

@@ -1,3 +1,7 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib') unless $:.include?(File.dirname(__FILE__) + '/../lib')
+require 'prologue/version'
+require 'prologue/cli'
+
 module Prologue
   
 end

data/prologue.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "thor"
   s.add_dependency('rails', '>= 3.0.0')
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba" 
   s.add_development_dependency "rspec", "~> 2.0.0"

data/templates/admin/users.rb

@@ -22,7 +22,9 @@ end
 
 inject_into_file 'app/controllers/admin/users_controller.rb', :after => "def create\n" do
 <<-'FILE'
-    @user = User.new(params[:user])
+    @user = User.new
+    # attr_accessor logic here
+    @user.attributes = params[:user]
     if @user.save
       flash[:notice] = "User created!"
       redirect_to admin_users_url
@@ -36,7 +38,7 @@ inject_into_file 'app/controllers/admin/users_controller.rb', :after => "def upd
 <<-'FILE'
     params[:user].delete(:password) if params[:user][:password].blank?
     params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
-
+    # attr_accessor logic here
     if @user.update_attributes(params[:user])
       flash[:notice] = "Successfully updated #{@user.name}."
       redirect_to admin_users_url

data/templates/bootstrap.rb

@@ -1,5 +1,21 @@
+require "net/http"
+require "net/https"
+require "uri"
+require 'rbconfig'
+
 say "Building Application with Prologue..."
 
+def get_remote_https_file(source, destination)
+  uri = URI.parse(source)
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl = true
+  http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+  request = Net::HTTP::Get.new(uri.request_uri)
+  response = http.request(request)
+  path = File.join(destination_root, destination)
+  File.open(path, "w") { |file| file.write(response.body) }
+end
+
 append_file '.gitignore' do
   '.DS_Store'
   'log/*.log'

data/templates/cancan.rb

@@ -87,28 +87,11 @@ if ENV['PROLOGUE_ADMIN']
         .check_box_item
           = check_box_tag "user[role_ids][]", role.id, @user.roles.include?(role), :id => "user_role_#{role.id}"
           %label{:for => "user_role_#{role.id}"}= role.name.humanize
+      = hidden_field_tag "user[role_ids][]", ""
   RUBY
   end
 
-  inject_into_file 'app/controllers/admin/users_controller.rb', :after => "@user = User.new(params[:user])\n" do
-  <<-'RUBY'
-    @user.role_ids = params[:user][:role_ids] if current_user.role? :admin
-  RUBY
-  end
-
-  inject_into_file 'app/controllers/admin/users_controller.rb', :before => "if @user.update_attributes(params[:user])\n" do
-  <<-'RUBY'
-    @user.send(:attributes=, { :role_ids => params[:user][:role_ids] }, false) if current_user.role? :admin
-    params[:user].delete(:role_ids)
-    
-  RUBY
-  end
-
-  inject_into_file 'app/controllers/admin/users_controller.rb', :after => "def update\n" do
-  <<-'RUBY'
-    params[:user][:role_ids] ||= []
-  RUBY
-  end
+  gsub_file 'app/controllers/admin/users_controller.rb', /# attr_accessor logic here/, '@user.accessible = [:role_ids] if current_user.role? :admin'
 end
 
 append_file 'db/seeds.rb' do

data/templates/gemfile.rb

@@ -31,4 +31,10 @@ gem "launchy", :group => [:cucumber]
 gem "timecop", :group => [:test, :cucumber]
 gem "pickle", :group => [:test, :cucumber]
 
+# for windows users
+if ( (Config::CONFIG['host_os'] =~ /mswin|mingw/) && (Config::CONFIG["ruby_version"] =~ /1.8/) )
+  gem "win32console", :group => [:test, :cucumber]
+  gem "windows-pr", :group => [:test, :cucumber]
+  gem "win32-open3"
+end
 run 'bundle install'

data/templates/initializers.rb

@@ -1,7 +1,19 @@
-initializer('active_record.rb') do
+initializer('accessible_attributes.rb') do
 <<-'FILE'
-# This forces you to set attr_accessible in all your models
-ActiveRecord::Base.send(:attr_accessible, nil)
+class ActiveRecord::Base
+  attr_accessible
+  attr_accessor :accessible
+
+  private
+
+  def mass_assignment_authorizer
+    if accessible == :all
+      self.class.protected_attributes
+    else
+      super + (accessible || [])
+    end
+  end
+end
 FILE
 end
 

data/templates/js.rb

@@ -1,6 +1,6 @@
 
 get "http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js",  "public/javascripts/jquery.js"
-get "http://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
+get_remote_https_file "https://github.com/rails/jquery-ujs/raw/master/src/rails.js", "public/javascripts/rails.js"
 get "http://html5shiv.googlecode.com/svn/trunk/html5.js", "public/javascripts/shiv.js"
 run 'rm public/javascripts/application.js'
 
@@ -56,4 +56,5 @@ create_file 'public/javascripts/core.js' do
 
 })(jQuery);
 FILE
-end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - Quick Left
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -06:00
+date: 2010-11-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -184,6 +184,6 @@ rubyforge_project: prologue
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: prologue-0.3.0
+summary: prologue-0.3.6
 test_files: []