hobo 1.3.0.pre27 → 1.3.0.pre28

data/VERSION

@@ -1 +1 @@
-1.3.0.pre27
+1.3.0.pre28

data/lib/generators/hobo/admin_subsite/admin_subsite_generator.rb

@@ -18,15 +18,12 @@ module Hobo
     end
 
     def generate_admin_user_controller
-      invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"]
+      invoke "hobo:controller", ["#{file_name}/#{options[:user_resource_name].pluralize.underscore}"], options
       template "users_index.dryml", "app/views/#{file_name}/#{options[:user_resource_name].pluralize.underscore}/index.dryml"
     end
 
     def generate_site_taglib
-      invoke 'hobo:subsite_taglib', [name],
-                                    :user_resource_name => options[:user_resource_name],
-                                    :admin => true,
-                                    :invite_only => invite_only?
+      invoke 'hobo:subsite_taglib', [name], options.merge(:admin => true)
     end
 
     def append_admin_tag_into_application_taglib

data/lib/generators/hobo/admin_subsite/templates/admin.css

@@ -1,2 +1,20 @@
-html, body { background: #333;}
-.page-header { background: #555; }
+body {
+  background-color: #333;
+  background-image: none;
+}
+
+.page-header {
+  background: #555;
+}
+
+.page-header.sidemenu {
+  background: none;
+}
+
+.page-header h1 a {
+  color:#FCFFF5;
+}
+
+#main-nav-container {
+  background:#555555
+}

data/lib/generators/hobo/admin_subsite/templates/application.dryml

@@ -0,0 +1 @@
+<!-- Global taglib - these tags are shared across all subsites -->

data/lib/generators/hobo/controller.rb

@@ -2,7 +2,7 @@ module Generators
   module Hobo
     Controller = classy_module do
 
-      check_class_collision :suffix => 'Controller'
+      # check_class_collision :suffix => 'Controller'
 
       class_option :helpers, :type => :boolean,
       :desc => "Generates helper files",

data/lib/generators/hobo/rapid/rapid_generator.rb

@@ -16,6 +16,8 @@ module Hobo
       copy_file "hobo-rapid.css",     "public/stylesheets/hobo-rapid.css"
       directory "themes/clean/public","public/hobothemes/clean"
       directory "themes/clean/views", "app/views/taglibs/themes/clean"
+      directory "themes/clean-sidemenu/public","public/hobothemes/clean-sidemenu"
+      directory "themes/clean-sidemenu/views", "app/views/taglibs/themes/clean-sidemenu"
     end
 
   end

data/lib/generators/hobo/rapid/templates/hobo-rapid.js

@@ -53,7 +53,7 @@ var Hobo = {
                     i += 1
                 }
             })
-            params.push("page_path=" + hoboPagePath)
+            params.push("page_path=" + encodeURIComponent(hoboPagePath))
         }
 
         if (resultUpdates) {

data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/stylesheets/clean-sidemenu.css

@@ -0,0 +1,81 @@
+@import url('/hobothemes/clean/stylesheets/clean.css');
+@import url('/hobothemes/clean/stylesheets/rapid-ui.css');
+
+body {
+  width: 95%;
+  min-width: 800px;
+}
+
+.page-header div.search {
+  margin-top: 0;
+  padding-left:50px;
+  padding-right:0
+}
+
+.page-header{
+  margin-top: 6px;
+  background: none;
+}
+
+.account-nav {
+  margin-top: 0;
+}
+
+.page-header h1 {
+  padding: 20px 30px 20px 20px;
+}
+
+.page-header h1 a {
+  color:#3B5F87
+}
+
+#container{
+  width:100%;
+}
+
+#main-nav-container{
+  width: 20%;
+  background: #ACD3E6 url(../images/300-3B5F87-ACD3E6-H.png) repeat-y;
+  vertical-align:top;
+}
+
+#content-container {
+  width: 80%;
+  background-color:#FCFFF5;
+  vertical-align:top;
+}
+
+.section.with-flash {
+  background: none;
+  padding-top: 10px;
+}
+
+.main-nav {
+  padding: 30px 0;
+}
+
+.main-nav li {
+  text-align: right;
+  margin-right: 0;
+  list-style-type: none;
+}
+
+.main-nav a {
+  background: none;
+  border-bottom: 1px dotted #FCFFF5;
+  display: block;
+  font-size: 14px;
+  font-weight: bold;
+  padding: 7px 20px;
+  color: #FCFFF5;
+}
+
+.main-nav a:hover {
+  background: #DBE1E5 url(../images/100-ACD3E6-DBE1E5-H.png) repeat-y;
+  color:#3B5F87;
+}
+
+.main-nav li.current a {
+  background: #FCFFF5 url(../images/100-DBE1E5-FCFEF5-H.png) repeat-y;
+  color: #242E42;
+}

data/lib/generators/hobo/rapid/templates/themes/clean-sidemenu/views/clean-sidemenu.dryml

@@ -0,0 +1,30 @@
+<extend tag="page" attrs="title, full-title">
+  <old-page merge title="&title" full-title="&full_title">
+
+    <stylesheets: param>
+      <stylesheet name="reset"/>
+      <theme-stylesheet/>
+      <stylesheet name="application" param="app-stylesheet"/>
+    </stylesheets:>
+
+    <header: class="sidemenu" param>
+      <live-search param if="&defined_route? :site_search"/>
+      <account-nav if="&login_url(Hobo::Model::User.default_user_model)" param/>
+      <h1 param="app-name"><a href="#{base_url}/"><app-name/></a></h1>
+    </header:>
+
+    <content: replace>
+      <table id="container">
+        <tr>
+          <td id="main-nav-container">
+            <main-nav current="&title" param/>
+          </td>
+          <td id="content-container">
+            <section with-flash-messages param="content"/>
+          </td>
+        </tr>
+      </table>
+    </content:>
+
+  </old-page>
+</extend>

data/lib/generators/hobo/rapid/templates/themes/clean/public/stylesheets/clean.css

@@ -1,4 +1,4 @@
-html, body {color: #193440; background: url(../images/300-ACD3E6-fff.png) repeat-x #fff; }
+body {color: #193440; background: url(../images/300-ACD3E6-fff.png) repeat-x #fff; }
 .page-header {color: white; background: url(../images/101-3B5F87-ACD3E6.png) repeat-x #3F606E;}
 .page-header .navigation.main-nav a {
   background: url(../images/30-3E547A-242E42.png) repeat-x #242E42;

data/lib/generators/hobo/subsite.rb

@@ -10,7 +10,7 @@ module Generators
                  :type => :boolean,
                  :desc => "Rename application.dryml to front_site.dryml"
 
-      check_class_collision :suffix => 'SiteController'
+      # check_class_collision :suffix => 'SiteController'
 
       def move_and_generate_files
         if options[:make_front_site]
@@ -20,8 +20,10 @@ module Generators
           end
           say "Renaming app/views/taglibs/application.dryml to app/views/taglibs/front_site.dryml" \
               unless options[:quiet]
-          FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml") unless options[:pretend]
-          copy_file "application.dryml", 'app/views/taglibs/application.dryml'
+          unless options[:pretend]
+            FileUtils.mv('app/views/taglibs/application.dryml', "app/views/taglibs/front_site.dryml")
+            copy_file "application.dryml", 'app/views/taglibs/application.dryml'
+          end
         end
 
         template "controller.rb.erb", File.join('app/controllers', file_name, "#{file_name}_site_controller.rb")

data/lib/generators/hobo/test_framework/test_framework_generator.rb

@@ -42,10 +42,10 @@ private
     end
 
     def setup_rspec
-      gem 'rspec-rails', '>= 2.0.0', :group => [:test, :development]
+      gem 'rspec-rails', '>= 2.5.0', :group => [:test, :development]
       @should_update = true
       return unless options[:update]
-      @finalize_hooks << lambda {say "Finalizing rspec installation..."; invoke 'rspec:install'}
+      @finalize_hooks << lambda {say "Finalizing rspec installation..."; system 'rails g rspec:install'}
     end
 
     def setup_shoulda
@@ -60,7 +60,7 @@ private
 
     def add_generators_block
       n = name == 'rspec_with_shoulda' ? 'rspec' : name
-      block = "\n  config.generators do |g|"
+      block = "\n    config.generators do |g|"
       block << "\n      g.test_framework :#{n}, :fixtures => #{options[:fixtures].inspect}" if !options[:fixtures] || name != 'test_unit'
       block << "\n      g.fallbacks[:#{n}] = :test_unit" unless name == 'test_unit'
       block << "\n      g.fixture_replacement = :#{options[:fixture_replacement]}" unless options[:fixture_replacement].blank?

data/lib/generators/hobo/user_mailer/user_mailer_generator.rb

@@ -12,7 +12,7 @@ module Hobo
       "rails generate hobo:user_mailer [NAME=user] [options]"
     end
 
-    check_class_collision :suffix => 'Mailer'
+    # check_class_collision :suffix => 'Mailer'
 
     def generate_mailer
       template 'mailer.rb.erb', File.join('app/mailers', "#{file_path}_mailer.rb")

data/lib/hobo/model.rb

@@ -450,7 +450,7 @@ module Hobo
           if parts[0..2].include?(0)
             nil
           else
-            Time.zone ? Time.zone.local(*parts) : Time.local(*parts)
+            field_type <= Time ? Time.utc(*parts) : Time.zone.local(*parts)
           end
         else
           value

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

@@ -474,8 +474,8 @@ Assuming the context is a blog post...
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
 <def tag="view" for="Date" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
 
-<!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
-  <def tag="view" for="Time" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
+<!-- Renders `this` in localized :default format. `format` can be a symbol representing a Time::DATE_FORMATS or a standard format string (see strftime) -->
+  <def tag="view" for="Time" attrs="format"><%= this && (format||= :time) && (format.is_a?(Symbol) ? this.to_s(format) : this.strftime(format) ) %></def>
 
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
 <def tag="view" for="ActiveSupport::TimeWithZone" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>

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

@@ -374,33 +374,36 @@ edit collections a `Category` model in your application:
 ### Attributes
 
  - order: The order of the year, month and day menus. A comma separated string or an array. Default: "year, month, day"
+ - date-separator, discard-type, prompt and prefix are passed to the select_date helper as options
 
-Any other attributes are passed through to the `select_date` helper.
+All the other attributes are passed to the `select_date` helper as the html-options hash.
 
 The menus default to the current date if the current value is nil.
 
   -->
-<def tag="input" for="date" attrs="order">
+<def tag="input" for="date" attrs="order, date-separator, discard-type, prompt, prefix">
   <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
-  <%= select_date(this || current_time, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
+  <%= select_date(this || current_time,
+                  (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
+                  attributes - [:name]) %>
 </def>
 
 
-<!-- A date/time picker, using the `select_date` helper from Rails
+<!-- A date/time picker, using the `select_time` helper from Rails
 
 ### Attributes
 
- - order: The order of the year, month and date menus. A comma separated string or an array. Default: "year, month,
-   day, hour, minute, second"
+ - include-seconds, time-separator, prompt and prefix are passed to the select_time helper as options
 
-Any other attributes are passed through to the `select_date` helper.
+All the other attributes are passed to the `select_time` helper as the html-options hash.
 
 The menus default to the current time if the current value is nil.
 
   -->
-<def tag="input" for="time" attrs="order">
-  <% order = order.nil? ? [:year, :month, :day, :hour, :minute, :second] : comma_split(order).*.to_sym -%>
-  <%= select_date(this || current_time, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
+<def tag="input" for="time" attrs="include-seconds, time-separator, prompt, prefix">
+  <%= select_time( this || current_time,
+                   (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this),
+                   attributes - [:name] ) %>
 </def>
 
 
@@ -410,18 +413,21 @@ The menus default to the current time if the current value is nil.
 
  - order: The order of the year, month and date menus. A comma separated string or an array. Default: "year, month,
    day, hour, minute"
+ - date-separator, discard-type, prompt and prefix are passed to the select_date helper as options
 
-Any other attributes are passed through to the `select_datetime` helper.
+All the other attributes are passed to the `select_date` helper as the html-options hash.
 
 The menus default to the current time if the current value is nil.
 
   -->
-<def tag="input" for="datetime" attrs="order">
+<def tag="input" for="datetime" attrs="order, date-separator, discard-type, prompt, prefix">
   <% if ! order.nil?
        order = comma_split(order).*.to_sym
        attributes.merge!(:order => order)
      end -%>
-  <%= select_datetime(this || current_time, attributes.merge(:prefix => param_name_for_this)) %>
+  <%= select_datetime(this || current_time,
+                     (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
+                      attributes - [:name] ) %>
 </def>
 
 <!-- An `<input type='text'>` input. -->

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

@@ -130,7 +130,7 @@
 <def tag="plugin-method">
   <%=
       braids = File.open("#{Rails.root}/.braids") {|f| YAML::load(f) } rescue {}
-      if !braids[this.root.to_s.gsub(Rails.root+"/", "")].nil?
+      if !braids[this.root.to_s.gsub(Rails.root.to_s+"/", "")].nil?
         "braid"
       elsif File.lstat(this.root.to_s).symlink?
         "symlink"

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.3.0.pre27
+  hash: -1637108434
+  prerelease: true
+  segments: 
+  - 1
+  - 3
+  - 0
+  - pre28
+  version: 1.3.0.pre28
 platform: ruby
 authors: 
 - Tom Locke
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -04:00
+date: 2011-03-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +27,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +43,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 961915916
+        segments: 
+        - 3
+        - 0
+        - pre
         version: 3.0.pre
   type: :runtime
   version_requirements: *id002
@@ -43,7 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre27
+        hash: -1637108434
+        segments: 
+        - 1
+        - 3
+        - 0
+        - pre28
+        version: 1.3.0.pre28
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre27
+        hash: -1637108434
+        segments: 
+        - 1
+        - 3
+        - 0
+        - pre28
+        version: 1.3.0.pre28
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -65,7 +93,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.0.pre27
+        hash: -1637108434
+        segments: 
+        - 1
+        - 3
+        - 0
+        - pre28
+        version: 1.3.0.pre28
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -76,6 +110,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id006
@@ -87,6 +124,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id007
@@ -98,6 +138,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 7
+        - 5
         version: 0.7.5
   type: :development
   version_requirements: *id008
@@ -131,6 +176,7 @@ files:
 - lib/generators/hobo/admin_subsite/admin_subsite_generator.rb
 - lib/generators/hobo/admin_subsite/templates/admin.css
 - lib/generators/hobo/admin_subsite/templates/admin_tag_injection.erb
+- lib/generators/hobo/admin_subsite/templates/application.dryml
 - lib/generators/hobo/admin_subsite/templates/controller.rb.erb
 - lib/generators/hobo/admin_subsite/templates/users_index.dryml
 - lib/generators/hobo/assets/assets_generator.rb
@@ -173,6 +219,12 @@ files:
 - lib/generators/hobo/rapid/templates/ie7-recalc.js
 - lib/generators/hobo/rapid/templates/lowpro.js
 - lib/generators/hobo/rapid/templates/reset.css
+- lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/100-ACD3E6-DBE1E5-H.png
+- lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/100-DBE1E5-FCFEF5-H.png
+- lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/300-3B5F87-ACD3E6-H.png
+- lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/images/spinner.gif
+- lib/generators/hobo/rapid/templates/themes/clean-sidemenu/public/stylesheets/clean-sidemenu.css
+- lib/generators/hobo/rapid/templates/themes/clean-sidemenu/views/clean-sidemenu.dryml
 - lib/generators/hobo/rapid/templates/themes/clean/public/images/101-3B5F87-ACD3E6.png
 - lib/generators/hobo/rapid/templates/themes/clean/public/images/30-3E547A-242E42.png
 - lib/generators/hobo/rapid/templates/themes/clean/public/images/30-DBE1E5-FCFEF5.png
@@ -320,17 +372,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: hobo
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The web app builder for Rails