Deprecate Query#language

#65 (review)

Author: roback

lib/twingly/search/query.rb

@@ -6,10 +6,9 @@ module Search
     # Twingly Search API query
     #
     # @attr [String] search_query the search query.
-    # @attr [String] language language to restrict the query to.
     # @attr [Client] client the client that this query is connected to.
     class Query
-      attr_accessor :search_query, :language, :client
+      attr_accessor :search_query, :client
 
       # @deprecated Please use {#search_query} instead
       def pattern
@@ -23,6 +22,18 @@ def pattern=(search_query)
         @search_query = search_query
       end
 
+      # @deprecated Please use {#search_query} instead
+      def language
+        warn "[DEPRECATION] `language` is deprecated. Please use `search_query` instead."
+        @language
+      end
+
+      # @deprecated Please use {#search_query=} instead
+      def language=(language_code)
+        warn "[DEPRECATION] `language=` is deprecated. Please use `search_query=` instead."
+        @language = language_code
+      end
+
       # @return [Time] the time that was set with {#start_time=}.
       def start_time
         @start_time
@@ -66,7 +77,7 @@ def url_parameters
       # @return [Hash] the request parameters.
       def request_parameters
         full_search_query = search_query.to_s.dup
-        full_search_query << " lang:#{language}"                   if language
+        full_search_query << " lang:#{@language}" unless @language.to_s.empty?
         full_search_query << " start-date:#{formatted_start_date}" if start_time
         full_search_query << " end-date:#{formatted_end_date}"     if end_time
 

spec/query_spec.rb

@@ -23,6 +23,16 @@
     it { expect { subject.pattern = "test" }.to output(/deprecated/).to_stderr }
   end
 
+  describe "#language" do
+    it { expect { subject.language }.to output(/deprecated/).to_stderr }
+    it { expect { subject.language = "en" }.to output(/deprecated/).to_stderr }
+
+    it "should be included in the search query" do
+      subject.language = "no"
+      expect(subject.request_parameters.fetch(:q)).to include("lang:no")
+    end
+  end
+
   describe ".new" do
     context "without client" do
       subject { described_class.new }