RubyGems - hobo - Versions diffs - 0.6.2 → 0.6.3 - Mend

hobo 0.6.2 → 0.6.3

Files changed (60) hide show

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/default/public/stylesheets/application.css CHANGED

@@ -59,7 +59,7 @@ ul.account_nav { font-size: 80%; clear:right; }
 .flash { margin: 10px 30px; background: white; border: 2px solid #aaf; padding: 10px; text-align: center; }
-#page {
+.page_wrapper  {
     width:800px;
     background-color: white;
     margin-left:auto;

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/default/views/application.dryml CHANGED

@@ -1,6 +1,28 @@
 <include src="plugins/hobo/tags/rapid"/>
-<def tag="Page" attrs="title_prefix, title">
+<def tag="Page" extend_with="theme">
+  <PageWithoutTheme merge>
+    <wrapper>
+      <div id="page_top">
+        <div id="page_right">
+          <div id="page_bottom">
+            <div id="page_left">
+              <div id="page_corner02">
+                <div id="page_corner04">
+                  <div id="page_corner03">
+                    <div id="page_corner01">
+                      <div id="page_inner_top">
+                        <default_tagbody/>
+      </div></div></div></div></div></div></div></div></div>
+    </wrapper>
+    <stylesheets><default_tagbody/><theme_stylesheet/></stylesheets>
+  </PageWithoutTheme>
+</def>
+<def tag="OldPage" attrs="title_prefix, title">
   <% title ||= type_name + ": " + name(:no_wrapper => true) %>
   <doctype version="HTML 4.01 Transitional"/>
   <html>

data/hobo_files/plugin/generators/hobo_user_controller/templates/controller.rb CHANGED

@@ -2,4 +2,6 @@ class <%= class_name %>Controller < ApplicationController
   hobo_user_controller
+  auto_actions :all, :except => :create
 end

data/hobo_files/plugin/generators/hobo_user_model/templates/model.rb CHANGED

@@ -1,11 +1,13 @@
 class <%= class_name %> < ActiveRecord::Base
-  hobo_user_model :username
+  hobo_user_model
   fields do
     username :string
     timestamps
   end
+  set_login_attr :username
   alias_attribute :to_s, :username

data/hobo_files/plugin/init.rb CHANGED

@@ -1,3 +1,4 @@
+# Monkey patches, ooh ooh
 require 'extensions'
 require 'rexml'
 require 'active_record/has_many_association'
@@ -9,6 +10,7 @@ require 'hobo'
 require 'hobo/dryml'
 require 'hobo/model'
+require 'hobo/field_declaration_dsl'
 require 'hobo/dryml/template'
 require 'hobo/dryml/taglib'
@@ -19,23 +21,33 @@ require 'hobo/plugins'
 require 'extensions/test_case' if RAILS_ENV == "test"
+# Rich data types
+require "hobo/html_string"
+require "hobo/markdown_string"
+require "hobo/textile_string"
+require "hobo/password_string"
+require "hobo/text"
+require "hobo/email_address"
+require "hobo/enum_string"
+require "hobo/percentage"
 ActionView::Base.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
 class ActionController::Base
   def self.hobo_user_controller(model=nil)
+    @model = model
     include Hobo::ModelController
-    self.model = model if model
     include Hobo::UserController
   end
   def self.hobo_model_controller(model=nil)
+    @model = model
     include Hobo::ModelController
-    self.model = model if model
   end
-  def self.hobo_controller(model=nil)
+  def self.hobo_controller
     include Hobo::Controller
   end
@@ -45,13 +57,12 @@ class ActiveRecord::Base
   def self.hobo_model
     include Hobo::Model
   end
-  def self.hobo_user_model(login_attr=nil, &b)
+  def self.hobo_user_model
     include Hobo::Model
-    include Hobo::AuthenticatedUser
-    set_login_attr(login_attr, &b) if login_attr
+    include Hobo::User
   end
 end
 # Default settings
-Hobo.developer_features = ["development", "test"].include?(RAILS_ENV) if Hobo.developer_features? == nil
+Hobo.developer_features = RAILS_ENV.in?(["development", "test"]) if Hobo.developer_features?.nil?

data/hobo_files/plugin/lib/active_record/has_many_association.rb CHANGED

@@ -28,10 +28,10 @@ module ActiveRecord::Associations
       if loaded?
         target.include?(record)
       else
-        find(record.id) && true rescue false
+        (r = find(record.id)) && r == record rescue false
       end
     end
     def member_class
       proxy_reflection.klass

data/hobo_files/plugin/lib/extensions.rb CHANGED

@@ -24,13 +24,29 @@ class Module
     aliased_target, punctuation = target.to_s.sub(/([?!=])$/, ''), $1
     yield(aliased_target, punctuation) if block_given?
     without = "#{aliased_target}_without_#{feature}#{punctuation}"
-    unless without.in?(instance_methods)
+    unless instance_methods.include?(without)
       alias_method without, target
       alias_method target, "#{aliased_target}_with_#{feature}#{punctuation}"
     end
   end
+  def alias_tag_chain(tag, feature)
+    if tag.to_s =~ /^[A-Z]/
+      without = "#{tag}Without#{feature.to_s.camelize}"
+      with    = "#{tag}With#{feature.to_s.camelize}"
+    else
+      without = "#{tag}_without_#{feature}"
+      with    = "#{tag}_with_#{feature}"
+    end
+    unless instance_methods.include?(without)
+      alias_method without, tag
+      alias_method tag, with
+    end
+  end
   # Fix delegate so it doesn't go bang if 'to' is nil
   def delegate(*methods)
     options = methods.pop
@@ -46,7 +62,7 @@ class Module
       EOS
     end
   end
   private
   def bool_attr_accessor(*args)
@@ -77,7 +93,7 @@ module Kernel
   def it() It.new end
   alias its it
 end
@@ -148,13 +164,41 @@ end
 class SafeNil
-  def self.instance
-    @instance ||= SafeNil.new
+  include Singleton
+  def method_missing(method, *args, &b)
+    return nil unless nil.respond_to? method
+    nil.send(method, *args, &b) rescue nil
+  end
+end
+alias DelegateClass_without_safe_nil DelegateClass
+def DelegateClass(klass)
+  c = DelegateClass_without_safe_nil(klass)
+  c.class_eval do
+    def _?
+      self
+    end
+  end
+  c
+end
+class TrueClass
+  def implies(x)
+    x
   end
-  def method_missing(*args, &b)
-    nil.send(*args, &b) rescue nil
+end
+class FalseClass
+  def implies(x)
+    true
   end
 end
@@ -168,10 +212,10 @@ module Enumerable
     not_found
   end
-  def every(proc)
-    map(&proc)
+  def every(method, *args)
+    map { |x| x.send(method, *args) }
   end
   def map_with_index
     res = []
     each_with_index {|x, i| res << yield(x, i)}
@@ -218,9 +262,9 @@ class Hash
     res
   end
-  def map_hash
+  def map_hash(&b)
     res = {}
-    each {|k,v| res[k] = yield(k,v) }
+    each {|k,v| res[k] = b.arity == 1 ? yield(v) : yield(k, v) }
     res
   end

data/hobo_files/plugin/lib/hobo.rb CHANGED

@@ -88,7 +88,7 @@ module Hobo
     def dom_id(obj, attr=nil)
       if obj.nil?
-        raise HoboError, "Tried to get dom id of nil.#{attr}" if attr
+        raise ArgumentError, "Tried to get dom id of nil.#{attr}" if attr
         return 'nil'
       end
@@ -98,11 +98,13 @@ module Hobo
       elsif obj.is_a?(Class)
         return type_id(obj)
       elsif !obj.respond_to?(:typed_id)
-        if attr
-          return dom_id(get_field(obj, attr))
-        else
-          raise ArgumentError, "Can't create dom id for #{obj.inspect}"
-        end
+        return (if attr
+                  dom_id(get_field(obj, attr))
+                elsif obj.respond_to?(:id)
+                  "#{obj.class.name.underscore}_#{obj.id}"
+                else
+                  raise ArgumentError, "Can't create dom id for #{obj.inspect}"
+                end)
       end
       attr ? "#{obj.typed_id}_#{attr}" : obj.typed_id
     end
@@ -138,84 +140,12 @@ module Hobo
       results
     end
-    def add_routes(map)
-      begin
-        ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
-      rescue
-        # No database, no routes
-        return
-      end
-      require "#{RAILS_ROOT}/app/controllers/application" unless Object.const_defined? :ApplicationController
-      require "#{RAILS_ROOT}/app/assemble.rb" if File.exists? "#{RAILS_ROOT}/app/assemble.rb"
-      for model in Hobo.models
-        controller_name = "#{model.name.pluralize}Controller"
-        controller = controller_name.constantize if (Object.const_defined? controller_name) ||
-          File.exists?("#{RAILS_ROOT}/app/controllers/#{controller_name.underscore}.rb")
-        if controller
-          web_name = model.name.underscore.pluralize.downcase
-          # Simple support for composite models, we might later need a CompositeModelController
-          if model < Hobo::CompositeModel
-            map.connect "#{web_name}/:id", :controller => web_name, :action => 'show'
-          elsif controller < Hobo::ModelController
-            map.resources web_name, :collection => { :completions => :get }
-            for collection in controller.collections
-              new_method = Hobo.simple_has_many_association?(model.reflections[collection])
-              Hobo.add_collection_routes(map, web_name, collection, new_method)
-            end
-            for method in controller.web_methods
-              map.named_route("#{web_name.singularize}_#{method}",
-                              "#{web_name}/:id/#{method}",
-                              :controller => web_name,
-                              :action => method.to_s,
-                              :conditions => { :method => :post })
-            end
-            for view in controller.show_actions
-              map.named_route("#{web_name.singularize}_#{view}",
-                              "#{web_name}/:id/#{view}",
-                              :controller => web_name,
-                              :action => view.to_s,
-                              :conditions => { :method => :get })
-            end
-            if controller < Hobo::UserController
-              prefix = web_name == "users" ? "" : "#{web_name.singularize}_"
-              map.named_route("#{web_name.singularize}_login", "#{prefix}login",
-                              :controller => web_name, :action => 'login')
-              map.named_route("#{web_name.singularize}_logout", "#{prefix}logout",
-                              :controller => web_name, :action => 'logout')
-              map.named_route("#{web_name.singularize}_signup", "#{prefix}signup",
-                              :controller => web_name, :action => 'signup')
-            end
-          end
-        end
-      end
-    end
-    def add_collection_routes(map, controller_name, collection_name, new_method)
-      singular_name = collection_name.to_s.singularize
-      map.with_options :controller => controller_name, :conditions => { :method => :get } do |m|
-        m.named_route("#{controller_name.singularize}_#{collection_name}",
-                      "#{controller_name}/:id/#{collection_name}",
-                      :action => "show_#{collection_name}")
-        m.named_route("new_#{controller_name.singularize}_#{singular_name}",
-                      "#{controller_name}/:id/#{collection_name}/new",
-                      :action => "new_#{singular_name}") if new_method
-      end
+    def add_routes(m)
+      Hobo::ModelRouter.add_routes(m)
     end
-    def all_controllers
-      Hobo.models.map {|m| m.name.underscore.pluralize}
+    def all_models
+      Hobo.models.map { |m| m.name.underscore }
     end
@@ -229,7 +159,8 @@ module Hobo
     def get_field(object, field)
-      if field.to_s =~ /\d+/
+      return nil if object.nil?
+      if field.to_s =~ /^\d+$/
         object[field.to_i]
       else
         object.send(field)
@@ -248,6 +179,7 @@ module Hobo
       field, parent = nil
       path.each do |field|
+        return nil if object.nil?
         parent = object
         object = get_field(parent, field)
       end
@@ -281,15 +213,20 @@ module Hobo
       refl = object.class.reflections[field.to_sym] if object.is_a?(ActiveRecord::Base)
-      # has_many and polymorphic associations are not editable (for now)
-      return false if refl and (refl.macro == :has_many or refl.options[:polymorphic] or refl.macro == :has_one)
+      # has_one and polymorphic associations are not editable (for now)
+      return false if refl and (refl.options[:polymorphic] or refl.macro == :has_one)
       if object.has_hobo_method?(:editable_by?)
         check_permission(:edit, person, object, field.to_sym)
+      elsif object.has_hobo_method?("#{field}_editable_by?")
+        object.send("#{field}_editable_by?", person)
       else
         # Fake an edit test by setting the field in question to
         # Hobo::Undefined and then testing for update permission
+        # This technique is not suitable for has_many associations
+        return false if refl._?.macro == :has_many
         current = object.send(field)
         new = object.duplicate
@@ -346,10 +283,10 @@ module Hobo
       if field
         field = field.to_sym if field.is_a? String
-        return false if object.is_a?(ActiveRecord::Base) and object.class.never_show?(field)
+        return false if object.class.respond_to?(:never_show?) && object.class.never_show?(field)
       else
         # Special support for classes (can view instances?)
-        if object.is_a?(Class) and object < ActiveRecord::Base
+        if object.is_a?(Class) and object < Hobo::Model
           object = object.new
         elsif Hobo.simple_has_many_association?(object)
           object = object.new
@@ -357,7 +294,7 @@ module Hobo
       end
       viewable = check_permission(:view, person, object, field)
       if viewable and field and
-          ( (field_val = get_field(object, field)).is_a?(ActiveRecord::Base) or field_val.is_a?(Array) )
+          ( (field_val = get_field(object, field)).is_a?(Hobo::Model) or field_val.is_a?(Array) )
         # also ask the current value if it is viewable
         can_view?(person, field_val)
       else

data/hobo_files/plugin/lib/hobo/composite_model.rb CHANGED

@@ -64,6 +64,8 @@ module Hobo
       objects = self.class.models.map {|m| instance_variable_get("@#{m.underscore}")}
       objects.every(:id).join("_")
     end
+    alias_method :to_param, :id
   end

data/hobo_files/plugin/lib/hobo/controller.rb CHANGED

@@ -4,19 +4,27 @@ module Hobo
     include AuthenticationSupport
-    def self.included(base)
-      if base.is_a?(Class)
-        included_in_class(base)
+    class << self
+      def included(base)
+        if base.is_a?(Class)
+          included_in_class(base)
+        end
       end
-    end
-    def self.included_in_class(klass)
-      klass.extend(ClassMethods)
-      klass.class_eval do
-        alias_method_chain :redirect_to, :object_url
-        @included_taglibs = []
+      def included_in_class(klass)
+        klass.extend(ClassMethods)
+        klass.class_eval do
+          alias_method_chain :redirect_to, :object_url
+          @included_taglibs = []
+        end
+        Hobo::HoboHelper.add_to_controller(klass)
+      end
+      def controller_and_view_for(page_path)
+        page_path.match(/(.*)\/([^\/]+)/)[1..2]
       end
-      Hobo::HoboHelper.add_to_controller(klass)
     end
     module ClassMethods
@@ -27,27 +35,30 @@ module Hobo
         @included_taglibs << if options[:from_plugin]
                                'plugins/' + options[:from_plugin] + '/taglibs/' + src
                              else
-                               src
+                               src.to_s
                              end
       end
     end
     protected
-    def redirect_to_with_object_url(destination, view=nil)
+    def redirect_to_with_object_url(destination, *args)
       if destination.is_a?(String, Hash, Symbol)
         redirect_to_without_object_url(destination)
       else
-        redirect_to_without_object_url(object_url(destination, view))
+        redirect_to_without_object_url(object_url(destination, *args))
       end
     end
-    def hobo_ajax_response(this=nil, results={})
-      this ||= @this
-      part_page = params[:part_page]
+    def hobo_ajax_response(*args)
+      results = args.extract_options!
+      this = args.first || @this
+      page_path = params[:page_path]
       r = params[:render]
       if r
-        ajax_update_response(this, part_page, r.values, results)
+        ajax_update_response(this, page_path, r.values, results)
         true
       else
         false
@@ -55,9 +66,9 @@ module Hobo
     end
-    def ajax_update_response(this, part_page, render_specs, results={})
+    def ajax_update_response(this, page_path, render_specs, results={})
       add_variables_to_assigns
-      renderer = Hobo::Dryml.page_renderer(@template, [], part_page) if part_page
+      renderer = Hobo::Dryml.page_renderer(@template, [], page_path) if page_path
       render :update do |page|
         page << "var _update = typeof Hobo == 'undefined' ? Element.update : Hobo.updateElement;"
@@ -129,3 +140,12 @@ module Hobo
   end
 end
+class ActionController::Base
+  def home_page
+    ""
+  end
+end