conformity 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01f3786cd9944fbc1a8275c48afcc2dc9128ea83
-  data.tar.gz: f0d8722c3d724f21c3bb712e34057911a7bd6f3a
+  metadata.gz: 03f5bb53373a113a0035f5d41f94d396c70f6e58
+  data.tar.gz: 880e740b3ba9efd4db77ac939dd5ad72012eca69
 SHA512:
-  metadata.gz: 0ec8f708b330e8cb8d75d8e856f9f1b766e97cb2780cf73458c639a577153a299e9a75f7b153098e92a86ee90dbdd58debee712e3ad55e143a31d7add4354a13
-  data.tar.gz: 643358251d8989f885d6cd189d0ad5fda13402fd3f548420a4bfedb3c17ab2dd66dd24d1b30bf9452f2cf431e013e4379297c5aefc398891df9e886533232396
+  metadata.gz: b053d5f3f3eacc49e888927c696252b88dc9bf65ae1bde18d66290c40aa6d4ccba7d476dfb716dac3dc701ca0cd6da99a79b609704bed0be2454303d6729af8b
+  data.tar.gz: 208caa041d7abcbfcd5b3b52a6b839a3aae2defb56796fa30b904dd2ccecca5237ddb35b2ff91be8376c5ac508176166128270e8a001e1c9fe81225d11f453f9

data/lib/conformity/actions.rb

@@ -1,16 +1,17 @@
 module Conformity
   class Actions
-    attr_reader :session
+    attr_reader :session, :fields
 
     ACTIONS = [:visit, :find, :fill_in, :select, :check, :uncheck, :choose,
                :click_on, :wait]
 
-    def initialize(session = Capybara.current_session)
+    def initialize(fields, session = Capybara.current_session)
+      @fields = fields
       @session = session
     end
 
     def field(name, options={})
-      Field.value(name)
+      fields.value(name)
     end
 
     def method_missing(name, *args, &block)

data/lib/conformity/field.rb

@@ -3,29 +3,10 @@ module Conformity
     attr_reader :name, :options
     attr_accessor :type
 
-    class << self
-      def find(name)
-        fields[name]
-      end
-      
-      def value(name)
-        find(name).value
-      end
-
-      def fields
-        @fields ||= {}
-      end
-
-      def add_field(field)
-        fields[field.name] = field
-      end
-    end
-
     def initialize(name, options = {})
       @name = name
       @options = options[:options]
       @required = options[:required] || false
-      self.class.add_field(self)
     end
 
     def required?

data/lib/conformity/fields.rb

@@ -0,0 +1,31 @@
+module Conformity
+  class Fields
+    def fields
+      @fields ||= []
+    end
+
+    def add_field(field)
+      fields << field
+    end
+
+    def add_new_field(name, opts={})
+      add_field(Field.new(name, opts))
+    end
+
+    def field_names
+      fields.map { |field| field.name }
+    end
+
+    def set_values(values)
+      fields.each_with_index { |field, i| field.value = values[i] }
+    end
+
+    def value(name)
+      find(name).value
+    end
+
+    def find(name)
+      fields.select { |field| field.name == name }.first
+    end
+  end
+end

data/lib/conformity/form.rb

@@ -2,41 +2,40 @@ module Conformity
   class Form
     extend Forwardable
 
-    attr_reader :actions, :block, :success_conditions
+    attr_reader :host, :steps
 
-    def_delegators :@success_conditions, :has_content?, :has_status_code?,
+    def_delegators :success_conditions, :has_content?, :has_status_code?,
       :success?
+    def_delegators :fields_container, :fields, :field_names
 
-    def initialize(host = '', &block)
-      set_host(host)
-      @success_conditions = SuccessConditions.new(Capybara.current_session)
-      @actions = Actions.new
-      @block = block
-      instance_eval(&block)
+    def initialize(host = '', &steps)
+      @host = host
+      @steps = steps
+      instance_eval(&steps)
     end
 
-    def set_host(host)
-      Capybara.app_host = host
+    def fields_container
+      @fields_container ||= Fields.new
     end
 
-    def field(name, opts = {})
-      fields << Field.new(name, opts)
-      fields.last
+    def actions
+      @actions ||= Actions.new(fields_container)
     end
 
-    def fields
-      @fields ||= []
+    def success_conditions
+      @success_conditions ||= SuccessConditions.new
     end
 
-    def field_names
-      fields.map(&:name)
+    def field(name, opts = {})
+      fields_container.add_new_field(name, opts)
     end
 
     def fill
       Capybara.current_session.reset!
+      set_host(host)
 
       begin
-        actions.instance_eval(&block)
+        actions.instance_eval(&steps)
       rescue => e
         raise FillError, "#{e.message}"
       end
@@ -44,8 +43,7 @@ module Conformity
     end
 
     def fill_with(*field_values)
-      val_enum = field_values.to_enum
-      fields.each { |field| field.value = val_enum.next }
+      fields_container.set_values(field_values)
       fill
     end
 
@@ -57,5 +55,10 @@ module Conformity
     # so Kernel#select isn't called
     def select(*args)
     end
+
+  private
+    def set_host(host)
+      Capybara.app_host = host
+    end
   end
 end

data/lib/conformity/success_conditions.rb

@@ -1,7 +1,7 @@
 module Conformity
   class SuccessConditions
 
-    def initialize(session)
+    def initialize(session = Capybara.current_session)
       @session = session
       @conditions = []
     end

data/lib/conformity/version.rb

@@ -1,3 +1,3 @@
 module Conformity
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/conformity.rb

@@ -11,6 +11,7 @@ end
 require 'conformity/actions'
 require 'conformity/form'
 require 'conformity/field'
+require 'conformity/fields'
 require 'conformity/success_conditions'
 
 module Conformity

data/spec/actions_spec.rb

@@ -6,69 +6,54 @@ require 'conformity/actions'
 include Conformity
 describe Conformity::Actions do
   before :each do
-    @field = double('field', value: 'quack')
+    @fields = double()
+    @session = double()
+    @actions = Actions.new(@fields, @session)
   end
 
   describe "#field" do
     it "get's the value of the field" do
-      actions = Actions.new
-
-      allow(Field).to receive(:value).with(:name) { "Jane Doe" }
-
-      expect(actions.field(:name)).to match("Jane Doe")
+      allow(@fields).to receive(:value).with(:name) { "Jane Doe" }
+      expect(@actions.field(:name)).to match("Jane Doe")
     end
   end
 
   describe "#method_missing" do
     it "delegates action calls to session" do
-      session = double
-      actions = Actions.new(session)
-
-      expect(session).to receive(:visit).with("/")
-      actions.visit('/')
+      expect(@session).to receive(:visit).with("/")
+      @actions.visit('/')
     end
 
     it "ignores success conditions" do
-      session = double
-      actions = Actions.new(session)
-
-      expect { actions.has_status_code?; actions.has_content? }.to_not raise_error
+      expect { @actions.has_status_code?; @actions.has_content? }.to_not raise_error
     end
   end
 
   describe "#select" do
     it "is called on session" do
-      session = double
-      actions = Actions.new(session)
-
-      expect(session).to receive(:select)
-      actions.select('Yes')
+      expect(@session).to receive(:select)
+      @actions.select('Yes')
     end
     
     it "is not called on Kernel" do
       skip "not sure how to test"
-      session = double
-      actions = Actions.new(session)
-
       expect(Kernel).to_not receive(:select)
-      actions.select('Yes')
+      @actions.select('Yes')
     end
   end
 
   describe "logging" do
     it "calls session to save a screenshot" do
-      session = double
       Conformity.configure do |c|
         c.log_screenshots = true
         c.screenshots_folder = "."
       end
 
       allow(Time).to receive(:now) { 0 }
-      allow(session).to receive(:visit)
-      expect(session).to receive(:save_screenshot).with("./0_visit.png")
+      allow(@session).to receive(:visit)
+      expect(@session).to receive(:save_screenshot).with("./0_visit.png")
 
-      actions = Actions.new(session)
-      actions.visit('/')
+      @actions.visit('/')
     end
   end
 end

data/spec/field_spec.rb

@@ -50,23 +50,4 @@ describe Conformity::Field do
       expect(field.required?).to be_falsey
     end
   end
-
-  describe ".find" do
-    it "returns a field with the given name" do
-      to_find = Field.new(:a)
-      Field.new(:b)
-      Field.new(:c)
-
-      expect(Field.find(:a)).to be(to_find)
-    end
-  end
-
-  describe ".value" do
-    it "returns the value for a field with name" do
-      field = Field.new(:field)
-      field.value = "blue"
-      
-      expect(Field.value(:field)).to match("blue")
-    end
-  end
 end

data/spec/fields_spec.rb

@@ -0,0 +1,55 @@
+require_relative 'spec_helper'
+require 'conformity/field'
+
+include Conformity
+describe Conformity::Fields do
+  before :each do
+    @fields = Fields.new
+  end
+
+  describe "#add_field" do
+    it "adds a field to fields" do
+      field = double()
+      @fields.add_field(field)
+      expect(@fields.fields).to include(field)
+    end
+  end
+
+  describe "#add_new_field" do
+    it "adds a new field to fields" do
+      @fields.add_new_field(:title, options: ["Ms.", "Mr."])
+      allow(Field).to receive(:new) { double("Field", :name => :title) }
+      expect(@fields.fields.any? { |f| f.name == :title }).to be_truthy
+    end
+  end
+
+  describe "#field_names" do
+    it "returns the names of added fields" do
+      @fields.add_new_field(:name)
+      @fields.add_new_field(:title, options: ["Ms.", "Mr."])
+      @fields.add_new_field(:email)
+      expect(@fields.field_names).to match([:name, :title, :email])
+    end
+  end
+
+  describe "#value" do
+    it "returns the value for field name" do
+      field = double("Field", :name => :phone_number, value: '867-5309')
+      @fields.add_field(field)
+      expect(@fields.value(:phone_number)).to match('867-5309')
+    end
+  end
+
+  describe "#set_values" do
+    it "sets the value of fields" do
+      field_a = double()
+      field_b = double()
+
+      allow(@fields).to receive(:fields) { [field_a, field_b] }
+      expect(field_a).to receive(:value=).with('1')
+      expect(field_b).to receive(:value=).with('2')
+
+      @fields.set_values(['1', '2'])
+    end
+  end
+end

data/spec/form_spec.rb

@@ -30,33 +30,10 @@ describe Form do
   end
 
   describe '#field' do
-    it 'should return a field' do
-      expect(@form.field(:name)).to be_instance_of Field
-    end
-  end
-
-  describe '#fields' do
-    it 'should be empty with no fields' do
-      expect(@form.fields).to be_empty
-    end
-
-    it 'should return fields when there are fields' do
-      @form.field(:name)
-      @form.field(:state, options: ["NY", "CA"])
-      
-      expect(@form.fields).to_not be_empty
-      expect(@form.fields.all? { |field| field.class == Field }).to be_truthy
-    end
-  end
-
-  describe '#field_names' do
-    it 'lists the field names' do
-      form = Form.new do
-        fill_in 'name', with: field(:name)
-        choose field(:state, options: ['NY', 'CA'])
-      end
-
-      expect(form.field_names).to match([:name, :state])
+    it "should delegate to fields_container" do
+      args = :name, { options: ['a', 'b'] }
+      expect(@form.fields_container).to receive(:add_new_field).with(*args)
+      @form.field(*args)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conformity
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Nikias Kalpaxis
@@ -68,11 +68,13 @@ files:
 - lib/conformity.rb
 - lib/conformity/actions.rb
 - lib/conformity/field.rb
+- lib/conformity/fields.rb
 - lib/conformity/form.rb
 - lib/conformity/success_conditions.rb
 - lib/conformity/version.rb
 - spec/actions_spec.rb
 - spec/field_spec.rb
+- spec/fields_spec.rb
 - spec/form_spec.rb
 - spec/spec_helper.rb
 - spec/success_conditions_spec.rb
@@ -103,6 +105,7 @@ summary: Automates form submissions by building upon Capybara.
 test_files:
 - spec/actions_spec.rb
 - spec/field_spec.rb
+- spec/fields_spec.rb
 - spec/form_spec.rb
 - spec/spec_helper.rb
 - spec/success_conditions_spec.rb