hobo 1.3.0.pre14 → 1.3.0.pre15

data/VERSION

@@ -1 +1 @@
-1.3.0.pre14
+1.3.0.pre15

data/lib/generators/hobo/i18n/templates/hobo.en.yml

@@ -177,3 +177,4 @@ en:
 
     boolean_yes: "Yes"
     boolean_no: "No"
+    password_hidden: "[password hidden]"

data/lib/generators/hobo/i18n/templates/hobo.es-DO.yml

@@ -183,3 +183,4 @@
 
     boolean_yes: "Si"
     boolean_no: "No"
+    password_hidden: "[contraseña]"

data/lib/generators/hobo/i18n/templates/hobo.it.yml

@@ -184,3 +184,4 @@ it:
 
     boolean_yes: "Si"
     boolean_no: "No"
+    password_hidden: "[parola chiave]"

data/lib/generators/hobo/i18n/templates/hobo.pt-PT.yml

@@ -178,3 +178,4 @@
 
     boolean_yes: "Sim"
     boolean_no: "Não"
+    password_hidden: "[palavra-chave]"

data/lib/generators/hobo/routes/routes_generator.rb

@@ -1,14 +1,25 @@
+require 'generators/hobo_support/eval_template'
+
 module Hobo
   class RoutesGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    include Generators::HoboSupport::EvalTemplate
+
     def self.banner
       "rails generate hobo:routes #{self.arguments.map(&:usage).join(' ')} [options]"
     end
 
     def generate_routes
       Hobo::Routes.reset_linkables
-      template "hobo_routes.rb.erb", Hobo::Engine.config.hobo.routes_path
+      h = Hobo::Engine.config.hobo
+      template_name = 'hobo_routes.rb.erb'
+      if h.read_only_file_system
+        # just fill the @linkable_keys without writing any file
+        eval_template template_name
+      else
+        template template_name, h.routes_path
+      end
     end
 
 private

data/lib/generators/hobo/setup_wizard/setup_wizard_generator.rb

@@ -44,6 +44,9 @@ module Hobo
     class_option :git_repo, :type => :boolean,
     :desc => "Create the git repository with the initial commit"
 
+    class_option :gitignore_auto_generated_files, :type => :boolean,
+    :desc => "Add the auto-generated files to .gitignore", :default => true
+
 
     def startup
       if wizard?
@@ -205,16 +208,20 @@ EOI
       if wizard?
         say_title 'Git Repository'
         return unless yes_no?("Do you want to initialize a git repository now?")
+        gitignore_auto_generated = yes_no? "Do you want git to ignore the auto-generated files?\n(Choose 'n' only if you are planning to deploy on a read-only File System like Heroku)"
         say 'Initializing git repository...'
       else
         return unless options[:git_repo]
+        gitignore_auto_generated = options[:gitignore_auto_generated_files]
+      end
+      if gitignore_auto_generated
+        hobo_routes_rel_path = Hobo::Engine.config.hobo.routes_path.relative_path_from Rails.root
+        append_file '.gitignore', "app/views/taglibs/auto/**/*\n#{hobo_routes_rel_path}\n"
       end
-      hobo_routes_rel_path = Hobo::Engine.config.hobo.routes_path.relative_path_from Rails.root
-      append_file '.gitignore', "app/views/taglibs/auto/**/*\n#{hobo_routes_rel_path}\n"
       git :init
       git :add => '.'
       git :commit => '-m "initial commit"'
-      say "NOTICE: If you change the config.hobo.routes_path, you should update the .gitignore file accordingly.", Color::YELLOW
+      say("NOTICE: If you change the config.hobo.routes_path, you should update the .gitignore file accordingly.", Color::YELLOW) if gitignore_auto_generated
     end
 
     def finalize

data/lib/hobo/controller.rb

@@ -97,7 +97,7 @@ module Hobo
         end
         page << renderer.part_contexts_storage if renderer
       end
-   end
+    end
 
 
     def dryml_context

data/lib/hobo/engine.rb

@@ -39,30 +39,21 @@ module Hobo
 
     ActiveSupport.on_load(:before_initialize) do
       require 'hobo/undefined'
-
+      HoboFields.never_wrap(Hobo::Undefined)
       h = config.hobo
       Dryml::DrymlGenerator.enable([h.rapid_generators_path], h.auto_taglibs_path)
-
-      HoboFields.never_wrap(Hobo::Undefined)
     end
 
     initializer 'hobo.routes' do |app|
       h = app.config.hobo
       # generate at first boot, so no manual generation is required
       unless File.exists?(h.routes_path)
-        if h.read_only_file_system
-          raise Hobo::Error, "No #{h.routes_path} found!"
-        else
-          Rails::Generators.invoke('hobo:routes', %w[-f -q])
-        end
+        raise Hobo::Error, "No #{h.routes_path} found!" if h.read_only_file_system
+        Rails::Generators.invoke('hobo:routes', %w[-f -q])
       end
       app.routes_reloader.paths << h.routes_path
-      unless h.read_only_file_system
-        app.config.to_prepare do
-          Rails::Generators.configure!
-          # generate before each request in development
-          Rails::Generators.invoke('hobo:routes', %w[-f -q])
-        end
+      app.config.to_prepare do
+        Rails::Generators.invoke('hobo:routes', %w[-f -q])
       end
     end
 

data/lib/hobo/extensions/active_record/relation_with_origin.rb

@@ -15,8 +15,8 @@ module ActiveRecord
       end
       alias_method_chain :scoped, :origin
 
-      def method_missing_with_origin(method, *args)
-        res = method_missing_without_origin(method, *args)
+      def method_missing_with_origin(method, *args, &block)
+        res = method_missing_without_origin(method, *args, &block)
         res.origin = @owner if res.respond_to?(:origin)
         res.origin_attribute = @reflection.name if res.respond_to?(:origin_attribute)
         res

data/lib/hobo/routes.rb

@@ -1,32 +1,31 @@
 module Hobo
-  class Routes
-    class << self
+  module Routes
+    extend self
 
-      def reset_linkables
-        @linkable_keys = Set.new
-      end
-
-      def linkable_key(klass, action, options)
-        subsite = options[:subsite] || options['subsite']
-        method  = options[:method]  || options['method'] || :get
-        [ subsite, klass.name, action, method ].join('/')
-      end
+    def reset_linkables
+      @linkable_keys = Set.new
+    end
 
-      def linkable!(klass, action, options={})
-        @linkable_keys << linkable_key(klass, action, options)
-      end
+    def linkable_key(klass, action, options)
+      subsite = options[:subsite] || options['subsite']
+      method  = options[:method]  || options['method'] || :get
+      [ subsite, klass.name, action, method ].join('/')
+    end
 
-      def linkable?(klass, action, options={})
-        @linkable_keys.member? linkable_key(klass, action, options)
-      end
+    def linkable!(klass, action, options={})
+      @linkable_keys << linkable_key(klass, action, options)
+    end
 
-      def models_with(wanted_action)
-        @linkable_keys.map do |k|
-          subsite, class_name, action, method = k.split('/')
-          (action == wanted_action) ? class_name.constantize : nil
-        end.compact
-      end
+    def linkable?(klass, action, options={})
+      @linkable_keys.member? linkable_key(klass, action, options)
+    end
 
+    def models_with(wanted_action)
+      @linkable_keys.map do |k|
+        subsite, class_name, action, method = k.split('/')
+        (action == wanted_action) ? class_name.constantize : nil
+      end.compact
     end
+
   end
 end

data/lib/hobo.rb

@@ -5,13 +5,13 @@ require 'will_paginate'
 require 'hobo/extensions/enumerable'
 require 'hobo/extensions/array'
 
-ActiveSupport::Dependencies.autoload_paths |= [ File.dirname(__FILE__)]
+ActiveSupport::Dependencies.autoload_paths |= [File.dirname(__FILE__)]
 
 
 module Hobo
 
   VERSION = File.read(File.expand_path('../../VERSION', __FILE__)).strip
-  @@root = Pathname.new File.expand_path(File.dirname(__FILE__) + "/..")
+  @@root = Pathname.new File.expand_path('../..', __FILE__)
   def self.root; @@root; end
 
   class Error < RuntimeError; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  hash: -1637175963
+  hash: -1637175966
   prerelease: true
   segments: 
   - 1
   - 3
   - 0
-  - pre14
-  version: 1.3.0.pre14
+  - pre15
+  version: 1.3.0.pre15
 platform: ruby
 authors: 
 - Tom Locke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 -04:00
+date: 2010-11-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175963
+        hash: -1637175966
         segments: 
         - 1
         - 3
         - 0
-        - pre14
-        version: 1.3.0.pre14
+        - pre15
+        version: 1.3.0.pre15
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175963
+        hash: -1637175966
         segments: 
         - 1
         - 3
         - 0
-        - pre14
-        version: 1.3.0.pre14
+        - pre15
+        version: 1.3.0.pre15
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -93,13 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1637175963
+        hash: -1637175966
         segments: 
         - 1
         - 3
         - 0
-        - pre14
-        version: 1.3.0.pre14
+        - pre15
+        version: 1.3.0.pre15
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency