watirmark 5.29.2 → 5.29.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6863f2ffd5c7d3f536ee996f273bbd3e22b29cee
-  data.tar.gz: 44bee9f7b30b0fdacf9947f6f7f31398527bb959
+  metadata.gz: e0a29b86dfedffc425b759146a17e4e131b19c47
+  data.tar.gz: 70c357b0cadb675104ec1bdc982a81340e05bd05
 SHA512:
-  metadata.gz: ef17f156091e90821158b4c0d3286055b6f63b82782bb520ba02b6c0f9bf8fd1346dfee7fc3c4736f035012880aa9d62df19bb9ec75e89339441ccab77cdff80
-  data.tar.gz: eee08540eebbda2d609c6c06ca702f9eec887449d32de34c91672aa80a9e802917eb107a182c1fbf11c0dfc9a29cec1ac1e3af7b6c730bd190c59900006f5264
+  metadata.gz: a4e21b4bd41ecc14958cda3f64a1a686da4b2d3206086b6465da3c01873e9250f474a82098ac6020f094d5c020b1a7a4051e1da4e1b299de0eca16d16d2b8160
+  data.tar.gz: eb0dc66a6e7ef0764e3d29fe705277918977118bdb6bd953123e2ad419155d38d9d97d7a1dc42b57cdc518ce6a30324fe700d8c1d554e814d3f23593b1aa70f7

data/lib/watirmark/controller/actions.rb

@@ -48,8 +48,7 @@ module Watirmark
     def edit
       search_for_record
       @view.edit @model
-      populate_data(@model.updates)
-      @model.clear_updates
+      populate_data
       check_for_noop_populate
     end
 

data/lib/watirmark/controller/controller.rb

@@ -38,14 +38,14 @@ module Watirmark
         initialize_model(data)
       end
 
-      def populate_data(updates=nil)
-        submit_process_page(@last_process_page.underscored_name) {submit} if populate_values(updates)
+      def populate_data
+        submit_process_page(@last_process_page.underscored_name) {submit} if populate_values
       end
 
-      def populate_values(updates=nil)
+      def populate_values
         @seen_value = false
         @last_process_page = nil
-        keyed_update_elements(updates).each do |k|
+        keyed_elements.each do |k|
           next unless k.populate_allowed?
           submit_process_page_when_page_changes(k)
           before_process_page(k)
@@ -159,11 +159,6 @@ module Watirmark
         @view.keyed_elements.select{|e| !value(e).nil?}
       end
 
-      def keyed_update_elements(updates)
-        Watirmark.logger.info("Editing these keyword(s) in populate_data: #{updates}") unless updates.nil? || updates.empty?
-        keyed_elements.select{|k| updates.nil? || updates.include?(k.keyword) }
-      end
-
       def locate_model(supermodel)
         case supermodel
           when Hash

data/lib/watirmark/extensions/ruby_extensions.rb

@@ -118,6 +118,13 @@ class ModelOpenStruct < OpenStruct
     h
   end
 
+  def includes? hash
+    raise "#{hash.inspect} is not a Hash" unless hash.is_a?(Hash)
+    h = self.to_h
+    hash.each_pair { |key, value| return false unless h[key] == value }
+    true
+  end
+
   # Stub these out so it doesn't find anything
   def find(model)
   end

data/lib/watirmark/models/factory.rb

@@ -15,7 +15,7 @@ module Watirmark
       include FactoryMethodGenerators
 
       attr_accessor :defaults, :model_name, :models, :parent, :children, :model_type
-      attr_reader   :keywords, :updates
+      attr_reader   :keywords
 
       def marshal_dump
         [@keywords, @model_name, @models, @parent, @children, @model_type, self.to_h]
@@ -107,19 +107,11 @@ module Watirmark
       # Update the model using the provided hash
       def update hash
         remove_empty_entries hash
-        hash.each_pair do |key, value|
-          @updates << key
-          send "#{key}=", value
-        end
+        hash.each_pair { |key, value| send "#{key}=", value }
         self
       end
       alias :has :update
 
-      def clear_updates
-        @updates = []
-      end
-
-
       # Update the model using the provided hash but only if exists (TODO: may not be needed any more)
       def update_existing_members hash
         remove_empty_entries hash

data/lib/watirmark/version.rb

@@ -1,5 +1,5 @@
 module Watirmark
   module Version
-    STRING = '5.29.2'
+    STRING = '5.29.3'
   end
 end

data/spec/controller_actions_spec.rb

@@ -151,60 +151,4 @@ describe Watirmark::Actions do
   it 'should not throw an exception if populate_data is overridden' do
     lambda { ControllerActionsTest::ActionCreateControllerWithOverride.new.create }.should_not raise_error
   end
-
-  describe 'Controllers will only populate newly updated values in the model' do
-
-    before(:all) do
-      class TestEditView < Page
-        keyword(:edit_test) {}
-        keyword(:edit_test_two) {}
-        def create(model); end
-        def edit(model); end
-      end
-      class TestEditController < Watirmark::WebPage::Controller
-        @view = TestEditView
-        def populate_edit_test; end
-        def populate_edit_test_two; end
-      end
-      class TestEditModel < Watirmark::Model::Factory
-        keywords :edit_test
-        defaults do
-          edit_test { true }
-        end
-      end
-    end
-
-    specify 'populate_data populates keywords that have not been populated before' do
-      model = TestEditModel.new
-      c = TestEditController.new(model)
-      model.update(edit_test: true)
-      c.expects(:populate_edit_test).once
-      c.run :edit
-      c.run :edit
-      c.run :edit
-      model.update(edit_test_two: true)
-      c.expects(:populate_edit_test_two).once
-      c.run :edit
-      c.run :edit
-      c.run :edit
-    end
-
-    specify 'create should populate every time regardless of model updates' do
-      model = TestEditModel.new
-      c = TestEditController.new(model)
-      c.expects(:populate_edit_test).twice
-      c.run :create
-      c.run :create
-    end
-
-    specify 'create should populate every time even when the model is updated' do
-      model = TestEditModel.new
-      c = TestEditController.new(model)
-      c.expects(:populate_edit_test).twice
-      c.run :create
-      model.update(edit_test_two: true)
-      c.expects(:populate_edit_test_two).once
-      c.run :create
-    end
-  end
 end

data/spec/model_factory_spec.rb

@@ -99,20 +99,6 @@ describe "#update" do
     lambda{keys.update('   '.to_sym=>'') }.should_not raise_error
   end
 
-  specify "model #updates hash is updated when any keywords in the model is updated" do
-    keys = FactoryTest::UpdateModel.new
-    keys.update(:username=>'username', :foo=>'foo')
-    expect(keys.updates).to include(:username)
-    expect(keys.updates).to include(:foo)
-  end
-
-  specify "model #updates hash is cleared when #clear_updates is called" do
-    keys = FactoryTest::UpdateModel.new
-    keys.update(:username=>'username', :foo=>'foo')
-    keys.clear_updates
-    expect(keys.updates).to be_empty
-  end
-
 end
 
 describe "defaults" do
@@ -503,7 +489,7 @@ end
 describe "keywords" do
   before :all do
     module FactoryTest
-      class ElementTest
+      class Element
         attr_accessor :value
 
         def initialize(x)
@@ -512,9 +498,9 @@ describe "keywords" do
       end
 
       class SomeView < Page
-        keyword(:first_name)  { ElementTest.new :a }
-        keyword(:middle_name) { ElementTest.new :b }
-        keyword(:last_name)   { ElementTest.new :c }
+        keyword(:first_name)  { Element.new :a }
+        keyword(:middle_name) { Element.new :b }
+        keyword(:last_name)   { Element.new :c }
       end
 
       class SomeModel < Watirmark::Model::Factory

data/spec/open_struct_spec.rb

@@ -0,0 +1,27 @@
+require_relative 'spec_helper'
+
+describe "ModelOpenStruct includes?" do
+  before :all do
+    @struct = ModelOpenStruct.new(a: 1, b: 2, c: 'three')
+  end
+
+  it 'open struct includes hash' do
+    @struct.includes?(a: 1, c: 'three').should == true
+  end
+
+  it 'open struct does not include hash' do
+    @struct.includes?(d: 1).should == false
+  end
+
+  it 'single element hash' do
+    @struct.includes?(a: 1).should == true
+  end
+
+  it 'return true if hash is nil' do
+   expect { @struct.includes?(nil) }.should raise_error
+  end
+
+  it 'throw error if hash is not passed' do
+    expect { @struct.includes?(Object.new) }.should raise_error
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watirmark
 version: !ruby/object:Gem::Version
-  version: 5.29.2
+  version: 5.29.3
 platform: ruby
 authors:
 - Hugh McGowan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
@@ -205,6 +205,7 @@ files:
 - spec/helper_methods_spec.rb
 - spec/model_factory_spec.rb
 - spec/model_traits_spec.rb
+- spec/open_struct_spec.rb
 - spec/page_spec.rb
 - spec/process_page_spec.rb
 - spec/session_spec.rb
@@ -232,13 +233,14 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: watirmark 5.29.2
+summary: watirmark 5.29.3
 test_files:
 - spec/model_traits_spec.rb
 - spec/session_spec.rb
 - spec/controller_spec.rb
 - spec/controllers_and_models_spec.rb
 - spec/model_factory_spec.rb
+- spec/open_struct_spec.rb
 - spec/helper_methods_spec.rb
 - spec/controller_actions_spec.rb
 - spec/watir_webdriver_spec.rb