hobo 0.8.5 → 0.8.6

data/taglibs/rapid_support.dryml

@@ -1,3 +1,24 @@
+<!-- Rapid Support is the home for some tags that are useful in defining other tags. -->
+
+
+<!-- Call with the context set to a record. Repeats the content of the tag with `this` and `this_field` set to the value and name of each of the record's fields in turn. E.g. this is useful for generating a form containing each of the fields. Tags like `<field-list>` and `<table>` forward their attributes to this tag and also have the features described here. For example, the `fields` attribute to `<field-list>` supports the same options as described here.
+  
+This tag is in need of a review - it's a bit funky.
+
+### Attributes
+
+ - `fields` - set to one of:
+    - A model class - equivalent to listing all of the regular 'content columns' of that model
+    - '`*`' - equivalent to listing all of the regular 'content columns' of the current record
+    - A comma separated list of field names.
+  Defaults to '`*`'
+ - `assocaitions` - set to `has_many` to select the associations `has_many` relationships used as the "fields". Do not also give the `fields` attribute.
+ - `skip` - comma separated list of field names to omit.
+ - `skip-associations` - set to `has-many` to omit all `has_many` associations.
+ - `include-timestamps` - whether or not to include the standard ActiveRecord timestamp fields such as `created_at` and `updated_at`. Defaults to false.
+ - `force-all` - by default fields are skipped if the current user does not have view permission. Set `force-all` to true to skip this permission check and include all the fields.
+  
+  -->
 <def tag="with-fields" attrs="fields, associations, skip, skip-associations, include-timestamps, force-all"><%
   fields.nil? || associations.nil? or raise ArgumentError, "with-fields -- specify either fields or associations but not both"
    
@@ -31,6 +52,22 @@
   end
 %></def>
 
+<!-- Call with the context set to a model class. Repeats the content of the tag with `this` set name of each of the model's fields in turn. E.g. this tag is used when generating the heading row in a `<table fields='...'/>`.
+  
+This tag is in need of a review - it's a bit funky.
+
+### Attributes
+
+ - `fields` - set to one of:
+    - A model class - equivalent to listing all of the regular 'content columns' of that model
+    - '`*`' - equivalent to listing all of the regular 'content columns' of the current record
+    - A comma separated list of field names.
+  Defaults to '`*`'
+ - `skip` - comma separated list of field names to omit.
+ - `skip-associations` - set to `has-many` to omit all `has_many` associations.
+ - `include-timestamps` - whether or not to include the standard ActiveRecord timestamp fields such as `created_at` and `updated_at`. Defaults to false.
+  
+  -->
 <def tag="with-field-names" attrs="fields, skip, skip-associations, include-timestamps"><%=
   field_names = if fields.nil? || fields == "*" || fields.is_a?(Class)
                   klass = fields.is_a?(Class) ? fields : this.member_class
@@ -53,7 +90,7 @@
   field_names -= comma_split(skip) if skip
   scope.new_scope :field_name => nil, :field_path => nil do
     field_names.map do |n|
-      scope.field_name = n == "this" ? this.member_class.name : n.to_s.gsub("." , "_") 
+      scope.field_name = n == "this" ? this.member_class.try.name : n.to_s.gsub("." , "_") 
       scope.field_path = n
       parameters.default
     end

data/taglibs/rapid_user_pages.dryml

@@ -1,11 +1,15 @@
+<!-- Rapid User Pages contains tags that implement the basics of Hobo's user management: log in, sign up, forgot password etc. -->
+
+<!-- Some of the user pages use a simplified layout that does not feature things like the main nav and live-search. This tag defines that page -->
 <def tag="simple-page">
   <page without-live-search without-main-nav merge>
-    <account-nav: replace><dev-user-changer/></account-nav:>
+    <account-nav: replace />
   </page>
 </def>    
 
 
-<def tag="login-page" attrs="remember-me">
+<!-- Simple log-in page  -->
+<def tag="login-page">
   <% remember_me = true if remember_me.nil? %>
   <simple-page title="Log in" merge>
    
@@ -31,9 +35,11 @@
               </item-value>
             </labelled-item>
 
-            <labelled-item if="&remember_me">
+            <labelled-item param="remember-me">
               <item-label class="field-label" param="remember-me-label">Remember me:</item-label>
-              <item-value><input type="checkbox" name="remember_me" id="remember-me" param="remember-me-input"/></item-value>
+              <item-value>
+                <input type="checkbox" name="remember_me" id="remember-me" param="remember-me-input" checked/>
+              </item-value>
             </labelled-item>
           </labelled-item-list>
           <div param="actions">
@@ -48,6 +54,8 @@
 </def>
 
 
+<!-- The page that initiates the forgotten password process. Contians a single text-input where the user can provide
+ their email address -->
 <def tag="forgot-password-page">
   <simple-page title="Forgotten Password" merge>
    
@@ -81,7 +89,9 @@
   </simple-page>
 </def>
 
-
+<!-- Second page in the forgotten password process. Informs the user that the email has been sent "If the e-mail address you
+entered is in our records". This is to avoid a privacy concern that the forgotten-password mechanism can be otherwise used to tell
+if a given email is associated with an account or not. -->
 <def tag="forgot-password-email-sent-page">
   <simple-page>
     <body: class="forgot-password-page" param/>
@@ -105,6 +115,7 @@
 </def>
 
 
+<!-- The page that is displayed on attempting to log in to an account that has been disabled. -->
 <def tag="account-disabled-page">
 
   <simple-page title="Account not available" merge>
@@ -125,6 +136,7 @@
 </def>
 
 
+<!-- Basic account page that provides the ability for the user to change their email address and password. -->
 <def tag="account-page">
 
   <page title="#{name} - Account" merge>

data/test/permissions/models/models.rb

@@ -6,11 +6,6 @@ $:.unshift "#{HOBO_HOME}/hobo/lib"
 require 'rubygems'
 require 'sqlite3'
 require 'activerecord'
-require 'hobosupport'
-require 'hobofields'
-require 'hobo'
-
-Hobo::Model.enable
 
 module Models
   
@@ -19,27 +14,27 @@ module Models
   HOME = File.dirname(__FILE__)
   
   def model(name, &b)
-    klass = Object.const_set(name, Class.new(ActiveRecord::Base))
+    klass = Object.const_get(name)
     klass.hobo_model
     klass.class_eval(&b)
     klass.delete_all rescue nil
   end
   
   def user_model(name, &b)
-    klass = Object.const_set(name, Class.new(ActiveRecord::Base))
+    klass = Object.const_get(name)
     klass.hobo_user_model
     klass.class_eval(&b)
     klass.delete_all rescue nil
   end
   
   def create_database_sqlite3
-    ActiveRecord::Base.establish_connection(:adapter  => "sqlite3",
-                                            :database => "#{HOME}/test.sqlite3",
-                                            :timeout  => 5000)
+    ActiveRecord::Base.establish_connection(:adapter => "sqlite3",
+                                            :database => "/tmp/hobo_permissions_test.sqlite3",
+                                            :timeout => 5000)
   end
   
   def init
-    create_database_sqlite3
+    Hobo::Model.enable
     make_models
     up, down = HoboFields::MigrationGenerator.run
     ActiveRecord::Migration.class_eval(up)
@@ -47,6 +42,10 @@ module Models
   
   def make_models
 
+    [:Response, :Comment, :Request, :Recipe, :Collaboratorship, :Image, :CodeExample, :User].each do |m|
+      Object.const_set(m, Class.new(ActiveRecord::Base))
+    end
+      
     model :Response do
       fields do 
         body :string
@@ -112,6 +111,9 @@ module Models
       fields do
         filename :string
       end
+      has_one :recipe
+      def update_permitted?;  recipe.user == acting_user end      
+      def create_permitted?;  true end
     end
 
     user_model :User do
@@ -131,4 +133,14 @@ module Models
     
   end
   
-end
+end
+
+# activerecord 2.3.2 is buggy.  It requires a connection before we can
+# load hobo.  see https://gist.github.com/90542/0417ee6e71f0bed287824d47163c0e34ff4dc321
+# otherwise, this line should be in Models.init
+Models.create_database_sqlite3
+require 'hobosupport'
+require 'hobofields'
+require 'hobo'
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.8.5
+  version: 0.8.6
 platform: ruby
 authors: 
 - Tom Locke
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-09 00:00:00 +00:00
+date: 2009-05-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.5
+        version: 0.8.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: hobofields
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.8.5
+        version: 0.8.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -64,11 +64,9 @@ extra_rdoc_files:
 - lib/active_record/association_collection.rb
 - lib/active_record/association_proxy.rb
 - lib/active_record/association_reflection.rb
-- lib/extensions/test_case.rb
 - lib/hobo/accessible_associations.rb
 - lib/hobo/authentication_support.rb
 - lib/hobo/bundle.rb
-- lib/hobo/composite_model.rb
 - lib/hobo/controller.rb
 - lib/hobo/dev_controller.rb
 - lib/hobo/dryml/dryml_builder.rb
@@ -106,7 +104,6 @@ extra_rdoc_files:
 - lib/hobo/model.rb
 - lib/hobo/model_controller.rb
 - lib/hobo/model_router.rb
-- lib/hobo/model_support.rb
 - lib/hobo/permissions/associations.rb
 - lib/hobo/permissions.rb
 - lib/hobo/rapid_helper.rb
@@ -116,6 +113,7 @@ extra_rdoc_files:
 - lib/hobo/scopes/named_scope_extensions.rb
 - lib/hobo/scopes.rb
 - lib/hobo/static_tags
+- lib/hobo/tasks/rails.rb
 - lib/hobo/undefined.rb
 - lib/hobo/undefined_access_error.rb
 - lib/hobo/user.rb
@@ -125,8 +123,6 @@ extra_rdoc_files:
 - LICENSE.txt
 - README
 - tasks/environments.rake
-- tasks/fix_dryml.rake
-- tasks/generate_tag_reference.rake
 - tasks/hobo_tasks.rake
 files: 
 - bin/hobo
@@ -139,11 +135,9 @@ files:
 - lib/active_record/association_collection.rb
 - lib/active_record/association_proxy.rb
 - lib/active_record/association_reflection.rb
-- lib/extensions/test_case.rb
 - lib/hobo/accessible_associations.rb
 - lib/hobo/authentication_support.rb
 - lib/hobo/bundle.rb
-- lib/hobo/composite_model.rb
 - lib/hobo/controller.rb
 - lib/hobo/dev_controller.rb
 - lib/hobo/dryml/dryml_builder.rb
@@ -181,7 +175,6 @@ files:
 - lib/hobo/model.rb
 - lib/hobo/model_controller.rb
 - lib/hobo/model_router.rb
-- lib/hobo/model_support.rb
 - lib/hobo/permissions/associations.rb
 - lib/hobo/permissions.rb
 - lib/hobo/rapid_helper.rb
@@ -191,6 +184,7 @@ files:
 - lib/hobo/scopes/named_scope_extensions.rb
 - lib/hobo/scopes.rb
 - lib/hobo/static_tags
+- lib/hobo/tasks/rails.rb
 - lib/hobo/undefined.rb
 - lib/hobo/undefined_access_error.rb
 - lib/hobo/user.rb
@@ -274,8 +268,6 @@ files:
 - taglibs/rapid_support.dryml
 - taglibs/rapid_user_pages.dryml
 - tasks/environments.rake
-- tasks/fix_dryml.rake
-- tasks/generate_tag_reference.rake
 - tasks/hobo_tasks.rake
 - test/generators/test_generator_helper.rb
 - test/generators/test_helper.rb
@@ -317,7 +309,6 @@ signing_key:
 specification_version: 2
 summary: The web app builder for Rails
 test_files: 
-- test/dryml/complilation_test.rb
 - test/generators/test_generator_helper.rb
 - test/generators/test_helper.rb
 - test/generators/test_hobo_model_controller_generator.rb

data/lib/extensions/test_case.rb

@@ -1,129 +0,0 @@
-
-class Test::Unit::TestCase
-
-  def self.fixture_objects(model, *names)
-    fixtures model
-    names.each do |name|
-      class_eval "def #{name}; #{model}(:#{name}); end"
-    end
-  end
-
-  protected
-
-  module HoboTesting
-
-    class HoboHelpers
-
-      def urlb
-        "http://example.com"
-      end
-    end
-
-    attr_reader :current_user
-
-    def is_redirected_to(x)
-      url = x.is_a?(String) ? x : object_url(x)
-      assert_response :redirect
-      assert_redirected_to(url)
-      follow_redirect!
-      assert_response :success
-    end
-
-    def logs_in_as(user, password)
-      @current_user = user
-      post login_url(user), :login => user.login, :password => password
-      assert_response :redirect, "#{user.login} failed to log in"
-      get homepage_url
-      assert_response :success
-    end
-
-    def visits(obj, action=nil, params={})
-      get object_url(obj, action, params)
-      assert_response :success
-    end
-
-    def cant_visit(obj, action=nil)
-      get object_url(obj, action)
-      assert_response :forbidden
-    end
-
-    def creates(klass, params)
-      replace_objects_in_params!(params)
-      post object_url(klass), klass.name.underscore => params
-      new_obj = assigns["this"]
-      flunk "validation errors: #{new_obj.errors.full_messages.join("\n")}" unless new_obj.errors.empty?
-      assert_response :redirect
-      new_obj
-    end
-
-    def deletes(object)
-      post object_url(object, "destroy")
-      assert_raise(ActiveRecord::RecordNotFound) { object.class.find(object.id) }
-      assert_response :redirect
-    end
-
-    def cant_create(klass, params)
-      replace_objects_in_params!(params)
-      post object_url(klass), klass.name.underscore => params
-      assert_response :forbidden
-    end
-
-    def can_see(s)
-      assert_select("body", Regexp.new(s.split.map { |w| Regexp.escape(w) }.join("\s*")),
-                    current_should("be able to see: #{s}"))
-    end
-
-    alias_method :sees, :can_see
-
-    def cant_see(s)
-      assert_select("body", { :text => Regexp.new(s.split.map { |w| Regexp.escape(w) }.join("\s*")), :count => 0 },
-                    current_should("not be able to see: #{s}"))
-    end
-
-    def creates_and_visits(klass, params)
-      new_obj = creates(klass, params)
-      visits(new_obj)
-      new_obj
-    end
-
-    def calls_method(object, method, params={})
-      post object_url(object, method), params
-      assert_response :success
-    end
-
-    def current_should(s)
-      "#{current_user.login} should #{s}"
-    end
-
-    def object_url(obj, action=nil, *param_hashes)
-      HoboHelpers.new.send(:object_url, obj, action, *param_hashes)
-    end
-
-    def replace_objects_in_params!(hash)
-      hash.each do |k,v|
-        if v.is_a? ActiveRecord::Base
-          hash[k] = "@" + v.typed_id
-        elsif v.is_a? Hash
-          replace_objects_in_params!(v)
-        end
-      end
-    end
-
-  end
-
-  def new_session
-    open_session do |sess|
-      sess.extend(HoboTesting)
-      session_opened(sess) if respond_to? :session_opened
-      yield sess if block_given?
-    end
-  end
-
-  def new_session_as(person, password)
-    new_session do |sess|
-      sess.logs_in_as(person, password)
-      yield sess if block_given?
-    end
-  end
-
-end

data/lib/hobo/composite_model.rb

@@ -1,73 +0,0 @@
-module Hobo
-
-  class CompositeModel
-
-    include ModelSupport
-
-    class << self
-
-      def find(id)
-        ids = id.split('_')
-        new(*ids.map_with_index{|id, i| @models[i].constantize.find(id)})
-      end
-
-      def compose(*models)
-        @models = models.map &it.to_s.camelize
-        attr_reader *models
-        CompositeModel.composites ||= {}
-        CompositeModel.composites[@models.sort] = self.name
-
-        Hobo.register_model(self)
-      end
-
-      attr_accessor :composites
-
-      attr_reader :models
-
-      def new_for(objects)
-        classes = objects.map{|o| o.class.name}.sort
-        composite_class = CompositeModel.composites[classes].constantize rescue
-          (raise ArgumentError, "No composite model for #{classes.inspect}")
-        composite_class.new(*objects)
-      end
-
-    end
-
-
-    def initialize(*objects)
-      objects.each do |obj|
-        raise ArgumentError, "invalid objects for composition: #{objects.inspect}" unless
-          obj.class.name.in? self.class.models
-        instance_variable_set("@#{obj.class.name.underscore}", obj)
-      end
-    end
-
-
-    def has_hobo_method?(name)
-      respond_to?(name)
-    end
-
-
-    def compose_with(object, use=nil)
-      self_classes = use ? use.models : self.class.models
-      from_self = (self_classes - [object.class.name]).map {|classname| send(classname.underscore)}
-      CompositeModel.new_for(from_self + [object])
-    end
-
-
-    def typed_id
-      "#{self.class.name.underscore}:#{id}"
-    end
-
-
-    def id
-      objects = self.class.models.map {|m| instance_variable_get("@#{m.underscore}")}
-      objects.*.id.join("_")
-    end
-
-    alias_method :to_param, :id
-
-  end
-
-end
-