lib/cql.rb in cql-0.2.0 vs lib/cql.rb in cql-0.2.1

@@ -1,9 +1,8 @@
 require 'gherkin/parser/parser'
 require 'gherkin/formatter/json_formatter'
 require 'stringio'
-require 'deep_clone'
 require File.dirname(__FILE__) + "/dsl"
 
 module CQL
 
   class Query
@@ -13,11 +12,11 @@
     def format_to_ary_of_hsh data
       result = Array.new(data.size).map { |e| {} }
       @what.each do |w|
         CQL::MapReduce.send(w, data).each_with_index { |e, i| result[i][w]=e }
       end
-      result
+      result.size == 1 ? result.first : result
     end
 
     def initialize features, &block
       @data = features
       @data = self.instance_eval(&block)
@@ -36,10 +35,10 @@
     def initialize features_home_dir
       @parsed_feature_files = load_features list_features features_home_dir
     end
 
     def query &block
-      Query.new(parsed_feature_files.__deep_clone__, &block).data
+      Query.new(parsed_feature_files.clone, &block).data
     end
 
     private
     def list_features base_dir
       require 'find'
\ No newline at end of file