interview 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c086485085f2eb7fa260a71e20dc4ada0005abd7
-  data.tar.gz: 65f36b1b39de18b9bd330ab4467254b4b1a24c37
+  metadata.gz: d507579cd98098a01a96c41b05d2438c6901c516
+  data.tar.gz: 1552d050ca6ce66b9776bf88fc51a874dc491856
 SHA512:
-  metadata.gz: e65be2cb25eea128a5f19da3624aea3816bb03f9f2d8979031e461e7cf83be18be9b5e5a5f7bdcb283e0dcd601e33e2c062095e030ce5d1a2c5d26e2d6ce9c29
-  data.tar.gz: 2c610a979c4efe97cb05514b515216cba453d58765e603e7b5e95285607a962558e31c8ddec24c01f5a5116f48a46ee20a5c6d8a248e2fe7444d01462c6b3a6a
+  metadata.gz: ec3a5e48eaa89103f27a7a7fafa8140a8f08cfc721af7c621d22575882ec80f1245906f115eb11f35b8655197e20dc552afe76b9ae1fc36f8d24c900417c5443
+  data.tar.gz: 8b3c16d387a7e887f890c258d86d78cc015f7eba5e627ae35adf3b48af02a814132e1d5f5df4da01d466984bad57cd02d1bd144c9b642856847228a74f65edd7

data/interview.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "draper"
   spec.add_runtime_dependency "builder"
+  spec.add_runtime_dependency "bootstrap-sass"
 end

data/lib/{generators/interview/install/templates → assets/javascripts}/interview.js.coffee

@@ -1,33 +1,27 @@
 jQuery ->
 
-  $(".tip").popover(placement: 'top auto')
+  # $(".tip").popover(placement: 'top auto')
   
-  $(".tip").on 'click', (event) ->
+  $(document).on 'click', '.tip', (e) ->
     event.preventDefault()
   
-  $(".action_hint").tooltip(placement: 'top auto')
-  
-  $('.tab_box a').click (e) ->
+  $(document).on 'click', '.tab_box a', (e) ->
     e.preventDefault()
     $(this).tab('show')
   
-  bind_remove_links = ->
-    $('.nested_form_remove_link').click (e) ->
-      e.preventDefault()
-      $(this).closest(".nested_form").find(".nested_form_destroy").val("1")
-      $(this).closest(".nested_form").collapse('hide')
-  
-  bind_remove_links()
+  $(document).on 'click', '.nested_form_remove_link', (e) ->
+    e.preventDefault()
+    $(this).closest(".nested_form").find(".nested_form_destroy").val("1")
+    $(this).closest(".nested_form").collapse('hide')
     
-  $('.nested_form_add_link').click (e) ->
+  $(document).on 'click', '.nested_form_add_link', (e) ->
     e.preventDefault()
     new_id = new Date().getTime()
     regexp = new RegExp("new_association", "g")
     html = $(this).data('content').replace(regexp, new_id)
     $(".nested_forms").append(html)
-    bind_remove_links()
   
-  $('.nested_form_polymorphic_add_link').click (e) ->
+  $(document).on 'click', '.nested_form_polymorphic_add_link', (e) ->
     e.preventDefault()
     object_class = $('#add_link_class').children('option:selected').val()
     if object_class != ''
@@ -36,9 +30,8 @@ jQuery ->
       regexp = new RegExp("new_association", "g")
       html = data[object_class].replace(regexp, new_id)
       $(".nested_forms").append(html)
-      bind_remove_links()
       
-  $('.polymorphic_add_link').click (e) ->
+  $(document).on 'click', '.polymorphic_add_link', (e) ->
     e.preventDefault()
     object_class = $('#add_link_class').children('option:selected').val()
     if object_class != ''
@@ -70,19 +63,19 @@ jQuery ->
           error: (data) ->
             tree.jstree('refresh')
             $(tree).before("<div class=\"alert alert-danger\">#{data.responseText}</div>")
-            
-  $('.collapse_link').click (e) -> 
+  
+  $(document).on 'click', '.collapse_link', (e) ->
     e.preventDefault()
     $($(this).data('target')).collapse('toggle')
   
-  $('.img-link').click (e) ->
+  $(document).on 'click', '.img-link', (e) ->
     e.preventDefault()
     links = $(this).closest('.image-gallery').find('.img-link')
-    target = event.target || event.srcElement
+    target = e.target || e.srcElement
     link = if target.src then target.parentNode else target
     options = { index: link, event: e }
     blueimp.Gallery(links, options)
-
+  
   $('.upload_image').fileupload
     add: (e, data) ->
       types = /(\.|\/)(gif|jpe?g|png|mov|mpeg|mpeg4|avi)$/i
@@ -100,7 +93,7 @@ jQuery ->
     done: (e, data) ->
       $(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
@@ -110,7 +103,6 @@ jQuery ->
         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', '__method')
         data.submit()
         $("input[name='__method']").attr('name', '_method')
@@ -123,7 +115,7 @@ jQuery ->
     done: (e, data) ->
       data.context.find('.upload_buffer_id').attr('value', data.result.id)
       data.context.find('.image').attr('src', data.result.thumb_url)
-
+  
   $('.nested_form').each ->
     nested_form = $(this)
     upload_buffer_id = $(this).find('.upload_buffer_id').attr('value')

data/lib/{generators/interview/install/templates/bootstrap_interview.css.scss → assets/stylesheets/interview.css.scss}

@@ -1,4 +1,4 @@
-@import 'font-awesome';
+/* @import 'font-awesome'; */
 
 @import 'colors';
 
@@ -10,6 +10,7 @@ $navbar-inverse-color: #ffffff;
 $navbar-inverse-link-color: $brand-primary-lighten;
 $navbar-inverse-link-hover-color: #ffffff;
 
+@import 'bootstrap-sprockets';
 @import 'bootstrap';
 
 $actionbar-padding: 5px !default;
@@ -74,7 +75,7 @@ $nav-stacked-link-padding-level2: 5px 15px 5px 45px !default;
     padding: $nav-stacked-link-padding-level1;
   }
   > li.level2 > a {
-    padding: $nav-stacked-link-padding-level1;
+    padding: $nav-stacked-link-padding-level2;
   }
 }
 

data/lib/generators/interview/install/install_generator.rb

@@ -13,10 +13,8 @@ module Interview
       
       def add_assets
         copy_file "application.css", "app/assets/stylesheets/application.css" # todo: überdenken
-        copy_file "bootstrap_interview.css.scss", "app/assets/stylesheets/bootstrap_interview.css.scss"
         copy_file "colors.css.scss", "app/assets/stylesheets/colors.css.scss"
         copy_file "application.js", "app/assets/javascripts/application.js" # todo: überdenken
-        copy_file "interview.js.coffee", "app/assets/javascripts/interview.js.coffee"
         copy_file "missing_thumb.png", "app/assets/images/missing_thumb.png"
         copy_file "missing_medium.png", "app/assets/images/missing_medium.png"
         copy_file "missing_large.png", "app/assets/images/missing_large.png"

data/lib/generators/interview/install/templates/interview.rb

@@ -1,4 +1,4 @@
 Rails.application.config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
 Rails.application.config.i18n.default_locale = :de
 
-Rails.application.config.generators.stylesheets false
+ActionView::Template.register_template_handler(:iview, ::Interview::Handler)

data/lib/interview.rb

@@ -1,66 +1,80 @@
 require "active_support/inflector"
 require "draper"
 require "builder"
+require "bootstrap-sass"
 
 require "interview/version"
 
 require "interview/control"
-require "interview/has_controls"
-require "interview/container"
+require "interview/meta_control"
+require "interview/has_html_options"
 require "interview/builder"
+require "interview/nested_buildable"
+require "interview/handler"
+require "interview/engine"
 require "interview/object_context"
+require "interview/association_methods"
 
-require "interview/text"
-require "interview/link"
-require "interview/dropdown"
-require "interview/space"
-require "interview/tooltip"
-require "interview/html_control"
-require "interview/actionbar"
-require "interview/grid"
-require "interview/list"
-require "interview/tree"
-require "interview/navigation"
-require "interview/navigation_item"
-require "interview/tab_box"
-require "interview/tab"
-require "interview/breadcrumbs"
-require "interview/media_object"
-require "interview/panel"
-require "interview/collapse_container"
-require "interview/condition_container"
-
-require "interview/attribute"
-require "interview/string_attribute"
-require "interview/text_attribute"
-require "interview/integer_attribute"
-require "interview/decimal_attribute"
-require "interview/boolean_attribute"
-require "interview/date_attribute"
-require "interview/datetime_attribute"
-require "interview/option_attribute"
-require "interview/html_text_attribute"
-require "interview/image_attribute"
-require "interview/image_gallery_attribute"
-require "interview/image_light_box"
-require "interview/association_attribute"
-require "interview/association_list_attribute"
-require "interview/hidden_attribute"
-require "interview/container_attribute"
+require "interview/controls/section"
+require "interview/controls/text"
+require "interview/controls/html_headers"
+require "interview/controls/container"
+require "interview/controls/link"
+require "interview/controls/dropdown"
+require "interview/controls/space"
+require "interview/controls/glyphicon"
+require "interview/controls/tooltip"
+require "interview/controls/html_control"
+require "interview/controls/actionbar"
+require "interview/controls/grid"
+require "interview/controls/list"
+require "interview/controls/tree"
+require "interview/controls/navigation"
+require "interview/controls/navigation_item"
+require "interview/controls/tab_box"
+require "interview/controls/tab"
+require "interview/controls/breadcrumbs"
+require "interview/controls/media_object"
+require "interview/controls/panel"
+require "interview/controls/collapse_container"
+require "interview/controls/pagination"
+require "interview/controls/html_doctype"
+require "interview/controls/alert"
 
-require "interview/view"
-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/controls/attribute"
+require "interview/controls/string_attribute"
+require "interview/controls/text_attribute"
+require "interview/controls/integer_attribute"
+require "interview/controls/decimal_attribute"
+require "interview/controls/boolean_attribute"
+require "interview/controls/date_attribute"
+require "interview/controls/datetime_attribute"
+require "interview/controls/option_attribute"
+require "interview/controls/html_text_attribute"
+require "interview/controls/image_attribute"
+require "interview/controls/image_gallery_attribute"
+require "interview/controls/image_light_box"
+require "interview/controls/association_attribute"
+require "interview/controls/association_list_attribute"
+require "interview/controls/hidden_attribute"
+require "interview/controls/container_attribute"
 
-require "interview/association_methods"
+require "interview/controls/view"
+require "interview/controls/form"
+require "interview/controls/nested_form"
+require "interview/controls/nested_form_remove_link"
+require "interview/controls/nested_form_add_link"
+require "interview/controls/nested_form_add_images"
+require "interview/controls/form_errors"
+require "interview/controls/polymorphic_nested_form"
+require "interview/controls/polymorphic_add_link"
+require "interview/controls/search_form"
+require "interview/controls/submit"
+require "interview/controls/button"
+require "interview/controls/progress_bar"
+require "interview/controls/horizontal_form_container"
+require "interview/controls/scaffold_card"
+require "interview/controls/scaffold_form"
 
 module Interview
   # Your code goes here...

data/lib/interview/association_methods.rb

@@ -1,5 +1,7 @@
 module AssociationMethods
   
+  # todo: überarbeiten
+  
   def define_readers
     super
     mixin.class_eval <<-CODE, __FILE__, __LINE__ + 1

data/lib/interview/builder.rb

@@ -1,49 +1,57 @@
 module Interview
   class Builder
     
+    attr_accessor :html, :curr_parent
+    
     def initialize(options={})
-      @target = Interview::Container.new
+      @html = ::Builder::XmlMarkup.new
     end
     
-    def controls!
-      @target.controls
+    def render!
+      @html.target!
     end
     
-    def render!
-      @target.render
+    def add!(control, &block)
+      if @curr_parent.is_a? MetaControl and not @curr_parent.skip
+        @curr_parent.build_child self, control, &block
+      else
+        control.parent = @curr_parent
+        @curr_parent = control
+        control.build self, &block
+        @curr_parent = control.parent
+      end
     end
     
-    def add!(sym, *args, &block)
+    def add_abstract!(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
+        # todo: prüfen, ob Control vorhanden
         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
+      add! control, &block
     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
+    def tag!(sym, *args, &block)
+      @html.tag!(sym, *args, &block)
     end
     
-    def method_missing(sym, *args, &block)
-      add!(sym, *args, &block)
+    def text!(text)
+      @html.text!(text)
+    end
+    
+    def <<(text)
+      @html << text
     end
     
-    protected
+    def lookup!(attr_name)
+      @curr_parent.find_attribute!(attr_name)
+    end
+    
+    def method_missing(sym, *args, &block)
+      add_abstract!(sym, *args, &block)
+    end
     
   end
 end

data/lib/interview/control.rb

@@ -18,7 +18,7 @@ module Interview
       end
     end
     
-    def set_defaults
+    def set_defaults # todo: löschen?
       if self.class.const_defined? 'DEFAULTS'
         self.class::DEFAULTS.each do |key, value|
           self.send("#{key}=".to_sym, value)
@@ -35,12 +35,21 @@ module Interview
     end
     
     def find_attribute(attribute)
-      return nil if @parent.nil?
-      if @parent.respond_to? attribute
-        return @parent.send attribute
+      if respond_to? attribute
+        value = send attribute
+        return value if value
+      end
+      if @parent
+        return @parent.find_attribute(attribute)
       else
-        return @parent.find_attribute attribute
+        return nil
       end
+      # return nil if @parent.nil?
+      # if @parent.respond_to? attribute
+        # return @parent.send attribute
+      # else
+        # return @parent.find_attribute attribute
+      # end
     end
     
     def find_attribute!(attr_name)
@@ -49,8 +58,17 @@ module Interview
       return attribute
     end
     
-    def render
-      return ''
+    def build(b)
+      yield if block_given?
+    end
+    
+    def build_with_params(b, params={})
+      set_attributes(params)
+      build(b)
+    end
+    
+    def build_child(b, control, &block)
+      b.add! control, &block
     end
     
   end

data/lib/interview/controls/actionbar.rb

@@ -0,0 +1,41 @@
+module Interview
+  class Actionbar < Control
+    
+    attr_accessor :title, :icon
+    
+    def build(b)
+      title = @title || find_attribute(:title)
+      icon = @icon
+      if icon == :polymorphic
+        object = find_attribute! :object
+        icon = object.icon
+      end
+      
+      b.section html_class: 'clearfix' do
+        if block_given?
+          b.section style: 'ul', html_class: 'list-inline pull-right' do
+            b.meta_class pointer: self do
+              yield
+            end
+          end
+        end
+        if title
+          b.section style: 'p', html_class: 'h3' do
+            if icon
+              b.section style: 'span', html_class: icon
+              b.space
+            end
+            b.text text: title
+          end
+        end
+      end
+    end
+    
+    def build_child(b, control, &block)
+      b.section style: 'li' do
+        super
+      end
+    end
+    
+  end
+end