kiss 1.8.7 → 1.8.8

data/VERSION

@@ -1 +1 @@
-1.8.7
+1.8.8

data/lib/kiss/action.rb

@@ -6,8 +6,8 @@ class Kiss
     
     class << self
       _attr_reader :subdir, :part, :name, :path, :parent_class, :object_options, :aliases
+      alias_method :action_path, :path
       attr_reader :layout, :breadcrumbs, :authentication_required, :base_url
-      
       dsl_accessor :breadcrumb, :object_breadcrumb
       
       def inherited(subclass)
@@ -17,11 +17,7 @@ class Kiss
         @_child_classes = {}
       end
       
-      def action_path
-        self.path
-      end
-      
-      def get_subclass_from_path(path, request, params)
+      def action_instance_for_path(path, request, params)
         action_subdir = ''
         action_path = '/'
         action_found = false
@@ -48,7 +44,7 @@ class Kiss
           
           if part =~ /\A([\w\-\.\+\%]+)\=([\w\-\.\+\%]+)\Z/
             params[$1.url_unescape] = $2.url_unescape
-            action_path += '/'
+            action_path += '/' + part
             next
           end
           
@@ -253,8 +249,9 @@ class Kiss
     
     attr_accessor :layout, :title
     
-    _attr_reader :request, :controller, :forms, :action, :action_path, :template,
+    _attr_reader :request, :controller, :forms, :action, :path, :template,
       :extension, :args, :params, :output, :output_options
+    alias_method :action_path, :path
     
     def arg(index)
       @_args[index]
@@ -278,7 +275,7 @@ class Kiss
     def initialize(request, action_path, extension, collection, object, object_part, object_display_name, breadcrumbs, args, params = {})
       @_request = request
       @_controller = request.controller
-      @_action_path = action_path
+      @_path = action_path
       @_extension = extension
       @_object = object
       @_object_part = object_part
@@ -646,10 +643,5 @@ class Kiss
     def action
       self
     end
-    
-    def path
-      self.class.path
-    end
-    alias_method :action_path, :path
   end
 end

data/lib/kiss/form.rb

@@ -125,7 +125,7 @@ class Kiss
       :current_section, :current_columns
     dsl_accessor :name, :url, :action, :method, :enctype, :errors, :cancel, :mark_required,
       :id, :class, :style, :html, :error_class, :field_error_class, :objects_save_order,
-      :object, :prepend_html, :append_html, :year, :timezone
+      :object, :prepend_html, :append_html, :year, :timezone, :attach_field_errors
       
     # Create DSL methods for component types
     self.class_eval(
@@ -138,7 +138,8 @@ class Kiss
       attrs = args.to_attrs
       add_field({
         :type => type,
-        :name => name
+        :name => name,
+        :attach_errors => @_attach_field_errors
       }.merge(attrs), &block)
     end
     
@@ -171,6 +172,8 @@ class Kiss
       
       @_components = []
       @_fields = Hashay.new
+      @_attach_field_errors = false
+      @_has_field_errors = false
       @_object_fields = {}
       @_default_values ||= {}
       @_params = {}

data/lib/kiss/form/field.rb

@@ -112,7 +112,7 @@ class Kiss
       
       def add_error(message)
         (@_attach_errors ? @_errors : form.errors) << message
-        @_form.has_field_errors = true
+        @_form.field_errors << message
         nil
       end
       

data/lib/kiss/login.rb

@@ -10,8 +10,7 @@ class Kiss
         @_session['login'] = {}
       end
       
-      @_persist_data = @_session['login']
-      self.merge!(@_persist_data)
+      self.merge!(@_session['login'])
     end
     
     def expired?
@@ -19,7 +18,7 @@ class Kiss
     end
     
     def persist(data = {})
-      @_persist_data.merge!(data)
+      @_session['login'].merge!(data)
       self.merge!(data)
     end
     

data/lib/kiss/request.rb

@@ -191,7 +191,7 @@ EOT
       @@action_class ||= Kiss::Action.get_root_class(@_controller, @_controller.action_dir)
       
       # return action handler (instance of action class)
-      @@action_class.get_subclass_from_path(path, self, params)
+      @@action_class.action_instance_for_path(path, self, params)
     end
   
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 8
-  - 7
-  version: 1.8.7
+  - 8
+  version: 1.8.8
 platform: ruby
 authors: 
 - Shawn Van Ittersum
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-18 00:00:00 -07:00
+date: 2012-07-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency