simple_form-magic_submit 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c2b4fa35c2a5f39e90147adb06366b67464969a
-  data.tar.gz: 9e1f739bc6b5b2dc629bbe9cf1ee7c7bd2e6ba7c
+  metadata.gz: 87ca804fae3f7a0ddea9b6c274811bbd608fe202
+  data.tar.gz: 32b03c1942686a0a57f30dd863476eb4dcc9e8cd
 SHA512:
-  metadata.gz: d948b4dda764fb3fea94c1024b26b225a404b3f1c930a6826c9205f65c2f16dc699a003f343416101a333fb94772206c29e384b3fd1db6b468becce208732f53
-  data.tar.gz: 75217ff98788cf714dc88a5b2125492c60409460c2bf1a59ec0de290145a3840bccf4c5148a59f3745944159a310bab2d1bad4c6430a201a6c0f8e40bcd39719
+  metadata.gz: 8b7a8c045917656bdedab912ec93ed8eae928763cdfb3987c0b2fb87c33819f4eaca774c1e1f510549df116601ed997133491e18e732e7eb9e88ce49a844d514
+  data.tar.gz: 44aa9d4b79cec36cf2cf7819d57638a7e5d9a0ccc0eaf3fbfe8370003da1e1c76efaa1c6390222193c83bd771eb901223c181d4d181a8bfcfc49e09705572176

data/README.md

@@ -125,3 +125,8 @@ Each lookup will have `%{model}` interpolated to the name of the model.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## Thanks go to...
+
+Victor Nahuel Chaves (https://github.com/nahue) for adding support for model-less forms.
+

data/lib/simple_form/magic_submit.rb

@@ -22,28 +22,53 @@ module SimpleForm
     end
 
   private
+
+    def bound_to_model?
+      #  if its a string means that its bound to a model.. but if its a symbol its not...
+      self.object_name.is_a?(String)# || self.object.present?
+    end
+
     def main_class(options = {})
       options.fetch(:destructive, false) ? 'btn-destructive' : 'btn-primary'
     end
-    
+
     def controller_scope
+      # falls to default if the model isn't tied to a model
+      return "default" unless bound_to_model?
+
       template.controller.params[:controller].gsub('/', '.')
     end
 
     def object_scope
+      # returns empty string if no model is found to prevent exception
+      return "" unless bound_to_model?
+
       self.object.class.model_name.i18n_key.to_s
     end
 
     def translate_key(key = nil)
-      key ||= self.object.errors.count > 0 ? :retry : :submit
-      I18n.t("simple_form.magic_submit.#{controller_scope}.#{object_scope}.#{lookup_action}.#{key}",
-        default: [
-          :"simple_form.magic_submit.#{controller_scope}.#{lookup_action}.#{key}",
-          :"simple_form.magic_submit.default.#{lookup_action}.#{key}",
-          :"helpers.submit.#{lookup_action}"
-        ],
-        model: self.object.class.model_name.human.titlecase
-      ).html_safe
+
+      if bound_to_model?
+        key ||= self.object.errors.count > 0 ? :retry : :submit
+
+        I18n.t("simple_form.magic_submit.#{controller_scope}.#{object_scope}.#{lookup_action}.#{key}",
+          default: [
+            :"simple_form.magic_submit.#{controller_scope}.#{lookup_action}.#{key}",
+            :"simple_form.magic_submit.default.#{lookup_action}.#{key}",
+            :"helpers.submit.#{lookup_action}"
+          ],
+          model: self.object.class.model_name.human.titlecase
+        ).html_safe
+      else
+        # we have no model errors... so we test if the post is get or already posted
+        key ||= template.request.get? ? :submit : :retry
+        I18n.t("simple_form.magic_submit.#{controller_scope}.#{object_scope}.#{lookup_action}.#{key}",
+          default: [
+            :"simple_form.magic_submit.#{controller_scope}.#{lookup_action}.#{key}",
+            :"simple_form.magic_submit.default.#{lookup_action}.#{key}",
+            :"helpers.submit.#{lookup_action}"
+        ]).html_safe
+      end
     end
 
   end

data/lib/simple_form/magic_submit/version.rb

@@ -1,5 +1,5 @@
 module SimpleForm
   module MagicSubmit
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form-magic_submit
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrey Subbotin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-08 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_form
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Magic Submit Button for Simple Form