codeigniter_vender 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/codeigniter_vender.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{codeigniter_vender}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["qichunren"]
-  s.date = %q{2011-02-21}
+  s.date = %q{2011-02-25}
   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 = [
@@ -369,9 +369,9 @@ Gem::Specification.new do |s|
      "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/migration.rb.erb",
      "lib/generators/ci/model/templates/model.php",
-     "lib/generators/ci/model/templates/model.rb",
-     "lib/generators/ci/model/templates/model_migration.rb.erb",
+     "lib/generators/ci/model/templates/model.rb.erb",
      "lib/generators/ci/named_base.rb",
      "spec/spec_helper.rb",
      "uninstall.rb"

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

@@ -28,6 +28,15 @@ module Ci
         create_file "config/codeigniter.yml" do
           "version: #{options.version}\npath: public/#{@subdir}"
         end
+      end        
+      
+      def create_resources_dir_and_files    
+        say_status("Generate assets directory for resources", "", :green)
+        empty_directory "public/#{@subdir}/assets"
+        empty_directory "public/#{@subdir}/assets/images"
+        empty_directory "public/#{@subdir}/assets/javascripts"
+        empty_directory "public/#{@subdir}/assets/stylesheets"
+        empty_directory "public/#{@subdir}/assets/uploads"
       end
       
       def set_db_config 

data/lib/generators/ci/model/model_generator.rb

@@ -1,25 +1,47 @@
-require "generators/ci/named_base"
+# encoding: utf-8
+require 'rails/generators/active_record'
 
 module Ci
   module Generators
 
-    class ModelGenerator < NamedBase
+    class ModelGenerator < ActiveRecord::Generators::Base
+      desc "Create a codeIgniter model."
+      
+      
       argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
-      class_option :migration,  :type => :boolean
+      class_option :skip_migration,  :type => :boolean, :default => false  
       
-      # default_options :skip_timestamps => false, :skip_migration => false 
+      def self.source_root
+        @source_root ||= File.expand_path('../templates', __FILE__)
+      end
       
+      
+      def generate_migration
+         migration_template "migration.rb.erb", "db/migrate/#{migration_file_name}" unless options.skip_migration?  
+       end
+    
       def create_ci_model
         template "model.php", "#{ci_root}/application/models/#{file_name}_model.php"
       end
       
       def create_rails_model
-        
+        template "model.rb.erb", "app/models/#{file_name}.rb"  
+      end   
+      
+      protected
+
+      def migration_file_name
+        "create_#{table_name}.rb"
       end
+
+      def migration_class_name
+        "create_#{table_name}".camelize
+      end      
       
-      def create_migration
-        
-      end 
+      def ci_root
+        @ci_root ||= YAML.load_file("config/codeigniter.yml")["path"]
+      end
+
       
     end
     

data/lib/generators/ci/model/templates/migration.rb.erb

@@ -0,0 +1,16 @@
+class <%= migration_class_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+<% for attribute in attributes -%>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+<% if options[:timestamps] %>
+      t.timestamps
+<% end -%>
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/lib/generators/ci/model/templates/model.php

@@ -7,16 +7,11 @@ class <%= class_name %>_model extends CI_Model {
     function __construct(){
         parent::__construct();
         //  Write your own initialize code
-    }                         
+    }                                   
     
-    function get($limit){
-      $query = $this->db->get("<%= table_name %>", $limit);
-      return $query->result();
-    }                         
-    
-    function get($per_page, $offset){
+    function get($limit, $offset = 0){
       $query = $this->db->get("<%= table_name %>", $limit, $offset);
-      return $query->result();  
+      return $query->result();
     }
     
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - qichunren
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-21 00:00:00 +08:00
+date: 2011-02-25 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -380,9 +380,9 @@ files:
 - 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/migration.rb.erb
 - lib/generators/ci/model/templates/model.php
-- lib/generators/ci/model/templates/model.rb
-- lib/generators/ci/model/templates/model_migration.rb.erb
+- lib/generators/ci/model/templates/model.rb.erb
 - lib/generators/ci/named_base.rb
 - spec/spec_helper.rb
 - uninstall.rb

data/lib/generators/ci/model/templates/model_migration.rb.erb

@@ -1,16 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-  def self.up
-    create_table :<%= table_name -%> do |t|
-<% for attribute in attributes -%>
-      t.<%= attribute.type -%> :<%= attribute.name -%>
-<% end -%>
-<% unless options[:skip_timestamps] -%>
-      t.timestamps
-<% end -%>
-    end
-  end
-
-  def self.down
-    drop_table :<%= table_name -%>
-  end
-end