threetaps-client 1.0.2 → 1.0.3

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/client/posting_client.rb

@@ -81,8 +81,9 @@ class PostingClient < Client
   #  Returns information on the existence of postings.
   #
   def exists_posting(posting)
-    params = "ids=#{posting}"
+    params = "ids=[#{posting.to_json_for_status}]"
     response = execute_post("/posting/exists", params)
-    ExistsResponse.from_array(decode(response))
+    p decode(response)[0]
+    ExistsResponse.new(decode(response)[0])
   end
 end

data/lib/client/search_client.rb

@@ -76,7 +76,7 @@ class SearchClient < Client
   # 
   def best_match(keywords)
     response = execute_get("/search/best-match", "keywords=#{keywords}")
-    BestMatchResponse.from_hash(decode(response))
+    BestMatchResponse.new(decode(response))
   end
 
 end

data/lib/client/status_client.rb

@@ -54,7 +54,7 @@ class StatusClient < Client
     data = "["
     data << postings.collect{|posting| "{#{posting.to_json_for_status_client}}"}.join(',')
     data << "]"
-    params = "ids=#{data}"
+    params = "postings=#{data}"
     response = execute_post("status/get", params)
     GetStatusResponse.from_array(decode(response))
   end

data/lib/dto/posting/exists_response.rb

@@ -7,10 +7,10 @@
 #  response = ExistsResponse.from_hash("success" => "true")
 #  response.success       # => true
 #
-class ExistsResponse
-  attr_accessor :exists, :postKey, :error
-
-  def self.from_array(json)
-    json
+class ExistsResponse < Struct.new(:indexed, :postKey, :exists, :failures)
+  def initialize(hash = {})
+    hash.each do |key, value|
+      self.send("#{key}=".to_sym, value )
+    end
   end
 end

data/lib/dto/search/best_match_response.rb

@@ -12,9 +12,14 @@
 #  response.numResults   # => 20
 #  response.num_results  # => 20
 #
-class BestMatchResponse < Struct.new(:category, :numResults) do
+class BestMatchResponse < Struct.new(:category, :numResults, :error) do
     def num_results
       numResults
     end
   end
+  def initialize(hash = {})
+    hash.each do |key, value|
+      self.send("#{key}=".to_sym, value )
+    end
+  end
 end

data/lib/models/posting.rb

@@ -33,10 +33,10 @@
 #  posting.to_json_for_status        # => Array of JSON objects
 class Posting < SuperModel::Base
   attributes :postKey, :heading, :body, :category, :source, :location,
-             :longitude, :latitude, :language, :price, :currency, :images,
-             :externalURL, :externalID, :accountName, :accountID, :clickCount,
-             :timestamp, :expiration, :indexed, :trustedAnnotations,
-             :annotations, :errors, :status, :history
+    :longitude, :latitude, :language, :price, :currency, :images,
+    :externalURL, :externalID, :accountName, :accountID, :clickCount,
+    :timestamp, :expiration, :indexed, :trustedAnnotations,
+    :annotations, :errors, :status, :history
 
   def initialize(*params)
     super(*params)
@@ -46,10 +46,14 @@ class Posting < SuperModel::Base
   end
 
   def to_json
-    posting = "{"+'source:'+"'#{self.source}'" + ',category:' + "'#{self.category}'" + ',location:' + "'#{self.location}'" + ',heading:' +  "'#{CGI.escape self.heading}'"
-    posting << ",timestamp: '#{(Time.now.utc.to_s(:db)).gsub(/\s/,"+")}'"
+    posting = "{"+'source:'+"'#{self.source}'" + ',category:' + "'#{self.category}'" + ',location:' + "'#{self.location}'" + ',heading:' +  "'#{CGI.escape self.heading.to_json}'"
+    if self.timestamp
+      posting << ",timestamp: '#{(self.timestamp.utc.to_s(:db)).gsub(/\s/,"+")}'"
+    else
+      posting << ",timestamp: '#{(Time.now.utc.to_s(:db)).gsub(/\s/,"+")}'"
+    end
     posting << ',images:' + "[#{images.collect{ |image| "'#{image}'"}.join(',')}]"
-    posting << ',body:' + "'#{CGI.escape self.body.gsub(/\n/," ")}'" unless self.body.blank?
+    posting << ',body:' + "'#{CGI.escape self.body.to_json}'" unless self.body.blank?
     posting <<  ',price:' + "'#{self.price}'"
     posting <<  ',currency:' + "'#{self.currency}'"
     posting <<  ',accountName:' + "'#{self.accountName}'"
@@ -66,12 +70,12 @@ class Posting < SuperModel::Base
 
   def to_json_for_update
     data = "['#{self.postKey}',"
-    data << "{heading:"+  "'#{CGI.escape self.heading}'"  unless self.heading.blank?
+    data << "{heading:"+  "'#{CGI.escape self.heading.to_json}'"  unless self.heading.blank?
     data << ",images:" + "[#{images.collect{ |image| "'#{image}'"}.join(',')}]"
     data << ",source:'#{self.source}'" unless self.source.blank?
     data << ",category:'#{self.category}'" unless self.category.blank?
     data << ",location:'#{self.location}'" unless self.location.blank?
-    data << ",body:" + "'#{CGI.escape self.body.gsub(/\n/," ")}'" unless self.body.blank?
+    data << ",body:" + "'#{CGI.escape self.body.to_json}'" unless self.body.blank?
     data <<  ',price:' + "'#{self.price}'"
     data <<  ',currency:' + "'#{self.currency}'"
     data <<  ',accountName:' + "'#{self.accountName}'"

data/spec/client/posting_client_spec.rb

@@ -30,7 +30,9 @@ describe PostingClient do
 
   it "should return boolean value" do
     stub_post_and_json_decode
-    @posting_client.exists_posting(mock("")).should be_true
+    ExistsResponse.stub!(:new).and_return mock("ExistsResponse", :exists => true)
+    ExistsResponse.should_receive(:new).with(nil)
+    @posting_client.exists_posting(mock("Posting", :to_json_for_status=>"")).exists.should be_true
   end
 end
 

data/spec/client/search_client_spec.rb

@@ -44,7 +44,8 @@ describe SearchClient do
   it "should send GET request and create BestMatchResponse from result" do
     keywords = ""
     bestmatch_response = mock "bestmatch_response"
-    BestMatchResponse.should_receive(:from_hash).and_return bestmatch_response
+    stub_get_and_json_decode
+    BestMatchResponse.stub!(:new).and_return bestmatch_response
 
     @search_client.best_match(keywords).should == bestmatch_response
   end

data/test/client/test_posting_client.rb

@@ -7,6 +7,8 @@ class TestPostingClient < Test::Unit::TestCase
     posting = Posting.new(
       :source => "3TAPS",
       :heading => "Svitla posting",
+      :location => "ZZZ",
+      :category => "ZZZZ",
       :timestamp => Time.now
     )
     response = client.create_posting(posting)
@@ -14,29 +16,33 @@ class TestPostingClient < Test::Unit::TestCase
     assert_equal CreateResponse, response.first.class
     assert_nil response.first.error
     posting_key = response.first.post_key
-    posting.heading = "Svitla posting +++#{rand(100)}+++"
-    posting.postKey = posting_key
-    posting.body = "posting"
-
-    response = client.update_posting(posting)
-    assert_equal true, response.success
-
-    keys << posting_key
-
-    posting = Posting.new(
-      :source => "3TAPS",
-      :heading => "Svitla posting",
-      :timestamp => Time.now
-    )
-    response = client.create_posting(posting)
-    assert_equal Array, response.class
-    assert_equal CreateResponse, response.first.class
-    assert_nil response.first.error
-    posting_key = response.first.post_key
-
-    keys << posting_key
-
-    response = client.delete_posting(keys)
+    p posting_key
+#    posting.heading = "Svitla posting +++#{rand(100)}+++"
+#    posting.postKey = posting_key
+#    posting.body = "posting"
+#   # sleep(50)
+#    response = client.update_posting(posting)
+#    p response
+#    assert_equal true, response.success
+#
+#    keys << posting_key
+#
+#    posting = Posting.new(
+#      :source => "3TAPS",
+#      :heading => "Svitla posting",
+#      :location => "ZZZ",
+#      :category => "ZZZZ",
+#      :timestamp => Time.now
+#    )
+#    response = client.create_posting(posting)
+#    assert_equal Array, response.class
+#    assert_equal CreateResponse, response.first.class
+#    assert_nil response.first.error
+#    posting_key = response.first.post_key
+#    keys << posting_key
+    p "waiting while indexed by server"
+    sleep(10)
+    response = client.delete_posting(posting_key)
     assert_equal DeleteResponse, response.class
     assert_equal true, response.success
   end
@@ -46,18 +52,23 @@ class TestPostingClient < Test::Unit::TestCase
     posting1 = Posting.new(
       :source => "3TAPS",
       :heading => "Svitla posting1",
+      :location => "ZZZ",
+      :category => "ZZZZ",
       :timestamp => Time.now
     )
     posting2 = Posting.new(
       :source => "3TAPS",
       :heading => "Svitla posting2",
-      :timestamp => Time.now
+      :location => "ZZZ",
+      :category => "ZZZZ"
     )
     response = client.create_posting([posting1, posting2])
+    p response
     assert_equal Array, response.class
     assert_equal CreateResponse, response.first.class
     assert_nil response.first.error
-
+    p "waiting while indexed by server"
+    sleep(15)
     posting_key = response[0].post_key
     posting1.postKey = posting_key
     posting_key = response[1].post_key
@@ -75,9 +86,9 @@ class TestPostingClient < Test::Unit::TestCase
 
   should "test posting retrieval" do
     client = PostingClient.new
-    posting = client.get_posting("BF87BFW")
+    posting = client.get_posting("BLQ7YJD")
     assert_equal Posting, posting.class
-    assert_equal "BF87BFW", posting.postKey
+    assert_equal "BLQ7YJD", posting.postKey
   end
 
   should "test posting deletion" do

data/test/client/test_search_client.rb

@@ -23,7 +23,7 @@ class TestSearchClient < Test::Unit::TestCase
     search_response = client.search(search_request)
     assert_equal SearchResponse, search_response.class
     assert_equal Array, search_response.results.class
-    assert_equal Posting, search_response.results.first.class
+    assert_equal Hash, search_response.results.first.class
   end
 
   should "get the count request result" do
@@ -47,9 +47,9 @@ class TestSearchClient < Test::Unit::TestCase
   end
 
   should "get the best match result" do
-    search_keywords = "iPad,Apple,iPhone"
+    search_keywords = "iPad Apple iPhone"
     client = SearchClient.new
-    best_match_response = client.best_match(search_keywords)
+    best_match_response = client.best_match(CGI.escape search_keywords)
     assert_equal BestMatchResponse, best_match_response.class
     assert_equal 'SELE', best_match_response.category
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - 3taps.com
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-06 00:00:00 +03:00
+date: 2011-04-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -220,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -307507889
+      hash: -228372899
       segments: 
       - 0
       version: "0"