interview 0.0.11 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ded6f81ccc27790ac8af9e7736ba24dcea1351ef
-  data.tar.gz: 32e2e873999a080d5d95d12ced1f9609ab624ea7
+  metadata.gz: c086485085f2eb7fa260a71e20dc4ada0005abd7
+  data.tar.gz: 65f36b1b39de18b9bd330ab4467254b4b1a24c37
 SHA512:
-  metadata.gz: 44f793488cf09e87ebceca9105fe524a6dccb9e272861697ebc13e048f89bb5f2b7ab170b4e00a8508d76c4575225480dfa548f14f4726afeff3046652cf6b50
-  data.tar.gz: 01df35e37381e15ee7f5e2ad8fc0219e4daf29bf9010d1add339737ed9120d5b092afc68a00260cfbe54ee5b354da940940a36c43475b7e9bd4f0d5b5749da83
+  metadata.gz: e65be2cb25eea128a5f19da3624aea3816bb03f9f2d8979031e461e7cf83be18be9b5e5a5f7bdcb283e0dcd601e33e2c062095e030ce5d1a2c5d26e2d6ce9c29
+  data.tar.gz: 2c610a979c4efe97cb05514b515216cba453d58765e603e7b5e95285607a962558e31c8ddec24c01f5a5116f48a46ee20a5c6d8a248e2fe7444d01462c6b3a6a

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

@@ -128,5 +128,5 @@ jQuery ->
     nested_form = $(this)
     upload_buffer_id = $(this).find('.upload_buffer_id').attr('value')
     if upload_buffer_id
-      $.getJSON "upload_buffers/#{upload_buffer_id}.json", (data) ->
+      $.getJSON "/upload_buffers/#{upload_buffer_id}.json", (data) ->
         nested_form.find('.image').attr('src', data.thumb_url)

data/lib/interview/actionbar.rb

@@ -11,12 +11,13 @@ module Interview
         object = find_attribute! :object
         icon = object.icon
       end
+      controls = add_parent(build_children)
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'clearfix' do
-        unless @controls.empty?
+        unless controls.empty?
           html.ul class: 'list-inline pull-right' do
-            @controls.each do |control|
+            controls.each do |control|
               html.li do
                 html << control.render
               end

data/lib/interview/attribute.rb

@@ -62,7 +62,7 @@ module Interview
     end
     
     def render_card_style
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'row' do
         html.p class: 'col-xs-3' do
           html.b caption unless @hide_caption
@@ -82,7 +82,7 @@ module Interview
       object = find_attribute! :object
       align = @align || find_attribute(:align)
       
-      html = Builder::XmlMarkup.new(indent: 2)
+      html = ::Builder::XmlMarkup.new(indent: 2)
       html.div class: 'form-group' do
         
         html.div class: 'col-xs-3' if (@hide_caption or @caption_as_placeholder) and align == 'horizontal'
@@ -112,7 +112,7 @@ module Interview
         {}
       end
       html << form_builder.label(@method, html_opts) do
-        form_html = Builder::XmlMarkup.new
+        form_html = ::Builder::XmlMarkup.new
         form_html.text! caption
         form_html.target!.html_safe
       end

data/lib/interview/boolean_attribute.rb

@@ -3,7 +3,7 @@ module Interview
     
     def render_read
       return '' if value.nil?
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       if value
   			html.span '', class: 'glyphicon glyphicon-ok'
   		else
@@ -23,7 +23,7 @@ module Interview
       object = find_attribute! :object
       align = @align || find_attribute(:align)
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: "form-group attribute_#{@method.to_s} collapse in" do
         if align == 'horizontal'
           html.div class: 'col-xs-9 col-xs-offset-3' do
@@ -37,11 +37,11 @@ module Interview
     end
     
     def render_checkbox
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html << render_write
       html.text! ' '
       html << form_builder.label(@method) do
-        form_html = Builder::XmlMarkup.new
+        form_html = ::Builder::XmlMarkup.new
         form_html.text! caption
         # if not @hide_tooltip and tooltip != ''
         #   form_html.text! ' '

data/lib/interview/breadcrumbs.rb

@@ -7,9 +7,9 @@ module Interview
       if Object.const_defined?('Gretel')
         return h.breadcrumbs
       else
-        html = Builder::XmlMarkup.new
+        html = ::Builder::XmlMarkup.new
         html.ol class: 'breadcrumb' do
-          @controls.each do |control|
+          add_parent(build_children).each do |control|
             html << control.render
           end
         end

data/lib/interview/builder.rb

@@ -0,0 +1,49 @@
+module Interview
+  class Builder
+    
+    def initialize(options={})
+      @target = Interview::Container.new
+    end
+    
+    def controls!
+      @target.controls
+    end
+    
+    def render!
+      @target.render
+    end
+    
+    def add!(sym, *args, &block)
+      if Object.const_defined?(sym.to_s.camelcase) and
+         Object.const_get(sym.to_s.camelcase) <= Interview::Control
+        control = Object.const_get(sym.to_s.camelcase).new(*args)
+      else
+        control = Object.const_get("Interview::#{sym.to_s.camelcase}").new(*args)
+      end
+      @target.add_control control
+      if block and control.respond_to? :add_block
+        control.add_block(&block)
+      elsif block
+      temp_target = @target
+      @target = control
+      yield
+        @target = temp_target
+      end
+    end
+    
+    def <<(control_or_array)
+      if control_or_array.kind_of? Array
+        @target.add_controls control_or_array
+      else 
+        @target.add_control control_or_array
+      end
+    end
+    
+    def method_missing(sym, *args, &block)
+      add!(sym, *args, &block)
+    end
+    
+    protected
+    
+  end
+end

data/lib/interview/collapse_container.rb

@@ -5,13 +5,13 @@ module Interview
     attr_accessor :caption
         
     def render
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
+      controls = add_parent(build_children)
       if @caption
         link = Interview::Link.new(caption: @caption)
-        controls = @controls
       else
-        link = @controls.first
-        controls = @controls[1..-1]
+        link = controls.first
+        controls = controls[1..-1]
       end
       link.url = '#'
       link.html_class << 'collapse_link'

data/lib/interview/condition_container.rb

@@ -7,7 +7,7 @@ module Interview
     def render
       object = find_attribute :object
       if @condition.call(object)
-        return @controls.map do |control|
+        return add_parent(build_children).map do |control|
           control.render
         end.join
       else

data/lib/interview/container.rb

@@ -0,0 +1,13 @@
+module Interview
+  class Container < Control
+    
+    include HasControls
+    
+    def render
+      return add_parent(build_children).map do |control|
+        control.render
+      end.join
+    end
+    
+  end
+end

data/lib/interview/container_attribute.rb

@@ -15,8 +15,8 @@ module Interview
     end
     
     def render_read
-      html = Builder::XmlMarkup.new
-      @controls.each do |control|
+      html = ::Builder::XmlMarkup.new
+      add_parent(build_children).each do |control|
         html << control.render
       end
       return html.target!

data/lib/interview/control.rb

@@ -53,21 +53,5 @@ module Interview
       return ''
     end
     
-    @definition = ControlDef.new :control
-      
-    def self.definition
-      return @definition
-    end
-
-    def self.build(opts={})
-      return @definition.build(opts)
-    end
-
-    def self.inherited(subclass)
-      new_def = @definition.deep_dup
-      new_def.klass = subclass.name.underscore.to_sym
-      subclass.instance_variable_set :@definition, new_def
-    end
-    
   end
 end

data/lib/interview/dropdown.rb

@@ -11,7 +11,7 @@ module Interview
     
     def render
 	  container_tag = @container_tag || 'div'
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html_class = @html_class.dup
       html_class << 'dropdown'
       html.tag! container_tag, class: html_class.join(' ') do
@@ -25,7 +25,7 @@ module Interview
           html.span '', class: 'caret'
         end
         html.ul class: 'dropdown-menu' do
-          @controls.each do |control|
+          add_parent(build_children).each do |control|
             html.li do
               html << control.render
             end

data/lib/interview/form.rb

@@ -14,11 +14,11 @@ module Interview
       end
       return h.form_for(object, role: 'form', html: html_options) do |form_builder|
         @form_builder = form_builder
-        html = Builder::XmlMarkup.new(indent: 2)
+        html = ::Builder::XmlMarkup.new(indent: 2)
         
         render_default_controls(html)
         
-        @controls.each do |control|
+        add_parent(build_children).each do |control|
           html << control.render
           html.text! ' ' if @align == 'inline'
         end

data/lib/interview/form_errors.rb

@@ -4,7 +4,7 @@ module Interview
     def render
       object = find_attribute!(:object)
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       if object.errors.any?
         html.div class: 'alert alert-danger' do
           html.h4 h.translate("errors.template.header", count: object.errors.count, model: object.class.model_name.human)

data/lib/interview/grid.rb

@@ -7,14 +7,15 @@ module Interview
     
     def render
       objects = @objects || find_attribute!(:objects)
+      controls = add_parent(build_children)
       @object = find_attribute!(:object)
       sortable_id = "sortable_#{@object.class.model_name.plural}" if @sortable
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.table class: 'table' do
         html.thead do
           html.tr do
             html.th '' if @sortable
-            @controls.each do |control|
+            controls.each do |control|
               html.th do
                 html << control.caption
               end
@@ -34,7 +35,7 @@ module Interview
                   html.span '', class: 'handle glyphicon glyphicon-resize-vertical'
                 end
               end
-              @controls.each do |control|
+              controls.each do |control|
                 html.td do
                   html << control.render
                 end

data/lib/interview/has_controls.rb

@@ -4,7 +4,7 @@ module HasControls
   
   def initialize(params={})
     super
-    @controls = self.class.definition.build_controls_for self
+    @controls = []
   end
   
   def add_control(control, &block)
@@ -14,7 +14,7 @@ module HasControls
   end
   
   def add_controls(controls)
-    controls.each { |control| control.parent = self }
+    add_parent(controls)
     @controls += controls
   end
   
@@ -28,16 +28,13 @@ module HasControls
     end.flatten
   end
   
-  def self.included(mod)
-    mod.extend ClassMethods
+  def build_children
+    return @controls
   end
   
-  module ClassMethods
-    
-    def control(klass, params={}, &block)
-      @definition.control(klass, params, &block)
-    end
-    
+  def add_parent(controls)
+    controls.each { |control| control.parent = self }
+    return controls
   end
   
 end

data/lib/interview/html_control.rb

@@ -3,7 +3,13 @@ module Interview
     
     def initialize(params={}, &block)
       super
-      @html = Builder::XmlMarkup.new
+      @html = ::Builder::XmlMarkup.new
+      if block
+        yield @html
+      end
+    end
+    
+    def add_block(&block)
       yield @html
     end
     

data/lib/interview/image_attribute.rb

@@ -11,7 +11,7 @@ module Interview
       
       return '' if value.nil? and @hide_if_not_exists
       
-      html = Builder::XmlMarkup.new
+      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
@@ -27,7 +27,7 @@ module Interview
     def render_write
       image_style = @image_style || :thumb
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'image_attribute_container' do
         unless value.nil? and @hide_if_not_exists
           html.div class: 'inline-block' do

data/lib/interview/image_gallery_attribute.rb

@@ -8,7 +8,7 @@ module Interview
       image_style = @image_style || :thumb
       images = value
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       render_gallery(html, images, submethod, image_style, @light_box_image_style)
       return html.target!
     end
@@ -20,7 +20,7 @@ module Interview
       images = object.send @method
       model = images.klass.model_name.singular
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'image-upload-group' do
       
         html << form_builder.hidden_field("#{@method.singularize}_ids", class: 'image-ids')

data/lib/interview/image_light_box.rb

@@ -2,7 +2,7 @@ module Interview
   class ImageLightBox < Control
     
     def render
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div id: "blueimp-gallery", class: "blueimp-gallery" do
     	  html.div '', class: "slides"
     	  html.h3 '', class: "title"

data/lib/interview/link.rb

@@ -102,7 +102,7 @@ module Interview
     end
     
     def render_list_style(url, html_class=[], html_options={})
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       li_class = @active ? 'active' : ''
       html.li class: li_class do
         html << render_link(url, html_class, html_options)
@@ -111,17 +111,18 @@ module Interview
     end
     
     def render_link(url, html_class=[], html_options={})
+      controls = add_parent(build_children)
       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?
+        html = ::Builder::XmlMarkup.new
+        if controls.empty?
           html.span '', class: "glyphicon glyphicon-#{@image}" if @image
           html.text! ' ' if @image and @caption
           html << @caption if @caption
         else
-          @controls.each do |control|
+          controls.each do |control|
             html << control.render
           end
         end

data/lib/interview/list.rb

@@ -7,10 +7,10 @@ module Interview
     
     def render
       objects = @objects || find_attribute!(:objects)
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       objects.each do |object|
         @object = object
-        @controls.each do |control| # todo: controls neu initialisieren?
+        add_parent(build_children).each do |control| # todo: controls neu initialisieren?
           html << control.render
         end
       end

data/lib/interview/media_object.rb

@@ -7,14 +7,15 @@ module Interview
     def render
       image_size = @image_size || :thumb
       object = find_attribute :object
+      controls = add_parent(build_children)
       @object = object
-      html = Builder::XmlMarkup.new(indent: 2)
+      html = ::Builder::XmlMarkup.new(indent: 2)
       html.div class: 'media' do
-        @controls[0].html_class << 'pull-left' if @controls[0].respond_to? 'html_class'
-        html << @controls.first.render
+        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'
-          @controls[1..-1].each do |control|
+          controls[1].html_class << 'media-heading' if controls[1].respond_to? 'html_class'
+          controls[1..-1].each do |control|
             html << control.render
           end
         end

data/lib/interview/navigation.rb

@@ -7,9 +7,9 @@ module Interview
     def render
       auto_set_active
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.ul class: 'nav nav-pills nav-stacked' do
-        @controls.each do |control|
+        add_parent(build_children).each do |control|
           html << control.render
         end
       end

data/lib/interview/navigation_item.rb

@@ -25,12 +25,12 @@ module Interview
         html << @caption if @caption
       end)
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.li class: css_class do  
         html << link.render
       end
       if show_siblings
-        @controls.each do |c| 
+        add_parent(build_children).each do |c| 
           html << c.render 
         end
       end

data/lib/interview/navigation_item_old.rb

@@ -10,12 +10,12 @@ module Interview
       css_class += " active" if @active
       show_siblings = @active || siblings.any? { |sib| sib.active }
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.li class: css_class do
         html << super
       end
       if show_siblings
-        @controls.each do |c| 
+        add_parent(build_children).each do |c| 
           html << c.render 
         end
       end

data/lib/interview/nested_form.rb

@@ -9,7 +9,7 @@ module Interview
       assoc_form_builder = find_attribute! :form_builder
       assoc_method = find_attribute! :assoc_method
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'nested_form_container' do
         if @image_based
           html << Interview::NestedFormAddImages.new.render
@@ -38,9 +38,9 @@ module Interview
     def render_nested_form(form_builder)
       @form_builder = form_builder
       @object = form_builder.object
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'nested_form collapse in' do
-        @controls.each do |control|
+        add_parent(build_children).each do |control|
           html << control.render
         end
         html << form_builder.hidden_field(:id)

data/lib/interview/nested_form_add_images.rb

@@ -5,7 +5,7 @@ module Interview
     
     def render
       if @style and @style.to_sym == :horizontal_form
-        html = Builder::XmlMarkup.new # todo: in eigenes Objekt auslagern?
+        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
@@ -18,7 +18,7 @@ module Interview
     end
     
     def render_link
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: "clearfix" do
         html.span class: "btn btn-default fileinput-button" do
           html.span "Bilder hinzufügen" # todo

data/lib/interview/nested_form_add_link.rb

@@ -5,7 +5,7 @@ module Interview
     
     def render
       if @style and @style.to_sym == :horizontal_form
-        html = Builder::XmlMarkup.new # todo: in eigenes Objekt auslagern?
+        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
@@ -48,7 +48,7 @@ module Interview
         data_content[poly_class.model_name.singular] = html
       end
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div do
         html << h.select_tag("add_link_class", h.options_for_select(select_options), class: 'form-control', style: 'display: inline; width: auto;')
         html.text! ' '

data/lib/interview/nested_form_remove_link.rb

@@ -5,7 +5,7 @@ module Interview
     
     def render
       if @style and @style.to_sym == :horizontal_form
-        html = Builder::XmlMarkup.new
+        html = ::Builder::XmlMarkup.new
         html.div class: 'row' do
           html.div class: 'col-xs-9 col-xs-offset-3' do
             html << render_link

data/lib/interview/object_context.rb

@@ -1,8 +1,12 @@
 module Interview
-  module ObjectContext # todo: Überdenken
+  module ObjectContext
     
     attr_reader :object
     
+    def initialize
+      puts "DEPRECATION WARNING: Interview::ObjectContext is deprecated."
+    end
+    
     def object=(object)
       if object.is_a? String
         @object = Object::const_get(object.camelcase).new

data/lib/interview/option_attribute.rb

@@ -34,7 +34,7 @@ module Interview
     
     def render_radios
       object = find_attribute!(:object)
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       get_options(object).each do |option|
         html.div class: 'radio' do  
           html.label do

data/lib/interview/panel.rb

@@ -3,10 +3,10 @@ module Interview
     include HasControls
     
     def render
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div class: 'panel panel-default' do
         html.div class: 'panel-body' do
-          @controls.each do |control|
+          add_parent(build_children).each do |control|
             html << control.render
           end
         end

data/lib/interview/polymorphic_add_link.rb

@@ -35,7 +35,7 @@ module Interview
         [ poly_class.human_name, poly_class.name ]
       end
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.div do
         html << h.select_tag("add_link_class", h.options_for_select(select_options), class: 'form-control', style: 'display: inline; width: auto;')
         html.text! ' '

data/lib/interview/progress_bar.rb

@@ -11,7 +11,7 @@ module Interview
     
     def render
       html_class = @html_class
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       opts = { class: "progress" }
       opts[:class] += " collapse" if @hidden
       opts[:class] += ' ' + @html_class.join(' ') unless @html_class.empty?

data/lib/interview/search_form.rb

@@ -4,7 +4,7 @@ module Interview
     def render
       object = find_attribute! :object
       return h.form_tag(h.polymorphic_path(object.class.model_name.plural, action: 'search'), method: :get, class: 'form-inline', role: 'form') do
-        html = Builder::XmlMarkup.new(indent: 2)
+        html = ::Builder::XmlMarkup.new(indent: 2)
         html.div do
           html.div class: 'form-group' do
             html << h.text_field_tag(:search, h.params[:search], class: 'form-control')

data/lib/interview/space.rb

@@ -3,7 +3,7 @@ module Interview
     attr_accessor :style
     
     def render
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       if @style and @style.to_sym == :line
         html.hr
       elsif @style and @style.to_sym == :break

data/lib/interview/tab.rb

@@ -6,11 +6,11 @@ module Interview
     attr_accessor :caption, :active
     
     def render
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html_class = 'tab-pane'
       html_class += ' active' if @active
       html.div class: html_class, id: @caption do
-        @controls.each do |control|
+        add_parent(build_children).each do |control|
           html << control.render
         end
       end

data/lib/interview/tab_box.rb

@@ -4,13 +4,14 @@ module Interview
     include HasControls
     
     def render
-      if @controls.none? { |c| c.active }
-        @controls.first.active = true
+      controls = add_parent(build_children)
+      if controls.none? { |c| c.active }
+        controls.first.active = true
       end
       
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.ul class: 'nav nav-tabs tab_box' do
-        @controls.each do |control|
+        controls.each do |control|
           html_class = control.active ? 'active' : ''
           html.li class: html_class do
             html.a control.caption, href: "##{control.caption}", :'data-toogle' => 'tab'
@@ -18,7 +19,7 @@ module Interview
         end
       end
       html.div class: 'tab-content' do
-        @controls.each do |control|
+        controls.each do |control|
           html << control.render
         end
       end

data/lib/interview/text.rb

@@ -10,7 +10,7 @@ module Interview
     end
     
     def render
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       if @style
         opts = {}
         opts[:class] = @html_class.join(' ') unless @html_class.empty?
@@ -29,13 +29,13 @@ module Interview
       if @bold
         html.b do
           html << @text # todo: besser .text! statt << ?
-          @controls.each do |control| 
+          add_parent(build_children).each do |control| 
             html << control.render
           end
         end
       else
         html << @text if @text # todo: besser .text! statt << ?
-        @controls.each do |control| 
+        add_parent(build_children).each do |control| 
           html << control.render
         end
       end

data/lib/interview/tooltip.rb

@@ -26,7 +26,7 @@ module Interview
     end
     
     def render_popover_style
-      html = Builder::XmlMarkup.new
+      html = ::Builder::XmlMarkup.new
       html.text! ' '
       html.a href: '#', class: 'tip', :'data-toggle' => 'popover', :'data-content' => tooltip do
         html.span '', class: 'glyphicon glyphicon-question-sign'

data/lib/interview/version.rb

@@ -1,3 +1,3 @@
 module Interview
-  VERSION = "0.0.11"
+  VERSION = "0.1.0"
 end

data/lib/interview/view.rb

@@ -98,7 +98,7 @@ module Interview
         end
       end
       
-      html = @controls.map { |c| c.render }.join
+      html = add_parent(build_children).map { |c| c.render }.join
       
       @object = tmp_object
       @objects = tmp_objects

data/lib/interview.rb

@@ -4,9 +4,10 @@ require "builder"
 
 require "interview/version"
 
-require "interview/control_def"
 require "interview/control"
 require "interview/has_controls"
+require "interview/container"
+require "interview/builder"
 require "interview/object_context"
 
 require "interview/text"
@@ -28,7 +29,6 @@ require "interview/media_object"
 require "interview/panel"
 require "interview/collapse_container"
 require "interview/condition_container"
-require "interview/pagination"
 
 require "interview/attribute"
 require "interview/string_attribute"
@@ -90,175 +90,10 @@ module ActiveRecord
       return objects.map { |object| object.human_id }
     end
     
-    # todo: auslagern in eigenes gem
-    def self.filter(filter)
-      relation = self
-      # self.joins_for_filter(filter).each do |join_table|
-      #   relation = relation.joins(join_table)
-      # end
-      return relation.where(*self.filter_to_sql(filter))
-    end
-
-    def self.joins_for_filter(filter)
-      join_tables = []
-      filter.each do |attr, filter|
-        if assoc = self.reflect_on_association(attr) and assoc.macro != :belongs_to
-          join_tables << assoc.plural_name.to_sym # todo
-        end
-      end
-      return join_tables.uniq
-    end
-    
-    def self.filter_to_sql(filter)
-      if filter.is_a? Hash # todo
-        result = hash_filter_to_sql(filter)
-      elsif filter.respond_to? :each
-        result = filter_combination_to_sql(filter)
-      end # todo: else
-      return result
-    end
-    
-    def self.filter_combination_to_sql(filter)
-      if [:and, :or].include? filter.first
-        combination = filter.first
-        filter = filter[1..-1]
-      end
-      combination ||= :or
-      sqls = []
-      values = []
-      filter.each do |f|
-        f = self.filter_to_sql(f)
-        sqls << f.first
-        values += f[1..-1]
-      end
-      sql = '(' + sqls.join(" #{combination.to_s.upcase} ") + ')'
-      return [sql] + values
-    end
-
-    def self.hash_filter_to_sql(filter)
-      sqls = []
-      values = []
-      filter.each do |attr, filter|
-        if self.reflect_on_association(attr)
-          result = self.assoc_filter_to_sql(attr, filter)
-        elsif column = self.columns_hash[attr.to_s]
-          result = case column.type
-          when :string
-            self.string_filter_to_sql(attr, filter)
-          when :integer, :decimal
-            self.number_filter_to_sql(attr, filter)
-          when :date
-            self.date_filter_to_sql(attr, filter)
-          when :boolean
-            self.boolean_filter_to_sql(attr, filter)
-          end
-          # todo: erweitern
-        else
-          raise "Not possible to set a filter for #{attr}"
-        end
-        sqls << result.first
-        values += result[1..-1]
-      end
-      sql = sqls.join(' AND ')
-      return [sql] + values
-    end
-
-    def self.string_filter_to_sql(attr, filter, negation=false)
-      negation = negation ? 'NOT ' : ''
-      if filter.respond_to?(:each)
-        return self.value_combination_to_sql(attr, filter, :string)
-      else
-        sql = "#{negation}#{attr} = ?"
-      end
-      return [sql, filter]
-    end
-    
-    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
-        connective = result[1].blank? ? '=' : result[1]
-        value = result[2].include?('.') ? result[2].to_f : result[2].to_i
-        sql = "#{negation}#{attr} #{connective} ?"
-        values = [value]
-      else
-        sql = "#{negation}#{attr} = ?"
-        values = [filter]
-      end
-      return [sql] + values
-    end
-
-    def self.date_filter_to_sql(attr, filter, negation=false)
-      negation = negation ? 'NOT ' : ''
-      if filter.respond_to?(:each)
-        if filter.size != 2 # todo: value_combination einbauen
-          raise "invalid date filter: #{filter.inspect} 2 elements expected, #{filter.size} given"
-        end
-        sql = "#{negation}#{attr} BETWEEN ? AND ?"
-        values = filter
-      else
-        sql = "#{negation}#{attr} = ?"
-        values = [filter]
-      end
-      return [sql] + values
-    end
-
-    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, 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 #{negation}IN (SELECT #{assoc.foreign_key} FROM #{assoc.join_table} WHERE #{number_filter.first})"
-      end # todo: erweitern
-      return [sql] + values
-    end
-    
-    def self.value_combination_to_sql(attr, filter, filter_type)
-      # todo: check if set is possible
-      if filter.first == :not
-        return self.send("#{filter_type}_filter_to_sql", attr, filter[1], true)
-      elsif [:and, :or].include? filter.first
-        combination = filter.first
-        filter = filter[1..-1]
-      end
-      combination ||= :or
-      sqls = []
-      values = []
-      filter.each do |f|
-        f = self.send("#{filter_type}_filter_to_sql", attr, f)
-        sqls << f.first
-        values += f[1..-1]
-      end
-      sql = '(' + sqls.join(" #{combination.to_s.upcase} ") + ')'
-      return [sql] + values
-    end
-    
     def self.human_name(options={})
       options = {scope: [self.i18n_scope, :models], count: 1}.merge(options)
       I18n.translate(self.name.underscore, options)
     end
-    
-  end
-end
-
-module ActiveRecord::Associations::Builder
-  class CollectionAssociation < Association
-    include AssociationMethods
+  
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: interview
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.1.0
 platform: ruby
 authors:
 - Jannes Köhler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -126,12 +126,13 @@ files:
 - lib/interview/attribute.rb
 - lib/interview/boolean_attribute.rb
 - lib/interview/breadcrumbs.rb
+- lib/interview/builder.rb
 - lib/interview/button.rb
 - lib/interview/collapse_container.rb
 - lib/interview/condition_container.rb
+- lib/interview/container.rb
 - lib/interview/container_attribute.rb
 - lib/interview/control.rb
-- lib/interview/control_def.rb
 - lib/interview/date_attribute.rb
 - lib/interview/datetime_attribute.rb
 - lib/interview/decimal_attribute.rb
@@ -159,7 +160,6 @@ files:
 - lib/interview/nested_form_remove_link.rb
 - lib/interview/object_context.rb
 - lib/interview/option_attribute.rb
-- lib/interview/pagination.rb
 - lib/interview/panel.rb
 - lib/interview/polymorphic_add_link.rb
 - lib/interview/progress_bar.rb

data/lib/interview/control_def.rb

@@ -1,36 +0,0 @@
-class ControlDef
-  
-  attr_accessor :klass
-  attr_reader :params, :controls
-  
-  def initialize(klass, params={})
-    @klass = klass.to_sym
-    @params = params
-    @controls = []
-  end
-  
-  def control(klass, params={}, &block)
-    control = ControlDef.new(klass, params)
-    @controls << control
-    yield(control) if block_given?
-  end
-  
-  def build(params={})
-    control = Object::const_get("#{@klass.to_s.camelcase}").new(@params.merge(params))
-    if control.respond_to? :add_controls
-      control.add_controls build_controls_for(control)
-    end
-    return control
-  end
-  
-  def build_controls_for(parent_control)
-    return @controls.map { |c| c.build(parent: parent_control) }
-  end
-  
-  def deep_dup
-    new_definition = self.class.new(@klass, @params.deep_dup)
-    new_definition.instance_variable_set :@controls, @controls.deep_dup
-    return new_definition
-  end
-  
-end

data/lib/interview/pagination.rb

@@ -1,12 +0,0 @@
-module Interview
-  class Pagination < Control
-  
-    attr_accessor :objects
-  
-    def render
-      objects = @objects || find_attribute!(:objects)
-      return h.paginate(objects)
-    end
-  
-  end
-end