kookaburra 0.23.1 → 0.24.0

data/.rvmrc

@@ -1,4 +1,4 @@
-rvm use ruby-1.9.3@kookaburra --create --install
-rvm use ruby-1.9.2@kookaburra --create --install
-rvm use ree-1.8.7@kookaburra --create --install
-rvm use ruby-1.8.7@kookaburra --create --install
+rvm use ruby-1.9.3@kookaburra --create --install; bundle check
+rvm use ruby-1.9.2@kookaburra --create --install; bundle check
+rvm use  ree-1.8.7@kookaburra --create --install; bundle check
+rvm use ruby-1.8.7@kookaburra --create --install; bundle check

data/Gemfile

@@ -1,8 +1,8 @@
 source 'http://rubygems.org'
 
 gem 'i18n'
-gem 'activesupport', '>= 3.0'
 gem 'patron'
+gem 'json_pure'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,9 +1,6 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.3)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
     addressable (2.2.7)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -24,6 +21,7 @@ GEM
       rake
       rdoc
     json (1.6.6)
+    json_pure (1.7.3)
     libwebsocket (0.1.3)
       addressable
     mime-types (1.18)
@@ -77,10 +75,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0)
   capybara
   i18n
   jeweler
+  json_pure
   patron
   redcarpet (~> 1.0)
   reek

data/VERSION

@@ -1 +1 @@
-0.23.1
+0.24.0

data/kookaburra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "kookaburra"
-  s.version = "0.23.1"
+  s.version = "0.24.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Wilger", "Sam Livingston-Gray", "Ravi Gadad"]
-  s.date = "2012-04-13"
+  s.date = "2012-05-15"
   s.description = "Cucumber + Capybara = Kookaburra? It made sense at the time."
   s.email = "johnwilger@gmail.com"
   s.extra_rdoc_files = [
@@ -67,8 +67,8 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
       s.add_runtime_dependency(%q<patron>, [">= 0"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<capybara>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -78,8 +78,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sinatra>, [">= 0"])
     else
       s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0"])
       s.add_dependency(%q<patron>, [">= 0"])
+      s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -90,8 +90,8 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0"])
     s.add_dependency(%q<patron>, [">= 0"])
+    s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/kookaburra/dependency_accessor.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string'
-
 class Kookaburra
   # @private
   module DependencyAccessor
@@ -15,8 +13,10 @@ class Kookaburra
 
     def define_dependency_accessor(name)
       define_method(name) do
+        class_name = self.class.name
+        class_name.sub!(/^$/, 'an Anonymous Class!!!')
         instance_variable_get("@#{name}") or raise "No %s object was set on %s initialization." \
-          % [name, [self.class.name, 'an Anonymous Class!!!'].reject(&:blank?).first]
+          % [name, class_name]
       end
 
       define_method("#{name}=") do |value|

data/lib/kookaburra/given_driver.rb

@@ -1,4 +1,4 @@
-require 'active_support/core_ext/module/delegation'
+require 'forwardable'
 
 class Kookaburra
   # Your GivenDriver subclass is used to define your testing DSL for setting up
@@ -33,6 +33,8 @@ class Kookaburra
   #     end
   #   end
   class GivenDriver
+    extend Forwardable
+
     # It is unlikely that you would call #initialize yourself; your GivenDriver
     # object is instantiated for you by {Kookaburra#given}.
     #
@@ -48,7 +50,7 @@ class Kookaburra
     # Access to the shared {Kookaburra::MentalModel} instance
     #
     # @attribute [rw] mental_model
-    delegate :mental_model, :to => :configuration
+    def_delegator :configuration, :mental_model
 
     # Used to access your APIDriver in your own GivenDriver implementation
     #

data/lib/kookaburra/json_api_driver.rb

@@ -1,6 +1,6 @@
-require 'kookaburra/api_driver'
 require 'delegate'
-require 'active_support/json'
+require 'json'
+require 'kookaburra/api_driver'
 
 class Kookaburra
   # Delegates all methods (by default) to and instance of
@@ -55,11 +55,11 @@ class Kookaburra
     end
 
     def encode(data)
-      ActiveSupport::JSON.encode(data) unless data.nil?
+      JSON.dump(data) unless data.nil?
     end
 
     def decode(data)
-      ActiveSupport::JSON.decode(data)
+      JSON.parse(data)
     end
   end
 end

data/lib/kookaburra/mental_model.rb

@@ -1,6 +1,5 @@
 require 'delegate'
 require 'kookaburra/exceptions'
-require 'active_support/core_ext/hash'
 
 class Kookaburra
   # Each instance of {Kookaburra} has its own instance of MentalModel. This object
@@ -69,6 +68,33 @@ class Kookaburra
         self.object_id == other.object_id
       end
 
+      # Returns a new hash that contains key/value pairs for the
+      # specified keys with values copied from this collection.
+      #
+      # @note This is semantically the same as `Hash#slice` as provided
+      #   by `ActiveSupport::CoreExt::Hash`
+      # @param [Object] *keys The keys that should be copied from the
+      #   collection
+      # @return [Hash] The resulting keys/values from the collection
+      def slice(*keys)
+        data = keys.inject({}) { |memo, key|
+          memo[key] = self[key]
+          memo
+        }
+      end
+
+      # Returns a new hash that contains every key/value from this
+      # collection *except* for the specified keys
+      #
+      # @note This is semantically the same as `Hash#except` as provided
+      #   by `ActiveSupport::CoreExt::Hash`
+      # @param [Object] *keys The keys that should *not* be copied from
+      #   the collection
+      # @return [Hash] The resulting keys/values from the collection
+      def except(*keys)
+        slice(*(self.keys - keys))
+      end
+
       # Deletes a key/value pair from the collection, and persists the deleted pair
       # in a subcollection.
       #

data/lib/kookaburra/mental_model_matcher.rb

@@ -53,7 +53,7 @@ class Kookaburra
       # @return Boolean
       def matches?(actual)
         @actual = actual
-        expected_items_not_found.empty? && unexpected_items_found.empty?
+        expected_items_found? && !unexpected_items_found?
       end
 
       # Message to be printed when observed reality does not conform to
@@ -64,13 +64,13 @@ class Kookaburra
       # @return String
       def failure_message_for_should
         message = "expected #{@collection_key} to match the user's mental model, but:\n"
-        if expected_items_not_found.present?
+        unless expected_items_found?
           message += "expected to be present:         #{pp_array(expected_items)}\n"
-          message += "the missing elements were:      #{pp_array(expected_items_not_found)}\n"
+          message += "the missing elements were:      #{pp_array(expected_items_that_were_not_found)}\n"
         end
-        if unexpected_items_found.present?
+        if unexpected_items_found?
           message += "expected to not be present:     #{pp_array(unexpected_items)}\n"
-          message += "the unexpected extra elements:  #{pp_array(unexpected_items_found)}\n"
+          message += "the unexpected extra elements:  #{pp_array(unexpected_items_that_were_found)}\n"
         end
         message
       end
@@ -99,15 +99,23 @@ class Kookaburra
       def expected_items;   @expected.values;   end
       def unexpected_items; @unexpected.values; end
 
-      def expected_items_not_found
+      def expected_items_that_were_not_found
         difference_between_arrays(expected_items, @actual)
       end
 
-      def unexpected_items_found
+      def unexpected_items_that_were_found
         unexpected_items_not_found = difference_between_arrays(unexpected_items, @actual)
         difference_between_arrays(unexpected_items, unexpected_items_not_found)
       end
 
+      def expected_items_found?
+        expected_items_that_were_not_found.empty?
+      end
+
+      def unexpected_items_found?
+        !unexpected_items_that_were_found.empty?
+      end
+
       # (Swiped from RSpec's array matcher)
       # Returns the difference of arrays, accounting for duplicates.
       # e.g., difference_between_arrays([1, 2, 3, 3], [1, 2, 3]) # => [3]

data/lib/kookaburra/test_helpers.rb

@@ -1,6 +1,6 @@
+require 'forwardable'
 require 'kookaburra'
 require 'kookaburra/mental_model_matcher'
-require 'active_support/core_ext/module/delegation'
 
 class Kookaburra
   # This module is intended to be mixed in to your testing context to provide
@@ -81,6 +81,8 @@ class Kookaburra
   #     ui.widget_list.widgets.should == k.get_data(:widgets).slice(widgets)
   #   end
   module TestHelpers
+    extend Forwardable
+
     # The {Kookaburra} instance to be used by your tests. It gets configured
     # using the options set in {Kookaburra.configuration}, and the result is
     # memoized.
@@ -92,11 +94,11 @@ class Kookaburra
 
     # @method given
     # Delegates to {#k}
-    delegate :given, :to => :k
+    def_delegator :k, :given
 
     # @method ui
     # Delegates to {#k}
-    delegate :ui, :to => :k
+    def_delegator :k, :ui
 
     # RSpec-style custom matcher that compares a given array with
     # the current state of one named collection in the mental model

data/lib/kookaburra/ui_driver.rb

@@ -1,5 +1,4 @@
-require 'active_support/core_ext/hash'
-require 'active_support/core_ext/module/delegation'
+require 'forwardable'
 require 'kookaburra/assertion'
 require 'kookaburra/ui_driver/ui_component'
 require 'kookaburra/ui_driver/ui_component/address_bar'
@@ -60,6 +59,7 @@ class Kookaburra
   #   ui.account_management.account_list.should be_visible
   class UIDriver
     include Assertion
+    extend Forwardable
 
     class << self
       # Tells the UIDriver about your {UIComponent} subclasses.
@@ -112,6 +112,8 @@ class Kookaburra
 
     # @attribute [r] mental_model
     # @return [Kookaburra::MentalModel]
-    delegate :mental_model, :to => :@configuration
+    def_delegator :configuration, :mental_model
+
+    attr_reader :configuration
   end
 end

data/lib/kookaburra/ui_driver/ui_component.rb

@@ -1,6 +1,5 @@
 require 'kookaburra/exceptions'
 require 'kookaburra/assertion'
-require 'active_support/core_ext/object/try'
 
 class Kookaburra
   class UIDriver
@@ -148,7 +147,8 @@ class Kookaburra
       # @raise [UnexpectedResponse] raised if the server error detection
       #   function returns true
       def detect_server_error!
-        if @server_error_detection.try(:call, browser)
+        return if @server_error_detection.nil?
+        if @server_error_detection.call(browser)
           raise UnexpectedResponse, "Your server error detection function detected a server error. Looks like your applications is busted. :-("
         end
       end

data/spec/integration/test_a_rack_application_spec.rb

@@ -5,8 +5,7 @@ require 'thwait'
 
 # These are required for the Rack app used for testing
 require 'sinatra/base'
-require 'active_support/json'
-require 'active_support/hash_with_indifferent_access'
+require 'json'
 
 # The server port that the application server will attach to
 APP_PORT = ENV['APP_PORT'] || 3009
@@ -24,7 +23,7 @@ describe "testing a Rack application with Kookaburra" do
 
         def parse_json_req_body
           request.body.rewind
-          ActiveSupport::JSON.decode(request.body.read).symbolize_keys
+          JSON.parse(request.body.read, :symbolize_names => true)
         end
 
         post '/users' do
@@ -104,7 +103,7 @@ describe "testing a Rack application with Kookaburra" do
           widget_data = if request.media_type == 'application/json'
                           parse_json_req_body
                         else
-                          params.symbolize_keys.slice(:name)
+                          {:name => params['name']}
                         end
           widget_data[:id] = `uuidgen`.strip
           @@widgets << widget_data

data/spec/kookaburra/mental_model_spec.rb

@@ -24,11 +24,21 @@ describe Kookaburra::MentalModel do
     end
 
     describe '#slice' do
-      it 'returns a hash of items matching the specified keys' do
+      it 'returns a hash of items from the collection that match the specified keys' do
         collection[:foo] = 'foo'
         collection[:bar] = 'bar'
         collection[:baz] = 'baz'
-        collection.slice(:foo, :baz).should == { :foo => 'foo', :baz => 'baz' }
+        collection.slice(:foo, :baz).should == {:foo => 'foo', :baz => 'baz'}
+      end
+    end
+
+    describe '#except' do
+      it 'returns a hash of items from the collection that do not match the specified keys' do
+        collection[:foo] = 'foo'
+        collection[:bar] = 'bar'
+        collection[:baz] = 'baz'
+        collection[:yak] = 'yak'
+        collection.except(:foo, :baz).should == {:bar => 'bar', :yak => 'yak'}
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: kookaburra
 version: !ruby/object:Gem::Version 
-  hash: 65
+  hash: 127
   prerelease: 
   segments: 
   - 0
-  - 23
-  - 1
-  version: 0.23.1
+  - 24
+  - 0
+  version: 0.24.0
 platform: ruby
 authors: 
 - John Wilger
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-13 00:00:00 Z
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -40,13 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 3
         segments: 
-        - 3
         - 0
-        version: "3.0"
+        version: "0"
   version_requirements: *id002
-  name: activesupport
+  name: patron
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -60,7 +59,7 @@ dependencies:
         - 0
         version: "0"
   version_requirements: *id003
-  name: patron
+  name: json_pure
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development