hobo 1.3.0.pre11 → 1.3.0.pre12

data/VERSION

@@ -1 +1 @@
-1.3.0.pre11
+1.3.0.pre12

data/bin/hobo

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 require 'fileutils'
 
-if ENV["HOBO_DEV_ROOT"]
-  dev_root = File.expand_path ENV["HOBO_DEV_ROOT"], FileUtils.pwd
+if ENV["HOBODEV"]
+  dev_root = File.expand_path ENV["HOBODEV"], FileUtils.pwd
   $:.unshift "#{dev_root}/hobo_support/lib"
 else
   require 'rubygems'
@@ -12,7 +12,7 @@ begin
   require 'hobo_support/command'
 rescue LoadError
   puts "The 'hobo_support' gem is not installed.
-You probably need to set the HOBO_DEV_ROOT environment variable to the local repository path."
+You probably need to set the HOBODEV environment variable to your local hobo git-repository path."
   exit
 end
 

data/lib/generators/hobo/resource/resource_generator.rb

@@ -16,7 +16,7 @@ module Hobo
     def generate_hobo_model
       # is there any better way to pass attributes?
       attr = attributes.map{|a| "#{a.name}:#{a.type}"}
-      invoke 'hobo:model', [name.singularize, attr], options
+      invoke 'hobo:model', [name, attr], options
     end
 
   end

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

@@ -27,7 +27,7 @@ module Hobo
                  :desc => "Admin Subsite Name", :default => 'admin'
 
     class_option :private_site, :type => :boolean,
-                 :desc => "Make the site unaccessible to non-mebers"
+                 :desc => "Make the site unaccessible to non-members"
 
     class_option :migration_generate, :type => :boolean,
     :desc => "Generate migration only"
@@ -39,7 +39,7 @@ module Hobo
     :desc => "Sets the default locale"
 
     class_option :locales, :type => :array,
-    :desc => "Choose the locales"
+    :desc => "Choose the locales", :default => %w[en]
 
     class_option :git_repo, :type => :boolean,
     :desc => "Create the git repository with the initial commit"
@@ -64,7 +64,7 @@ module Hobo
         fixture_replacement = ask("Type your preferred fixture replacement or <enter> for no replacement:")
       else
         # return if it is all default so no invoke is needed
-        return if (options[:test_framework] == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
+        return if (options[:test_framework].to_s == 'test_unit' && options[:fixtures] && options[:fixture_replacement].blank?)
         test_framework = options[:test_framework]
         fixtures = options[:fixtures]
         fixture_replacement = options[:fixture_replacement]

data/lib/hobo/controller.rb

@@ -70,8 +70,7 @@ module Hobo
 
 
     def ajax_update_response(page_path, render_specs, results={})
-      @template.send(:_evaluate_assigns_and_ivars)
-      renderer = Dryml.page_renderer(@template, [], page_path) if page_path
+      renderer = Dryml.page_renderer(view_context, page_path) if page_path
 
       render :update do |page|
         page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
@@ -91,7 +90,7 @@ module Hobo
         end
         page << renderer.part_contexts_storage if renderer
       end
-    end
+   end
 
 
     def dryml_context
@@ -113,10 +112,7 @@ module Hobo
 
 
     def tag_renderer
-      @tag_renderer ||= begin
-        @template.send(:_evaluate_assigns_and_ivars)
-        Dryml.empty_page_renderer(@template)
-      end
+      @tag_renderer ||= Dryml.empty_page_renderer(view_context)
     end
 
 

data/lib/hobo/helper/translations.rb

@@ -27,13 +27,8 @@ module Hobo
       #         my: "Mitt {{app}}"
       #       The output should be: Mitt Program
       #
-      # The "count" option set the integer passed or to the Model.count if : dynamic is passed.
-      # The following lines are the same:
+      # The "count" option is passed to the I18n.t method as is
       #
-      # <ht key="modelname.any.key" count="&:dynamic">
-      # <ht key="modelname.any.key" count="&model.count">
-      #
-      # Otherwise with features as the ht method, step 1, 2 and 3 above.
       def ht(key, options={})
 
         # Check if called as a tag, i.e. like this <ht></ht>

data/lib/hobo/rapid/taglibs/rapid_core.dryml

@@ -169,7 +169,7 @@ Provides a short hand way of displaying images in public/images
      res << "var pluralisations = {#{names * ', '}}; "
    end
    base = [base_url, subsite].compact.join("/")
-   res << "urlBase = '#{base}'; hoboPagePath = '#{view_name}'"
+   res << "urlBase = '#{base}'; hoboPagePath = '#{request.fullpath}'"
    if protect_against_forgery?
      res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
    end

metadata

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