end_view 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f3054dbb6674965ce22fdfeba1ecd14b6135299
-  data.tar.gz: 303127059c06331b85b75274e6362cadcae3e360
+  metadata.gz: 13f724862bcef543e1ca3548cd79e9ede0210500
+  data.tar.gz: 2711de7e149ee22d53f4837329d8ec84221dc445
 SHA512:
-  metadata.gz: 3b179876261d57e25381eabbe1ab7be6d86599309542383e818c482ffe7bee2e0f0e61aac6513fff26b467e34b7b0ce295c7b140984142ca52922f974799d47d
-  data.tar.gz: 2ce08b9f83504d1d74b2734d790498337c26186571076362602d98cb2d109df6d8d223de4a28c0d6887786d48d4b70af70fee23b50894dfc11c9ff72aa222d68
+  metadata.gz: 56e62c0c920d3598df45cdfcf46f13d73e94820dc4b1caa3c87317ba9154dcfe012634900cdc9914fcf5aaf619b483601f54a3fb094eaf24ce58f30385eef805
+  data.tar.gz: 65097ea3bbb3c75ccbb88fb5314e1fbc6d396a534b73f54ac20a7ca7624e07579e9afafa38e75ac2c949ed94b09b285b77415394f24fa39acee644bf3568941c

data/lib/end_view/bootstrap/form_group.rb

@@ -3,6 +3,10 @@ require 'attire'
 require 'inflecto'
 
 module EndView
+  def self.bootstrap_form_group(*args)
+    Bootstrap::FormGroup.render(*args)
+  end
+
   module Bootstrap
     class FormGroup
       include EndView.new(__FILE__)
@@ -66,6 +70,7 @@ end
 
 __END__
 
+/ Bootstrap Form Group
 .form-group
   - if label
     %label{label_opts}= label

data/lib/end_view/bootstrap/form_modal.rb

@@ -1,24 +1,47 @@
 require 'end_view/bootstrap/modal'
-require 'forwardable'
 
 module EndView
+  def self.bootstrap_form_modal(*args, &b)
+    Bootstrap::FormModal.render(*args, &b)
+  end
+
   module Bootstrap
-    class FormModal < Modal
-      compile(__FILE__)
-      extend Forwardable
+    class FormModal
+      include EndView.new(__FILE__)
+
+      def self.render(*args, &b)
+        new(*args).render(&b)
+      end
 
-      def initialize(form_builder, opts = {})
-        super({ dismiss_value: 'Cancel' }.merge(opts))
-        @form_builder = form_builder
-        @submit_value = opts[:submit_value] || 'Okay'
+      attr_init :id, :form_builder, :'opts = {}'
+
+      def render(*args, &b)
+        super(*args) { Modal.render(id, opts_with_buttons, &b) }
       end
 
       private
 
-      attr_reader :form_builder, :submit_value
-      def_delegators :form_builder, :form_opts,
-                                    :authenticity_token_opts,
-                                    :form_method_opts
+      alias_method :f, :form_builder
+
+      def opts_with_buttons
+        { buttons: buttons }.merge(@opts)
+      end
+
+      def cancel_value
+        opts[:cancel_value] || 'Cancel'
+      end
+
+      def submit_value
+        opts[:submit_value] || 'Okay'
+      end
+
+      def buttons
+        [[cancel_opts, cancel_value], [submit_opts, submit_value]]
+      end
+
+      def cancel_opts
+        { class: 'btn btn-default', 'data-dismiss' => :modal }
+      end
 
       def submit_opts
         { class: 'btn btn-primary', type: 'submit' }
@@ -29,18 +52,8 @@ end
 
 __END__
 
-.modal{modal_opts}
-  .modal-dialog{dialog_opts}
-    .modal-content
-      - if title
-        .modal-header
-          %button{close_opts}
-            %span(aria-hidden) &times;
-          %h4{title_opts}= title
-      %form{form_opts}
-        %input{authenticity_token_opts}
-        %input{form_method_opts}
-        .modal-body= yield
-        .modal-footer
-          %button{dismiss_opts}= dismiss_value
-          %button{submit_opts}= submit_value
+/ Bootstrap Form Modal
+%form{f.form_opts}
+  %input{f.auth_token_opts}
+  %input{f.form_method_opts}
+  = yield

data/lib/end_view/bootstrap/modal.rb

@@ -2,31 +2,37 @@ require 'end_view'
 require 'attire'
 
 module EndView
+  def self.bootstrap_modal(*args, &b)
+    Bootstrap::Modal.render(*args, &b)
+  end
+
   module Bootstrap
     class Modal
       include EndView.new(__FILE__)
-      attr_init modal_id: "modal#{rand(10_000)}",
-                title: nil,
-                size: nil,
-                label: "label#{rand(10_000)}",
-                dismiss_value: 'Okay'
+      attr_init :id, title: nil,
+                     size: nil,
+                     label: nil,
+                     dismiss_value: 'Okay',
+                     buttons: nil
 
       def self.render(*args, &b)
         new(*args).render(&b)
       end
 
-      public :modal_id
-
       private
 
       def modal_opts
-        { id: modal_id,
+        { id: id,
           class: 'fade',
           tabindex: -1,
           role: 'dialog',
           aria: { labelledby: label, hidden: true } }
       end
 
+      def label
+        @label ||= "#{id}Label"
+      end
+
       def dialog_opts
         { class: size }
       end
@@ -41,6 +47,10 @@ module EndView
         { class: 'modal-title', id: label }
       end
 
+      def buttons
+        @buttons ||= [[dismiss_opts, dismiss_value]]
+      end
+
       def dismiss_opts
         { class: 'btn btn-default', 'data-dismiss' => :modal }
       end
@@ -50,14 +60,22 @@ end
 
 __END__
 
+/ Bootstrap Modal
 .modal{modal_opts}
   .modal-dialog{dialog_opts}
     .modal-content
+
       - if title
+        / Modal Header
         .modal-header
           %button{close_opts}
             %span(aria-hidden) ×
           %h4{title_opts}= title
+
+      / Modal Body
       .modal-body= yield
+
+      / Modal Footer
       .modal-footer
-        %button{dismiss_opts}= dismiss_value
+        - buttons.each do |(button_opts, button_value)|
+          %button{button_opts}= button_value

data/lib/end_view/bootstrap/simple_form.rb

@@ -0,0 +1,38 @@
+require 'end_view'
+require 'attire'
+require 'end_view/bootstrap/form_group'
+require 'end_view/form/record_builder'
+
+module EndView
+  def self.bootstrap_simple_form(*args)
+    Bootstrap::SimpleForm.render(*args)
+  end
+
+  module Bootstrap
+    class SimpleForm
+      include EndView.new(__FILE__)
+      attr_method :render, :url_or_record, :auth_token, :attributes, :'opts = {}'
+
+      private
+
+      def form_builder
+        @form_builder ||= EndView.form_builder(url_or_record, auth_token, opts)
+      end
+      alias_method :f, :form_builder
+
+      def form_group(attribute)
+        FormGroup.render(form_builder, attribute)
+      end
+    end
+  end
+end
+
+__END__
+
+/ Bootstrap Simple Form
+%form{f.form_opts}
+  %input{f.auth_token_opts}
+  %input{f.form_method_opts}
+  - attributes.each do |attribute|
+    = form_group(attribute)
+  %button{type: 'submit'} Okay

data/lib/end_view/bootstrap/simple_form_modal.rb

@@ -0,0 +1,36 @@
+require 'end_view/bootstrap/form_modal'
+require 'end_view/bootstrap/form_group'
+require 'end_view/form'
+
+module EndView
+  def self.bootstrap_simple_form_modal(*args)
+    Bootstrap::SimpleFormModal.render(*args)
+  end
+
+  module Bootstrap
+    class SimpleFormModal
+      attr_method :render, :id,
+                           :url_or_record,
+                           :auth_token,
+                           :attributes,
+                           :'form_opts = {}',
+                           :'modal_opts= {}'
+
+      def render
+        FormModal.render(id, form_builder, modal_opts) do
+          attributes.map { |attribute| form_group(attribute) }.join
+        end
+      end
+
+      private
+
+      def form_builder
+        @form_builder ||= EndView.form_builder(url_or_record, auth_token, form_opts)
+      end
+
+      def form_group(attribute)
+        FormGroup.render(form_builder, attribute)
+      end
+    end
+  end
+end

data/lib/end_view/bootstrap/tab_pane.rb

@@ -0,0 +1,28 @@
+require 'attire'
+require 'inflecto'
+
+module EndView
+  def self.bootstrap_tab_pane(*args, &b)
+    Bootstrap::TabPane.new(*args, &b)
+  end
+
+  module Bootstrap
+    class TabPane
+      attr_init :id, { content: nil, label: nil }, :'&content_block'
+      public :id
+      attr_writer :active
+
+      def render
+        content || content_block.call
+      end
+
+      def label
+        @label ||= Inflecto.humanize(id)
+      end
+
+      def active
+        @active && 'active'
+      end
+    end
+  end
+end

data/lib/end_view/bootstrap/tabpanel.rb

@@ -0,0 +1,64 @@
+require 'end_view'
+require 'attire'
+require 'end_view/bootstrap/tab_pane'
+
+module EndView
+  def self.bootstrap_tabpanel(*args)
+    Bootstrap::Tabpanel.new(*args)
+  end
+
+  module Bootstrap
+    class Tabpanel
+      include EndView.new(__FILE__)
+      attr_init id: nil, panes: [], fade: false, active_pane: 0
+      public :panes
+
+      def add_pane(*args, &b)
+        panes << TabPane.new(*args, &b)
+      end
+
+      def render(*args, &b)
+        set_active_pane
+        super(*args, &b)
+      end
+
+      private
+
+      def set_active_pane
+        panes.each { |p| p.active = false }
+        panes[active_pane].active = true
+      end
+
+      def link_opts(pane)
+        { href: "##{pane.id}",
+          role: 'tab',
+          'aria-controls' => pane.id,
+          'data-toggle' => 'tab' }
+      end
+
+      def pane_opts(pane)
+        { id: pane.id,
+          role: 'tabpanel',
+          class: [fade && 'fade',
+                  fade && pane.active && 'in',
+                  pane.active] }
+      end
+    end
+  end
+end
+
+__END__
+
+/ Bootstrap Tabpanel
+%div{id: id, role: 'tabpanel'}
+
+  / Nav Tabs
+  %ul.nav.nav-tabs{role: 'tablist'}
+    - panes.each do |pane|
+      %li{role: 'presentation', class: pane.active}
+        %a{link_opts(pane)}= pane.label
+
+  / Tab Panes
+  .tab-content
+    - panes.each do |pane|
+      .tab-pane{pane_opts(pane)}= pane.render

data/lib/end_view/bootstrap.rb

@@ -1,4 +1,7 @@
 require 'end_view/bootstrap/modal'
 require 'end_view/bootstrap/form_modal'
 require 'end_view/bootstrap/form_group'
-require 'end_view/bootstrap/login_modal'
+require 'end_view/bootstrap/simple_form'
+require 'end_view/bootstrap/simple_form_modal'
+require 'end_view/bootstrap/tab_pane'
+require 'end_view/bootstrap/tabpanel'

data/lib/end_view/form/builder.rb

@@ -1,18 +1,22 @@
 require 'attire'
 
 module EndView
+  def self.form_builder(*args)
+    Form::Builder.new(*args)
+  end
+
   module Form
     class Builder
-      attr_init :form_url, :form_authenticity_token, form_method: 'post'
+      attr_init :form_url, :auth_token, form_method: 'post'
 
       def form_opts(opts = {})
         { action: form_url, method: 'post' }.merge(opts)
       end
 
-      def authenticity_token_opts(opts = {})
-        { name: 'authenticity_token',
+      def auth_token_opts(opts = {})
+        { name: 'auth_token',
           type: 'hidden',
-          value: form_authenticity_token }.merge(opts)
+          value: auth_token }.merge(opts)
       end
 
       def form_method_opts(opts = {})

data/lib/end_view/form/record_builder.rb

@@ -2,13 +2,18 @@ require 'inflecto'
 require 'end_view/form/builder'
 
 module EndView
+  def self.form_builder(url_or_record, *args)
+    builder_class = url_or_record.is_a?(String) ? Form::Builder : Form::RecordBuilder
+    builder_class.new(url_or_record, *args)
+  end
+
   module Form
     class RecordBuilder < Builder
-      attr_init :record, :form_authenticity_token, model_name: nil,
-                                                   model_id: nil,
-                                                   action: nil,
-                                                   form_method: nil,
-                                                   form_url: nil
+      attr_init :record, :auth_token, model_name: nil,
+                                      model_id: nil,
+                                      action: nil,
+                                      form_method: nil,
+                                      form_url: nil
 
       def form_opts(opts = {})
         super.merge(class: form_class, id: form_id).merge(opts)

data/lib/end_view/form/simple_form.rb

@@ -0,0 +1,39 @@
+require 'end_view'
+require 'inflecto'
+require 'end_view/form/record_builder'
+
+module EndView
+  def self.simple_form(*args)
+    Form::SimpleForm.render(*args)
+  end
+
+  module Form
+    class SimpleForm
+      include EndView.new(__FILE__)
+      attr_method :render, :url_or_record, :auth_token, :attributes, :'opts = {}'
+
+      private
+
+      def form_builder
+        @form_builder ||= EndView.form_builder(url_or_record, auth_token, opts)
+      end
+      alias_method :f, :form_builder
+
+      def label(attribute)
+        Inflecto.humanize(attribute.to_s)
+      end
+    end
+  end
+end
+
+__END__
+
+/ Simple Form
+%form{f.form_opts}
+  %input{f.auth_token_opts}
+  %input{f.form_method_opts}
+  - attributes.each do |attribute|
+    .form-group
+      %label{f.label_opts(attribute)}= label(attribute)
+      %input{f.input_opts(attribute)}/
+  %button{type: 'submit'} Okay

data/lib/end_view/form.rb

@@ -1,2 +1,3 @@
 require 'end_view/form/builder'
 require 'end_view/form/record_builder'
+require 'end_view/form/simple_form'

data/lib/end_view/rails/layout.rb

@@ -1,23 +1,19 @@
 require 'end_view'
-require 'forwardable'
 require 'attire'
 
 module EndView
+  def self.rails_layout(*args)
+    Rails::Layout.new(*args)
+  end
+
   module Rails
     class Layout
       include EndView.new(__FILE__)
-      extend Forwardable
-      attr_init :view_context, :title
-
-      def self.render(*args, &b)
-        new(*args).render(&b)
-      end
+      attr_init :view_context, :title, head: nil
 
       private
 
-      def_delegators :view_context, :stylesheet_link_tag,
-                                    :javascript_include_tag,
-                                    :csrf_meta_tags
+      alias_method :vc, :view_context
 
       def stylesheet_args
         ['application', { media: 'all', 'data-turbolinks-track' => true }]
@@ -36,7 +32,8 @@ __END__
 %html
   %head
     %title= title
-    = stylesheet_link_tag(*stylesheet_args)
-    = javascript_include_tag(*javascript_args)
-    = csrf_meta_tags
+    = vc.stylesheet_link_tag(*stylesheet_args)
+    = vc.javascript_include_tag(*javascript_args)
+    = vc.csrf_meta_tags
+    = head
   %body= yield

data/lib/end_view.rb

@@ -9,7 +9,7 @@ module EndView
       @default_engine ||= Tilt::HamlTemplate
     end
 
-    def new(file, template_engine = EndView.default_engine)
+    def new(file, template_engine = default_engine)
       Module.new do
         define_singleton_method(:included) do |base|
           base.extend ClassMethods
@@ -29,21 +29,17 @@ module EndView
 
   module ClassMethods
     def inherited(child)
+      super
       child.template = template
       child.layout = layout
     end
 
     def compile(file, template_engine = EndView.default_engine)
-      @template = template_engine.new { data(file) }
+      data = IO.read(file).gsub("\r\n", "\n").split(/^__END__$/).last
+      @template = template_engine.new(file) { data }
     end
 
     attr_accessor :layout, :template
-
-    private
-
-    def data(file)
-      IO.read(file).gsub("\r\n", "\n").split(/^__END__$/)[1]
-    end
   end
 
   module Methods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: end_view
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Max White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -47,7 +47,7 @@ dependencies:
         version: '0.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '0.1'
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -130,11 +130,15 @@ files:
 - lib/end_view/bootstrap.rb
 - lib/end_view/bootstrap/form_group.rb
 - lib/end_view/bootstrap/form_modal.rb
-- lib/end_view/bootstrap/login_modal.rb
 - lib/end_view/bootstrap/modal.rb
+- lib/end_view/bootstrap/simple_form.rb
+- lib/end_view/bootstrap/simple_form_modal.rb
+- lib/end_view/bootstrap/tab_pane.rb
+- lib/end_view/bootstrap/tabpanel.rb
 - lib/end_view/form.rb
 - lib/end_view/form/builder.rb
 - lib/end_view/form/record_builder.rb
+- lib/end_view/form/simple_form.rb
 - lib/end_view/rails.rb
 - lib/end_view/rails/layout.rb
 homepage: https://github.com/mushishi78/end_view

data/lib/end_view/bootstrap/login_modal.rb

@@ -1,30 +0,0 @@
-require 'end_view/bootstrap/form_modal'
-require 'end_view/bootstrap/form_group'
-require 'end_view/form/record_builder'
-
-module EndView
-  module Bootstrap
-    class LoginModal
-      attr_method :render, :user, :form_authenticty_token, form_opts: {},
-                                                           modal_opts: {},
-                                                           form_builder: nil
-
-      def render
-        FormModal.render(form_builder, modal_opts) do
-          form_group(:email) << form_group(:password)
-        end
-      end
-
-      private
-
-      def form_builder
-        @form_builder ||=
-          Form::RecordBuilder.new(user, form_authenticty_token, form_opts)
-      end
-
-      def form_group(attribute)
-        FormGroup.render(form_builder, attribute)
-      end
-    end
-  end
-end