lamed 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lamed.gemspec

@@ -0,0 +1,89 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{lamed}
+  s.version = "0.1.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Lee Chang"]
+  s.date = %q{2010-01-19}
+  s.description = %q{Yet another LaMe Ruby Web Framework}
+  s.email = %q{leetchang@gmail.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lamed.gemspec",
+     "lib/lamed.rb",
+     "lib/lamed/controller.rb",
+     "lib/lamed/helper.rb",
+     "lib/lamed/initializer.rb",
+     "lib/lamed/main.rb",
+     "lib/lamed/model.rb",
+     "lib/lamed/object_loader.rb",
+     "lib/lamed/redis.rb",
+     "spec/examples/conf/config.yml",
+     "spec/examples/conf/database.yml",
+     "spec/examples/config.ru",
+     "spec/examples/ext/controllers/hello_world.rb",
+     "spec/examples/ext/controllers/lamest/bar.rb",
+     "spec/examples/ext/controllers/lamest/foo.rb",
+     "spec/examples/ext/models/bar_model.rb",
+     "spec/examples/ext/models/foo_model.rb",
+     "spec/examples/ext/views/hello_world.mustache",
+     "spec/examples/ext/views/lamest/bar.mustache",
+     "spec/examples/ext/views/lamest/foo.mustache",
+     "spec/examples/lib/foo_lib.rb",
+     "spec/helpers_spec.rb",
+     "spec/initializer_spec.rb",
+     "spec/lame_spec.rb",
+     "spec/object_loader_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/onemorehill/lamed}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{Get LaMeD}
+  s.test_files = [
+    "spec/examples/ext/controllers/hello_world.rb",
+     "spec/examples/ext/controllers/lamest/bar.rb",
+     "spec/examples/ext/controllers/lamest/foo.rb",
+     "spec/examples/ext/models/bar_model.rb",
+     "spec/examples/ext/models/foo_model.rb",
+     "spec/examples/lib/foo_lib.rb",
+     "spec/helpers_spec.rb",
+     "spec/initializer_spec.rb",
+     "spec/lame_spec.rb",
+     "spec/object_loader_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rack>, [">= 1.0"])
+      s.add_development_dependency(%q<mustache>, [">= 0"])
+    else
+      s.add_dependency(%q<rack>, [">= 1.0"])
+      s.add_dependency(%q<mustache>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rack>, [">= 1.0"])
+    s.add_dependency(%q<mustache>, [">= 0"])
+  end
+end
+

data/lib/lamed/controller.rb

@@ -1,12 +1,12 @@
+require 'mustache'
+
 module Lamed
-  
   class Controller < Mustache
     
     include Rack
     include Lamed::Helper
     extend Lamed::Helper
-    include Lamed::Record
-    include Lamed::Lib
+    include Lamed::Model
               
     attr_accessor :query, :path, :self_path, :env
   
@@ -38,6 +38,7 @@ module Lamed
     end
   
     def call(env)
+      @env = env
       env[:query] = self.parse_query_string(env['QUERY_STRING'])
       env[:path] = self.parse_uri(env['SCRIPT_NAME'])
       response(env)
@@ -56,10 +57,12 @@ module Lamed
      return @req_params
     end
   
-    def content_type(string)
-      @req_params[:content_type] = string
+    def content_type(content_type)
+      @req_params[:content_type] = content_type
     end
-  
-  end
     
+    def user_agent
+      @env['HTTP_USER_AGENT']
+    end
+  end
 end

data/lib/lamed/helper.rb

@@ -1,7 +1,6 @@
 module Lamed
   
   module Helper
-          
     # -=-=-=-= Hash Helper =-=-=-=-
     # Changes keys that are strings in symbols.  Goes two deep.
     def symbolize_hash_keys(hash = self)
@@ -39,6 +38,12 @@ module Lamed
       return path
     end
     
+    def class_to_path(klass)
+      klass_str = klass.to_s.split("::").collect { |s| uncamelize_string s }
+      klass_path = File.join("/", klass_str)
+      return klass_path
+    end      
+    
     # Convert strings into a usable MySQL time object.
     def mysql_time(str)
       str[/(\d+)-(\d+)-(\d+)\s(\d+):(\d+):(\d+)/]
@@ -82,7 +87,5 @@ module Lamed
       }
       return new_hash
     end
-    
   end
-  
 end

data/lib/lamed/initializer.rb

@@ -8,7 +8,6 @@ require 'lib/lamed/object_loader'
 
 module Lamed
   
-  
   # Build configurations from yaml files  
   if defined?(ROOT)
     OPTIONS = {
@@ -28,38 +27,42 @@ module Lamed
       @sys_options = SYS_OPTIONS 
       log_path =@sys_options[:logs] || OPTIONS[:log_path]
       OPTIONS[:rotate] = !@sys_options.nil? ? @sys_options[:rotate] : nil
-      OPTIONS[:log] = File.join(log_path, OPTIONS[:env].to_s ,".log")
+      @log_path = File.join(log_path, OPTIONS[:env].to_s  + ".log")
     end
   end
   
   class << self
-
     # Set up logging
     def initialize_logger
       if defined?(SYS_OPTIONS)
-        logs = Logger.new(@log_path, OPTIONS[:rotate])
-        case OPTIONS[:env]
-        when :development
-          logs.level = Logger::DEBUG
-        when :test
-          logs.level = Logger::DEBUG
-        when :staging
-          logs.level = Logger::DEBUG
-        when :production
-          logs.level = Logger::WARN
+        begin
+          logs = Logger.new(@log_path, OPTIONS[:rotate])
+          case OPTIONS[:env]
+          when :development
+            logs.level = Logger::DEBUG
+          when :test
+            logs.level = Logger::DEBUG
+          when :staging
+            logs.level = Logger::DEBUG
+          when :production
+            logs.level = Logger::WARN
+          end
+        rescue
+          logs = nil
         end
-      else
+      end
+      if logs.nil?
+        puts "The log path #{@log_path} does not exist or is not writable."
+        puts "Log messages will be sent to STANDARD ERROR"
         logs = Logger.new(STDERR)
       end
-      puts "The log path does not exist or is not writable.  Log messages will be sent to STANDARD ERROR"
       @logger = logs
-      logs.warn("Logging level is set to #{logs.level}")
+      logs.warn("Logging level is set to #{@logger.level}")
       return @logger
     end
     
     if defined?(ROOT)
-      require 'lib/lamed/record'
-      require 'lib/lamed/lib'
+      require 'lib/lamed/model'
     end
 
     def logger
@@ -67,27 +70,24 @@ module Lamed
     end
     
     def load_lib
-      #Dir[LAME_ROOT + '/lib/*.rb'].each {|d| require d}
-      lib = LoadObjects.new(ROOT, :lib)
-      lib.build_path_hash
-      lib.build_objects
+      Dir[ROOT + '/lib/**/*.rb'].each {|f| load f}
     end
     
     def load_controller
-      ObjectLoader.load_new_objects(:controller)
+      ObjectLoader.load_controller_object
     end
     
-    def load_record
-      ObjectLoader.load_new_objects(:record)
+    def load_model
+     ObjectLoader.load_model_object
     end
-    
   end
   
   if defined?(SYS_OPTIONS)
-    load_record
+    load_model
     require 'lib/lamed/controller'
     load_controller
+    load_lib
   end
   initialize_logger
-
+  
 end

data/lib/lamed/main.rb

@@ -2,8 +2,27 @@ require 'rack'
 require 'rack/builder'
 require 'logger'
 
-module Lamedd
+module Lamed
     
   require 'lib/lamed/initializer'
     
+end
+
+module Rack
+  
+  class Builder
+    
+    include Lamed
+    
+    def run_apps
+      use Rack::Lint
+      ObjectLoader.mapped_class.each_pair do |path, klass|
+        map path do
+          run klass.new
+        end
+      end
+    end
+    
+  end
+  
 end

data/lib/lamed/model.rb

@@ -0,0 +1,70 @@
+require 'mysql'
+require 'lib/lamed/redis'
+
+module Lamed
+  
+  module Model
+    
+    #include Lamed
+    
+    LAME_ROOT = ::LAME_ROOT unless defined?(LAME_ROOT)
+  
+  end
+  
+  class MySQL < Mysql
+
+    attr_reader :status, :db_conn, :db_conn_read, :params
+
+    def initialize(params = {})
+      @params        = params
+      @host          = params[:host]      || '127.0.0.1'
+      @port          = (params[:port]     || 3306).to_i
+      @user          = params[:username]  || 'root'
+      @password      = params[:password]  || 'pwd'
+      @database      = params[:database]
+      @read_host     = params[:read_host]
+      @read_username = params[:read_user]
+      @read_password = params[:read_password]
+      @read_database = params[:read_password]
+      @read_port     = params[:read_port]
+      self.connect
+    end
+
+    def connect
+      $db_conn = Mysql.real_connect(@host, @user, @password, @database, @port)
+      # Check to make sure there is a read db in the configs
+      if @read_host
+        $db_conn_read = Mysql.real_connect(@read_host, @read_username, @read_password, @read_database, @read_port)
+      else
+        $db_conn_read = $db_conn
+      end
+    end
+
+    def self.query(query_string)
+      n = 0							# track how many times the system had to reconnect to the db
+      begin
+        # Test to see if the query starts with a select which would mean it was a read query
+        if query_string.split[0].upcase == "SELECT"
+          res = $db_conn_read.query(query_string)
+        else
+          res = $db_conn.query(query_string)
+        end
+      rescue Mysql::Error => e
+        case e.to_s
+          when 'MySQL server has gone away'
+            MySQL.new($DB_OPTIONS)
+            n += 1
+            retry
+          when 'Lost connection to MySQL server during query'
+            MySQL.new($DB_OPTIONS) 
+            n += 1
+            retry
+          else
+            # Don't know what to do because of an unknown error so to play it safe we'll just break instead looping endlessly.
+            raise "ERROR: #{e.to_s} Not sure what this error is from #{@host}."
+        end
+      end
+      return res
+    end
+  end
+end

data/lib/lamed/object_loader.rb

@@ -1,30 +1,32 @@
 ROOT = ::File.join(::File.dirname(__FILE__), '..') unless defined?(ROOT)
 
 module Lamed
-    
   class ObjectLoader
     
+    ORIG_OBJECT_CONSTANTS = Object.constants.freeze
+    ROOT_EXT     = File.join(ROOT, "/ext")
+    VIEW_PATH    = File.join(ROOT_EXT, "/views")
+    file_pattern = "**/*.rb"
+    
+    FILE_FILTER = {
+      :model      => File.join(ROOT_EXT, "/models", file_pattern),
+      :controller => File.join(ROOT_EXT, "/controllers", file_pattern),
+      :view       => File.join(ROOT_EXT, "/views", file_pattern)
+    }
+      
     class << self
       
-      include Lamed::Helper
-      extend Lamed::Helper
+      include Lamed
+      include Helper
+      extend Helper
+      
+      attr_reader :mapped_class
       
       # Load objects in this order:
       #  Libraries - Lib
-      #  Records or models - Record
+      #  Records or models - Model
       #  Controllers or apps - Controller
-      
-      ORIG_OBJECT_CONSTANTS = Object.constants.freeze
-      ROOT_EXT     = File.join(ROOT, "/ext")
-      VIEW_PATH    = File.join(ROOT_EXT, "/view")
-      FILE_PATTERN = "**/*.rb"
-      
-      FILE_FILTER = {
-        :record     => File.join(ROOT_EXT, "/record", FILE_PATTERN),
-        :controller => File.join(ROOT_EXT, "/controller", FILE_PATTERN),
-        :view       => File.join(ROOT_EXT, "/view", FILE_PATTERN)
-      }
-    
+        
       def get_files(type)
         @paths = Dir.glob(FILE_FILTER[type])
       end
@@ -41,21 +43,23 @@ module Lamed
       end
     
       def camelize_ext_subdir(subdir)
-        ext_subdir = subdir.split(ROOT_EXT)[1]
-        camelized_ext_subdir = camelize_path ext_subdir
+        ext_subdir = subdir.split(ROOT_EXT + "/controllers")[1]
+        camelized_ext_subdir = camelize_path ext_subdir if ext_subdir
         return camelized_ext_subdir
       end
     
       def create_object_from_camelized_path(camelized_ext_subdir)
-        klass = Lamed
-        camelized_ext_subdir.each { |symbol|
-          if klass.constants.include?(symbol)
-            klass_prime = klass.const_get(symbol)
-          else 
-            klass_prime = klass.const_set(symbol, Module.new)
+        klass = Lamed::Controller
+        if camelized_ext_subdir
+          camelized_ext_subdir.each do |symbol|
+            if klass.constants.include?(symbol)
+              klass_prime = klass.const_get(symbol)
+            else 
+              klass_prime = klass.const_set(symbol, Module.new)
+            end
+            klass = klass_prime
           end
-          klass = klass_prime
-        }
+        end
         return klass
       end
     
@@ -68,39 +72,63 @@ module Lamed
       end
     
       def create_view_path(camelized_ext_subdir)
-        camelized_ext_subdir_prime = camelized_ext_subdir.dup; camelized_ext_subdir_prime.delete_at(0)
-        camelized_ext_subdir_prime.unshift(:View)
-        view_path = File.join(ROOT_EXT, uncamelize_path(camelized_ext_subdir_prime))
+        camelized_ext_subdir_dup = camelized_ext_subdir.nil? ? [] : camelized_ext_subdir.dup
+        view_path = File.join(VIEW_PATH, uncamelize_path(camelized_ext_subdir_dup))
         return view_path
       end
     
-      # Load new object(s) into new klass(es) as defined by their path.
+      # Load new controller(s) into new klass(es) as defined by their path.
       # First load the files then build the class/modules(klass) from the path.
-      # Then move the newly created objects into the newly built klass.
+      # Then move the newly created objects into the newly built class.
       # Finally, remove the newly loaded objects from Object.
-      # Change the path= for controllers to the location of the mustache templates. 
-      def load_new_object_into_klass(subdir, file_name)
+      # Change the +path=+ for the new controllers to the location of the mustache templates +VIEW_PATH+. 
+      def load_controller_into_new_class(subdir, file_name)
         orig_object_constants = Object.constants.dup
         load_new_object(subdir, file_name)
         camelized_ext_subdir = camelize_ext_subdir(subdir)
         klass = create_object_from_camelized_path(camelized_ext_subdir)
         view_path = create_view_path(camelized_ext_subdir)
-        (Object.constants - orig_object_constants).each { |o|
+        (Object.constants - orig_object_constants).each do |o|
           o_klass = Object.const_get(o)
           # Change path to mustache path location if it has the path method (Check for a Controller object)
-          o_klass.path = create_view_path(camelized_ext_subdir) if o_klass.respond_to?('path')
+          o_klass.path = create_view_path(camelized_ext_subdir) if o_klass.respond_to?(:path)
           klass.const_set(o, o_klass)
-          Object.instance_eval { remove_const o } 
-        }
+          Object.instance_eval { remove_const o }
+          complete_klass_str = klass.to_s + "::" + o_klass.to_s
+          map_new_class(complete_klass_str) if o_klass.respond_to?(:path)
+        end
       end
       
-      def load_new_objects(type)
-        get_files(type)
+      # Create a new map for the Controller using Rack::Builder map      
+      def map_new_class(klass_str)
+        path_prime = File.join(klass_str.split('::').collect { |s| uncamelize_string s })
+        path = path_prime.split('/controller').last
+        map_class_to_path(path, klass_str)
+      end
+      
+      def map_class_to_path(path, klass_str)
+        @mapped_class = Hash.new unless defined?(@mapped_class)
+        @mapped_class[path] = eval(klass_str)
+      end
+      
+      def load_controller_object
+        get_files(:controller)
         map_file_to_subdir
-        @mapped_file.each_pair { |subdir, file_name| load_new_object_into_klass(subdir, file_name) }
+        @mapped_file.each_pair { |subdir, file_name| load_controller_into_new_class(subdir, file_name) }
       end
-    
+      
+      # Load model(s)
+      def load_model_object
+        orig_object_constants = Object.constants.dup
+        klass = Lamed::Model
+        get_files(:model)
+        @paths.each { |f| load f }
+        (Object.constants - orig_object_constants).each do |o|
+          o_klass = Object.const_get(o)
+          klass.const_set(o, o_klass)
+          Object.instance_eval { remove_const o }
+        end
+      end    
     end
-    
   end
 end

data/lib/lamed.rb

@@ -1,7 +1,6 @@
 lib_path = File.expand_path(File.dirname(__FILE__)) + "/../"
 $LOAD_PATH.unshift(lib_path) unless $LOAD_PATH.include?(lib_path)
-
-::LAME_ROOT = ::File.expand_path(::File.dirname(__FILE__)) unless defined?(::LAME_ROOT)
+LAME_ROOT = File.expand_path(File.dirname(__FILE__)) unless defined?(LAME_ROOT)
 
 require 'lib/lamed/main'
 

data/spec/examples/conf/config.yml

@@ -0,0 +1,2 @@
+development:
+  rotate: daily

data/spec/examples/config.ru

@@ -0,0 +1,13 @@
+lame_path = ::File.expand_path(::File.dirname(__FILE__)) + "/../../"
+$LOAD_PATH.unshift(lame_path) unless $LOAD_PATH.include?(lame_path)
+::ROOT = ::File.expand_path(::File.dirname(__FILE__)) unless defined?(::ROOT)
+
+require 'lib/lamed'
+
+# Do not remove this unless you want to manually map HTTP['PATH_INFO'] to your controllers.
+run_apps
+
+# Add your custom url mappings here
+# map "/hello" do
+#   run HelloWorld.new 
+# end

data/spec/examples/ext/controllers/hello_world.rb

@@ -0,0 +1,9 @@
+class HelloWorld < Lamed::Controller
+  
+  def say_hello
+    @req_params[:content_type] = 'text/html'
+    hello = "Hello World.  We just got LaMeD!"
+    return hello
+  end
+  
+end

data/spec/examples/ext/controllers/lamest/bar.rb

@@ -0,0 +1,9 @@
+class Bar < Lamed::Controller
+  
+  def say_hello
+    @req_params[:content_type] = 'text/html'
+    hello = "Hello.  This is the #{self.to_s} controller"
+    return hello
+  end
+  
+end

data/spec/examples/ext/controllers/lamest/foo.rb

@@ -0,0 +1,9 @@
+class Foo < Lamed::Controller
+
+  def say_hello
+    @req_params[:content_type] = 'text/html'
+    hello = "Hello.  This is the #{self.to_s} controller"
+    return hello
+  end
+
+end

data/spec/examples/ext/models/bar_model.rb

@@ -0,0 +1,2 @@
+class BarModel < Lamed::MySQL
+end

data/spec/examples/ext/models/foo_model.rb

@@ -0,0 +1,2 @@
+class FooModel < Lamed::MySQL
+end

data/spec/examples/ext/views/hello_world.mustache

@@ -0,0 +1 @@
+{{say_hello}}

data/spec/examples/ext/views/lamest/bar.mustache

@@ -0,0 +1 @@
+{{say_hello}}

data/spec/examples/ext/views/lamest/foo.mustache

@@ -0,0 +1 @@
+{{say_hello}}

data/spec/examples/lib/foo_lib.rb

@@ -0,0 +1,2 @@
+class FooLib
+end

data/spec/helpers_spec.rb

@@ -1,6 +1,13 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 require File.join(File.dirname(__FILE__), '..', '/lib/lamed/helper')
 
+module Foo
+  module Bar
+    module Har
+    end
+  end
+end
+
 module Lamed
   
   include Helper
@@ -48,4 +55,12 @@ module Lamed
     end
   end
   
+  describe "Convert a class to a path string" do
+    it "should build a path string from a class" do
+      klass = Foo::Bar::Har 
+      path = class_to_path klass
+      path.should == "/foo/bar/har"
+    end
+  end
+  
 end

data/spec/initializer_spec.rb

@@ -1,27 +1,26 @@
 LAME_ROOT =  File.join(File.dirname(__FILE__), '..')
-ROOT = File.join(LAME_ROOT, "/spec/fixtures")
+ROOT = File.join(LAME_ROOT, "/spec/examples")
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
 
 require 'rack'
 require 'lib/lamed/initializer'
 
-module Lamed
   
   describe "Initialize all Lamed Objects" do
     it "should initialize the logger to STDERR" do
       Lamed.logger.level.should == 0
     end
     
-    it "should initialize the Controller and Record objects" do
-      Lamed::Record.constants.should == [:BarRecord, :FooRecord]
-      Lamed::Controller.constants.should == [:FirstController, :Second, :BarRecord, :FooRecord, :VERSION, :Builder, :Cascade,
-                                            :Chunked, :CommonLogger, :ConditionalGet, :ContentLength, :ContentType, :File,
-                                            :Deflater, :Directory, :ForwardRequest, :Handler, :Head, :Lint, :Lock,
-                                            :MethodOverride, :Mime, :Recursive, :Reloader, :ShowExceptions, :ShowStatus,
-                                            :Static, :URLMap, :Utils, :MockRequest, :MockResponse, :Request, :Response, :Auth,
-                                            :Session, :Adapter, :Template, :ContextMiss, :Context]
+    it "should initialize the Controller, Lib, and Model objects" do
+      Lamed::Model.constants.should == [:BarModel, :FooModel]
+      Lamed::Controller.constants.sort.should == [:HelloWorld, :Lamest, :BarModel, :FooModel, :VERSION, :Cascade, :Chunked,
+                                             :ConditionalGet, :ContentLength, :ContentType, :File, :Deflater, :Directory,
+                                             :ForwardRequest, :Handler, :Head, :Lint, :Lock, :MethodOverride, :Mime,
+                                             :Recursive, :Reloader, :ShowStatus, :Static, :URLMap, :MockRequest,
+                                             :MockResponse, :Response, :Auth, :Session, :Adapter, :Builder, :CommonLogger,
+                                             :Utils, :Request, :ShowExceptions, :Template, :ContextMiss, :Context].sort
+      Object.constants.include?(:FooLib).should == true
     end
     
   end
   
-end

data/spec/object_loader_spec.rb

@@ -1,12 +1,11 @@
 LAME_ROOT =  File.join(File.dirname(__FILE__), '..')
-ROOT = File.join(LAME_ROOT, "/spec/fixtures")
+ROOT = File.join(LAME_ROOT, "/spec/examples")
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..'))
 
 require 'mustache'
 require 'rack'
 require "lib/lamed/helper"
-require 'lib/lamed/lib'
-require 'lib/lamed/record'
+require 'lib/lamed/model'
 require 'lib/lamed/controller'
 require "lib/lamed/object_loader"
 
@@ -14,101 +13,101 @@ module Lamed
     
   describe "Load Objects into a tree" do
     it "should find all record files within a subdir" do
-      record_result     = ["/usr/pub/projects/lamed/spec/../spec/fixtures/ext/record/bar_record.rb",
-                           "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/record/foo_record.rb"]
-      controller_result = ["/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/first_controller.rb",
-                           "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second/second_controller.rb", 
-                           "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second/third_controller.rb"]
-      record_paths = ObjectLoader.get_files(:record)
+      record_result     = ["/usr/pub/projects/lamed/spec/../spec/examples/ext/models/bar_model.rb",
+                           "/usr/pub/projects/lamed/spec/../spec/examples/ext/models/foo_model.rb"]
+      controller_result = ["/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/hello_world.rb",
+                           "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest/bar.rb",
+                           "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest/foo.rb"]
+      record_paths = ObjectLoader.get_files(:model)
       controller_paths = ObjectLoader.get_files(:controller)
       record_paths.should == record_result
       controller_paths.should == controller_result
     end
   
     it "should group subdirs together given a path" do
-      @paths = ["/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/first_controller.rb",
-                    "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second/second_controller.rb",
-                    "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second/third_controller.rb"]
-      result = { "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller" => ["first_controller.rb"],
-                 "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second" => ["second_controller.rb",
-                 "third_controller.rb"] }
+      @paths = ["/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/hello_world.rb",
+                    "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest/foo.rb",
+                    "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest/bar.rb"]
+      result = {"/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers"=>["hello_world.rb"],
+                "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest"=>["bar.rb", "foo.rb"]}
       mapped_file = ObjectLoader.map_file_to_subdir
       mapped_file.should == result
     end
 
     it "should get the camelized ext sub directory" do
-      subdir = "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second"
+      subdir = "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/second"
       ext_subdir = ObjectLoader.camelize_ext_subdir(subdir)
-      ext_subdir.should == [:Controller, :Second]
+      ext_subdir.should == [:Second]
     end
     
     it "should load path symbols as objects" do
-      camelized_path = [:Controller, :Second]
+      camelized_path = [:Second]
       klass = ObjectLoader.create_object_from_camelized_path(camelized_path)
       klass.should == Lamed::Controller::Second
     end
     
     it "should create new Controller objects from files" do
-      subdir, file_name = "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second", 
-                          ["second_controller.rb", "third_controller.rb"]                          
+      subdir, file_name = "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest", 
+                          ["bar.rb", "foo.rb"]                          
       new_objects = ObjectLoader.load_new_object(subdir, file_name)
-      Object.constants.include?(:SecondController).should == true
-      Object.constants.include?(:ThirdController).should == true
+      Object.constants.include?(:Foo).should == true
+      Object.constants.include?(:Bar).should == true
       # Clean up
-      Object.instance_eval { [:SecondController, :ThirdController].each { |o| remove_const o } }
+      Object.instance_eval { [:Foo, :Bar].each { |o| remove_const o } }
     end
     
     it "should create new Record Objects from files" do
-      subdir, file_name = "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/record",
-                          ["foo_record.rb", "bar_record.rb"]
+      subdir, file_name = "/usr/pub/projects/lamed/spec/../spec/examples/ext/models",
+                          ["foo_model.rb", "bar_model.rb"]
       new_objects = ObjectLoader.load_new_object(subdir, file_name)
-      Object.constants.include?(:FooRecord).should == true
-      Object.constants.include?(:BarRecord).should == true
+      Object.constants.include?(:FooModel).should == true
+      Object.constants.include?(:BarModel).should == true
       # Clean up
-       Object.instance_eval { [:BarRecord, :FooRecord].each { |o| remove_const o } }
+       Object.instance_eval { [:BarModel, :FooModel].each { |o| remove_const o } }
     end
     
     it "should create a new view path for the new class" do
-      camelized_ext_subdir = [:Controller, :Second]
+      camelized_ext_subdir = [:Lamest, :Foo]
       view_path = ObjectLoader.create_view_path(camelized_ext_subdir)
-      view_path.should == "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/view/second"
+      view_path.should == "/usr/pub/projects/lamed/spec/../spec/examples/ext/views/lamest/foo"
     end
       
     it "should move new objects to new Lamed class/modules" do
       load 'lib/lamed/object_loader.rb'
-      subdir, file_name = "/usr/pub/projects/lamed/spec/../spec/fixtures/ext/controller/second",
-                          ["second_controller.rb", "third_controller.rb"]
-      ObjectLoader.load_new_object_into_klass(subdir, file_name)
-      Object::Lamed::Controller::Second.constants.should == [:SecondController, :ThirdController]
-      Object::Lamed::Controller::Second::ThirdController.class.should == Class
+      subdir, file_name = "/usr/pub/projects/lamed/spec/../spec/examples/ext/controllers/lamest",
+                          ["bar.rb", "foo.rb"]
+      ObjectLoader.load_controller_into_new_class(subdir, file_name)
+      Object::Lamed::Controller::Lamest.constants.should == [:Bar, :Foo]
+      Object::Lamed::Controller::Lamest::Foo.class.should == Class
     end
     
     it "should check to see if new objects were removed from Object" do
-      Object.constants.include?(:SecondController).should == false
-      Object.constants.include?(:ThirdController).should == false
+      Object.constants.include?(:Foo).should == false
+      Object.constants.include?(:Bar).should == false
     end
     
     it "should check the view path for the new objects" do
-      Object::Lamed::Controller::Second::SecondController.path.should == "/usr/pub/projects/lamed/spec/fixtures/ext/view/second"
-      Object::Lamed::Controller::Second::ThirdController.path.should == "/usr/pub/projects/lamed/spec/fixtures/ext/view/second"
+      Object::Lamed::Controller::Lamest::Bar.path.should == "/usr/pub/projects/lamed/spec/examples/ext/views/lamest"
+      Object::Lamed::Controller::Lamest::Foo.path.should == "/usr/pub/projects/lamed/spec/examples/ext/views/lamest"
     end
     
     it "should load up controllers" do
-      ObjectLoader.load_new_objects(:controller)
-      Lamed.constants.should == [:Helper, :Lib, :Record, :Controller, :ObjectLoader]
-      Lamed::Controller.constants.should == [:Second, :FirstController, :VERSION, :Builder, :Cascade, :Chunked, :CommonLogger,
-                                            :ConditionalGet, :ContentLength, :ContentType, :File, :Deflater, :Directory,
-                                            :ForwardRequest, :Handler, :Head, :Lint, :Lock, :MethodOverride, :Mime,
-                                            :Recursive, :Reloader, :ShowExceptions, :ShowStatus, :Static, :URLMap, :Utils,
-                                            :MockRequest, :MockResponse, :Request, :Response, :Auth, :Session, :Adapter,
-                                            :Template, :ContextMiss, :Context]
-      Lamed::Controller::Second.constants.should == [:SecondController, :ThirdController]
+      ObjectLoader.load_controller_object
+      Lamed.constants.should == [:Helper, :Model, :MySQL, :Controller, :ObjectLoader]
+      Lamed::Controller.constants.sort.should == [:Adapter, :Auth, :Builder, :Cascade, :Chunked, :CommonLogger,
+                                                  :ConditionalGet, :ContentLength, :ContentType, :Context, :ContextMiss,
+                                                  :Deflater, :Directory, :File, :ForwardRequest, :Handler, :Head, 
+                                                  :HelloWorld, :Lamest, :Lint, :Lock, :MethodOverride, :Mime, :MockRequest,
+                                                  :MockResponse, :Recursive, :Reloader, :Request, :Response, :Second,
+                                                  :Session, :ShowExceptions, :ShowStatus, :Static, :Template, :URLMap,
+                                                  :Utils, :VERSION].sort
+      Lamed::Controller::Lamest.constants.should == [:Bar, :Foo]
     end
     
-    it "should load up records" do
-      ObjectLoader.load_new_objects(:record)
-      Lamed.constants.should == [:Helper, :Lib, :Record, :Controller, :ObjectLoader]
-      Lamed::Record.constants.should == [:BarRecord, :FooRecord]
+    it "should load up models" do
+      ObjectLoader.load_model_object
+      Lamed.constants.should == [:Helper, :Model, :MySQL, :Controller, :ObjectLoader]
+      Lamed::Model.constants.should == [:BarModel, :FooModel]
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lamed
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Lee Chang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -08:00
+date: 2010-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,23 +48,27 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- lamed.gemspec
 - lib/lamed.rb
 - lib/lamed/controller.rb
 - lib/lamed/helper.rb
 - lib/lamed/initializer.rb
-- lib/lamed/lib.rb
 - lib/lamed/main.rb
-- lib/lamed/mysql.rb
+- lib/lamed/model.rb
 - lib/lamed/object_loader.rb
-- lib/lamed/record.rb
 - lib/lamed/redis.rb
-- spec/fixtures/conf/config.yml
-- spec/fixtures/conf/database.yml
-- spec/fixtures/ext/controller/first_controller.rb
-- spec/fixtures/ext/controller/second/second_controller.rb
-- spec/fixtures/ext/controller/second/third_controller.rb
-- spec/fixtures/ext/record/bar_record.rb
-- spec/fixtures/ext/record/foo_record.rb
+- spec/examples/conf/config.yml
+- spec/examples/conf/database.yml
+- spec/examples/config.ru
+- spec/examples/ext/controllers/hello_world.rb
+- spec/examples/ext/controllers/lamest/bar.rb
+- spec/examples/ext/controllers/lamest/foo.rb
+- spec/examples/ext/models/bar_model.rb
+- spec/examples/ext/models/foo_model.rb
+- spec/examples/ext/views/hello_world.mustache
+- spec/examples/ext/views/lamest/bar.mustache
+- spec/examples/ext/views/lamest/foo.mustache
+- spec/examples/lib/foo_lib.rb
 - spec/helpers_spec.rb
 - spec/initializer_spec.rb
 - spec/lame_spec.rb
@@ -100,11 +104,12 @@ signing_key:
 specification_version: 3
 summary: Get LaMeD
 test_files: 
-- spec/fixtures/ext/controller/first_controller.rb
-- spec/fixtures/ext/controller/second/second_controller.rb
-- spec/fixtures/ext/controller/second/third_controller.rb
-- spec/fixtures/ext/record/bar_record.rb
-- spec/fixtures/ext/record/foo_record.rb
+- spec/examples/ext/controllers/hello_world.rb
+- spec/examples/ext/controllers/lamest/bar.rb
+- spec/examples/ext/controllers/lamest/foo.rb
+- spec/examples/ext/models/bar_model.rb
+- spec/examples/ext/models/foo_model.rb
+- spec/examples/lib/foo_lib.rb
 - spec/helpers_spec.rb
 - spec/initializer_spec.rb
 - spec/lame_spec.rb

data/lib/lamed/lib.rb

@@ -1,15 +0,0 @@
-module Lamed
-  
-  module Lib
-    
-    LAME_ROOT = ::LAME_ROOT unless(LAME_ROOT)
-
-=begin 
-    if defined?(SYS_OPTIONS)
-      lib.build_path_hash
-      lib.build_objects
-    end
-=end
-  end
-  
-end

data/lib/lamed/mysql.rb

@@ -1,59 +0,0 @@
-require 'mysql'
-
-class MySQL 
-
-  attr_reader :status, :db_conn, :db_conn_read, :params
-    
-  def initialize(params = {})
-    @params        = params
-    @host          = params[:host]      || '127.0.0.1'
-    @port          = (params[:port]     || 3306).to_i
-    @user          = params[:username]  || 'root'
-    @password      = params[:password]  || 'pwd'
-    @database      = params[:database]
-    @read_host     = params[:read_host]
-    @read_username = params[:read_user]
-    @read_password = params[:read_password]
-    @read_database = params[:read_password]
-    @read_port     = params[:read_port]
-    self.connect
-  end
-  
-  def connect
-    $db_conn = Mysql.real_connect(@host, @user, @password, @database, @port)
-    # Check to make sure there is a read db in the configs
-    if @read_host
-      $db_conn_read = Mysql.real_connect(@read_host, @read_username, @read_password, @read_database, @read_port)
-    else
-      $db_conn_read = $db_conn
-    end
-  end
-
-  def self.query(query_string)
-    n = 0							# track how many times the system had to reconnect to the db
-    begin
-      # Test to see if the query starts with a select which would mean it was a read query
-      if query_string.split[0].upcase == "SELECT"
-        res = $db_conn_read.query(query_string)
-      else
-        res = $db_conn.query(query_string)
-      end
-    rescue Mysql::Error => e
-      case e.to_s
-        when 'MySQL server has gone away'
-          MySQL.new($DB_OPTIONS)
-          n += 1
-          retry
-        when 'Lost connection to MySQL server during query'
-          MySQL.new($DB_OPTIONS) 
-          n += 1
-          retry
-        else
-          # Don't know what to do because of an unknown error so to play it safe we'll just break instead looping endlessly.
-          raise "ERROR: #{e.to_s} Not sure what this error is from #{@host}."
-      end
-    end
-    return res
-  end
-
-end

data/lib/lamed/record.rb

@@ -1,20 +0,0 @@
-require 'lib/lamed/mysql'
-require 'lib/lamed/redis'
-
-module Lamed
-  
-  module Record
-    
-    #include Lamed
-    
-    LAME_ROOT = ::LAME_ROOT unless defined?(LAME_ROOT)
-    
-    if defined?($DB_OPTIONS)
-      record.build_path_hash
-      record.build_objects
-    end
-
-  
-  end
-
-end

data/spec/fixtures/conf/config.yml

@@ -1,13 +0,0 @@
-development:
-  radio_indexer_cache: ['127.0.0.1:11211']
-  index_cache: ['127.0.0.1:11211']
-  main_cache: ['127.0.0.1:11211']
-  redis_host: '127.0.0.1'
-  redis_port: 6389
-  http_procs: 1
-  workers: 1
-  port: 3000
-  run_as: reco
-  pid: logs/run/
-  logs: logs/nutsie_radio
-  rotate: daily

data/spec/fixtures/ext/controller/first_controller.rb

@@ -1,3 +0,0 @@
-class FirstController < Lamed::Controller
-
-end

data/spec/fixtures/ext/controller/second/second_controller.rb

@@ -1,2 +0,0 @@
-class SecondController < Lamed::Controller
-end

data/spec/fixtures/ext/controller/second/third_controller.rb

@@ -1,2 +0,0 @@
-class ThirdController < Lamed::Controller
-end

data/spec/fixtures/ext/record/bar_record.rb

@@ -1,2 +0,0 @@
-class BarRecord < MySQL
-end

data/spec/fixtures/ext/record/foo_record.rb

@@ -1,2 +0,0 @@
-class FooRecord < MySQL
-end