dynaspan 0.1.2 → 0.1.3.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d4b55cf6c429bb1ac873e0a70acd51a16645c83
-  data.tar.gz: 13e3925cdca42feca1289d938f571d6b9075a5ae
+  metadata.gz: f80e4bd299517b42e0fde2effce96b24c2ab859f
+  data.tar.gz: 96769dc4258951d0c4e47b5579ae3303566e6ea7
 SHA512:
-  metadata.gz: ef2603ad09170b034138d392edc6a66cb2c3af26be3de24a7a44768c8595871928c82d55c5730160bd6df5eb35fe234448509d48a38729e3f05f95ad369a442f
-  data.tar.gz: f7b67edadbd7efac14e3e75a498424ed36a5a9bba8bbab52be30ee41266647eda7aa535f5b4ef760886a47ea0cea41515278341e02936d7f2ce6b8fee8a43897
+  metadata.gz: e65fae87fdec33a773698f90fbb72ecee98a061d91700cd17ff8553b0d266c057cd81c1e1549de4759805750d741ebd26e8438ac44a14238b6e9e2f97413c740
+  data.tar.gz: a07cda41584ba51b3bc445ff61762e527dc0388d0bbcbedf96c079ca51187bf1f2c7bb5fa73b914bd111ee288e6f548fcc59d9fc23416a8f1a24c53392fdb0f1

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.swp
 *.rbc
 .idea
 .bundle

data/app/helpers/dynaspan/application_helper.rb

@@ -9,13 +9,18 @@ module Dynaspan
       dynaspan_text('area', master_ds_object, parameters)
     end
 
+    def dynaspan_select(master_ds_object,*parameters, &block)
+      dynaspan_text('select', master_ds_object, parameters, &block)
+    end
+
     private
+    module_function
 
-    def dynaspan_counter
-      @count_for_viewspace = @count_for_viewspace.to_i + 1
+    def to_id(obj)
+      !!obj ? "#{obj.class.name}#{obj.try(:id)}" : ""
     end
 
-    def dynaspan_text(kind, master_ds_object,*parameters)
+    def dynaspan_text(kind, master_ds_object,*parameters, &block)
       parameters.flatten!
       if parameters.first.is_a? Symbol
         attr_object = nil
@@ -36,18 +41,25 @@ module Dynaspan
         remote: true,
         authenticity_token: true
       )
+      options[:html_options] = ActiveSupport::HashWithIndifferentAccess.new(options[:html_options])
+      options[:html_options][:class] = "dyna-span form-control dyna-span-input #{options[:html_options][:class]}"
+      options[:html_options].delete_if {|k,v| [:id, :onblur, :onfocus].include? k}
       render(
           partial: "dynaspan/dynaspan_text_#{kind}",
           locals: {
             master_ds_object: master_ds_object,
             attr_object: attr_object,
             attrib: attrib,
-            unique_ref_id: options.fetch(:unique_id) { dynaspan_counter },
+            unique_ref_id: options.fetch(:unique_id) { [to_id(master_ds_object), to_id(attr_object), attrib].join },
             dyna_span_edit_text: edit_text,
             hidden_fields: options[:hidden_fields],
             ds_callback_on_update: options[:callback_on_update],
             ds_callback_with_values: options[:callback_with_values],
-            form_for_options: options[:form_for]
+            form_for_options: options[:form_for],
+            schoices: options[:choices],          # For form 'select' field
+            soptions: options.fetch(:options) { Hash.new },          # For form 'select' field
+            html_options: options[:html_options],
+            block: block
           }
       )
     end

data/app/views/dynaspan/_dynaspan_text_area.html.erb

@@ -9,10 +9,10 @@
           <% hidden_fields.each do |hkey, hval| %>
             <%= a.hidden_field hkey.to_sym, value: hval %>
           <% end if hidden_fields %>
-          <%= a.text_area attrib, id: "dyna_span_field_val_#{unique_ref_id}", class: 'dyna-span form-control dyna-span-input', onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');" %>
+          <%= a.text_area attrib, id: "dyna_span_field_val_#{unique_ref_id}", onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');", **html_options.symbolize_keys %>
         <% end %>
       <% else %>
-        <%= f.text_area attrib, id: "dyna_span_field_val_#{unique_ref_id}", class: 'dyna-span form-control dyna-span-input', onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');" %>
+        <%= f.text_area attrib, id: "dyna_span_field_val_#{unique_ref_id}", onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');", **html_options.symbolize_keys %>
         <% hidden_fields.each do |hkey, hval| %>
           <%= f.hidden_field hkey.to_sym, value: hval %>
         <% end if hidden_fields %>

data/app/views/dynaspan/_dynaspan_text_field.html.erb

@@ -9,10 +9,10 @@
           <% hidden_fields.each do |hkey, hval| %>
             <%= a.hidden_field hkey.to_sym, value: hval %>
           <% end if hidden_fields %>
-          <%= a.text_field attrib, id: "dyna_span_field_val_#{unique_ref_id}", class: 'dyna-span form-control dyna-span-input', onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');" %>
+          <%= a.text_field attrib, id: "dyna_span_field_val_#{unique_ref_id}", onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');", **html_options.symbolize_keys %>
         <% end %>
       <% else %>
-        <%= f.text_field attrib, id: "dyna_span_field_val_#{unique_ref_id}", class: 'dyna-span form-control dyna-span-input', onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');" %>
+        <%= f.text_field attrib, id: "dyna_span_field_val_#{unique_ref_id}", onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');", **html_options.symbolize_keys %>
         <% hidden_fields.each do |hkey, hval| %>
           <%= f.hidden_field hkey.to_sym, value: hval %>
         <% end if hidden_fields %>

data/app/views/dynaspan/_dynaspan_text_select.html.erb

@@ -0,0 +1,24 @@
+<%# This is used through the helper method dynaspan_text_field %>
+<div id="dyna_span_block<%= unique_ref_id %>" <%= "data-ds-callback-on-update=\"#{ds_callback_on_update}\" " if ds_callback_on_update.present? %> <%= "data-ds-callback-with-values=\"#{ds_callback_with_values}\" " if ds_callback_with_values.present? %>class='dyna-span<%= ' ds-content-present' if (attr_object.try(attrib).present? || master_ds_object.try(attrib).present?) %>'>
+  <%= hidden_field_tag "last_dyna_span_val_#{unique_ref_id}", attr_object.try(attrib) || master_ds_object.try(attrib), id: "last_dyna_span_val_#{unique_ref_id}" %>
+  <div id="<%= "dyna_span_div#{unique_ref_id}" %>" style="display:none;">
+    <%= form_for(master_ds_object, **form_for_options.symbolize_keys) do |f| %>
+      <% if master_ds_object.nested_attributes_options.keys.any? {|i| i.to_s.=~(/#{attr_object.class.try(:model_name).try(:i18n_key).to_s}/) || i.to_s.=~(/#{attr_object.class.try(:table_name)}/) } and !attr_object.nil? %>
+        <%= f.fields_for master_ds_object.nested_attributes_options.keys.select {|i| i.to_s.=~(/#{attr_object.class.model_name.i18n_key.to_s}/) || i.to_s.=~(/#{attr_object.class.table_name}/) }.first, attr_object do |a|%>
+          <%= a.hidden_field(:id, value: attr_object.id) if attr_object.id.present? %>
+          <% hidden_fields.each do |hkey, hval| %>
+            <%= a.hidden_field hkey.to_sym, value: hval %>
+          <% end if hidden_fields %>
+          <%= a.select( attrib, schoices, soptions, {**html_options.symbolize_keys, id: "dyna_span_field_val_#{unique_ref_id}", onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');"}, &block) %>
+        <% end %>
+      <% else %>
+        <%=   f.select( attrib, schoices, soptions, {**html_options.symbolize_keys, id: "dyna_span_field_val_#{unique_ref_id}", onfocus: "$().dynaspan.upLast('#{unique_ref_id}');", onblur: "$().dynaspan.upHide('#{unique_ref_id}');"}, &block) %>
+        <% hidden_fields.each do |hkey, hval| %>
+          <%= f.hidden_field hkey.to_sym, value: hval %>
+        <% end if hidden_fields %>
+      <% end %>
+    <% end %>
+  </div>
+  <%= content_tag 'span', attr_object.try(attrib) || master_ds_object.try(attrib), id: "dyna_span_span#{unique_ref_id}", onclick: "$().dynaspan.upShow('#{unique_ref_id}');", class: 'dyna-span dyna-span-text', style: 'display:block;' %>
+  <%= content_tag('div', dyna_span_edit_text, class: 'dyna-span-edit-text pull-right', onclick: "$().dynaspan.upShow('#{unique_ref_id}');", style: 'cursor:pointer;')  %>
+</div>

data/lib/dynaspan/version.rb

@@ -1,3 +1,3 @@
 module Dynaspan
-  VERSION = '0.1.2'
+  VERSION = '0.1.3.beta1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dynaspan
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.beta1
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies: []
 description: In place text editing with AJAX substituting text to input field.
 email:
@@ -25,6 +25,7 @@ files:
 - app/helpers/dynaspan/application_helper.rb
 - app/views/dynaspan/_dynaspan_text_area.html.erb
 - app/views/dynaspan/_dynaspan_text_field.html.erb
+- app/views/dynaspan/_dynaspan_text_select.html.erb
 - config/routes.rb
 - dynaspan.gemspec
 - lib/assets/javascripts/dynaspan-jquery.js
@@ -48,14 +49,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - jQuery
 - Rails
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Text to AJAX editing in place.