mack 0.7.1.1 → 0.8.0

data/lib/mack/tasks/mack_update_tasks.rake

@@ -2,6 +2,24 @@ namespace :mack do
   
   namespace :update do
     
+    desc "Convert application configuration yml file into Configatron file"
+    task :configuration do
+      file = ENV['FILE'] || ENV['file'] || File.join(Mack.root, "config", "app_config")
+      raise "Cannot find: #{file}" if !File.exists?(file)
+      if File.directory?(file)
+        Dir.glob(File.join(file, "**", "*.yml")).each do |f|
+          convert_config_file(f)
+        end
+      else
+        raise "Cannot convert non-yml file: #{file}" if File.extname(file) != ".yml"
+        convert_config_file(file)
+      end
+      
+      puts "\nPlease note that you still have access to the pre-converted yml file(s)."
+    end
+    
+    
+    
   #   desc "Renames thin.ru to rackup.ru and updates your thin.yml, if necessary."
   #   task :rackup do
   #     require 'fileutils'
@@ -22,5 +40,71 @@ namespace :mack do
   end
   
 end
+# alias_task "mack:update", "mack:update:rackup"
+
+private 
+
+# ----- Helper methods for Configuration Updater -------- #
+def convert_config_file(file)
+  print "Converting: #{File.basename(file)}..."
+  dest_file = file.gsub(".yml", ".rb").gsub('app_config', 'configatron')
+  bak_file  = file
+  hash = YAML.load(File.read(file))
+  config_list = (hash) ? hash_to_configatron(hash) : []
+  data = ""
+  config_list.each do |line|
+    line = update_data(line)
+    data += (line + "\n")
+  end
+  FileUtils.mkdir_p(File.dirname(dest_file))
+  File.open(dest_file, "w") { |f| f.write(data.to_s) }
+  puts "done."
+end
+
+def update_data(old_data)
+  updates = {
+    "configatron.mack.log_level" => "configatron.mack.log.level",
+    "configatron.run_remote_tests" => "configatron.mack.run_remote_tests",
+    "configatron.mack.log.db_color" => "configatron.mack.log.colors.db",
+    "configatron.mack.log.error_color" => "configatron.mack.log.colors.error",
+    "configatron.mack.log.completed_color" => "configatron.mack.log.colors.completed",
+    "configatron.base_language" => "configatron.mack.localization.base_language",
+    "configatron.supported_languages" => "configatron.mack.localization.supported_languages",
+    "configatron.char_encoding" => "configatron.mack.localization.char_encoding",
+    "configatron.dynamic_translation" => "configatron.mack.localization.dynamic_translation",
+    "configatron.content_expiry" => "configatron.mack.localization.content_expiry",
+    "configatron.mack.share_routes" => "configatron.mack.distributed.share_routes",
+    "configatron.mack.share_objects" => "configatron.mack.distributed.share_objects",
+    "configatron.mack.share_views" => "configatron.mack.distributed.share_views",
+    "configatron.mack.distributed_app_name" => "configatron.mack.distributed.app_name",
+    "configatron.mack.distributed_site_domain" => "configatron.mack.distributed.site_domain",
+    "configatron.mack.drb_timeout" => "configatron.mack.distributed.timeout"
+  }
+  
+  key = old_data.split("=").first
+  if updates.has_key?(key)
+    return old_data.gsub(key, updates[key])
+  else
+    return old_data
+  end
+end
+
+def cleanup_key(key)
+  if key.is_a?Symbol
+    mod_key = key.to_s.gsub("::", ".").to_sym
+  else
+    mod_key = key.gsub("::", ".")
+  end
+end
 
-# alias_task "mack:update", "mack:update:rackup"
+def hash_to_configatron(hash, configs = [], current_config = "configatron")
+  hash.each_key do |key|
+    if hash[key].is_a?Hash
+      hash_to_configatron(hash[key], configs, (current_config + ".#{cleanup_key(key)}"))
+    else
+      configs << current_config + ".#{cleanup_key(key)} = #{hash[key].inspect}"
+    end
+  end
+  return configs
+end
+# ----- END:: Helper methods for Configuration Updater -------- #

data/lib/mack/tasks/rake_rules.rake

@@ -30,4 +30,10 @@ rule /^generate:/ do |t|
   Rake::Task["environment"].invoke
   klass = "#{klass.camelcase}Generator"
   gen = klass.constantize.run(ENV.to_hash)
+end
+
+rule /^gems:freeze:/ do |t|
+  gem_name = t.name.gsub('gems:freeze:', '')
+  ENV['gem_name'] = gem_name
+  Rake::Task["gems:install_and_freeze"].invoke
 end

data/lib/mack/tasks/test_tasks.rake

@@ -13,7 +13,7 @@ namespace :test do
     require File.join(File.dirname(__FILE__), '..', 'initialization', 'configuration')
     Mack::BootLoader.run(:configuration)
     t.libs << "test"
-    t.pattern = app_config.mack.send("#{app_config.mack.testing_framework}_file_pattern")
+    t.pattern = configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern")
     t.verbose = true
   end
   
@@ -22,7 +22,7 @@ namespace :test do
     require File.join(File.dirname(__FILE__), '..', 'initialization', 'configuration')
     Mack::BootLoader.run(:configuration)
     t.spec_opts << '--options' << 'test/spec.opts' if File.exists?('test/spec.opts')
-    t.spec_files = Dir.glob(app_config.mack.send("#{app_config.mack.testing_framework}_file_pattern"))
+    t.spec_files = Dir.glob(configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern"))
   end
   
   desc "Report code statistics (KLOCs, etc) from the application. Requires the rcov gem."
@@ -73,7 +73,7 @@ namespace :test do
     end
     
     puts "Generating... please wait..."
-    res = `#{rcov} --html #{app_config.mack.send("#{app_config.mack.testing_framework}_file_pattern")}`
+    res = `#{rcov} --html #{configatron.mack.send("#{configatron.mack.testing_framework}_file_pattern")}`
     res
   end
   
@@ -84,7 +84,7 @@ task :default do
   Mack::BootLoader.run(:configuration)
   tf = "rspec"
   begin
-    tf = app_config.mack.testing_framework
+    tf = configatron.mack.testing_framework
   rescue Exception => e
   end
   Rake::Task["test:setup"].invoke

data/lib/mack/testing/helpers.rb

@@ -12,6 +12,13 @@ if Mack.env == "test"
       end # Session
     end # RunnerHelpers
   end # Mack
+  module Rack # :nodoc:
+    class MockRequest # :nodoc:
+      def method_missing(sym, *args)
+        @app.instance_variable_get("@app").instance_variable_get("@request").send(sym, *args)
+      end
+    end
+  end
 end
 #++
 
@@ -22,13 +29,13 @@ module Mack
       # Temporarily changes the application configuration. Changes are reverted after
       # the yield returns.
       def temp_app_config(options = {})
-        app_config.load_hash(options, String.randomize)
-        yield
-        app_config.revert
+        configatron.temp(options) do
+          yield
+        end
       end
     
       def remote_test # :nodoc:
-        if (app_config.run_remote_tests)
+        if (configatron.mack.run_remote_tests)
           yield
         end
       end
@@ -93,7 +100,7 @@ module Mack
         sess = Mack::SessionStore.get($current_session_id, nil, nil, nil)
         if sess.nil?
           id = String.randomize(40).downcase
-          set_cookie(app_config.mack.session_id, id)
+          set_cookie(configatron.mack.session_id, id)
           sess = Mack::Session.new(id)
           Mack::SessionStore.store.direct_set(id, sess)
           $current_session_id = id
@@ -194,7 +201,7 @@ module Mack
             spt = ck.split("=")
             name = spt.first
             value = spt.last
-            if name == app_config.mack.session_id
+            if name == configatron.mack.session_id
               value = nil unless @_mack_in_session
             end
             set_cookie(name, value)

data/lib/mack/testing/rspec.rb

@@ -7,16 +7,11 @@ module Spec # :nodoc:
       include Mack::Routes::Urls
       include Mack::Testing::Helpers
     
-      alias_method :mack_run_with_description_capturing, :run_with_description_capturing
+      alias_instance_method :eval_block, :mack_eval_block
 
-      def run_with_description_capturing
-        begin
-            in_session do
-              instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
-            end
-        ensure
-          @_matcher_description = Spec::Matchers.generated_description
-          Spec::Matchers.clear_generated_description
+      def eval_block
+        in_session do
+          mack_eval_block
         end
       end
     
@@ -30,4 +25,27 @@ module Spec # :nodoc:
     end
   end # Matchers
   
+  # require 'spec/runner/formatter/base_text_formatter'
+  # module Runner # :nodoc:
+  #   module Formatter # :nodoc:
+  #     class BaseTextFormatter < BaseFormatter # :nodoc:
+  # 
+  #       def dump_pending
+  #         unless @pending_examples.empty?
+  #           @output.puts
+  #           @output.puts yellow("Pending:")
+  #           @pending_examples.each do |pending_example|
+  #             @output.puts yellow("#{pending_example[0]} (#{pending_example[1]})")
+  #             # @output.puts "  Called from #{pending_example[2]}"
+  #           end
+  #         end
+  #         @output.flush
+  #       end
+  #       
+  #     end # BaseTextFormatter
+  #   end # Formatter
+  # end # Runner
+  
 end # Spec
+
+

data/lib/mack/testing/test_case.rb

@@ -8,7 +8,7 @@ module Test # :nodoc:
       
       # Let's alias the run method in the class above us so we can create a new one here
       # but still reference it.
-      alias_method :super_run, :run # :nodoc:
+      alias_instance_method :run, :super_run # :nodoc:
 
       # We need to wrap the run method so we can do things like
       # run a cleanup method if it exists

data/lib/mack/utils/ansi/ansi_color.rb

@@ -5,7 +5,10 @@ module Mack
       module Color
         
         def self.wrap(color, string)
-          "\e[#{Mack::Utils::Ansi::ColorRegistry.registered_items[color.to_sym] || 0}m#{string}\e[0m"
+          if configatron.mack.log.use_colors
+            return "\e[#{Mack::Utils::Ansi::ColorRegistry.registered_items[color.to_sym] || 0}m#{string}\e[0m"
+          end
+          return string
         end
         
       end # Color

data/lib/mack/utils/forgery_detector.rb

@@ -127,9 +127,9 @@ module Mack
       
       def valid_request? # :nodoc:
         return true if !self.class.ignored_actions.empty? and self.skip_action?        
-        return app_config.mack.disable_forgery_detector ||
+        return configatron.mack.disable_forgery_detector ||
                 self.skip_action? ||
-                request.params[:method] == "get" ||
+                request.params[:method].to_sym == :get ||
                 (request.params[:__authenticity_token] == authenticity_token)
       end
       
@@ -142,7 +142,7 @@ module Mack
       include Singleton
 
       def dispense_token(key) # :nodoc:
-        salt = app_config.request_authenticity_token_salt || "shh, it's a secret"
+        salt = configatron.mack.retrieve(:request_authenticity_token_salt, "shh, it's a secret")
         salt = "shh, it's a secret" if salt.empty?
         string_to_hash = key.to_s + salt.to_s
         Digest::SHA1.hexdigest(string_to_hash)

data/lib/mack/utils/http_status_codes.rb

@@ -0,0 +1,19 @@
+module Mack
+  module Utils # :nodoc:
+    class HttpStatusCodes < Mack::Utils::RegistryMap
+      
+      def initial_state
+        YAML.load(File.read(File.join(File.dirname(__FILE__), 'http_status_codes.yml')))
+      end
+      
+      class << self
+        
+        def get(status)
+          self.registered_items[status.to_i] || 'UNKNOWN HTTP STATUS'
+        end
+        
+      end
+      
+    end # HttpStatusCodes
+  end # Utils
+end # Mack

data/lib/mack/utils/http_status_codes.yml

@@ -0,0 +1,55 @@
+100: Continue
+101: Switching Protocols
+102: Processing
+200: OK
+201: Created
+202: Accepted
+203: Non-Authoritative Information
+204: No Content
+205: Reset Content
+206: Partial Content
+207: Multi-Status
+300: Multiple Choices
+301: Moved Permanently
+302: Found
+303: See Other
+304: Not Modified
+305: Use Proxy
+306: Switch Proxy
+307: Temporary Redirect
+400: Bad Request
+401: Unauthorized
+402: Payment Required
+403: Forbidden
+404: Not Found  
+405: Method Not Allowed
+406: Not Acceptable
+407: Proxy Authentication Required
+408: Request Timeout
+409: Conflict
+410: Gone
+404: Not Found
+411: Length Required
+412: Precondition Failed
+413: Request Entity Too Large
+414: Request-URI Too Long
+415: Unsupported Media Type
+416: Requested Range Not Satisfiable
+417: Expectation Failed
+418: I'm a Teapot
+422: Unprocessable Entity
+423: Locked
+424: Failed Dependency
+425: Unordered Collection
+426: Upgrade Required
+449: Retry With
+500: Internal Server Error
+501: Not Implemented
+502: Bad Gateway
+503: Service Unavailable
+504: Gateway Timeout
+505: HTTP Version Not Supported
+506: Variant Also Negotiates
+507: Insufficient Storage
+509: Bandwidth Limit Exceeded
+510: Not Extended

data/lib/mack/utils/paths.rb

@@ -3,151 +3,151 @@ module Mack
     
     # <MACK_PROJECT_ROOT>
     def self.root(*files)
-      File.join(Mack.root, files)
+      File.join(Mack.root, *files)
     end
     
     # <MACK_PROJECT_ROOT>/public
     def self.public(*files)
-      Mack::Paths.root("public", files)
+      Mack::Paths.root("public", *files)
     end
     
     # <MACK_PROJECT_ROOT>/public/images
     def self.images(*files)
-      Mack::Paths.public("images", files)
+      Mack::Paths.public("images", *files)
     end
     
     # <MACK_PROJECT_ROOT>/public/javascripts
     def self.javascripts(*files)
-      Mack::Paths.public("javascripts", files)
+      Mack::Paths.public("javascripts", *files)
     end
     
     # <MACK_PROJECT_ROOT>/public/stylesheets
     def self.stylesheets(*files)
-      Mack::Paths.public("stylesheets", files)
+      Mack::Paths.public("stylesheets", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app
     def self.app(*files)
-      Mack::Paths.root("app", files)
+      Mack::Paths.root("app", *files)
     end
     
     # <MACK_PROJECT_ROOT>/log
     def self.log(*files)
-      Mack::Paths.root("log", files)
+      Mack::Paths.root("log", *files)
     end
     
     # <MACK_PROJECT_ROOT>/test
     def self.test(*files)
-      Mack::Paths.root("test", files)
+      Mack::Paths.root("test", *files)
     end
     
     # <MACK_PROJECT_ROOT>/tmp
     def self.tmp(*files)
-      Mack::Paths.root("tmp", files)
+      Mack::Paths.root("tmp", *files)
     end
         
     # <MACK_PROJECT_ROOT>/test/models
     def self.model_tests(*files)
-      Mack::Paths.test("models", files)
+      Mack::Paths.test("models", *files)
     end
     
     # <MACK_PROJECT_ROOT>/test/controllers
     def self.controller_tests(*files)
-      Mack::Paths.test("controllers", files)
+      Mack::Paths.test("controllers", *files)
     end
     
     def self.test_helpers(*files)
-      Mack::Paths.test("helpers", files)
+      Mack::Paths.test("helpers", *files)
     end
     
     # <MACK_PROJECT_ROOT>/test/helpers/controllers
     def self.controller_helper_tests(*files)
-      Mack::Paths.test_helpers("controllers", files)
+      Mack::Paths.test_helpers("controllers", *files)
     end
     
     # <MACK_PROJECT_ROOT>/test/helpers/views
     def self.view_helper_tests(*files)
-      Mack::Paths.test_helpers("views", files)
+      Mack::Paths.test_helpers("views", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/views
     def self.views(*files)
-      Mack::Paths.app("views", files)
+      Mack::Paths.app("views", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/views/layouts
     def self.layouts(*files)
-      Mack::Paths.views("layouts", files)
+      Mack::Paths.views("layouts", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/controllers
     def self.controllers(*files)
-      Mack::Paths.app("controllers", files)
+      Mack::Paths.app("controllers", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/models
     def self.models(*files)
-      Mack::Paths.app("models", files)
+      Mack::Paths.app("models", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/helpers
     def self.helpers(*files)
-      Mack::Paths.app("helpers", files)
+      Mack::Paths.app("helpers", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/helpers/controllers
     def self.controller_helpers(*files)
-      Mack::Paths.helpers("controllers", files)
+      Mack::Paths.helpers("controllers", *files)
     end
     
     # <MACK_PROJECT_ROOT>/app/helpers/views
     def self.view_helpers(*files)
-      Mack::Paths.helpers("views", files)
+      Mack::Paths.helpers("views", *files)
     end
 
     # <MACK_PROJECT_ROOT>/lib
     def self.lib(*files)
-      Mack::Paths.root("lib", files)
+      Mack::Paths.root("lib", *files)
     end
     
     # <MACK_PROJECT_ROOT>/lib/tasks
     def self.tasks(*files)
-      Mack::Paths.lib("tasks", files)
+      Mack::Paths.lib("tasks", *files)
     end
     
     # <MACK_PROJECT_ROOT>/db
     def self.db(*files)
-      Mack::Paths.root("db", files)
+      Mack::Paths.root("db", *files)
     end
     
     # <MACK_PROJECT_ROOT>/db/migrations
     def self.migrations(*files)
-      Mack::Paths.db("migrations", files)
+      Mack::Paths.db("migrations", *files)
     end
     
     # <MACK_PROJECT_ROOT>/config
     def self.config(*files)
-      Mack::Paths.root("config", files)
+      Mack::Paths.root("config", *files)
     end
     
-    # <MACK_PROJECT_ROOT>/config/app_config
-    def self.app_config(*files)
-      Mack::Paths.config("app_config", files)
+    # <MACK_PROJECT_ROOT>/config/configatron
+    def self.configatron(*files)
+      Mack::Paths.config("configatron", *files)
     end
     
     # <MACK_PROJECT_ROOT>/config/initializers
     def self.initializers(*files)
-      Mack::Paths.config("initializers", files)
+      Mack::Paths.config("initializers", *files)
     end
     
     # <MACK_PROJECT_ROOT>/vendor
     def self.vendor(*files)
-      Mack::Paths.root("vendor", files)
+      Mack::Paths.root("vendor", *files)
     end
     
     # <MACK_PROJECT_ROOT>/vendor/plugins
     def self.plugins(*files)
-      Mack::Paths.vendor("plugins", files)
+      Mack::Paths.vendor("plugins", *files)
     end
     
   end # Paths

data/lib/mack/utils/reloader.rb

@@ -0,0 +1,60 @@
+module Mack
+  # Mack::Reloader checks on every request, but at most every +secs+
+  # seconds, if a file loaded changed, and reloads it, logging to
+  # Mack.logger.debug.
+
+  class Reloader
+    def initialize(app, secs = configatron.mack.reload_classes)
+      @app = app
+      @secs = secs              # reload every @secs seconds max
+      @last = Time.now
+    end
+
+    def call(env)
+      if Time.now > @last + @secs
+        Thread.exclusive {
+          reload!
+          @last = Time.now
+        }
+      end
+
+      @app.call(env)
+    end
+
+    def reload!
+      need_reload = $LOADED_FEATURES.find_all { |loaded|
+        begin
+          if loaded =~ /\A[.\/]/  # absolute filename or 1.9
+            abs = loaded
+          else
+            if configatron.mack.deep_class_reload
+              abs = $LOAD_PATH.map { |path| ::File.join(path, loaded) }.find { |file| ::File.exist? file }
+            end
+          end
+
+          if abs
+            ::File.mtime(abs) > @last - @secs  rescue false
+          else
+            false
+          end
+        end
+      }
+
+      need_reload.each { |l|
+        $LOADED_FEATURES.delete l
+      }
+
+      need_reload.each { |to_load|
+        begin
+          if require to_load
+            Mack.logger.debug "#{self.class}: reloaded `#{to_load}'"
+          end
+        rescue LoadError, SyntaxError => e
+          raise e                 # Possibly ShowExceptions
+        end
+      }
+      need_reload
+    end
+
+  end
+end

data/lib/mack/utils/server.rb

@@ -20,13 +20,13 @@ module Mack
         # Any urls listed will go straight to the public directly and will not be served up via the app:
         app = Rack::Static.new(app, :urls => ["/css", "/images", "/files", "/images", "/stylesheets", "/javascripts", "/media", "/favicon.ico"], :root => "public")
         app = Mack::Utils::ContentLengthHandler.new(app)
-        app = Rack::Lint.new(app) if app_config.mack.use_lint 
+        app = Rack::Lint.new(app) if configatron.mack.use_lint 
         app = Rack::ShowStatus.new(app) 
-        app = Rack::ShowExceptions.new(app) if app_config.mack.show_exceptions
+        app = Rack::ShowExceptions.new(app) if configatron.mack.show_exceptions
         app = Rack::Recursive.new(app)
         
         # This will reload any edited classes if the cache_classes config setting is set to true.
-        app = Rack::Reloader.new(app, 1) unless app_config.mack.cache_classes
+        app = Mack::Reloader.new(app) unless configatron.mack.cache_classes
         app
       end
 

data/lib/mack/version.rb

@@ -1,3 +1,3 @@
 module Mack
-  VERSION = '0.7.1.1' unless const_defined?("VERSION")
+  VERSION = '0.8.0' unless const_defined?("VERSION")
 end

data/lib/mack/view_helpers/all_helpers.rb

@@ -1,5 +1,12 @@
 module Mack
   module ViewHelpers # :nodoc:
+    
+    def get_resource_root(resource)
+      path = ""
+      path = "#{configatron.mack.distributed.site_domain}" unless configatron.mack.distributed.site_domain.nil?
+      path = Mack::Assets::Helpers.instance.asset_hosts(resource) if path.empty?
+      return path
+    end
 
     # Used to easily include all Mack::ViewHelpers. It will NOT include itself!
     # This is primarily used to aid in testing view helpers.