amrita2 2.0.0 → 2.0.1

data/README

@@ -77,7 +77,7 @@ matching the +id+ attribute of XML element to model data.
 
 === Current version and roadmap
 
-Current version is 2.0.0 . 
+Current version is 2.0.1 . 
 
 === Setup
 

data/init.rb

@@ -3,4 +3,5 @@
 require 'amrita2/rails_bridge'
 
 ActionView::Base.register_template_handler "a2html", Amrita2View::Base
+ActionView::Base.register_template_handler "a2", Amrita2View::Base
 

data/lib/amrita2/rails_bridge.rb

@@ -2,9 +2,99 @@ require 'amrita2/template'
 
 require 'action_view'
 
+module Amrita2
+  module Core
+    class Hook
+      include ActionView::Helpers::FormHelper
+      include ActionView::Helpers::FormHelper
+    end
+  end
+
+end
+
+module Amrita2View # :nodoc: all
+  module FormHelper
+    class FormFieldHelper
+      include Amrita2::DictionaryData
+      attr_reader :form, :data
+      
+      def initialize(record, form, &block)
+        @record = record
+        @form = form
+        @data = {}
+        block.call(self)
+      end
+
+      def add_field(name, value)
+        @data[name] = value
+      end
+
+      def add_field_element(name, element)
+        add_field(name, Amrita2::SanitizedString[element])
+      end
+
+      def method_missing(meth, name, *args, &block)
+        value = @form.send(meth, name, *args, &block)
+        add_field_element(name, value)
+      end
+
+      def as_hash
+        @data
+      end
+
+      def as_label_field_hash
+        @data.inject(Hash.new) do |h, data|
+          k, v = *data
+          h.merge ({
+                     k => {
+                       :label => {
+                         :for=>"#{@record}_#{k}",
+                         :text=>k.to_s
+                       },
+                       :field => v
+                     }
+                   })
+        end
+      end
+    end
+    
+    def amrita_define_form(*args, &block)
+      record = args.first
+      method = :form_for
+      format = :as_hash
+      case h = args.last
+      when Hash
+        method = h.delete(:form_method) || method
+        format = h.delete(:amrita_format) || format
+      end
+
+      amrita_form_hook(method, *args) do |f|
+        FormFieldHelper.new(record, f) do |ff|
+          block.call(ff)
+        end.send(format)
+      end
+    end
+    
+    def amrita_form_hook(meth, *args, &block)
+      view = self
+      hook = Amrita2::Core::Hook.new do
+        _erbout = stream
+        view.instance_eval do
+          self.send(meth, *args) do |f|
+            data = block.call(f)
+            hook.render_me_with(data)
+          end
+        end
+      end
+    end
+  end
+  FormFieldHelper = FormHelper::FormFieldHelper
+end
+
 module ActionView # :nodoc: all
   class Base #:nodoc:
     include Amrita2::Runtime
+    include Amrita2View::FormHelper
   end
 end
 
@@ -18,13 +108,6 @@ module ActiveRecord # :nodoc: all
   end
 end
 
-module ActionController  # :nodoc: all
-  class Pagination::Paginator
-    include Amrita2::DictionaryData
-  end
-end
-
-
 module Amrita2View # :nodoc: all
   class Base
     include Amrita2
@@ -91,6 +174,8 @@ module Amrita2View # :nodoc: all
       end
     end
   end
+
+  
   module Helper
     include ActionView::Helpers::UrlHelper
 

data/lib/amrita2/template.rb

@@ -1,10 +1,7 @@
-require 'rubygems'
 require 'hpricot'
 require 'erb'
-#require 'rexml/document'
 require 'enumerator'
 
-
 module Amrita2 
  module ScalarData
     def amrita_value
@@ -73,18 +70,6 @@ class Time
   include Amrita2::ScalarData
 end
 
-# class REXML::Element
-#   include Amrita2::ScalarData
-#   def amrita_value
-#     Amrita2::SanitizedString[to_s]
-#   end
-
-#   def as_amrita_dictionary(*args)
-#     Amrita2::Util::REXMLConverter.new(*args).convert(self)
-#   end
-# end
-
-
 class Array
   include Amrita2::Enum
 end
@@ -96,7 +81,7 @@ end
 class Hash
   include Amrita2::DictionaryData
   def amrita_value(name)
-    self[name]
+    self[name.to_sym]
   end
 end
 
@@ -313,109 +298,9 @@ module Amrita2
         self.new(args)
       end
     end
-
-    class REXMLConverter # :nodoc: all
-      include Amrita2
-      include Util::OptionSupport
-
-      def initialize(*args)
-        parse_opt(*args)
-      end
-
-      def convert(e)
-        @noattrs = select_elements(e, :noattrs)
-        @use_child_contents = select_elements(e, :use_child_contents)
-        @use_child = select_elements(e, :use_child)
-        convert1(e)
-      end
-
-      def convert1(e)
-        h = {}
-        if use_attr?(e)
-          e.attributes.each do |key, value|
-            h[key.intern] = value
-          end
-        end
-
-        ctag = get_contents_tag(e)
-        if ctag
-          if e.elements.size > 0
-            s = e.collect { |cc| cc.to_s }
-            h[ctag] = SanitizedString[s]
-          else
-            h[ctag] = e.text
-          end
-        end
-
-        e.each_element do |c|
-          if use_child_contents?(c)
-            if c.elements.size > 0
-              s = c.collect { |cc| cc.to_s }
-              h[c.name.intern] = SanitizedString[s]
-            else
-              h[c.name.intern] = c.text
-            end
-          end
-
-          if use_child?(c)
-            ch = convert1(c)
-            case h[c.name.intern]
-            when nil
-              h.merge!(ch)
-            when Array
-              h[c.name.intern] << ch[c.name.intern]
-            else
-              h[c.name.intern] = [h[c.name.intern], ch[c.name.intern]]
-            end
-          end
-        end
-        if @opt[:use_tag]
-          { e.name.intern => h }
-        else
-          h
-        end
-      end
-
-      private
-
-      def select_elements(e, key)
-        case xpath = opt[key]
-        when String
-          REXML::XPath.match(e, xpath)
-        when nil,false
-          return []
-        else
-          REXML::XPath.match(e, "//*")
-        end
-      end
-
-      def get_contents_tag(e)
-        case o = opt[:use_contents]
-        when true, :use_contents
-          :contents
-        when Symbol
-          o
-        when nil
-          nil
-        else
-          raise "not implemented"
-        end
-      end
-
-      def use_attr?(e)
-        not @noattrs.include?(e)
-      end
-
-      def use_child_contents?(e)
-        @use_child_contents.include?(e)
-      end
-
-      def use_child?(e)
-        @use_child.include?(e)
-      end
-    end
   end
 
+
   module Runtime # :nodoc: all
     def amrita_set_context_value(v)
       Thread::current[:amrita_context_value] = v
@@ -951,7 +836,7 @@ module Amrita2
 
       def class_name
         if name
-          "XX" + name.capitalize
+          "XX" + name.capitalize.gsub(/[^\w\d]/, "_")
         else
           "XX%d" % [object_id.abs]
         end
@@ -971,7 +856,7 @@ module Amrita2
 
       def render_me(cg, n = name)
         if (n)
-          cg.put_string_expression("#{instance_name}.render_with($_.amrita_value(:#{n}), __binding__)")
+          cg.put_string_expression("#{instance_name}.render_with($_.amrita_value(#{n.inspect}), __binding__)")
         else
           cg.put_string_expression("#{instance_name}.render_with($_, __binding__)")
         end
@@ -1067,7 +952,6 @@ module Amrita2
 
       def compile_filters(element, name, *args)
         src = args.compact.join('|')
-        #filters = src.split('|').collect { |f| parse_filter(f) }
         filters = parse_filter(src)
         @filter_proc.call(element, name, filters)
         filters
@@ -2146,14 +2030,14 @@ module Amrita2
           if use_body
             body_key = @opt[:body]
             body_key = :body unless body_key.kind_of?(Symbol)
-            cg.code("body = $_.amrita_value(:#{body_key})")
+            cg.code("body = $_.amrita_value(#{body_key.inspect})")
           end
           if @opt.size > 0
             cg.code("a = {}")
             @opt.each do |key, v|
               next if key == :body
               if element.get_attribute(key)
-                cg.case_("v = $_.amrita_value(:#{v})") do
+                cg.case_("v = $_.amrita_value(#{v.inspect})") do
                   cg.when_("true") do
                     cg.code("a[#{key.inspect}] = #{element.get_attribute(key).inspect}")
                   end
@@ -2161,11 +2045,11 @@ module Amrita2
                     cg.code("a.delete(#{key.inspect})")
                   end
                   cg.else_ do
-                    cg.code("a[#{key.inspect}] = $_.amrita_value(:#{v})")
+                    cg.code("a[#{key.inspect}] = $_.amrita_value(#{v.inspect})")
                   end
                 end
               else
-                cg.code("v = $_.amrita_value(:#{v})")
+                cg.code("v = $_.amrita_value(#{v.inspect})")
                 cg.code("a[#{key.inspect}] = v if v")
               end
             end
@@ -2414,7 +2298,7 @@ module Amrita2
 
       def make_tupple_code(cg)
         init_code = @names.collect do |n|
-          "$_.amrita_value(:#{n})"
+          "$_.amrita_value(#{n.inspect})"
         end.join(",")
         cg.code("$_ = Tuple[#{init_code}]")
       end
@@ -2486,7 +2370,7 @@ module Amrita2
         init_code = @names.collect do |n|
           case n
           when Symbol
-            "$_.amrita_value(:#{n})"
+            "$_.amrita_value(#{n.inspect})"
           else
             "eval(#{with_context_value_expression(n).inspect},__binding__)"
           end
@@ -2532,7 +2416,7 @@ module Amrita2
       private
       def make_tupple_code(cg)
         init_code = @names.collect do |n|
-          "$_.amrita_value(:#{n})"
+          "$_.amrita_value(#{n.inspect})"
         end.join(",")
         cg.code("a = [#{init_code}]")
       end
@@ -2701,4 +2585,5 @@ module Amrita2
 
   SanitizedString = Util::SanitizedString
   Template = Core::Template
+  Hooki = Core::Hook
 end

data/lib/amrita2/testsupport.rb

@@ -144,28 +144,3 @@ end
 class Object 
   include Amrita2::TestSupport
 end
-
-if Object::const_defined?(:ActionView)
-
-  class ActionView::Base # :nodoc: all
-    def self.unregister_template_handler(extension)
-      self.cache_template_extensions = false
-      @@template_handlers.delete(extension)
-    end
-  end
-
-  module Amrita2
-    module RailsTestHelper # :nodoc: all
-      def compare_result
-        ActionView::Base.register_template_handler "a2html", Amrita2View::Base
-        amrita2_result = yield
-        ActionView::Base.unregister_template_handler "a2html"
-        erb_result = yield
-        assert_equal_as_xml(erb_result, amrita2_result)
-        #assert_dom_equal(amrita2_result, erb_result)
-      end
-    end
-  end
-
-end
-

data/lib/amrita2/version.rb

@@ -2,7 +2,7 @@ module Amrita2
   module Version
     MAJOR=2
     MINOR=0
-    TINY=0
+    TINY=1
 
     STRING=[MAJOR,MINOR,TINY].join('.')
   end

data/sample/depot/app/controllers/admin_controller.rb

@@ -17,7 +17,9 @@ class AdminController < ApplicationController
   end
 
   def list
-    @product_pages, @products = paginate :products, :per_page => 10
+    #@product_pages, @products = paginate :products, :per_page => 10
+
+    @products = Product.paginate :page => params[:page]
   end
 
   def show

data/sample/depot/app/helpers/cart_helper.rb

@@ -0,0 +1,8 @@
+module CartHelper
+  include ActionView::Helpers::NumberHelper
+  def total_price_currency
+    number_to_currency(total_price)
+  end
+end
+
+

data/sample/depot/app/helpers/price_helper.rb

@@ -0,0 +1,7 @@
+module PriceHelper
+  include ActionView::Helpers::NumberHelper
+  def to_currency
+    number_to_currency(self)
+  end
+end
+

data/sample/depot/config/environment.rb

@@ -54,20 +54,6 @@ end
 
 # Include your application configuration below
 
-module PriceHelper
-  include ActionView::Helpers::NumberHelper
-  def to_currency
-    number_to_currency(self)
-  end
-end
-
-class BigDecimal
-  include PriceHelper
-end
-
-class Integer
-  include PriceHelper
-end
 
 module StringHelper
   include ActionView::Helpers::TextHelper