saruman 0.0.1 → 0.0.2

data/README.md

@@ -2,19 +2,21 @@
 
 A ruby gem developed by jasonayre of bravenewwebdesign.com (site down currently), to make super complicated, ridiculous, time consuming things in Magento, e.g. creating a new extension, easy.
 
-## NOTE: NOT EVERYTHING HAS BEEN TESTED, USE AT YOUR OWN RISK
+## NOTE: NOT EVERYTHING HAS BEEN THOROUGHLY TESTED, USE AT YOUR OWN RISK
 
-### IF YOUR COMPUTER BLOWS UP, NOT MY FAULT. Probably make a new branch before attempting to use, ESPECIALLY if not creating a new extension.
+### IF YOUR COMPUTER BLOWS UP, NOT MY FAULT. Probably make a new branch before attempting to use!
 
 ## Installing
 
     gem install saruman
     
-Creating a new extension should be working. To do so, navigate to the root directory of your magento installation and call
+Creating a new extension should be working. To do so, MAKE SURE YOU ARE IN THE ROOT DIRECTORY (containing app folder) of your magento installation and call
 
     saruman extension
     
-The wizard should take you through the rest of it. I would recommend adding an observer, choose event #3 (checkout_cart_update), and then after it's finished, add an item to your cart and watch the system log, to verify everything is working correctly (well not EVERYTHING, just the observer and general installation of the extension really)
+The wizard should take you through the rest of it. I would recommend adding an observer, choose event #145 (checkout_cart_update), and then after it's finished, add an item to your cart and watch the system log, to verify everything is working correctly (well not EVERYTHING, just the observer and general installation of the extension really)
+
+If you created a model, check your db for the new tables, along with the extension version in core_resource table
 
 ### A picture is worth a thousand words (or is it a million?)
 
@@ -22,23 +24,31 @@ However the phrase goes, its a lot of words, so here is an example of what my te
 
 ![Saruman Image example](/jasonayre/saruman/raw/master/doc_assets/saruman_extension_example.jpg)
 
-### Creating the models
-
-You are able to create an unlimited number of models for your extension, and it is done in rails fashion. E.g, when you get to models part of wizard:
-
-    title:string content:text active:boolean
+## Commands
 
-Will create the magento installer sql using the rails friendly syntax.
+### saruman extension
 
-### Future stuff
+    saruman extension
+    
+Will guide you through the wizard process and help you build an extension. Will let you create an observer, model, helper for your new extension along with an installer.
 
-Technically I believe the model command is working, honestly haven't really tested it so I dont recommend using it. The idea behind this whole library is you will be able to do things like
+### saruman model
 
     saruman model
     
-And then the wizard will let you create any number of models, using a railsish syntax, which will create magento models for a specific extension. It will also create a new version upgrade, along with the resource models and what not.
+Will let you create any number of models for the specified magento extension. You must type the fields using same syntax rails uses. e.x.
 
-The coolest part and hardest part to get right, is I'm actually reading the config files of the magento extension, and appending the new data declarations for the models and what not, in an attempt to really simplify the creation of magento extensions. (work in progress, you can try it for now but no promises nothing will break)
+    title:string content:text active:boolean
+    
+When creating models, it is assumed that you will be creating a new version of the extension. Therefore, a upgrade file is created with the SQL for all of your new models, along with the appropriately named new version.
+NOTE: I couldn't remember whether Magento even allows anything but 0.0.1 (3 digits sep by period) syntax, so things will probably break if that is not the case, and you don't have the 3 digit version syntax on your extension (writing this super fast so dont have time to check.)    
 
+### saruman observer
 
+  saruman observer
+  
+Will create a new observer file with an unlimited amount of events you wish to observe. I also parsed a document containing most of the observer events in magento version 1.5ish I believe, so there are about 300 events to choose from, no guarantees that they all work or are up to date. Just type the number of the observer event youd like to observer, rinse and repeat until you are finished (note that it will create all the observer events into one observer.php file so it will overwrite if you have an observer already.)
+
+### Future stuff
 
+Controllers, helpers, more stuff. I'll post a screencast of how to use it as well, sometime in near future.

data/lib/saruman/cli.rb

@@ -8,11 +8,11 @@ module Saruman
     desc "extension", "Creates a new magento extension"
     def extension
       options = Hash.new
-      
+      options[:command] = __method__
       options[:namespace] = ask("Enter extension namespace:") { |q| q.default = "Saruman" }
       options[:name] = ask("Enter extension name:") { |q| q.default = "Wizard" }
       options[:author] = ask("Author of extension:") { |q| q.default = "Jason Ayre www.bravenewwebdesign.com" }
-      options[:version] = ask("Version number (default - 0.0.1):") { |q| q.default = "0.0.1" }
+      options[:version] = ask("Version number (Format - 0.0.1):") { |q| q.default = "0.0.1" }
       
       say("Would you like me to create an observer?")
       choose do |menu|
@@ -21,18 +21,25 @@ module Saruman
       end
       
       if(options[:observer])
+        
         say("Choose the events you would like to observe")
         begin
+          
           choose do |menu|
             if(options[:observer_events]).nil?
               options[:observer_events] = Array.new
             end
-            menu.choice(:catalogrule_before_apply) { options[:observer_events].push(:catalog_before_apply) }
-            menu.choice(:catalogrule_after_apply) { options[:observer_events].push(:catalog_after_apply) }
-            menu.choice(:checkout_cart_save_after) { options[:observer_events].push(:checkout_cart_save_after) }
+            if @observer_menu_builder.nil?
+              @observer_menu_builder = Saruman::ObserverMenuBuilder.new(menu)
+            else
+              @observer_menu_builder.display_choices(menu)
+            end
+            
           end
         end while agree("Observe another event?")
         
+        options[:observer_events] = @observer_menu_builder.decisions
+        
       end
       
       say("Would you like me to create a model?")
@@ -41,16 +48,16 @@ module Saruman
         menu.choice(:no) { options[:model] = false }
       end
       
-      if(options[:model])     
-
-          if(options[:models]).nil?
-            options[:models] = Array.new
-          end
-          
-          begin
-            question = Saruman::ModelBuilder.new
-            options[:models] << question.output
-          end while agree("Create another model?")
+      if(options[:model])
+        
+        if(options[:models]).nil?
+          options[:models] = Array.new
+        end
+        
+        begin
+          question = Saruman::ModelBuilder.new
+          options[:models] << question.output
+        end while agree("Create another model?")
         
       end
       
@@ -61,28 +68,61 @@ module Saruman
       end
       
       Saruman::Generators::Extension.start([options])
-
+      
+      if options[:model]
+        Saruman::Generators::Model.start([options])
+      end  
+      
     end
     
     desc "model", "Creates a new magento model"
     def model
       options = Hash.new
+      options[:command] = __method__
       options[:namespace] = ask("Enter extension namespace:") { |q| q.default = "Saruman" }
       options[:name] = ask("Enter extension name:") { |q| q.default = "Wizard" }
       
-        if(options[:models]).nil?
-          options[:models] = Array.new
-        end
-        
-        begin
-          question = Saruman::ModelBuilder.new
-          options[:models] << question.output
-        end while agree("Create another model?")
-
+      if(options[:models]).nil?
+        options[:models] = Array.new
+      end
       
+      begin
+        question = Saruman::ModelBuilder.new
+        options[:models] << question.output
+      end while agree("Create another model?")
+
       Saruman::Generators::Model.start([options])
       
-    end  
+    end
+    
+    desc "observer", "Creates a new observer for an extension"
+    def observer
+      options = Hash.new
+      options[:command] = __method__
+      options[:namespace] = ask("Enter extension namespace:") { |q| q.default = "Saruman" }
+      options[:name] = ask("Enter extension name:") { |q| q.default = "Wizard" }
+      
+      say("Choose the events you would like to observe")
+      begin
+        
+        choose do |menu|
+          if(options[:observer_events]).nil?
+            options[:observer_events] = Array.new
+          end
+          if @observer_menu_builder.nil?
+            @observer_menu_builder = Saruman::ObserverMenuBuilder.new(menu)
+          else
+            @observer_menu_builder.display_choices(menu)
+          end
+          
+        end
+      end while agree("Observe another event?")
+      
+      options[:observer_events] = @observer_menu_builder.decisions
+
+      Saruman::Generators::Observer.start([options])
+      
+    end
     
   end
   

data/lib/saruman/generators/extension/templates/extension_config.xml

@@ -35,18 +35,6 @@
   <global>
     <% if model? %>
     <models>
-      <<%= extension_name_lower %>>
-        <class><%= model_klass_name %></class>
-        <resourceModel><%= resource_model_name_lower %></resourceModel>
-      </<%= extension_name_lower %>>
-      <<%= resource_model_name_lower %>>
-        <class><%= resource_model_klass_name %></class>
-        <entities>
-          <% models.each do |model| %>
-          <<%= model[:model_name_lower] %>><table><%= model[:model_table_name] %></table></<%= model[:model_name_lower] %>>
-          <% end %>
-        </entities>
-      </<%= resource_model_name_lower %>>
     </models>
     <resources>
       <<%= extension_name_lower %>_setup>

data/lib/saruman/generators/extension.rb

@@ -5,6 +5,7 @@ module Saruman
   module Generators
     class Extension < Thor::Group
       include Thor::Actions
+      include Saruman::Base
       argument :arguments, :type => :hash
       
       def self.source_root
@@ -35,132 +36,112 @@ module Saruman
         end  
       end
       
-      def create_models
-        if model?
-          
-          models.each do |model|
-            @model_name = model[:model_name]
-            @model_klass_name = "#{namespace}_#{name}_Model_#{@model_name}"
-            @model_name_lower = model[:model_name_lower]
-
-            @resource_model_klass_name = "#{namespace}_#{name}_Model_Mysql4_#{@model_name}"
-            @table_name = model[:model_table_name]
-            template("Model.php", "#{model_path}#{@model_name}.php")
-            template("Resource_Model.php", "#{resource_model_path}#{@model_name}.php")
-          end
-          
-          @setup_path = "#{setup_base_path}#{name_lower}_setup/"
-          empty_directory(@setup_path)
-          template("mysql4-install.php", "#{@setup_path}mysql4-install-#{version}.php")
-        end
-      end
-      
       private
       
-      def namespace
-        arguments[:namespace]
-      end
-      
-      def name
-        arguments[:name]
-      end
-      
-      def combined_namespace
-        "#{arguments[:namespace]}_#{arguments[:name]}"
-      end
-      
-      def namespace_lower
-        namespace.downcase
-      end
-      
-      def name_lower
-        name.downcase
-      end
-      
-      #alias for name
-      def extension_name_lower
-        name.downcase
-      end
-      
-      def author
-        arguments[:author]
-      end
-      
-      def version
-        arguments[:version]
-      end  
-      
-      def global_config_basepath
-        "app/etc/modules/"
-      end
-      
-      def extension_base_path
-        "app/code/local/#{namespace}/#{name}/"
-      end
-      
-      def extension_config_path
-        "#{extension_base_path}etc/"
-      end
-      
-      def model_path
-        "#{extension_base_path}Model/"
-      end
-      
-      def resource_model_path
-        "#{model_path}Mysql4/"
-      end  
-      
-      def helper_path
-        "#{extension_base_path}Helper/"
-      end
-      
-      def setup_base_path
-        "#{extension_base_path}/sql/"
-      end
-      
-      def model_klass_name
-        "#{combined_namespace}_Model"
-      end
-      
-      def resource_model_name_lower
-        "#{name_lower}_mysql4"
-      end
-      
-      def resource_model_klass_name
-        "#{combined_namespace}_Model_Mysql4"
-      end  
-      
-      def observer?
-        if arguments[:observer] == true
-          return true
-        else
-          return false
-        end
-      end
-      
-      def observers
-        arguments[:observer_events]
-      end
-      
-      def helper?
-        if arguments[:helper] == true
-          return true
-        else
-          return false
-        end
-      end
-      
-      def model?
-        if arguments[:model] == true
-          return true
-        else
-          return false
-        end
-      end
-      
-      def models
-        arguments[:models]
-      end
+      # def namespace
+      #   arguments[:namespace]
+      # end
+      # 
+      # def name
+      #   arguments[:name]
+      # end
+      # 
+      # def combined_namespace
+      #   "#{arguments[:namespace]}_#{arguments[:name]}"
+      # end
+      # 
+      # def namespace_lower
+      #   namespace.downcase
+      # end
+      # 
+      # def name_lower
+      #   name.downcase
+      # end
+      # 
+      # #alias for name
+      # def extension_name_lower
+      #   name.downcase
+      # end
+      # 
+      # def author
+      #   arguments[:author]
+      # end
+      # 
+      # def version
+      #   arguments[:version]
+      # end  
+      # 
+      # def global_config_basepath
+      #   "app/etc/modules/"
+      # end
+      # 
+      # def extension_base_path
+      #   "app/code/local/#{namespace}/#{name}/"
+      # end
+      # 
+      # def extension_config_path
+      #   "#{extension_base_path}etc/"
+      # end
+      # 
+      # def model_path
+      #   "#{extension_base_path}Model/"
+      # end
+      # 
+      # def resource_model_path
+      #   "#{model_path}Mysql4/"
+      # end  
+      # 
+      # def helper_path
+      #   "#{extension_base_path}Helper/"
+      # end
+      # 
+      # def setup_base_path
+      #   "#{extension_base_path}/sql/"
+      # end
+      # 
+      # def model_klass_name
+      #   "#{combined_namespace}_Model"
+      # end
+      # 
+      # def resource_model_name_lower
+      #   "#{name_lower}_mysql4"
+      # end
+      # 
+      # def resource_model_klass_name
+      #   "#{combined_namespace}_Model_Mysql4"
+      # end  
+      # 
+      # def observer?
+      #   if arguments[:observer] == true
+      #     return true
+      #   else
+      #     return false
+      #   end
+      # end
+      # 
+      # def observers
+      #   arguments[:observer_events]
+      # end
+      # 
+      # def helper?
+      #   if arguments[:helper] == true
+      #     return true
+      #   else
+      #     return false
+      #   end
+      # end
+      # 
+      # def model?
+      #   if arguments[:model] == true
+      #     return true
+      #   else
+      #     return false
+      #   end
+      # end
+      # 
+      # def models
+      #   arguments[:models]
+      # end
       
     end
   end

data/lib/saruman/generators/model/templates/mysql4-install.php

@@ -6,14 +6,12 @@ $installer->startSetup();
 
 $installer->run("
 <% models.each do |model| %>
--- DROP TABLE IF EXISTS {$this->getTable('<%= model[:model_table_name] %>')};
+DROP TABLE IF EXISTS {$this->getTable('<%= model[:model_table_name] %>')};
 CREATE TABLE {$this->getTable('<%= model[:model_table_name] %>')} (
   `id` int(11) unsigned NOT NULL auto_increment,
-   <%= model[:sql] %>
-  PRIMARY KEY (`id`)
+<%= model[:sql] %>
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 <% end %>
-
-    ");
+");
 
 $installer->endSetup();

data/lib/saruman/generators/model/templates/resource_model_config_block.xml

@@ -4,5 +4,6 @@
     <% models.each do |model| %>
     <<%= model[:model_name_lower] %>><table><%= model[:model_table_name] %></table></<%= model[:model_name_lower] %>>
     <% end %>
+    
   </entities>
 </<%= resource_model_name %>>

data/lib/saruman/generators/model/templates/resource_model_entities_models_block.xml

@@ -0,0 +1,5 @@
+<% models.each do |model| %>
+<<%= model[:model_name_lower] %>><table><%= model[:model_table_name] %></table></<%= model[:model_name_lower] %>>
+
+<% end %>
+

data/lib/saruman/generators/model.rb

@@ -3,7 +3,10 @@ require 'nokogiri'
 module Saruman
   module Generators
     class Model < Thor::Group
+
       include Thor::Actions
+      include Saruman::Base
+      
       argument :arguments, :type => :hash
       
       def self.source_root
@@ -20,161 +23,65 @@ module Saruman
         end
       end
       
-      def create_model_directory
-        empty_directory(model_path) unless File.directory?(model_path)
+      def load_builders
+        @model_xml_config_builder = Saruman::ModelXmlConfigBuilder.new(models, self)
       end
       
-      def create_temp_directory
-        empty_directory("#{extension_temp_path}")
+      def create_model_directory
+        empty_directory(model_path) unless File.directory?(model_path)
       end
       
-      def read_extension_config
-
-        fp = "#{extension_config_path}/config.xml"
-        config = File.open(fp, "r+")
-        
-        @config = Nokogiri::XML(config)
-        config.close
+      def modify_config
         
-        @extension_current_version = @config.css("version").first.content
+        @config = read_extension_config
         
-        global_node = @config.css("global")
-
-        models_node = global_node.css("models")
+        unless config_has_tag?("config global")
+          insert_tag_at_node("global", "config")
+        end
         
-        if models_node.empty?
-          models_node = Nokogiri::XML::Node.new('models', @config)
-          global_node.first.add_child(models_node)
+        unless config_has_tag?("config global models")
+          insert_tag_at_node("models", "config global")
         end
         
-        model_declaration_node = @config.css("models #{name_lower}")
+        unless config_has_tag?("models #{name_lower}")
+          insert_xml_at_node(@model_xml_config_builder.config_global_models_model_xml, "config models")
+          insert_xml_at_node(@model_xml_config_builder.config_models_resource_xml, "config models")
+        else
+          insert_xml_at_node(@model_xml_config_builder.config_models_resource_entities_xml, "#{name_lower}_mysql4 entities")
+        end
         
-        if model_declaration_node.empty?
-          @resource_model_config_temp_path = "#{extension_temp_path}_config.xml"
-          template("resource_model_config_block.xml", @resource_model_config_temp_path)
-          resource_model_config_file = File.open(@resource_model_config_temp_path)
-          resource_model_config_block = Nokogiri::XML(resource_model_config_file).root
-          resource_model_config_file.close
-          
-          @model_config_temp_path = "#{extension_temp_path}model_config_block.xml"
-          template("model_config_block.xml", @model_config_temp_path)
-          model_config_file = File.open(@model_config_temp_path)
-          model_config_block = Nokogiri::XML(model_config_file).root
-          model_config_file.close
-          
-          models_node = @config.css("models").first
-          
-          models_node.add_child(model_config_block)
-          models_node.add_child(resource_model_config_block)
-          
+        unless config_has_tag?("resources")
+          insert_xml_at_node(@model_xml_config_builder.config_global_resources_xml, "config global resources")
         end
-
-        models_node_find = @config.css('models')
-
-        file = File.open(fp,'w')
-        file.puts @config.to_xml
-        file.close
-
+        
+        write_extension_config
+        
       end
       
-      def remove_temp_dir
-        FileUtils.rm_rf(extension_temp_path)
+      def create_models
+        models.each do |model|
+          @model_name = model[:model_name]
+          @model_klass_name = "#{namespace}_#{name}_Model_#{@model_name}"
+          @model_name_lower = model[:model_name_lower]
+
+          @resource_model_klass_name = "#{namespace}_#{name}_Model_Mysql4_#{@model_name}"
+          @table_name = model[:model_table_name]
+          template("Model.php", "#{model_path}#{@model_name}.php")
+          template("Resource_Model.php", "#{resource_model_path}#{@model_name}.php")
+        end       
       end  
       
       def create_installer_upgrade
-        template("mysql4-install.php", "#{setup_base_path}/mysql4-upgrade-#{@extension_current_version}-#{extension_upgrade_version}.php")
-      end
-      
-      private
-      
-      def namespace
-        arguments[:namespace]
-      end
-      
-      def name
-        arguments[:name]
-      end
-      
-      def combined_namespace
-        "#{arguments[:namespace]}_#{arguments[:name]}"
-      end
-      
-      def namespace_lower
-        namespace.downcase
-      end
-      
-      def name_lower
-        name.downcase
-      end
-      
-      #alias for name
-      def extension_name_lower
-        name.downcase
-      end
-      
-      def version
-        arguments[:version]
-      end
-      
-      def global_config_basepath
-        "app/etc/modules/"
-      end
-      
-      def extension_base_path
-        "app/code/local/#{namespace}/#{name}/"
-      end
-      
-      def extension_temp_path
-        "#{extension_base_path}temp/"
-      end  
-      
-      def extension_config_path
-        "#{extension_base_path}etc/"
-      end
-      
-      def model_path
-        "#{extension_base_path}Model/"
-      end
-      
-      def resource_model_path
-        "#{model_path}Mysql4/"
-      end
-      
-      def setup_base_path
-        "#{extension_base_path}sql/#{name_lower}_setup/"
-      end
-      
-      def model_klass_name
-        "#{combined_namespace}_Model"
-      end  
-      
-      def resource_model_name
-        "#{extension_name_lower}_mysql4"
-      end
-      
-      def resource_model_klass_name
-        "#{combined_namespace}_Model_Mysql4"
-      end
-      
-      def global_config_file_path
-        "#{global_config_basepath}#{combined_namespace}.xml"
-      end
-      
-      def extension_upgrade_version
-        @extension_current_version.to_f + 0.1
-      end  
-      
-      def model?
-        if arguments[:model] == true
-          return true
+        if command.to_s == "extension"
+          template("mysql4-install.php", "#{setup_base_path}/mysql4-install-#{version}.php")
+        elsif command.to_s == "model"
+          template("mysql4-install.php", "#{setup_base_path}/mysql4-upgrade-#{extension_current_version}-#{extension_upgrade_version}.php")
         else
-          return false
+
         end
       end
       
-      def models
-        arguments[:models]
-      end
+      private
       
     end
   end

data/lib/saruman/generators/observer/observer_events.csv

@@ -87,7 +87,6 @@ app/code/core/Mage/Catalog/Model/Product/Action.php,123,catalog_product_website_
 app/code/core/Mage/Catalog/Model/Product/Attribute/Source/Inputtype.php,55,adminhtml_product_attribute_types
 app/code/core/Mage/Catalog/Model/Product/Option/Api.php,166,catalog_product_prepare_save
 app/code/core/Mage/Catalog/Model/Product/Status.php,217,catalog_product_status_update
-app/code/core/Mage/Catalog/Model/Product/Type/Abstract.php,542,"Mage::dispatchEvent($eventName, array("
 app/code/core/Mage/Catalog/Model/Product/Type/Configurable/Price.php,71,catalog_product_type_configurable_price
 app/code/core/Mage/Catalog/Model/Product/Type/Grouped/Price.php,70,catalog_product_type_grouped_price
 app/code/core/Mage/Catalog/Model/Product/Type/Price.php,68,catalog_product_get_final_price

data/lib/saruman/generators/observer/templates/Observer.php

@@ -0,0 +1,13 @@
+<?php
+
+class <%= combined_namespace %>_Model_Observer
+{
+  <% observers.each do |event| %>
+  public function <%= event %>($observer)
+  {
+    $event = $observer->getEvent();
+    Mage::log("I put on my robe and wizard hat");
+    Mage::log($event->getEventName().' was called. Winning!');
+  }
+  <% end %>
+}

data/lib/saruman/generators/observer.rb

@@ -0,0 +1,47 @@
+require 'thor/group'
+require 'nokogiri'
+module Saruman
+  module Generators
+    class Observer < Thor::Group
+
+      include Thor::Actions
+      include Saruman::Base
+      
+      argument :arguments, :type => :hash
+      
+      def self.source_root
+        File.dirname(__FILE__) + "/observer/templates"
+      end
+
+      def load_builders
+        @observer_xml_config_builder = Saruman::ObserverXmlConfigBuilder.new(observers, self)
+      end
+      
+      def modify_config
+        
+        @config = read_extension_config
+        
+        unless config_has_tag?("config frontend")
+          insert_tag_at_node("frontend", "config")
+        end
+        
+        unless config_has_tag?("config frontend events")
+          insert_tag_at_node("events", "config frontend")
+        end
+        
+        insert_xml_at_node(@observer_xml_config_builder.config_frontend_events_observers_xml, "config frontend events")
+        
+        write_extension_config
+        
+      end
+      
+      def create_observers
+        template("Observer.php", "#{model_path}Observer.php")
+      end
+      
+      private
+      
+    end  
+
+  end
+end

data/lib/saruman/generators/saruman.rb

@@ -2,4 +2,5 @@ require 'thor/group'
 
 require "saruman/generators/extension"
 require "saruman/generators/model"
+require "saruman/generators/observer"
 require "saruman"

data/lib/saruman/version.rb

@@ -1,3 +1,3 @@
 module Saruman
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/saruman.rb

@@ -1,7 +1,235 @@
 require "saruman/version"
 require "highline"
+require "virtus"
+require "saruman"
+require "nokogiri"
+require 'active_support'
 module Saruman
   
+  module Base
+    
+    def namespace
+      arguments[:namespace]
+    end
+    
+    def name
+      arguments[:name]
+    end
+    
+    def combined_namespace
+      "#{arguments[:namespace]}_#{arguments[:name]}"
+    end
+    
+    def namespace_lower
+      namespace.downcase
+    end
+    
+    def name_lower
+      name.downcase
+    end
+    
+    #alias for name
+    def extension_name_lower
+      name.downcase
+    end
+    
+    def global_config_basepath
+      "#{Dir.pwd}/app/etc/modules/"
+    end
+    
+    def extension_base_path
+      "#{Dir.pwd}/app/code/local/#{namespace}/#{name}/"
+    end
+    
+    def extension_temp_path
+      "#{extension_base_path}temp/"
+    end  
+    
+    def extension_config_path
+      "#{extension_base_path}etc/"
+    end
+    
+    def model_path
+      "#{extension_base_path}Model/"
+    end
+    
+    def helper_path
+      "#{extension_base_path}Helper/"
+    end
+    
+    def resource_model_path
+      "#{model_path}Mysql4/"
+    end
+    
+    def setup_base_path
+      "#{extension_base_path}sql/#{name_lower}_setup/"
+    end
+    
+    def model_klass_name
+      "#{combined_namespace}_Model"
+    end  
+    
+    def resource_model_name
+      "#{extension_name_lower}_mysql4"
+    end
+    
+    def resource_model_klass_name
+      "#{combined_namespace}_Model_Mysql4"
+    end
+    
+    def global_config_file_path
+      "#{global_config_basepath}#{combined_namespace}.xml"
+    end
+    
+    def model?
+      if arguments[:model] == true
+        return true
+      else
+        return false
+      end
+    end
+    
+    def models
+      arguments[:models]
+    end
+    
+    def command
+      arguments[:command]
+    end
+    
+    def version
+      arguments[:version]
+    end
+    
+    def author
+      arguments[:author]
+    end  
+    
+    def observer?
+      if arguments[:observer] == true
+        return true
+      else
+        return false
+      end
+    end
+    
+    def observers
+      arguments[:observer_events]
+    end
+    
+    def helper?
+      if arguments[:helper] == true
+        return true
+      else
+        return false
+      end
+    end
+    
+    def extension_config_file_path
+      "#{extension_config_path}config.xml"
+    end  
+    
+    def read_extension_config
+      config = File.open(extension_config_file_path, "r+")
+      @config = Nokogiri::XML(config)
+      config.close
+      @config
+    end
+    
+    def write_extension_config
+      file = File.open(extension_config_file_path,'w')
+      file.puts @config.to_xml
+      file.close
+    end  
+    
+    def extension_current_version
+      @extension_current_version = @config.css("version").first.content
+    end
+    
+    def extension_upgrade_version
+      digits = extension_current_version.to_s.split(".")
+      current_version_float = "#{digits[0]}.#{digits[1]}#{digits[2]}".to_f
+      @extension_upgrade_version = (current_version_float + 0.01).to_s.sub(".", "").chars.to_a.join(".")
+    end  
+    
+    def config_has_tag?(tag_lookup)
+      target = @config.css(tag_lookup).first
+      if target.nil?
+        return false
+      else
+        return true
+      end
+    end
+    
+    def insert_tag_at_node(tag, tag_lookup)
+      target_tag = @config.css(tag_lookup).first
+      puts "inserting #{tag} from looku #{tag_lookup}"
+      unless target_tag.nil?
+        new_tag = "<#{tag}></#{tag}>"
+        target_tag.add_child(new_tag)
+      end
+    end
+    
+    def insert_xml_at_node(xml, tag_lookup)
+      target_tag = @config.css(tag_lookup).first
+      unless target_tag.nil?
+        target_tag.add_child(xml)
+      end
+    end  
+    
+  end  
+  
+  
+  module MenuBuilder
+    include Virtus
+    attribute :decisions, Array, :default => []
+
+    # def decisions
+    #   return decisions_made
+    # end  
+    
+  end
+  
+  class ObserverMenuBuilder
+    
+    # include Virtus
+    include MenuBuilder
+    # attribute :chosen_events, Array
+    attribute :observer_events, Array, :default => []
+    # attribute :decisions, Array, :default => []
+    BASE_DIR = File.dirname(__FILE__)
+    OBSERVER_EVENTS_FILE_PATH = BASE_DIR+"/saruman/generators/observer/observer_events.csv"
+    
+    def initialize(menu)
+      @events_file = File.open(OBSERVER_EVENTS_FILE_PATH, 'r')
+      @observer_events = []
+      @events_file.readlines.each do |row|
+        cells = row.strip().split(",")
+        @observer_events.push({:event_name => cells[2], :file => cells[0], :line => cells[1]})
+      end
+      @events_file.close
+      display_choices(menu)
+    end
+    
+    #make the choices pretty, longest string length minus offset, and take into account number of base digits of the choice
+    def pad_command_line(string, offset, index)
+      padding = ""
+      l = ((offset - string.length) - index.to_s.length)
+      l.times do
+        padding << " "
+      end
+      padding
+    end
+    
+    def display_choices(menu)
+      observer_events.each_with_index do |event,index|
+        menu.choice("#{event[:event_name]} #{pad_command_line(event[:event_name],67,index+1)} File: #{event[:file]} #{pad_command_line(event[:file],96,index+1)} Line: #{event[:line]}") { decisions.push(event[:event_name])}
+      end
+      menu
+    end  
+    
+  end
+  
   class ModelBuilder
     def initialize
       ask_question
@@ -11,7 +239,7 @@ module Saruman
       model_name = ask("Enter Name of model") { |q| q.default = "Post" }
       model_table_name = ask("Enter Table Name of model") { |q| q.default = "blog_post" }
       model_fields_input = ask("Enter Model Fields") { |q| q.default = "title:string active:boolean blog_id:integer:index" }
-      model_sql = parse_model_fields(model_fields_input)
+      model_sql = parse_model_fields(model_fields_input, model_table_name)
       @question_answer = {:model_name => model_name, :model_name_lower => model_name.downcase, :model_table_name => model_table_name, :sql => model_sql}
       @question_answer
     end
@@ -20,12 +248,16 @@ module Saruman
       return @question_answer
     end
     
-    def parse_model_fields(model_fields)
+    def parse_model_fields(model_fields, model_table_name)
       sql = ""
+      index_sql = ""
       model_fields.split(" ").each do |field|
-        field = Saruman::ModelBuilderField.new(field)
+        field = Saruman::ModelBuilderField.new(field, model_table_name)
         sql << field.sql + ",\n"
+        index_sql << field.index_sql if field.index?
       end
+      sql << index_sql 
+      sql << "  PRIMARY KEY (`id`) \n"
       sql
     end
     
@@ -33,11 +265,12 @@ module Saruman
   
   class ModelBuilderField
     
-    SQL_TYPE_MAPPINGS = {:string => "varchar(255)", :text => "text NOT NULL", :boolean => "tinyint(1) NOT NULL default 0", :date => "DATETIME default NULL", :int => "int(10)" }
-    attr_accessor :sql, :sql_type, :index
+    SQL_TYPE_MAPPINGS = {:string => "varchar(255)", :text => "text NOT NULL", :boolean => "tinyint(1) NOT NULL default 0", :date => "DATETIME default NULL", :int => "int(10)", :integer => "int(10)" }
+    attr_accessor :sql, :sql_type, :index, :segs, :index_sql
+    SQL_LINE_PADDING = "  "
     
-    def initialize(field)
-      segs = field.split(":")
+    def initialize(field, model_table_name)
+      @segs = field.split(":")
 
       case segs.length
       when 1
@@ -48,11 +281,139 @@ module Saruman
         @sql_type = segs[1].to_sym
       end
       
-      @sql = "`#{segs[0]}` #{SQL_TYPE_MAPPINGS[sql_type]}"
-      @index = true if(segs.length == 3)
-      
+      @sql = "#{SQL_LINE_PADDING}`#{segs[0]}` #{SQL_TYPE_MAPPINGS[sql_type]}"
+      if index?
+        @index = true
+        @index_sql = "#{SQL_LINE_PADDING}KEY `IDX_#{model_table_name.upcase}_#{segs[0].upcase}` (`#{segs[0]}`),\n"
+      end
+    end
+    
+    def index?
+      if(@segs.length==3)
+        return true
+      else
+        return false
+      end    
+    end  
+    
+  end
+  
+  module XmlBuilderBase
+    def method_missing(meth, *args, &block)
+      if(@generator.respond_to?(meth.to_sym, true))
+        @generator.send(meth.to_sym, *args)
+      else
+        super
+      end
+    end    
+  end  
+  
+  class ModelXmlConfigBuilder
+    include Virtus
+    include XmlBuilderBase
+    attribute :models, Array
+    attribute :config_models_resource_entities_xml, String
+    attribute :config_models_resource_xml, String
+    attribute :config_global_models_model_xml, String
+    attribute :config_global_resources_xml, String
+    
+    def initialize(models, generator)
+      @models = models
+      @generator = generator
+      @config_models_resource_entities_xml = set_config_models_resource_entities_xml
+      @config_models_resource_xml = set_config_models_resource_xml
+      @config_global_models_model_xml = set_config_global_models_model_xml
+      @config_global_resources_xml = set_config_global_resources_xml
+    end
+    
+    def set_config_models_resource_entities_xml
+      xml = ""
+      models.each do |model|
+        xml << "<#{model[:model_name_lower]}><table>#{model[:model_table_name]}</table></#{model[:model_name_lower]}>\n"
+      end
+      return xml
+    end
+    
+    def set_config_models_resource_xml
+      xml = "
+      <#{resource_model_name}>
+        <class>#{resource_model_klass_name}</class>
+        <entities>
+          #{config_models_resource_entities_xml}
+        </entities>
+      </#{resource_model_name}>
+    "
+      return xml
+    end
+    
+    def set_config_global_models_model_xml
+      xml = "
+      <#{extension_name_lower}>
+        <class>#{model_klass_name}</class>
+        <resourceModel>#{resource_model_name}</resourceModel>
+      </#{extension_name_lower}>
+    "
+      return xml
+    end
+    
+    def set_config_global_resources_xml
+      xml = "
+      <resources>
+        <#{extension_name_lower}_setup>
+          <setup>
+            <module>#{combined_namespace}</module>
+          </setup>
+          <connection>
+            <use>core_setup</use>
+          </connection>
+        </#{extension_name_lower}_setup>
+        <#{extension_name_lower}_write>
+          <connection>
+            <use>core_write</use>
+          </connection>
+        </#{extension_name_lower}_write>
+        <#{extension_name_lower}_read>
+          <connection>
+            <use>core_read</use>
+          </connection>
+        </#{extension_name_lower}_read>
+      </resources>
+    "
+      return xml
     end
     
   end
   
+  class ObserverXmlConfigBuilder
+    include Virtus
+    include XmlBuilderBase
+    attribute :observers, Array
+    attribute :config_frontend_events_observers_xml, String
+    
+    def initialize(observers, generator)
+      @observers = observers
+      @generator = generator
+      @config_frontend_events_observers_xml = set_config_frontend_events_observers_xml
+    end
+    
+    def set_config_frontend_events_observers_xml
+      xml=""
+      observers.each do |event|
+      xml << "
+      <#{event}>
+        <observers>
+          <#{combined_namespace}_Model_Observer>
+            <type>singleton</type>
+            <class>#{combined_namespace}_Model_Observer</class>
+            <method>#{event}</method>
+          </#{combined_namespace}_Model_Observer>
+        </observers>
+      </#{event}>
+    "
+      end
+      return xml
+    end
+    
+  end  
+  
 end

data/saruman.gemspec

@@ -26,7 +26,8 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
   s.add_dependency "highline"
   s.add_dependency "nokogiri"
-  s.add_dependency "roxml"  
+  s.add_dependency "virtus"
+  
   s.add_development_dependency "rspec", "~> 2.6"
   s.add_development_dependency "cucumber"
   s.add_development_dependency "aruba"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saruman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: roxml
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -158,19 +158,19 @@ files:
 - lib/saruman/cli.rb
 - lib/saruman/generators/extension.rb
 - lib/saruman/generators/extension/templates/Helper.php
-- lib/saruman/generators/extension/templates/Model.php
 - lib/saruman/generators/extension/templates/Observer.php
-- lib/saruman/generators/extension/templates/Resource_Model.php
 - lib/saruman/generators/extension/templates/extension_config.xml
 - lib/saruman/generators/extension/templates/module.xml
-- lib/saruman/generators/extension/templates/mysql4-install.php
 - lib/saruman/generators/model.rb
 - lib/saruman/generators/model/templates/Model.php
 - lib/saruman/generators/model/templates/Resource_Model.php
 - lib/saruman/generators/model/templates/model_config_block.xml
 - lib/saruman/generators/model/templates/mysql4-install.php
 - lib/saruman/generators/model/templates/resource_model_config_block.xml
+- lib/saruman/generators/model/templates/resource_model_entities_models_block.xml
+- lib/saruman/generators/observer.rb
 - lib/saruman/generators/observer/observer_events.csv
+- lib/saruman/generators/observer/templates/Observer.php
 - lib/saruman/generators/saruman.rb
 - lib/saruman/version.rb
 - saruman.gemspec

data/lib/saruman/generators/extension/templates/Model.php

@@ -1,11 +0,0 @@
-<?php
-
-class <%= @model_klass_name %> extends Mage_Core_Model_Abstract
-{
-    public function _construct()
-    {
-        parent::_construct();
-        $this->_init('<%= name_lower %>/<%= @model_name_lower %>');
-    }
-    
-}

data/lib/saruman/generators/extension/templates/Resource_Model.php

@@ -1,10 +0,0 @@
-<?php
-
-class <%= @resource_model_klass_name %> extends Mage_Core_Model_Mysql4_Abstract
-{
-  public function _construct()
-  {   
-    $this->_init('<%= name.downcase %>/<%= @model_name.downcase %>', '<%= @table_name %>_id');
-  }
-    
-}    

data/lib/saruman/generators/extension/templates/mysql4-install.php

@@ -1,19 +0,0 @@
-<?php
-
-$installer = $this;
-
-$installer->startSetup();
-
-$installer->run("
-<% models.each do |model| %>
--- DROP TABLE IF EXISTS {$this->getTable('<%= model[:model_table_name] %>')};
-CREATE TABLE {$this->getTable('<%= model[:model_table_name] %>')} (
-  `id` int(11) unsigned NOT NULL auto_increment,
-   <%= model[:sql] %>
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-<% end %>
-
-    ");
-
-$installer->endSetup();