interview 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f72fac32d421925cb9de553456f7d05725c4307
-  data.tar.gz: f1fdabaee5c509642c1b927fa8ac45d757d71415
+  metadata.gz: a79c351a953b407088c70c6686535f16980de03e
+  data.tar.gz: 2715694c6c5444764247942612506e19921b4390
 SHA512:
-  metadata.gz: a2a38a6cafd9890b5cf2d4b4aae750c6b7c8207d7cbaec77a8bf71d6d7d9986f2a6dd3505bfcb8cf260a2c900970eff8308e71a6fbd435020c9bb36881ea44a3
-  data.tar.gz: 18de1347ac17165a494057db3c5ac79c03168508ba29fa1f7b69b3d9f89703f8bab73a18d1eec961415771a2a05c18a9b3e04f643b6e74e05d60edf3a26aec78
+  metadata.gz: e12ba218332bfac951c2d76f15262cd50b1e1f7f48f4299955441b6aefa3912e49562cfe20997ad688b86d8ed25f24bee13fa0062cc1c4bd131380695e31dd2f
+  data.tar.gz: 671e31446ed9a9843030ddb389671ab48aa842e31f2281c02585890a3c01e49576177f432439a57262a1c604d10da1029f9bcbfbd134a9bdf2732e85a40d4e87

data/lib/generators/interview/install/templates/application.js

@@ -18,7 +18,7 @@
 //= require jquery.ui.sortable
 //= require jquery.ui.effect-highlight
 //= require jquery-fileupload/basic
-//= require jquery-fileupload/vendor/tmpl
+//= require jquery-tmpl
 //= require interview
 //= require_tree .
 //= require turbolinks

data/lib/generators/interview/install/templates/bootstrap_interview.css.scss

@@ -123,4 +123,16 @@ $nav-stacked-link-padding-level2: 5px 15px 5px 45px !default;
   vertical-align: middle;
   margin-right: 5px;
   margin-bottom: 5px;
+}
+
+.nested_form_container {
+  margin: 15px 0px;
+}
+
+.nested_form {
+  margin-top: 15px;
+}
+
+.progress-bar {
+  height: 20px;
 }

data/lib/generators/interview/install/templates/interview.js.coffee

@@ -76,46 +76,44 @@ jQuery ->
     $($(this).data('target')).collapse('toggle')
   
   $('.img-link').click (e) ->
-    links = $('.img-link')
+    e.preventDefault()
+    links = $(this).closest('.image-gallery').find('.img-link')
     target = event.target || event.srcElement
     link = if target.src then target.parentNode else target
     options = { index: link, event: e }
     blueimp.Gallery(links, options)
 
-  $('.image-upload').fileupload
+  $('.upload_image').fileupload
     add: (e, data) ->
       types = /(\.|\/)(gif|jpe?g|png|mov|mpeg|mpeg4|avi)$/i
       file = data.files[0]
       if types.test(file.type) || types.test(file.name)
-        data.context = $(tmpl("upload-progress-script", file))
-        $('#upload-progress').append($(data.context))
-
-        $("input[name='_method']").attr('name', 'method')
+        $(this).closest('.image_attribute_container').find('.progress').collapse('show')
+        $("input[name='_method']").attr('name', '__method')
         data.submit()
-        $("input[name='method']").attr('name', '_method')
+        $("input[name='__method']").attr('name', '_method')
       else
         alert("#{file.name} is not a gif, jpg or png image file")
     progress: (e, data) ->
-      if data.context
-        progress = parseInt(data.loaded / data.total * 100, 10)
-        data.context.find('.bar').css('width', progress + '%')
+      progress = parseInt(data.loaded / data.total * 100, 10)
+      $(this).closest('.image_attribute_container').find('.bar').css('width', progress + '%')
     done: (e, data) ->
-      $('#image-tag').attr('src', data.result.thumb_url)
-      # context = $(tmpl("image-thumb-script", data.result))
-      # $('#image-gallery').append($(context))
-      $('.image-id').attr('value', data.result.id)
-
-  $('.multiple-image-upload').fileupload
+      $(this).closest('.image_attribute_container').find('.upload_buffer_id').attr('value', data.result.id)
+      $(this).closest('.image_attribute_container').find('.image').attr('src', data.result.thumb_url)
+      
+  $('.nested_form_add_images').fileupload
     add: (e, data) ->
       types = /(\.|\/)(gif|jpe?g|png|mov|mpeg|mpeg4|avi)$/i
       file = data.files[0]
       if types.test(file.type) || types.test(file.name)
-        data.context = $(tmpl("upload-progress-script", file))
-        $('#upload-progress').append($(data.context))
-
-        $("input[name='_method']").attr('name', 'method')
+        tmpl_data = { index: new Date().getTime() }
+        data.context = $(this).closest('.nested_form_container').find('.nested_form_script').tmpl(tmpl_data)
+        $(this).closest('.nested_form_container').append(data.context)
+        data.context.find('.progress').collapse('show')
+        bind_remove_links()
+        $("input[name='_method']").attr('name', 'x_method')
         data.submit()
-        $("input[name='method']").attr('name', '_method')
+        $("input[name='x_method']").attr('name', '_method')
       else
         alert("#{file.name} is not a gif, jpg or png image file")
     progress: (e, data) ->
@@ -123,8 +121,5 @@ jQuery ->
         progress = parseInt(data.loaded / data.total * 100, 10)
         data.context.find('.bar').css('width', progress + '%')
     done: (e, data) ->
-      context = $(tmpl("image-thumb-script", data.result))
-      $('#image-gallery').append($(context))
-      ids = JSON.parse($('.image-ids').attr('value'))
-      ids.push data.result.id
-      $('.image-ids').attr('value', JSON.stringify(ids))
+      data.context.find('.upload_buffer_id').attr('value', data.result.id)
+      data.context.find('.image').attr('src', data.result.thumb_url)

data/lib/interview/attribute.rb

@@ -1,12 +1,13 @@
 module Interview
   class Attribute < Control
     
-    attr_accessor :method, :caption, :style, :link, :nil_value, :hide_caption, :hide_tooltip,
-      :only_for, :align, :on_changed, :html_class, :surrounding_tag
+    attr_accessor :method, :caption, :style, :link, :nil_value, :hide_caption, :caption_as_placeholder,
+      :hide_tooltip, :only_for, :align, :on_changed, :html_class, :surrounding_tag
     
     def initialize(params={})
-      @html_class = []
       super
+      @html_class = []
+      @html_class << params[:html_class] if params[:html_class]
     end
     
     def value
@@ -49,7 +50,9 @@ module Interview
     end
     
     def render_write
-      return form_builder.text_field @method, class: 'form-control'
+      opts = {class: 'form-control'}
+      opts[:placeholder] = caption if @caption_as_placeholder
+      return form_builder.text_field @method, opts
     end
     
     protected
@@ -82,7 +85,7 @@ module Interview
       html = Builder::XmlMarkup.new(indent: 2)
       html.div class: 'form-group' do
         
-        html.div class: 'col-xs-3' if @hide_caption and align == 'horizontal'
+        html.div class: 'col-xs-3' if (@hide_caption or @caption_as_placeholder) and align == 'horizontal'
         render_form_label(html)
         
         if align == 'horizontal'
@@ -101,7 +104,7 @@ module Interview
     
     def render_form_label(html)
       align = @align || find_attribute(:align)
-      html_opts = if @hide_caption or align == 'inline'
+      html_opts = if @hide_caption or @caption_as_placeholder or align == 'inline'
         { class: 'sr-only' }
       elsif align == 'horizontal'
         { class: 'col-xs-3 control-label' }

data/lib/interview/button.rb

@@ -0,0 +1,29 @@
+module Interview
+  class Button < Control
+    include HasControls
+    
+    attr_accessor :caption, :name, :style, :submit
+    attr_reader :html_class
+    
+    def initialize(params={})
+      @html_class = []
+      super
+    end
+    
+    def render
+      html_class = @html_class
+      if @style.to_s == 'primary'
+        html_class << 'btn btn-primary'
+      else
+        html_class << 'btn btn-default'
+      end
+        
+      if @submit
+        h.submit_tag @caption, name: @name, class: @html_class.join(' ')
+      else
+        h.button_tag @caption, name: @name, class: @html_class.join(' ')
+      end
+    end
+    
+  end
+end

data/lib/interview/collapse_container.rb

@@ -6,10 +6,21 @@ module Interview
         
     def render
       html = Builder::XmlMarkup.new
+      if @caption
+        link = Interview::Link.new(caption: @caption)
+        controls = @controls
+      else
+        link = @controls.first
+        controls = @controls[1..-1]
+      end
+      link.url = '#'
+      link.html_class << 'collapse_link'
+      link.html_data[:toggle] = 'collapse'
       new_id = Time.now.to_f.to_s.delete('.')
-      html << h.link_to(@caption, '#', class: 'collapse_link', data: { toggle: 'collapse', target: "##{new_id}" })
+      link.html_data[:target] = "##{new_id}"
+      html << link.render
       html.div id: new_id, class: 'panel-collapse collapse' do
-        @controls.each do |control|
+        controls.each do |control|
           html << control.render
         end
       end

data/lib/interview/dropdown.rb

@@ -2,7 +2,7 @@ module Interview
   class Dropdown < Control
     include HasControls
     
-    attr_accessor :image, :caption, :style, :html_class
+    attr_accessor :image, :caption, :style, :html_class, :container_tag
     
     def initialize(params={})
       @html_class = []
@@ -10,10 +10,11 @@ module Interview
     end
     
     def render
+	  container_tag = @container_tag || 'div'
       html = Builder::XmlMarkup.new
       html_class = @html_class.dup
       html_class << 'dropdown'
-      html.div class: html_class.join(' ') do
+      html.tag! container_tag, class: html_class.join(' ') do
         html_class = 'dropdown-toggle'
         html_class += ' btn btn-default' if @style == 'button'
         html.a class: html_class, href: '#', :'data-toggle' => 'dropdown' do

data/lib/interview/form.rb

@@ -2,7 +2,7 @@ module Interview
   class Form < Control
     include HasControls
     
-    attr_accessor :skip_submit, :multi_create, :align, :redirect_to
+    attr_accessor :skip_submit, :submit_label, :multi_create, :align, :redirect_to
     attr_reader :form_builder
     
     def render
@@ -41,7 +41,7 @@ module Interview
     
     def render_submit(html)
       if not @skip_submit
-        html << form_builder.submit(class: 'btn btn-primary')
+        html << form_builder.submit(@submit_label, class: 'btn btn-primary')
         if @multi_create || find_attribute(:multi_create)
           html.text! ' '
           html << h.check_box_tag('new_record', '1', true)

data/lib/interview/image_attribute.rb

@@ -9,65 +9,94 @@ module Interview
     attr_accessor :object, :submethod, :image_style, :hide_if_not_exists
     
     def render_read
-      submethod = @submethod || 'attachment'
       image_style = @image_style || :thumb
-      object = @object || find_attribute(:object)
-      image = value || object.association(@method).build
       
-      attachment = image.send(submethod)
-      return '' if not attachment.exists? and @hide_if_not_exists
+      return '' if value.nil? and @hide_if_not_exists
       
       html = Builder::XmlMarkup.new
       opts = {class: "image_#{image_style}"}
       opts[:class] += ' ' + @html_class.join(' ') unless @html_class.empty? or @surrounding_tag
       html.div opts do
-        html << h.image_tag(attachment.url(image_style), class: 'img-responsive')
+        if value.nil?
+          html << h.image_tag('missing_thumb.png', class: 'image img-responsive')
+        else
+          html << h.image_tag(value.url(image_style), class: 'image img-responsive')
+        end
       end
       return html.target!
     end
     
     def render_write
-      object = @object || find_attribute(:object)
-      submethod = @submethod || 'attachment'
       image_style = @image_style || :thumb
-      image = object.send(@method) || object.association(@method).build
-      attachment = image.send(submethod)
-      model = image.class.model_name.singular
       
       html = Builder::XmlMarkup.new
-      
-      html << form_builder.hidden_field("#{@method.singularize}_id", class: 'image-id')
-      
-      html.div class: 'inline-block' do
-        html << h.image_tag(attachment.url(image_style), id: 'image-tag')
-      end
-      
-      html.div class: 'inline-block' do
-        html.span class: "btn btn-default fileinput-button" do
-          html.span "Select file..."
-          html << h.file_field_tag("#{model}[#{submethod}]", class: 'image-upload', 
-            data: {url: "/#{model.pluralize}.json", type: 'POST'})
+      html.div class: 'image_attribute_container' do
+        unless value.nil? and @hide_if_not_exists
+          html.div class: 'inline-block' do
+            html << h.image_tag(value.url(image_style), class: 'image img-responsive')
+          end
         end
       
-        # if attachment.exists?
-        #   html << form_builder.check_box("destroy_#{@method}")
-        #   html.text! ' Datei löschen'
-        # end
-      end
-      
-      html.div id: 'upload-progress' do
-      end
-      
-      html.script id: 'upload-progress-script', type: 'text/x-tmpl' do
-        html.div class: 'upload' do
-          html.text! "{%=o.name%}"
-          html.div class: 'progress' do
-            html.div '', class: 'progress-bar bar', style: 'width: 0%'
+        html.div class: 'inline-block' do
+          html.div class: "clearfix" do
+            html.span class: "btn btn-default fileinput-button" do
+              html.span "Bild hochladen" # todo
+              html << h.file_field_tag("upload_buffer[attachment]", class: 'upload_image',
+                data: {url: "/upload_buffers.json", type: 'POST'})
+            end
           end
+          html << Interview::ProgressBar.new(hidden: true).render
+          html << form_builder.hidden_field(:upload_buffer_id, class: 'upload_buffer_id')
+      
+          # if attachment.exists?
+          #   html << form_builder.check_box("destroy_#{@method}")
+          #   html.text! ' Datei löschen'
+          # end
         end
       end
-      
       return html.target!
+      
+      # object = @object || find_attribute(:object)
+      # submethod = @submethod || 'attachment'
+      # image_style = @image_style || :thumb
+      # image = object.send(@method) || object.association(@method).build
+      # attachment = image.send(submethod)
+      # model = image.class.model_name.singular
+      # 
+      # html = Builder::XmlMarkup.new
+      # 
+      # html << form_builder.hidden_field("#{@method.singularize}_id", class: 'image-id')
+      # 
+      # html.div class: 'inline-block' do
+      #   html << h.image_tag(attachment.url(image_style), id: 'image-tag')
+      # end
+      # 
+      # html.div class: 'inline-block' do
+      #   html.span class: "btn btn-default fileinput-button" do
+      #     html.span "Select file..."
+      #     html << h.file_field_tag("#{model}[#{submethod}]", class: 'image-upload', 
+      #       data: {url: "/#{model.pluralize}.json", type: 'POST'})
+      #   end
+      # 
+      #   # if attachment.exists?
+      #   #   html << form_builder.check_box("destroy_#{@method}")
+      #   #   html.text! ' Datei löschen'
+      #   # end
+      # end
+      # 
+      # html.div id: 'upload-progress' do
+      # end
+      # 
+      # html.script id: 'upload-progress-script', type: 'text/x-tmpl' do
+      #   html.div class: 'upload' do
+      #     html.text! "{%=o.name%}"
+      #     html.div class: 'progress' do
+      #       html.div '', class: 'progress-bar bar', style: 'width: 0%'
+      #     end
+      #   end
+      # end
+      # 
+      # return html.target!
     end
     
   end

data/lib/interview/image_gallery_attribute.rb

@@ -25,14 +25,14 @@ module Interview
       
         html << form_builder.hidden_field("#{@method.singularize}_ids", class: 'image-ids')
     
-        render_gallery(html, images, submethod, image_style, @light_box_image_style)
-    
-        light_box_image_url = @light_box_image_style ? "#{@light_box_image_style}_url" : 'url'
-        html.script id: 'image-thumb-script', type: 'text/x-tmpl' do
-          html.a href: "{%=o.#{light_box_image_url}%}", class: 'img-link' do
-            html.img class: 'img-thumb', src: "{%=o.thumb_url%}"
-          end
-        end
+        # render_gallery(html, images, submethod, image_style, @light_box_image_style)
+        #     
+        # light_box_image_url = @light_box_image_style ? "#{@light_box_image_style}_url" : 'url'
+        # html.script id: 'image-thumb-script', type: 'text/x-tmpl' do
+        #   html.a href: "{%=o.#{light_box_image_url}%}", class: 'img-link' do
+        #     html.img class: 'img-thumb', src: "{%=o.thumb_url%}"
+        #   end
+        # end
     
         html.div class: "clearfix" do
           html.span class: "btn btn-default fileinput-button" do
@@ -46,10 +46,15 @@ module Interview
         end
     
         html.script id: 'upload-progress-script', type: 'text/x-tmpl' do
-          html.div class: 'upload' do
-            html.text! "{%=o.name%}"
-            html.div class: 'progress' do
-              html.div '', class: 'progress-bar bar', style: 'width: 0%'
+          html.div do
+            html.div class: 'inline-block' do
+              html.img class: 'img-thumb', src: '/assets/missing_180x180.png'
+            end
+            html.div class: 'inline-block' do
+              html.text! "{%=o.name%}"
+              html.div class: 'progress' do
+                html.div '', class: 'progress-bar bar', style: 'width: 0%'
+              end
             end
           end
         end
@@ -63,7 +68,7 @@ module Interview
     def render_gallery(html, images, submethod, image_style, light_box_image_style)
       html.div class: 'image-gallery' do
         images.each do |image|
-          html.a href: image.send(submethod).url(light_box_image_style), class: 'img-link' do
+          html.a href: image.send(submethod).url(light_box_image_style), class: 'img-link', title: image.subtitle do
             html << h.image_tag(image.send(submethod).url(image_style), class: 'img-thumb')
           end
         end

data/lib/interview/link.rb

@@ -3,11 +3,13 @@ module Interview
     include HasControls
     
     attr_accessor :image, :caption, :hint, :style, :active,
-                  :url, :controller, :object, :action, :http_method, :redirect_to, :nested_resource, :trail
-    attr_reader :url_params, :html_class
+                  :url, :controller, :object, :action, :http_method, :redirect_to, 
+                  :nested_resource, :trail
+    attr_reader :url_params, :html_class, :html_data
     
     def initialize(params={})
       @html_class = []
+      @html_data = {}
       @url_params = {}
       super
     end
@@ -111,6 +113,7 @@ module Interview
     def render_link(url, html_class=[], html_options={})
       class_string = html_class.join(' ')
       html_options[:class] = class_string unless html_class.empty?
+      html_options[:data] = @html_data unless @html_data.empty?
       return h.link_to(url, html_options) do
         html = Builder::XmlMarkup.new
         if @controls.empty?

data/lib/interview/media_object.rb

@@ -6,11 +6,11 @@ module Interview
     
     def render
       image_size = @image_size || :thumb
-      object = find_attribute! :object
+      object = find_attribute :object
       @object = object
       html = Builder::XmlMarkup.new(indent: 2)
       html.div class: 'media' do
-        @controls.first.html_class << 'pull-left'
+        @controls[0].html_class << 'pull-left' if @controls[0].respond_to? 'html_class'
         html << @controls.first.render
         html.div class: 'media-body' do
           @controls[1].html_class << 'media-heading' if @controls[1].respond_to? 'html_class'

data/lib/interview/nested_form.rb

@@ -2,23 +2,35 @@ module Interview
   class NestedForm < Control
     include HasControls
     
-    attr_accessor :polymorphic, :align # todo: align einbauen
+    attr_accessor :polymorphic, :align, :image_based # todo: align einbauen
     attr_reader :form_builder, :object
     
     def render
       assoc_form_builder = find_attribute! :form_builder
       assoc_method = find_attribute! :assoc_method
-      objects = find_attribute! :objects
       
       html = Builder::XmlMarkup.new
-      html.div class: 'nested_forms' do
-        html << assoc_form_builder.fields_for(assoc_method.to_sym, objects) do |form_builder|
+      html.div class: 'nested_form_container' do
+        if @image_based
+          html << Interview::NestedFormAddImages.new.render
+        end
+        html << assoc_form_builder.fields_for(assoc_method.to_sym) do |form_builder|
           if @polymorphic
             render_polymorphic_nested_form(form_builder)
           else
             render_nested_form(form_builder)
           end
         end
+        html.script class: 'nested_form_script', type: 'text/x-tmpl' do
+          new_object = assoc_form_builder.object.association(assoc_method.to_sym).build # todo: polymorphic add link
+          html << assoc_form_builder.fields_for(assoc_method.to_sym, new_object, :child_index => "${index}") do |form_builder|
+            if @polymorphic
+              render_polymorphic_nested_form(form_builder)
+            else
+              render_nested_form(form_builder)
+            end
+          end
+        end
       end
       return html.target!
     end
@@ -33,6 +45,9 @@ module Interview
         end
         html << form_builder.hidden_field(:id)
         html << form_builder.hidden_field(:_destroy, class: 'nested_form_destroy')
+        if @image_based
+          html << form_builder.hidden_field(:upload_buffer_id, class: 'upload_buffer_id')
+        end
       end
       html.target!.html_safe
     end

data/lib/interview/nested_form_add_images.rb

@@ -0,0 +1,33 @@
+module Interview
+  class NestedFormAddImages < Control
+    
+    attr_accessor :style
+    
+    def render
+      if @style and @style.to_sym == :horizontal_form
+        html = Builder::XmlMarkup.new # todo: in eigenes Objekt auslagern?
+        html.div class: 'row' do
+          html.div class: 'col-xs-9 col-xs-offset-3' do
+            html << render_link
+          end
+        end
+        return html.target!
+      else
+        return render_link
+      end
+    end
+    
+    def render_link
+      html = Builder::XmlMarkup.new
+      html.div class: "clearfix" do
+        html.span class: "btn btn-default fileinput-button" do
+          html.span "Bilder hinzufügen" # todo
+          html << h.file_field_tag("upload_buffer[attachment]", class: 'nested_form_add_images',
+            multiple: true, data: {url: "/upload_buffers.json", type: 'POST'})
+        end
+      end
+      return html.target!
+    end
+    
+  end
+end

data/lib/interview/progress_bar.rb

@@ -0,0 +1,25 @@
+module Interview
+  class ProgressBar < Control
+    
+    attr_accessor :hidden, :html_class
+    
+    def initialize(params={})
+      super
+      @html_class = []
+      @html_class << params[:html_class] if params[:html_class]
+    end
+    
+    def render
+      html_class = @html_class
+      html = Builder::XmlMarkup.new
+      opts = { class: "progress" }
+      opts[:class] += " collapse" if @hidden
+      opts[:class] += ' ' + @html_class.join(' ') unless @html_class.empty?
+      html.div opts do
+        html.div '', class: 'progress-bar bar', style: 'width: 0%'
+      end
+      return html.target!
+    end
+    
+  end
+end

data/lib/interview/text.rb

@@ -28,13 +28,13 @@ module Interview
     def render_text(html)
       if @bold
         html.b do
-          html.text! @text
+          html << @text # todo: besser .text! statt << ?
           @controls.each do |control| 
             html << control.render
           end
         end
       else
-        html.text! @text if @text
+        html << @text if @text # todo: besser .text! statt << ?
         @controls.each do |control| 
           html << control.render
         end

data/lib/interview/version.rb

@@ -1,3 +1,3 @@
 module Interview
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/interview.rb

@@ -52,9 +52,12 @@ require "interview/form"
 require "interview/nested_form"
 require "interview/nested_form_remove_link"
 require "interview/nested_form_add_link"
+require "interview/nested_form_add_images"
 require "interview/form_errors"
 require "interview/polymorphic_add_link"
 require "interview/search_form"
+require "interview/button"
+require "interview/progress_bar"
 
 require "interview/association_methods"
 
@@ -160,60 +163,68 @@ module ActiveRecord
       return [sql] + values
     end
 
-    def self.string_filter_to_sql(attr, filter, not_filter=false)
+    def self.string_filter_to_sql(attr, filter, negation=false)
+      negation = negation ? 'NOT ' : ''
       if filter.respond_to?(:each)
-        sql = "#{attr} in (?)"
+        return self.value_combination_to_sql(attr, filter, :string)
       else
-        sql = "#{attr} = ?"
+        sql = "#{negation}#{attr} = ?"
       end
       return [sql, filter]
     end
     
-    def self.number_filter_to_sql(attr, filter, not_filter=false)
+    def self.number_filter_to_sql(attr, filter, negation=false)
+      negation = negation ? 'NOT ' : ''
       if filter.respond_to?(:each)
         return self.value_combination_to_sql(attr, filter, :number)
       elsif filter.is_a? String
         unless result = filter.match(/^([!<>=]*)(\d+\.?\d*)$/)
           raise "invalid number filter: '#{filter}'"
         end
-        operator = result[1] != '' ? result[1] : '='
+        connective = result[1].blank? ? '=' : result[1]
         value = result[2].include?('.') ? result[2].to_f : result[2].to_i
-        sql = "#{attr} #{operator} ?"
+        sql = "#{negation}#{attr} #{connective} ?"
         values = [value]
       else
-        sql = "#{attr} = ?"
+        sql = "#{negation}#{attr} = ?"
         values = [filter]
       end
       return [sql] + values
     end
 
-    def self.date_filter_to_sql(attr, filter, not_filter=false)
+    def self.date_filter_to_sql(attr, filter, negation=false)
+      negation = negation ? 'NOT ' : ''
       if filter.respond_to?(:each)
-        if filter.size != 2
+        if filter.size != 2 # todo: value_combination einbauen
           raise "invalid date filter: #{filter.inspect} 2 elements expected, #{filter.size} given"
         end
-        sql = "#{attr} BETWEEN ? AND ?"
+        sql = "#{negation}#{attr} BETWEEN ? AND ?"
         values = filter
       else
-        sql = "#{attr} = ?"
+        sql = "#{negation}#{attr} = ?"
         values = [filter]
       end
       return [sql] + values
     end
 
-    def self.boolean_filter_to_sql(attr, filter, not_filter=false)
-      return ["#{attr} = ?", filter]
+    def self.boolean_filter_to_sql(attr, filter, negation=false)
+      if filter.respond_to?(:each)
+        return self.value_combination_to_sql(attr, filter, :boolean)
+      end
+      negation = negation ? 'NOT ' : ''
+      return ["#{negation}#{attr} = ?", filter]
     end
     
-    def self.assoc_filter_to_sql(attr, filter, not_filter=false)
+    def self.assoc_filter_to_sql(attr, filter, negation=false)
       if filter.respond_to?(:each)
         return self.value_combination_to_sql(attr, filter, :assoc)
       end
+      negation = negation ? 'NOT ' : ''
       assoc = self.reflect_on_association(attr)
       if assoc.macro == :has_and_belongs_to_many
         number_filter = self.number_filter_to_sql(assoc.association_foreign_key, filter)
         values = number_filter[1..-1]
-        sql = "id #{ not_filter ? 'NOT ' : ''}IN (SELECT #{assoc.foreign_key} FROM #{assoc.join_table} WHERE #{number_filter.first})"
+        sql = "id #{negation}IN (SELECT #{assoc.foreign_key} FROM #{assoc.join_table} WHERE #{number_filter.first})"
       end # todo: erweitern
       return [sql] + values
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interview
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jannes Köhler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-20 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,6 +126,7 @@ files:
 - lib/interview/attribute.rb
 - lib/interview/boolean_attribute.rb
 - lib/interview/breadcrumbs.rb
+- lib/interview/button.rb
 - lib/interview/collapse_container.rb
 - lib/interview/condition_container.rb
 - lib/interview/container_attribute.rb
@@ -153,12 +154,14 @@ files:
 - lib/interview/navigation_item.rb
 - lib/interview/navigation_item_old.rb
 - lib/interview/nested_form.rb
+- lib/interview/nested_form_add_images.rb
 - lib/interview/nested_form_add_link.rb
 - lib/interview/nested_form_remove_link.rb
 - lib/interview/object_context.rb
 - lib/interview/option_attribute.rb
 - lib/interview/panel.rb
 - lib/interview/polymorphic_add_link.rb
+- lib/interview/progress_bar.rb
 - lib/interview/search_form.rb
 - lib/interview/space.rb
 - lib/interview/string_attribute.rb