bc-htmlful 0.0.6 → 0.0.7.localtracker

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7.localtracker

data/bc-htmlful.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{bc-htmlful}
-  s.version = "0.0.6"
+  s.version = "0.0.7.localtracker"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Duarte Henriques", "Vasco Andrade e Silva"]
-  s.date = %q{2010-04-29}
+  s.date = %q{2010-06-02}
   s.description = %q{Form dynamic fields}
   s.email = %q{info@byclosure.com}
   s.extra_rdoc_files = [
@@ -32,16 +32,17 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/Byclosure/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Form dynamic fields}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else
   end
 end
+

data/lib/htmlful/dynamic_fields.rb

@@ -1,14 +1,25 @@
 module Htmlful
   module DynamicFields
-    def _dynamic_fields(form, resource, relationship_name, block1, block2)
-      relationship_i18n_name = resource.class.human_attribute_name(relationship_name).to_s
+    def add_remove_existing_sub_object_link_in_sub_form(sub_form, relationship_i18n_name)
+      concat sub_form.input(:_delete, :as => :hidden, :wrapper_html => {:class => 'remove'}, :input_html => {:class => "checkbox_remove"})
+      concat content_tag(:li, link_to(t(:remove_nested_element, :resource_name => relationship_i18n_name), '#', :class => "remove_fieldset"))
+    end
+
+    def add_remove_and_create_new_nested_input_links(relationship_i18n_name)
+      concat link_to(t(:remove_nested_element, :resource_name => relationship_i18n_name), '#', :class => "remove_element")
+      concat link_to(t(:create_nested_element, :resource_name => relationship_i18n_name), "#", :class => "create_element")
+    end
+
+    def get_relationship_i18n_name(resource, relationship_name)
+      resource.class.human_attribute_name(relationship_name) #.to_s
+    end
+
+    def create_dynamic_fields_form(form, resource, relationship_name, block1, block2)
       form.inputs :title => relationship_name do
         unless resource.send(relationship_name).empty?
           form.semantic_fields_for(relationship_name) do |sub_form|
             sub_form.inputs do
               block1.call(sub_form)
-              concat sub_form.input(:_delete, :as => :hidden, :wrapper_html => {:class => 'remove'}, :input_html => {:class => "checkbox_remove"})
-              concat content_tag(:li, link_to(t(:remove_nested_element, :resource_name => relationship_i18n_name), '#', :class => "remove_fieldset"))
             end
           end
         end
@@ -20,8 +31,7 @@ module Htmlful
               end
             end
           }
-          concat link_to(t(:remove_nested_element, :resource_name => relationship_i18n_name), '#', :class => "remove_element")
-          concat link_to(t(:create_nested_element, :resource_name => relationship_i18n_name), "#", :class => "create_element")
+          add_remove_and_create_new_nested_input_links(get_relationship_i18n_name(resource, relationship_name))
         }
       end
     end
@@ -30,38 +40,54 @@ module Htmlful
       block1 = lambda do |sub_form|
         sub_object = sub_form.object
         attributes.each do |attribute|
-          if is_date(sub_object, attribute)
+          if is_date?(sub_object, attribute)
             concat sub_form.input(attribute, :as => :string, :wrapper_html => {:class => 'datepick'})
-          elsif is_datetime(sub_object, attribute)
+            add_remove_existing_sub_object_link_in_sub_form(sub_form, get_relationship_i18n_name(resource, relationship_name))
+          elsif is_datetime?(sub_object, attribute)
             concat sub_form.input(attribute, :include_blank => false)
-          elsif is_document(sub_object, attribute)
+            add_remove_existing_sub_object_link_in_sub_form(sub_form, get_relationship_i18n_name(resource, relationship_name))
+          elsif is_document?(sub_object, attribute)
             if is_document_empty?(sub_object, attribute)
-              concat content_tag(:li, content_tag(:p, t(:no_document)))
+              # XXX Is this case is similar to an is_empty_image? If so it shouldn't show anything, if not remove the comments below
+              # concat content_tag(:li, content_tag(:p, t(:no_document)))
+              # add_remove_existing_sub_object_link_in_sub_form(sub_form, get_relationship_i18n_name(resource, relationship_name))
             else
-              if is_image(sub_object, attribute)
-                concat image_tag(sub_form.object.send(attribute).url(:thumb))
+              if is_image?(sub_object, attribute)
+                if is_image_empty?(sub_object)
+                  # XXX Do nohting, see is_empty_document? above
+                else
+                  image_opts = if sub_object.respond_to?(:geocoded?) && sub_object.geocoded?
+                    { :class => "geo-photo", :"data-lat" => sub_object.latitude, :"data-lng" => sub_object.longitude }
+                  else
+                    {}
+                  end
+                  concat link_to(image_tag(sub_object.send(attribute).url(:thumb), image_opts), sub_object.send(attribute).url)
+                  add_remove_existing_sub_object_link_in_sub_form(sub_form, get_relationship_i18n_name(resource, relationship_name))
+                end
               else
                 concat content_tag(:li, content_tag(:p, link_to(sub_object.send("#{attribute}_file_name"), sub_object.send(attribute).url)))
+                add_remove_existing_sub_object_link_in_sub_form(sub_form, get_relationship_i18n_name(resource, relationship_name))
               end
             end
           else
             concat sub_form.input(attribute)
+            add_remove_existing_sub_object_link_in_sub_form(sub_form, get_relationship_i18n_name(resource, relationship_name))
           end
         end
       end
       block2 = lambda do |sub_form|
         sub_object = sub_form.object
         attributes.each do |attribute|
-          if is_date(sub_object, attribute)
+          if is_date?(sub_object, attribute)
             concat sub_form.input(attribute, :as => :string, :wrapper_html => {:class => 'datepick ignore'})
-          elsif is_datetime(sub_object, attribute)
+          elsif is_datetime?(sub_object, attribute)
             concat sub_form.input(attribute, :include_blank => false)
           else
             concat sub_form.input(attribute) # takes care of everything else
           end
         end
       end
-      _dynamic_fields(form, resource, relationship_name, block1, block2)
+      create_dynamic_fields_form(form, resource, relationship_name, block1, block2)
     end
 
     def show_dynamic_fields(form, resource, relationship_name, *attributes)
@@ -82,13 +108,13 @@ module Htmlful
 
     # TODO: use concat and usage will be nicer
     def show_attribute_outside_form(resource, attribute, options=nil, &block)
-      if is_date(resource, attribute)
+      if is_date?(resource, attribute)
         resource.send(attribute) # TODO: add the controversial abbr method here, or just use title
-      elsif is_document(resource, attribute)
+      elsif is_document?(resource, attribute)
         if is_document_empty?(resource, attribute)
           t(:no_document)
         else
-          if is_image(resource, attribute)
+          if is_image?(resource, attribute)
             image_style = (options.nil? || options[:image_style].nil?)? :thumb : options[:image_style]
             image_tag(resource.send(attribute).url(image_style))
           else
@@ -102,17 +128,17 @@ module Htmlful
 
     # inside of a form
     def show_attribute(form, resource, attribute)
-      if is_date(resource, attribute)
+      if is_date?(resource, attribute)
         form.input(attribute, :as => :string, :wrapper_html => {:class => 'datepick'}, :input_html => {:disabled => true})
-      elsif is_document(resource, attribute)
+      elsif is_document?(resource, attribute)
         content_tag(:fieldset) do
           content_tag(:legend) do
             content_tag(:label, I18n.t("formtastic.labels.#{resource.class.name.underscore}.#{attribute}"))
           end +
-          if is_document_empty?(resource, attribute)
+            if is_document_empty?(resource, attribute)
             t(:no_document)
           else
-            if is_image(resource, attribute)
+            if is_image?(resource, attribute)
               image_tag(resource.send(attribute).url(:thumb))
             else
               link_to(resource.send("#{attribute}_file_name"), resource.send(attribute).url)
@@ -127,30 +153,31 @@ module Htmlful
     def show_subcollection(form, resource, association)
       collection = resource.send(association)
       resource_name_plural = localized_attribute_string(resource, association.to_sym)#resource.class.reflect_on_association(association.to_sym).klass.human_name(:count => 2)
+      raise ("Translation missing #{params[:locale]}, #{resource.class.human_name}, #{association}") if resource_name_plural.nil?
       content_tag(:label, resource_name_plural) +
-      if collection.empty?
+        if collection.empty?
         content_tag(:p, I18n.t(:no_resource_name_plural, :resource_name_plural => resource_name_plural.mb_chars.downcase))
       else
         content_tag(:ul, collection.inject("") { |html, sub_resource|
-          html + content_tag(:li, link_to(sub_resource.send(form.send(:detect_label_method, [sub_resource])), sub_resource))
+            html + content_tag(:li, link_to(sub_resource.send(form.send(:detect_label_method, [sub_resource])), sub_resource))
           }, :class => "sub-collection")
       end
     end
-    
+
     def multi_select_input(form, association, options={})
       form.input(association, options) + content_tag(:li, content_tag(:div, link_to(t(:clear_selected), "#", :class => "clear_multi_select"), :class => "clear_multi_select"))
     end
-    
+
     def form_inputs(form, *attributes)
       options = attributes.extract_options!
       resource = form.object
       returning("") do |html|
         attributes.each do |attribute|
           html << form.input(attribute)
-          if is_document(resource, attribute)
+          if is_document?(resource, attribute)
             unless is_document_empty?(resource, attribute)
               html << "<li>"
-              if is_image(resource, attribute)
+              if is_image?(resource, attribute)
                 image_style = (options.nil? || options[:image_style].nil?)? :thumb : options[:image_style]
                 html << image_tag(form.object.send(attribute).url(image_style))
               else
@@ -166,7 +193,7 @@ module Htmlful
     end
 
     protected
-    
+
     ## copied and adapted from formtastic
     def localized_attribute_string(resource, attr_name)
       model_name = resource.class.name.underscore
@@ -187,32 +214,36 @@ module Htmlful
       i18n_value = ::I18n.t(defaults.shift, :default => defaults, :scope => "formtastic.labels")
       i18n_value.blank? ? nil : i18n_value
     end
-    
-    def is_date(resource, attribute)
+
+    def is_date?(resource, attribute)
       col = resource.column_for_attribute(attribute)
       col && col.type == :date
     end
-    
-    def is_datetime(resource, attribute)
+
+    def is_datetime?(resource, attribute)
       col = resource.column_for_attribute(attribute)
       col && col.type == :datetime
     end
 
     # taken from formtastic
     @@file_methods = [:file?, :public_filename]
-    def is_document(resource, attribute)
+    def is_document?(resource, attribute)
       file = resource.send(attribute) if resource.respond_to?(attribute)
       file && @@file_methods.any? { |m| file.respond_to?(m) }
     end
-    
+
     def is_document_empty?(resource, attribute)
       resource.send("#{attribute}_file_name").blank?
     end
-    
+
+    def is_image_empty?(resource)
+      resource.new_record?
+    end
+
     # XXX: if image is missing, this will return false because it queries the styles. Find out what we want
-    def is_image(resource, attribute)
+    def is_image?(resource, attribute)
       file = resource.send(attribute) if resource.respond_to?(attribute)
-      is_document(resource, attribute) && file && file.respond_to?(:styles) && !file.styles.blank?
+      is_document?(resource, attribute) && file && file.respond_to?(:styles) && !file.styles.blank?
     end
   end
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: bc-htmlful
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 1032128881
+  prerelease: true
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  - localtracker
+  version: 0.0.7.localtracker
 platform: ruby
 authors: 
 - Duarte Henriques
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-29 00:00:00 +01:00
+date: 2010-06-02 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -50,23 +52,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Form dynamic fields