hungryform 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39175652aa112a3085607dd1732fbce6a18c8346
-  data.tar.gz: 498c9429cddebc710586b04a567fc2971988f0ef
+  metadata.gz: 25ffe91aae5e6e1817a43a158fc9d7bd7343b59b
+  data.tar.gz: 8c04ae6d5245c30ce22e2f4e48dd18c83f5f4288
 SHA512:
-  metadata.gz: 2513481ab882a6262f40ebb689c5c94fc708c5c00625ab614cf92d36805a86802f4fb2c1c299fa209b40e383989248dd3257f8651cffae7ed38c476d585fea9a
-  data.tar.gz: 06c0805c025591833781ce40a039622b2e01831333a8f72ffeef29a420cdb3c5c409fff3df2252b1ee393786d4f51640c555970762acb2cd5448eb3d9eb5f6cc
+  metadata.gz: e12e8aa25f40d6449b7ae034d8701ebb11b4dc78095532eb8824c9a5abd31ab277f37ada50a11c0b6ebc6fd80f103cbfd15216008d33b915672fa87e8c700101
+  data.tar.gz: a602d7919da04118f13d67e50b09cdc3edced4eb9c3c1b2f39407e82471915c68f64b08c23f5ce0a37b61de1a801e9d89388fe16f062a1e6301759e318243e41

data/lib/hungryform/elements/base/active_element.rb

@@ -20,34 +20,65 @@ module HungryForm
             self.required = false
           end
 
-          # Leave only the attributes that are being methods of the HungryForm::Validator class
-          @validation_rules = @attributes.select { |key, _| HungryForm::Validator.singleton_class.instance_methods(false).include?(key) }
+          # Determine validation attributes
+          # They can be only the methods of the HungryForm::Validator class
+          # or methods of the Validator module of the current class 
+          methods = HungryForm::Validator.singleton_class.instance_methods(false)
+          if self.class.const_defined?(:Validator)
+            methods += self.class.const_get(:Validator).instance_methods(false)
+          end
+
+          @validation_rules = @attributes.select { |key, _| methods.include?(key) }
           @attributes.delete_if { |key, _| @validation_rules.key?(key) }
 
           set_value
         end
 
+        # Element valid?
+        # Performs element validation
         def valid?
           clear_error
-          is_valid = true
           return true unless visible?
 
           @validation_rules.each do |key, rule|
-            self.error = HungryForm::Validator.send(key, self, rule) || ''
+            validate_rule(key, rule)
+
             unless error.empty?
               self.error = "This field #{error}"
-              is_valid = false
-              break
+              return false
             end
           end
 
-          is_valid
+          true
         end
 
+        # Element invalid?
+        # Performs elemen validation
         def invalid?
           !valid?
         end
 
+        # Validate a particular validation rule
+        # Searches for the validation attribute in the Validator module
+        # of the element's class or in the global Validator module
+        #
+        # Sample:
+        # text_field :txt, :required => true 
+        # will search for the "required" singleton method
+        # in the HungryForm::Elements::TextField::Validator and in the
+        # HungryGorm::Validator 
+        def validate_rule(attribute, rule)
+          if self.class.const_defined?(:Validator)
+            validator = self.class.const_get(:Validator)
+          end
+          
+          if validator.nil? || !validator.singleton_class.instance_methods(false).include?(attribute)
+            validator = HungryForm::Validator
+          end
+
+          self.error = validator.send(attribute, self, rule) || ''
+        end
+
         def set_value
           self.value = resolver.params[name] || attributes.delete(:value)
         end

data/lib/hungryform/elements/checkbox_field.rb

@@ -2,12 +2,28 @@ module HungryForm
   module Elements
     class CheckboxField < Base::ActiveElement
       def set_value
-        super
+        self.value = resolver.params[name] || attributes.delete(:value)
 
-        if resolver.params.key?(name)
-          self.attributes[:checked] = 'checked'
+        if value == 0
+          attributes.delete(:checked)
         else
-          self.attributes[:checked] = ''
+          self.value = 1
+          self.attributes[:checked] = true
+        end
+      end
+
+      def checked?
+        !!attributes[:checked]
+      end
+
+      # Overriding the Validator methods
+      module Validator
+        def self.required(element, rule)
+          if rule.respond_to? :call
+            rule.call(element)
+          else
+            'is required' if element.value == 0 && rule
+          end
         end
       end
     end

data/lib/hungryform/resolver.rb

@@ -45,18 +45,18 @@ module HungryForm
 
         arguments = [arguments] unless arguments.is_a?(Array)
 
-        arguments = arguments[0..1].map { |name| get_value(name) }
-        return false if arguments.any?(&:nil?)
+        values = arguments[0..1].map { |name| get_value(name) }
+        return false if values.any?(&:nil?)
 
         case operator
         when :eq
-          return arguments[0].to_s == arguments[1].to_s
+          return values[0].to_s == values[1].to_s
         when :lt
-          return arguments[0].to_f < arguments[1].to_f
+          return values[0].to_f < values[1].to_f
         when :gt
-          return arguments[0].to_f > arguments[1].to_f
+          return values[0].to_f > values[1].to_f
         when :set
-          return !arguments[0].empty?
+          return !values[0].empty?
         end
       end
     end

data/lib/hungryform/version.rb

@@ -1,3 +1,3 @@
 module HungryForm
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/elements/checkbox_field_spec.rb

@@ -10,21 +10,47 @@ describe HungryForm::Elements::CheckboxField do
   subject { HungryForm::Elements::CheckboxField.new(:element_name, group, resolver, options) {} }
 
   it_behaves_like 'an element'
-  it_behaves_like 'an active element'
+  it_behaves_like 'a hashable element'
 
-  describe "#set_value" do
-    context "when resolver contains the element name" do
-      before { resolver_options[:params] = {"group_element_name" => "on"} }
+  describe ".new" do
+    it "should have empty error" do
+      expect(subject.error).to eq ""
+    end
 
-      it "should be checked" do
-        expect(subject.attributes[:checked]).to eq 'checked'
-      end
+    it "should not be required if its parent is not visible" do
+      group_options[:visible] = false
+      options[:required] = true
+      expect(subject.required?).to eq false
     end
+  end
+
+  describe "#valid?" do
+    context "when required" do
+      before(:each) { options[:required] = true }
+
+      it "is valid" do
+        subject.value = 1
+        expect(subject.valid?).to eq true
+        expect(subject.error).to eq ''
+      end
 
-    context "when resolver doesn't contain the element name" do
-      it "should not be cheched" do
-        expect(subject.attributes[:checked]).to eq ''
+      it "is invalid" do
+        subject.value = 0
+        expect(subject.valid?).to eq false
+        expect(subject.error).to eq 'This field is required'
       end
     end
   end
+
+  describe "#set_value" do
+    it "should be checked" do
+      resolver_options[:params] = { "group_element_name" => 1 }
+      expect(subject.checked?).to eq true
+    end
+
+    it "should not be checked" do
+      resolver_options[:params] = { "group_element_name" => 0 }
+      expect(subject.checked?).to eq false
+    end
+  end
 end

data/spec/elements/shared_examples/active_element.rb

@@ -1,4 +1,6 @@
 RSpec.shared_examples "an active element" do
+  it_behaves_like 'a hashable element'
+
   describe ".new" do
     it "should have empty error" do
       expect(subject.error).to eq ""
@@ -42,11 +44,4 @@ RSpec.shared_examples "an active element" do
       end
     end
   end
-
-  describe "#to_hash" do
-    it 'should include required, value and error' do
-      options.merge!(value: '', required: true)
-      expect(subject.to_hash).to include(:required, :value, :error)
-    end
-  end
 end

data/spec/elements/shared_examples/hashable_element.rb

@@ -0,0 +1,8 @@
+RSpec.shared_examples "a hashable element" do
+  describe "#to_hash" do
+    it 'should include required, value and error' do
+      options.merge!(value: '', required: true)
+      expect(subject.to_hash).to include(:required, :value, :error)
+    end
+  end
+end

data/spec/resolver_spec.rb

@@ -3,6 +3,8 @@ require "spec_helper"
 describe HungryForm::Resolver do
   let(:resolver_params) { {:params => {}} }
   subject(:resolver) { HungryForm::Resolver.new(resolver_params) }
+  let(:group_options) { {} }
+  let(:group) { HungryForm::Elements::Group.new(:group, nil, resolver, group_options) {} }
 
   describe ".new" do
     it "should initialize resolver empty params" do
@@ -16,7 +18,7 @@ describe HungryForm::Resolver do
   end
 
   describe "#get_value" do
-    let(:element) { HungryForm::Elements::Html.new(:html_name, nil, resolver, { value: "value" }) {} }
+    let(:element) { HungryForm::Elements::Html.new(:html_name, group, subject, { value: "value" }) {} }
 
     it "should get value from lambda param" do
       value = subject.get_value( ->(el){ "value" } )
@@ -25,7 +27,7 @@ describe HungryForm::Resolver do
 
     it "should get value from a form element" do
       subject.elements[element.name] = element
-      expect(subject.get_value("html_name")).to eq "value"
+      expect(subject.get_value("group_html_name")).to eq "value"
     end
 
     it "should get value from a form params" do
@@ -39,39 +41,41 @@ describe HungryForm::Resolver do
   end
 
   describe "#resolve_dependency" do
-    it "should resolve EQ dependency" do
-      dependency = { eq: ["Text", "Text"] }
-      expect(subject.resolve_dependency(dependency)).to eq true
-    end
+    context "when dependency is of a scalar type" do
+      it "should resolve EQ dependency" do
+        dependency = { eq: ["Text", "Text"] }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end
 
-    it "should resolve LT dependency" do
-      dependency = { lt: ["0", "1"] }
-      expect(subject.resolve_dependency(dependency)).to eq true
-    end
+      it "should resolve LT dependency" do
+        dependency = { lt: ["0", "1"] }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end
 
-    it "should resolve GT dependency" do
-      dependency = { gt: ["1", "0"] }
-      expect(subject.resolve_dependency(dependency)).to eq true
-    end 
+      it "should resolve GT dependency" do
+        dependency = { gt: ["1", "0"] }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end 
 
-    it "should resolve SET dependency" do
-      dependency = { set: "1" }
-      expect(subject.resolve_dependency(dependency)).to eq true
-    end 
+      it "should resolve SET dependency" do
+        dependency = { set: "1" }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end
 
-    it "should resolve AND dependency" do
-      dependency = { and: [{set: "1"}, {set: "1"}] }
-      expect(subject.resolve_dependency(dependency)).to eq true
-    end
+      it "should resolve AND dependency" do
+        dependency = { and: [{set: "1"}, {set: "1"}] }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end
 
-    it "should resolve OR dependency" do
-      dependency = { or: [{set: ""}, {set: "1"}] }
-      expect(subject.resolve_dependency(dependency)).to eq true
-    end
+      it "should resolve OR dependency" do
+        dependency = { or: [{set: ""}, {set: "1"}] }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end
 
-    it "should resolve NOT dependency" do
-      dependency = { not: {set: ""} }
-      expect(subject.resolve_dependency(dependency)).to eq true
+      it "should resolve NOT dependency" do
+        dependency = { not: {set: ""} }
+        expect(subject.resolve_dependency(dependency)).to eq true
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hungryform
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Andrey Bazhutkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -112,6 +112,7 @@ files:
 - spec/elements/shared_examples/active_element.rb
 - spec/elements/shared_examples/element.rb
 - spec/elements/shared_examples/group.rb
+- spec/elements/shared_examples/hashable_element.rb
 - spec/elements/shared_examples/options_element.rb
 - spec/elements/text_area_spec.rb
 - spec/elements/text_field_spec.rb
@@ -153,6 +154,7 @@ test_files:
 - spec/elements/shared_examples/active_element.rb
 - spec/elements/shared_examples/element.rb
 - spec/elements/shared_examples/group.rb
+- spec/elements/shared_examples/hashable_element.rb
 - spec/elements/shared_examples/options_element.rb
 - spec/elements/text_area_spec.rb
 - spec/elements/text_field_spec.rb