clot_engine 1.2 → 1.2.1

data/lib/clot/base_drop.rb

@@ -88,8 +88,8 @@ module Clot
       @source.errors
     end
 
-    def collection_label
-      "label field"
+    def new_record
+      @source.new_record?
     end
 
     def self.method_missing(symbol, *args)

data/lib/clot/form_for.rb

@@ -20,7 +20,7 @@ module Clot
           @attributes[key] = value
         end
       else
-        syntax_error tag_name, markup, tokens
+        syntax_error# tag_name, markup, tokens
       end
       super
     end
@@ -81,7 +81,7 @@ module Clot
           @attributes[key] = value
         end
       else
-        syntax_error tag_name, markup, tokens
+        syntax_error# tag_name, markup, tokens
       end
       super
     end
@@ -91,7 +91,11 @@ module Clot
       if @attributes.has_key?('url_helper')
         Protected.config = context.registers[:controller]
         @attributes['url'] = Protected.send(@attributes['url_helper'].to_sym) unless @attributes.has_key?('url_helper_params')
-        @attributes['url'] = Protected.send(@attributes['url_helper'].to_sym, context[@attributes['url_helper_params']].source) if @attributes.has_key?('url_helper_params')
+        if params = context[@attributes['url_helper_params']]
+          arg = params.is_a?(String) ? params : params.source
+          @attributes['url'] = Protected.send(@attributes['url_helper'].to_sym, arg)
+        end
+
       end
 
       if @attributes.has_key?('html')
@@ -195,7 +199,6 @@ module Clot
       @params = @_params.clone
       @model = context[@params.shift]
 
-      result = ""
       if @model and @model.respond_to?(:errors) and @model.errors.count > 0
         @suffix = @model.errors.count > 1 ? "s" : ""
         @default_message = @model.errors.count.to_s + " error#{@suffix} occurred while processing information"
@@ -210,25 +213,11 @@ module Clot
           end
         end
 
-        result += '<div class="errorExplanation" id="errorExplanation"><h2>' + @default_message + '</h2><ul>'
-
-        @model.errors.each do |attr, msg|
-          result += "<li>#{error_message(attr, msg)}</li>"
-        end if @model.respond_to? :errors
+        readable_errors = @model.errors.map{ |target, msg| "#{target}: #{msg}" }
 
-        result += "</ul></div>"
+        { :message => @default_message, :errors => readable_errors }.to_json
       end
-      result
     end
-
-    def error_message(attr, msg)
-      unless attr == :base
-        "#{attr} - #{msg}"
-      else
-        msg
-      end
-    end
-
   end
 
 end

data/lib/clot/model_form_tags.rb

@@ -3,7 +3,6 @@ module Clot
     def set_primary_attributes(context)
       @item = context['form_model']
       if @item
-
         @attribute_name =  resolve_value(@params.shift,context)
         @first_attr = context['form_class_name']
       else
@@ -50,15 +49,9 @@ module Clot
     end
 
     def render(context)
-      result = super(context)
-      #if @errors.include? @attribute_name
-      #  result = "<div class=\"fieldWithErrors\">#{result}</div>"
-      #end
-      result
+      super(context)
     end
 
-
-
   end
 
  class FileField < FileFieldTag
@@ -99,84 +92,22 @@ module Clot
   end
 
   class CollectionSelect < ClotTag
-    include ModelTag
-    def set_primary_attributes(context)
-      super context
-      if @params[0] && ! @params[0].match(/:/)
-         @collection = resolve_value(@params.shift,context)
-      end
-      @default_id = 'id'
-      @default_name = 'name'
-      if @params[0] && ! @params[0].match(/:/)
-         @default_id = resolve_value(@params.shift,context)
-      end
-      if @params[0] && ! @params[0].match(/:/)
-         @default_name = resolve_value(@params.shift,context)
-      end
-    end
+    # usage:
+    # {% collection_select "order[bill_address_attributes]" method:"country_id", collection:available_countries, value_method:'id', text_method:'name', html_options:"{class:'large-field'}" %}
 
-    def gen_option(item)
-      selection_string = ""
-      item_string = item
-      value_string = ""
-
-      # this line below is for BSON::ObjectId which doesn't respond to :id, but does :_id
-      @default_id = "_id" if @default_id == 'id' and item.respond_to?(:_id)
-
-      # @item = NationSignupDrop
-      # item = NationPlan
-
-      attribute_names = @attribute_name.split('.')
-
-      if item.is_a?(String) || item.is_a?(Fixnum) || item.is_a?(Float)
-        if (@item[@attribute_name.to_sym].to_s == item.to_s) || (@item.respond_to?(@attribute_name.to_sym) && @item.send(@attribute_name.to_sym).to_s == item.to_s)
-          selection_string = ' selected="selected"'
-        end
-      else
-        item_string = item[@default_name.to_sym] || (@item.respond_to?(@attribute_name.to_sym) && @item.send(@default_name.to_sym))
-        value_string = %{ value="#{item[@default_id.to_sym]}"}
-        if @item.class.to_s == "NationSignupDrop" and attribute_names.size == 3 and attribute_names[0] == 'payment_profile' # this is a special case just for 3dna nation signup mongo stuff
-          if attribute_names[1] == 'billing_address'
-            if item[@default_id.to_sym].to_s == @item.source.payment_profile.billing_address[attribute_names[2].to_sym].to_s
-              selection_string = ' selected="selected"'
-            end
-          else
-            if item[@default_id.to_sym].to_s == @item.source.payment_profile[attribute_names[1].to_sym][attribute_names[2].to_sym].to_s
-              selection_string = ' selected="selected"'
-            end
-          end
-        elsif attribute_names.size == 3
-          if item[@default_id.to_sym].to_s == @item[attribute_names[0].to_sym][attribute_names[1].to_sym][attribute_names[2].to_sym].to_s
-            selection_string = ' selected="selected"'
-          end
-        elsif attribute_names.size == 2
-          if item[@default_id.to_sym].to_s == @item[attribute_names.first.to_sym][attribute_names.last.to_sym].to_s
-            selection_string = ' selected="selected"'
-          end
-        else
-          if item[@default_id.to_sym].to_s == @item[@attribute_name.to_sym].to_s
-            selection_string = ' selected="selected"'
-          end
-        end
-      end
-
-      "<option#{value_string}#{selection_string}>#{item_string}</option>"
-    end
+    def render(context)
+      super(context)
 
-    def personal_attributes(name,value)
-      case name
-        when 'prompt' then
-          @prompt_option = %{<option value="">#{value}</option>}
-      end
-    end
+      # collection_select(object, method, collection, value_method, text_method, options = {}, html_options = {})
+      method = @attributes['method']
+      collection = @attributes['collection']
+      value_method = @attributes['value_method']
+      text_method = @attributes['text_method']
+      @attributes.has_key?('options') ? options = @attributes['options'] : options = {}
+      @attributes.has_key?('html_options') ? html_options = @attributes['html_options'] : html_options = {}
 
-    def render_string
-      @option_string = "#{@prompt_option}"
-      @collection.each do |item|
-        @option_string << gen_option(item)
-      end
 
-      %{<select id="#{@id_string}" name="#{@name_string}">#{@option_string}</select>}
+      context.registers[:action_view].collection_select(@form_object, method, collection, value_method, text_method, options, html_options)
     end
   end
 

data/lib/clot/no_model_form_tags.rb

@@ -46,24 +46,31 @@ module Clot
   end
 
   class ClotTag < Liquid::Tag
+    Syntax = /([^\s]+)\s+/
+
     include AttributeSetter
     include TagHelper
-    def initialize(name, params, tokens)
-      @_params = split_params(params)
+
+    def initialize(tag_name, markup, tokens)
+      if markup =~ Syntax
+        @form_object = $1
+        @attributes = {}
+        markup.scan(Liquid::TagAttributes) do |key, value|
+          @attributes[key] = value
+        end
+      else
+        syntax_error tag_name, markup, tokens
+      end
       super
     end
 
     def render(context)
-
-
-      instance_variables.map(&:to_sym).each do |var|
-        unless [:@_params, :@markup, :@tag_name].include? var
-          instance_variable_set var, nil  #this is because the same parse tag is re-rendered
-        end
+      @attributes.each do |key, value|
+        @attributes[key] = resolve_value(value, context)
       end
-      @params = @_params.clone
-      set_attributes(context)
-      render_string
+
+      @form_object = context[@form_object].to_sym if context[@form_object].is_a?(String)
+      @form_object = context[@form_object].source if @form_object.nil? && context[@form_object].is_a?(Liquid::Drop)
     end
 
   end

data/lib/clot/protected.rb

@@ -5,9 +5,10 @@ module Protected
 
 
   class << self
-    include Rails.application.routes.url_helpers
-    include Refinery::Core::Engine.routes.url_helpers
-    include Spree::Core::Engine.routes.url_helpers
+    #include Spree::Core::Engine.routes.url_helpers
+    #include Refinery::Core::Engine.routes.url_helpers
+    #include Rails.application.routes.url_helpers
+    #include ActionView::Helpers::UrlHelper
 
     def config=(controller)
       @controller = controller
@@ -21,5 +22,4 @@ module Protected
       @controller
     end
   end
-
 end

data/lib/clot/tag_helper.rb

@@ -4,17 +4,30 @@ module Clot
       params.split(",").map(&:strip)
     end
 
-    def resolve_value(value,context)
+    def resolve_value(value, context)
       case value
-        when /^([\[])(.*)([\]])$/ then array =  $2.split " "; array.map { |item| resolve_value item, context }
-        when /^(["'])(.*)\1$/ then $2
-        when /^(\d+[\.]\d+)$/ then $1.to_f
-        when /^(\d+)$/ then value.to_i
-        when /^true$/ then true
-        when /^false$/ then false
-        when /^nil$/ then nil
-        when /^(.+)_path$/ then "/#{$1}"
-        else context[value]
+        when Liquid::Drop then
+          value.source
+        when /^([\[])(.*)([\]])$/ then
+          array = $2.split " "; array.map { |item| resolve_value item, context }
+        when /^"(\{.*\})"$/ then
+          eval($1) # hash from string
+        when /^(["'])(.*)\1$/ then
+          $2
+        when /^(\d+[\.]\d+)$/ then
+          $1.to_f
+        when /^(\d+)$/ then
+          value.to_i
+        when /^true$/ then
+          true
+        when /^false$/ then
+          false
+        when /^nil$/ then
+          nil
+        when /^(.+)_path$/ then
+          "/#{$1}"
+        else
+          context[value]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: clot_engine
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.12.0
+date: 2013-03-31 00:00:00.000000000 Z
+dependencies: []
 description: Extensions for solidifying Liquid Templates
 email:
 - alexander.negoda@gmail.com