hobo 1.4.0.pre5 → 1.4.0.pre6

data/TODO-1.4.txt

@@ -3,10 +3,6 @@
 ## regressions
 
  * after-submit, sortable-input-many do not work
- * Hobo 1.4 breaks default_scope.  If you're setting the order, you
-   can use Hobo's set_default_order as a stopgap although once it's
-   fixed please switch back to default_scope as set_default_order
-   is deprecated.
  * remote-method-button, create-button, update-button,
    transition-button: normal usages of these tags work, but they do
    not work if you ask them to do AJAX

data/VERSION

@@ -1 +1 @@
-1.4.0.pre5
+1.4.0.pre6

data/lib/generators/hobo/install_default_plugins/install_default_plugins_generator.rb

@@ -11,10 +11,10 @@ module Hobo
 
     def install_default_plugins
       opts = options.dup
-      opts[:version => Hobo::VERSION]
+      opts[:version] = Hobo::VERSION
       say "Installing default plugins for #{opts[:subsite]}..."
       say "Installing hobo_rapid plugin..."
-      install_plugin_helper('hobo_rapid', nil, opts)
+      install_plugin_helper('hobo_rapid', nil, opts.merge(:skip_dryml => true))
       say "Installing hobo_jquery plugin..."
       install_plugin_helper('hobo_jquery', nil, opts)
       say "Installing hobo_jquery_ui plugin..."

data/lib/generators/hobo/install_plugin/install_plugin_generator.rb

@@ -16,8 +16,9 @@ URL.  Otherwise it is considered to be a path.
     argument :name, :desc => "the plugin name"
     argument :git_path, :required => false, :desc => "if supplied, is passed to the :git or :path option in the gemfile"
     class_option :skip_gem, :type => :boolean, :aliases => '-M', :desc => "don't add plugin to Gemfile"
-    class_option :skip_js, :type => :boolean, :aliases => '-J', :desc => "don't add require to application.js"
-    class_option :skip_css, :type => :boolean, :aliases => '-C', :desc => "doesn't add require to application.css"
+    class_option :skip_js, :type => :boolean, :aliases => '-J', :desc => "don't add require to [subsite].js"
+    class_option :skip_css, :type => :boolean, :aliases => '-C', :desc => "doesn't add require to [subsite].css"
+    class_option :skip_dryml, :type => :boolean, :desc => "doesn't add include to [subsite]_site.dryml"
     class_option :version, :type => :string, :aliases => '-v', :desc => "Gemspec version string"
     class_option :comments, :type => :string, :desc => "comments to add before require/include"
     class_option :subsite, :type => :string, :aliases => '-e', :default => "all", :desc => "Subsite name (without '_site') or 'all'"

data/lib/generators/hobo/plugin.rb

@@ -43,7 +43,7 @@ module Generators
         subsites.each do |subsite|
           inject_js_require(name, subsite, options[:comments]) unless options[:skip_js]
           inject_css_require(name, subsite, options[:comments]) unless options[:skip_css]
-          inject_dryml_include(name, subsite, options[:comments])
+          inject_dryml_include(name, subsite, options[:comments]) unless options[:skip_dryml]
         end
 
         return need_update

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

@@ -31,6 +31,9 @@ module Hobo
     class_option :admin_subsite_name, :type => :string,
                  :desc => "Admin Subsite Name", :default => 'admin'
 
+    class_option :invite_only, :type => :boolean,
+                 :desc => "Require invitation to join site"
+
     class_option :private_site, :type => :boolean,
                  :desc => "Make the site unaccessible to non-members"
 

data/lib/generators/hobo/subsite_taglib/subsite_taglib_generator.rb

@@ -10,7 +10,7 @@ module Hobo
 
     def generate_taglib
       template "taglib.dryml.erb", File.join('app/views/taglibs', "#{file_name}_site.dryml")
-      Rails::Generators.invoke('hobo:install_default_plugins', ["--subsite=#{file_name}", "--theme=hobo_clean_admin", "--ui_theme=flick", "--skip_gem"])
+      Rails::Generators.invoke('hobo:install_default_plugins', ["--subsite=#{file_name}", "--theme=hobo_clean_admin", "--ui_theme=flick"])
     end
 
   end

metadata

@@ -2,7 +2,7 @@
 name: hobo
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.4.0.pre5
+  version: 1.4.0.pre6
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 Z
+date: 2012-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hobo_support
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre5
+        version: 1.4.0.pre6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre5
+        version: 1.4.0.pre6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.0.pre5
+        version: 1.4.0.pre6
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency