codeigniter_vender 0.0.4 → 0.0.5

data/README.md

@@ -4,16 +4,14 @@ This is for ruby fans who also love php. I love [CodeIgniter](http://codeigniter
 
 It is a set of php-code generators.
 
-The current CodeIgniter version is 2.0
+The current official CodeIgniter version is 2.0.
 
-### Example
+#### What is CodeIgniter?
 
-in your rails application:
-    ruby script/generate ci_app
+CodeIgniter is a powerful PHP framework with a very small footprint, built for PHP coders who need a simple and elegant toolkit to create full-featured web applications. If you're a developer who lives in the real world of shared hosting accounts and clients with deadlines, and if you're tired of ponderously large and thoroughly undocumented frameworks.
+
+CodeIgniter 是一个小巧但功能强大的 PHP 框架，作为一个简单而“优雅”的工具包，它可以为 PHP 程序员建立功能完善的 Web 应用程序。如果你是一个使用共享主机，并且为客户所要求的期限而烦恼的开发人员，如果你已经厌倦了那些傻大笨粗的框架。 
 
-    ruby script/generate ci_controller blog hot old
- 
-The above commands will generate php code into public directory
 
 ### How to start?
 
@@ -42,7 +40,12 @@ This will generate a controller named Page and two pages (about_us.php and help)
 
 Enjoy it!
 
+### Resources
 
++ [CodeIgniter official site](http://codeigniter.com/)
++ [CodeIgniter user guide](http://codeigniter.com/user_guide/)
++ [CodeIgniter中国站](http://codeigniter.org.cn/)  
++ [XAMPP](http://www.apachefriends.org/zh_cn/xampp.html)
 
 ### TODO List
 
@@ -50,4 +53,4 @@ Enjoy it!
 + test!!!
 
 
-Copyright (c) 2010 [qichunren], released under the MIT license
+Copyright (c) 2010 - 2011 [qichunren], released under the MIT license

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/codeigniter_vender.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{codeigniter_vender}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["qichunren"]
-  s.date = %q{2011-02-20}
+  s.date = %q{2011-02-21}
   s.description = %q{CodeigniterVender is a Ruby gem for php coder who love CodeIgniter.This is for rubyist who also love php.}
   s.email = %q{whyruby@gmail.com}
   s.extra_rdoc_files = [
@@ -32,14 +32,12 @@ Gem::Specification.new do |s|
      "lib/codeigniter/commands/help.rb",
      "lib/codeigniter/tasks/ci.rake",
      "lib/codeigniter_vender.rb",
-     "lib/generators/ci/ci_auth/USAGE",
-     "lib/generators/ci/ci_auth/ci_auth_generator.rb",
-     "lib/generators/ci/ci_auth/templates/auth.php",
-     "lib/generators/ci/ci_auth/templates/auth_model.php",
-     "lib/generators/ci/ci_auth/templates/login_form.php",
-     "lib/generators/ci/ci_layout/USAGE",
-     "lib/generators/ci/ci_layout/ci_layout_generator.rb",
-     "lib/generators/ci/ci_layout/templates/application_layout.php.erb",
+     "lib/generators/ci/auth/USAGE",
+     "lib/generators/ci/auth/auth_generator.rb",
+     "lib/generators/ci/auth/templates/auth.php",
+     "lib/generators/ci/auth/templates/auth_model.php",
+     "lib/generators/ci/auth/templates/login_form.php",
+     "lib/generators/ci/base.rb",
      "lib/generators/ci/controller/USAGE",
      "lib/generators/ci/controller/controller_generator.rb",
      "lib/generators/ci/controller/templates/controller.php",
@@ -366,6 +364,9 @@ Gem::Specification.new do |s|
      "lib/generators/ci/install/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/userguide.css",
      "lib/generators/ci/install/templates/README",
      "lib/generators/ci/install/templates/config/database.php",
+     "lib/generators/ci/layout/USAGE",
+     "lib/generators/ci/layout/layout_generator.rb",
+     "lib/generators/ci/layout/templates/application_layout.php",
      "lib/generators/ci/model/USAGE",
      "lib/generators/ci/model/model_generator.rb",
      "lib/generators/ci/model/templates/model.php",

data/lib/generators/ci/auth/auth_generator.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+require "generators/ci/base" 
+
+module Ci
+  module Generators
+    class AuthGenerator < Base
+      
+      desc "This generator generate User lgoin auth code." 
+      
+      def create_auth_controller
+        template "auth.php", "#{ci_root}/application/controllers/auth.php"
+      end
+      
+      def create_auth_model
+        template "auth_model.php", "#{ci_root}/application/models/auth_model.php"  
+      end  
+      
+      def create_auth_view
+        template "login_form.php", "#{ci_root}/application/views/login_form.php" 
+      end    
+    end
+    
+  end
+end

data/lib/generators/ci/{ci_auth → auth}/templates/auth.php

@@ -1,17 +1,18 @@
-<?php 
-class Auth extends Controller{
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+ 
+class Auth extends CI_Controller{
 	
-	function __construct(){
-		parent::Controller();
-	}
+  	function __construct(){
+  		parent::__construct();
+  		// Write your own initialize code
+  	} 
 	
 	function index($message=null){
 		$data = array(
 			'message' => $message
 		);
 		
-		$this->load->view('admin/header_simple');
-		$this->load->view('admin/auth/login_form', $data);
+		$this->load->view('auth/login_form', $data);
 	}
 	
 	function login(){
@@ -20,7 +21,7 @@ class Auth extends Controller{
 		if($login_result !== TRUE)
 			$this->index($login_result);
 		else
-			redirect('admin/dashboard');
+			redirect('users/dashboard');
 	}
 	
 	function logout(){

data/lib/generators/ci/auth/templates/auth_model.php

@@ -0,0 +1,56 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Auth_model extends CI_Model{
+	
+    function __construct(){
+        parent::__construct();
+        //  Write your own initialize code
+    }    
+	
+	  function doLogin(){
+  		  $data = array(
+    			'username LIKE' => $this->input->post('user'),
+    			'pass' => md5($this->input->post('pass'))
+    		);
+				
+    		//check db for valid user/pass pair
+    		$row = $this->db->get_where('users', $data)->first_row();
+  		 
+    		if($row->id == NULL)
+    			return "Invalid username or password.";
+		
+    		if($row->active != 'on')
+    			return "Your account has been suspended. Please <a href='/contact'><u>contact us</u></a> for more info.";
+		
+    		//set session variables
+    		$this->session->set_userdata('user', $row->username);
+    		$this->session->set_userdata('displayname', $row->displayname);
+      		$this->session->set_userdata('admin', $row->admin);
+  		
+    		//update last login time
+      		$this->db->update('users', 
+      			array('lastlogon'=>date('YmdHis')), 
+      			array('username LIKE'=>$row->username)
+      		);	
+  		
+      		return TRUE;
+    	}
+	
+      	function doLogout(){
+      		$this->session->sess_destroy();
+      	}   
+	
+    	  function loggedIn(){
+      		$user = $this->session->userdata('user');
+      		if($user == null || $user == '')
+      			return FALSE;
+		
+      		define('USER', $user);
+      		define('DISPLAYNAME', $this->session->userdata('displayname'));
+		
+      		return TRUE;  
+    	}  
+}   
+
+/* End of file auth_model.php */
+/* Location: ./application/models/auth_model.php */

data/lib/generators/ci/base.rb

@@ -0,0 +1,18 @@
+module Ci
+  module Generators
+
+    class Base < ::Rails::Generators::Base 
+      
+      def self.source_root
+        @_ci_source_root ||= File.expand_path(File.join(File.dirname(__FILE__), generator_name, 'templates'))
+      end
+                 
+      private
+      
+      def ci_root
+        @ci_root ||= YAML.load_file("config/codeigniter.yml")["path"]
+      end
+    end
+    
+  end
+end

data/lib/generators/ci/install/install_generator.rb

@@ -1,13 +1,12 @@
+# encoding: utf-8
+require "generators/ci/base"
+
 module Ci
   module Generators
-    class InstallGenerator < ::Rails::Generators::Base   
+    class InstallGenerator < Base   
       
       class_option :version, :type => :string, :aliases => :v, :default => "2.0.0", :desc => "set CodeIgniter version."
-      # class_option :subdir, :type => :string, :aliases => :s, :default => "", :desc => "install CodeIgniter prject into public subdir."  
-      
-      def self.source_root
-        File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-      end        
+      # class_option :subdir, :type => :string, :aliases => :s, :default => "", :desc => "install CodeIgniter prject into public subdir."       
       
       desc "This generator generate CodeIgniter project into public/ directory. This is your first step."
         

data/lib/generators/ci/layout/layout_generator.rb

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require "generators/ci/base"
+
+module Ci
+  module Generators
+
+    class LayoutGenerator < Base
+
+      class_option :jquery, :type => :boolean, :default => true, :desc => "User jQuery js."
+      argument :layout_name, :type => :string, :default => "application"
+      
+      def create_layout
+        template "application_layout.php", "#{ci_root}/application/views/layouts/#{layout_name.underscore}.php"
+      end
+  
+    end
+    
+  end
+end

data/lib/generators/ci/{ci_layout/templates/application_layout.php.erb → layout/templates/application_layout.php}

@@ -12,7 +12,7 @@
     <div id="header"></div>
     <div id="content"></div>
     <div id="footer"></div>
-<% if use_jquery -%>
+<% if options.jquery? -%>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.1/jquery.min.js"></script>
 <% end -%>
   </body>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - qichunren
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +08:00
+date: 2011-02-21 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -43,14 +43,12 @@ files:
 - lib/codeigniter/commands/help.rb
 - lib/codeigniter/tasks/ci.rake
 - lib/codeigniter_vender.rb
-- lib/generators/ci/ci_auth/USAGE
-- lib/generators/ci/ci_auth/ci_auth_generator.rb
-- lib/generators/ci/ci_auth/templates/auth.php
-- lib/generators/ci/ci_auth/templates/auth_model.php
-- lib/generators/ci/ci_auth/templates/login_form.php
-- lib/generators/ci/ci_layout/USAGE
-- lib/generators/ci/ci_layout/ci_layout_generator.rb
-- lib/generators/ci/ci_layout/templates/application_layout.php.erb
+- lib/generators/ci/auth/USAGE
+- lib/generators/ci/auth/auth_generator.rb
+- lib/generators/ci/auth/templates/auth.php
+- lib/generators/ci/auth/templates/auth_model.php
+- lib/generators/ci/auth/templates/login_form.php
+- lib/generators/ci/base.rb
 - lib/generators/ci/controller/USAGE
 - lib/generators/ci/controller/controller_generator.rb
 - lib/generators/ci/controller/templates/controller.php
@@ -377,6 +375,9 @@ files:
 - lib/generators/ci/install/templates/CodeIgniterLibs/CodeIgniter_2.0.0/user_guide/userguide.css
 - lib/generators/ci/install/templates/README
 - lib/generators/ci/install/templates/config/database.php
+- lib/generators/ci/layout/USAGE
+- lib/generators/ci/layout/layout_generator.rb
+- lib/generators/ci/layout/templates/application_layout.php
 - lib/generators/ci/model/USAGE
 - lib/generators/ci/model/model_generator.rb
 - lib/generators/ci/model/templates/model.php

data/lib/generators/ci/ci_auth/ci_auth_generator.rb

@@ -1,11 +0,0 @@
-class CiAuthGenerator < Rails::Generator::Base
-  
-  def manifest
-    record do |m|
-      m.file "auth.php", "public/system/application/controllers/admin/auth.php"
-      m.file "auth_model.php", "public/system/application/models/auth_model.php"
-      m.file "login_form.php", "public/system/application/views/login_form.php"
-    end
-  end
-  
-end

data/lib/generators/ci/ci_auth/templates/auth_model.php

@@ -1,52 +0,0 @@
-<?php 
-class Auth_model extends Model{
-	
-	function __contstruct(){
-		parent::Model();
-		//session_start();
-	}
-	
-	function doLogin(){
-		$data = array(
-			'username LIKE' => $this->input->post('user'),
-			'pass' => md5($this->input->post('pass'))
-		);
-				
-		//check db for valid user/pass pair
-		$row = $this->db->get_where('users', $data)->first_row();
-  		 
-		if($row->id == NULL)
-			return "Invalid username or password.";
-		
-		if($row->active != 'on')
-			return "Your account has been suspended. Please <a href='/contact'><u>contact us</u></a> for more info.";
-		
-		//set session variables
-		$this->session->set_userdata('user', $row->username);
-		$this->session->set_userdata('displayname', $row->displayname);
-  		$this->session->set_userdata('admin', $row->admin);
-  		
-		//update last login time
-  		$this->db->update('users', 
-  			array('lastlogon'=>date('YmdHis')), 
-  			array('username LIKE'=>$row->username)
-  		);	
-  		
-  		return TRUE;
-	}
-	
-	function doLogout(){
-		$this->session->sess_destroy();
-	}
-	
-	function loggedIn(){
-		$user = $this->session->userdata('user');
-		if($user == null || $user == '')
-			return FALSE;
-		
-		define('USER', $user);
-		define('DISPLAYNAME', $this->session->userdata('displayname'));
-		
-		return TRUE;
-	}
-}

data/lib/generators/ci/ci_layout/ci_layout_generator.rb

@@ -1,24 +0,0 @@
-class CiLayoutGenerator < Rails::Generator::Base
-
-  default_options :use_jquery => false
-  
-  def manifest
-    record do |m|
-      m.directory "public/system/application/views/layouts"
-      m.template "application_layout.php.erb", "public/system/application/views/layouts/application_layout.php", :assigns => { :use_jquery => options[:use_jquery] }
-    end
-  end
-
-  protected
-
-  def banner
-    "Usage: #{$0} ci_layout [options]"
-  end
-  
-  def add_options!(opt)
-    opt.separator ''
-    opt.separator 'Options:'
-    opt.on("--use-jquery", "Use google jquery api") { |v| options[:use_jquery] = true }
-  end
-  
-end