forma 0.1.5 → 0.1.6

data/lib/forma/action.rb

@@ -11,6 +11,7 @@ module Forma
       @label = h[:label]
       @icon = h[:icon]
       @url = h[:url]
+      @turbolink=h[:turbolink]
       @method = h[:method]
       @confirm = h[:confirm]
       @as = h[:as]
@@ -22,28 +23,31 @@ module Forma
     def to_html(model)
       if eval_condition(model)
         if @select
-          el(
-            'a',
-            attrs: {
-              id: @id, class: ['ff-action', 'btn', 'btn-mini', 'ff-select-action', 'btn-xs', 'btn-default'],
-              href: '#', 'data-original-title' => @tooltip,
-              'data-value-id' => model.id, 'data-value-type' => model.class.name, 'data-value-text' => model.to_s
-            },
-            children: [ el('i', attrs: { class: 'icon icon-download fa fa-hand-o-left' }) ]
-          )
+          attrs = {
+            id: @id,
+            class: ['ff-action', 'btn', 'btn-mini', 'ff-select-action', 'btn-xs', 'btn-default'],
+            href: '#',
+            'data-original-title' => @tooltip,
+            'data-value-id' => model.id,
+            'data-value-type' => model.class.name,
+            'data-value-text' => model.to_s
+          }
+          attrs['data-no-turbolink'] = 'true' if @turbolink == false
+          children = [ el('i', attrs: { class: 'icon icon-download fa fa-hand-o-left' }) ]
+          el('a', attrs: attrs, children: children)
         else
           children = [ (el('img', attrs: { src: eval_icon(model) }) if @icon.present?), el('span', text: eval_label(model)) ]
           button = (@as.to_s == 'button')
-          el(
-            'a',
-            attrs: {
-              id: @id,
-              class: ['ff-action', ('btn btn-default' if button)],
-              href: eval_url(model), 'data-method' => @method, 'data-confirm' => @confirm,
-              'data-original-title' => @tooltip
-            },
-            children: children
-          )
+          attrs = {
+            id: @id,
+            class: ['ff-action', ('btn btn-default' if button)],
+            href: eval_url(model),
+            'data-method' => @method,
+            'data-confirm' => @confirm,
+            'data-original-title' => @tooltip
+          }
+          attrs['data-no-turbolink'] = 'true' if @turbolink == false
+          el('a', attrs: attrs, children: children)
         end
       end
     end

data/lib/forma/field.rb

@@ -9,7 +9,7 @@ module Forma
     attr_reader :required, :autofocus, :readonly
     attr_reader :width, :height
     attr_reader :before, :after
-    attr_reader :url, :icon
+    attr_reader :url, :icon, :turbolink
     attr_accessor :model, :value, :parent, :child_model_name
     attr_writer :model_name
     attr_reader :actions
@@ -30,6 +30,7 @@ module Forma
       @empty = h[:empty]
       @force_nonempty = h[:force_nonempty]
       @class = h[:class]
+      @turbolink = h[:turbolink]
     end
 
     def action(url, h={})
@@ -66,7 +67,11 @@ module Forma
       else
         if val.present? or val == false or @force_nonempty
           view = view_element(val)
-          view = el('a', attrs: { href: eval_url }, children: [ view ]) if @url
+          if @url
+            attrs = { href: eval_url }
+            attrs['data-no-turbolink']=true if @turbolink==false
+            view = el('a', attrs: attrs, children: [ view ])
+          end
           el('div', attrs: { class: (@class ? eval_with_model(@class) : nil) },
             children: [ before_element, icon_element, view, after_element, actions_element, inline_hint_element ])
         else

data/lib/forma/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module Forma
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: forma
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
+  prerelease: 
 platform: ruby
 authors:
 - Dimitri Kurashvili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: less
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,29 +94,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: rich forms for ruby
@@ -151,26 +166,27 @@ files:
 homepage: http://github.com/dimakura/forma
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: rich forms for ruby
 test_files:
 - spec/config_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: db864b2082efde787f42ce9ee0f19be45ba57a49
-  data.tar.gz: 8ef26f83babeadb8dca45ded7aae302e93cb4507
-SHA512:
-  metadata.gz: 6170048156e4fae1a784982d160866c95557df6065de5d8dae718d852f243c2c6d7f7055c6fe409be6e7b6b953013f6651826fde0ff145f686bbf92b4382124a
-  data.tar.gz: 3ee1558ce246526dc4ca98c12b07ed0539aaf15829460a8be82304adc8495911835aa9ef6f801cef1906eac7df579a0f89540c278622cadbe3c616f871724e35