nitroapi 0.0.5 → 0.0.7

data/lib/nitro_api/batch_calls.rb

@@ -0,0 +1,62 @@
+module NitroApi
+  module BatchCalls
+
+    private
+
+    # Actually perform the batch call.
+    # @return [Hash] The hash containing the results from the nitro server
+    def make_run_batch_call
+      return false if @batch.nil? or @batch.size == 0
+
+      # The nitro API returns a differently formatted result if called with
+      # only one action. Thus, they need to be handled differently.
+      if @batch.size == 1
+        handle_batch_single_action
+      else
+        handle_batch_multiple_actions
+      end
+    end
+
+    # This function handles making the call when there is only one call in
+    # the batch.
+    def handle_batch_single_action
+      result = really_make_call(@batch[0][:params], @batch[0][:method])
+      @batch = nil
+
+      # TODO: improve the handling of other methods if only one is called with batch
+      if result['method'] == 'user.login' and result['res'] == 'ok'
+        @session = result['Login']['sessionKey']
+      end
+      result
+    end
+
+    # This function handles making the call when there is more than one call in
+    # the batch.
+    def handle_batch_multiple_actions
+      # TODO: improve handling of errors in the batch response
+      actions = []
+      @batch.each do |action|
+        actions << to_query(action[:params])
+      end
+
+      results = really_make_call({'method' => 'batch.run','methodFeed' => JSON.dump(actions)}, :post)
+      @batch = nil
+      extract_session_key results
+      results
+    end
+
+    # Extracts the session key from the results when multiple method calls are
+    # made in the batch.
+    # @param [Hash] batch_results The hash containing the results from the
+    #               batch call
+    def extract_session_key batch_results
+      batch_results['Nitro'].each do |result|
+        if result['method'] == 'user.login' and result['res'] == 'ok'
+          @session = result['Login']['sessionKey']
+          break
+        end
+      end
+    end
+
+  end
+end

data/lib/nitro_api/challenge.rb

@@ -1,5 +1,10 @@
 module NitroApi
   class Challenge
     attr_accessor :name, :description, :completed, :full_url, :thumb_url
+    attr_accessor :rules
+
+    def initialize()
+      @rules = []
+    end
   end
 end

data/lib/nitro_api/rule.rb

@@ -0,0 +1,5 @@
+module NitroApi
+  class Rule
+    attr_accessor :goal, :completed, :type, :action
+  end
+end

data/lib/nitro_api/site_calls.rb

@@ -0,0 +1,33 @@
+module NitroApi
+  module SiteCalls
+    def make_points_leaders_call opts
+      params = {
+          :method => 'site.getPointsLeaders'
+      }
+
+      # Only include the session key when it is present. This is to make batch
+      # calls work for this method.
+      params[:sessionKey] = @session if @session
+
+      opts_list = {
+          'criteria' => 'criteria',
+          'point_category' => 'pointCategory',
+          'return_count' => 'returnCount',
+          'start' => 'start',
+          'duration' => 'duration',
+          'user_ids' => 'userIds',
+          'tags' => 'tags',
+          'tags_operator' => 'tagsOperator',
+          'group_name' => 'groupName',
+          'with_rank' => 'withRank',
+          'with_surrounding_users' => 'withSurroundingUsers',
+          'preferences' => 'preferences'
+      }
+
+      opts.each do |key,value|
+        params[opts_list[key]] = value if opts_list.has_key?(key)
+      end
+      make_call(params, :get)
+    end
+  end
+end

data/lib/nitro_api/user_calls.rb

@@ -0,0 +1,155 @@
+module NitroApi
+  module UserCalls
+
+    def make_login_call
+      ts = Time.now.utc.to_i.to_s
+      params = {
+          :sig => sign(ts),
+          :ts => ts,
+          :apiKey => @api_key,
+          :userId => @user,
+          :method => 'user.login'
+      }
+      response = make_call(params)
+      if response.is_a?(Hash)
+        @session = response["Login"]["sessionKey"]
+      end
+      response
+    end
+
+    def make_log_action_call actions, opts={}
+      value = opts.delete(:value)
+      user_id = opts.delete(:other_user)
+      session_key = opts.delete(:session_key)
+      params = {
+          :tags => actions.is_a?(Array) ? actions.join(",") : actions,
+          :method => 'user.logAction'
+      }
+
+      # Only include the session key when it is present. This is to make batch
+      # calls work for this method.
+      if session_key or @session
+        params[:sessionKey] = session_key ? session_key : (@session ? @session : nil)
+      end
+
+      params[:value] = value.to_s if value && !value.to_s.empty?
+      params[:userId] = user_id if user_id && !user_id.to_s.empty
+      make_call(params)
+    end
+
+    def make_challenge_progress_call opts={}
+      # TODO: add support for the user.getChallengeProgress call to nitroapi
+      if not @batch.nil?
+        raise NitroError.new(10000), "user.getChallengeProgress not supported in batch mode by nitroapi"
+      end
+
+      params = {
+          :sessionKey => @session,
+          :method => 'user.getChallengeProgress'
+      }
+      challenge = opts[:challenge]
+      params['challengeName'] = challenge if challenge and !challenge.to_s.empty?
+      params['showOnlyTrophies'] = opts.delete(:trophies_only) || false
+      params['folder'] = opts.delete(:folder) if opts.has_key?(:folder)
+
+      response = make_call(params)
+
+      if valid_response?(response['challenges'])
+        items = ensure_array(response['challenges']['Challenge'])
+        items.reduce([]) do |challenges, item|
+          challenge = Challenge.new
+          challenge.name = item["name"]
+          challenge.description = item["description"]
+          challenge.full_url = item["fullUrl"]
+          challenge.thumb_url = item["thumbUrl"]
+          challenge.completed = item["completionCount"].to_i
+
+          if valid_response?(item["rules"])
+            ensure_array(item["rules"]['Rule']).each do |rule_elm|
+              rule = Rule.new
+              rule.action = rule_elm['actionTag']
+              rule.type = rule_elm['type'].to_sym
+              rule.completed = rule_elm['type'] == 'true'
+              if rule_elm['goal'] && !rule_elm['goal'].empty?
+                rule.goal = rule_elm['goal'].to_i
+              end
+              challenge.rules<< rule
+            end
+          end
+          challenges<< challenge
+        end
+      end
+    end
+
+    def make_award_challenge_call(challenge)
+      params = {
+          :sessionKey => @session,
+          :userId => @user,
+          :method => 'user.awardChallenge',
+          :challenge => challenge
+      }
+      make_call(params)
+    end
+
+    def make_action_history_call actions=[]
+      # TODO: add support for the user.getActionHistory call to nitroapi
+      if not @batch.nil?
+        raise NitroError.new(10000), "user.getActionHistory not supported in batch mode by nitroapi"
+      end
+
+      params = {
+          :sessionKey => @session,
+          :method => 'user.getActionHistory'
+      }
+      if actions && !actions.empty?
+        params[:tags] = actions.is_a?(Array) ? actions.join(",") : actions
+      end
+      response = make_call(params)
+      if valid_response?(response['ActionHistoryRecord'])
+        items = ensure_array(response['ActionHistoryRecord']['ActionHistoryItem'])
+        items.reduce([]) do
+        |history, item|
+          history<< {:tags => item['tags'],
+                     :ts => Time.at(item['ts'].to_i),
+                     :value => item['value'].to_i
+          }
+        end
+      else
+        []
+      end
+    end
+
+    def make_join_group_call group
+      params = {
+          :sessionKey => @session,
+          :method => 'user.joinGroup',
+          :groupName => group
+      }
+      make_call(params)
+    end
+
+    def make_get_points_balance_call opts={}
+      params = {
+          :method => 'user.getPointsBalance'
+      }
+
+      # Only include the session key when it is present. This is to make batch
+      # calls work for this method.
+      params[:sessionKey] = @session if @session
+
+      opts_list = {
+          'criteria' => 'criteria',
+          'point_category' => 'pointCategory',
+          'start' => 'start',
+          'end' => 'end',
+          'user_id' => 'userId',
+          'tags' => 'tags',
+      }
+
+      opts.each do |key,value|
+        params[opts_list[key]] = value if opts_list.has_key?(key)
+      end
+      make_call(params, :get)
+    end
+  end
+end

data/lib/nitro_api/version.rb

@@ -0,0 +1,3 @@
+module NitroApi
+  VERSION = "0.0.7"
+end

data/nitroapi.gemspec

@@ -1,69 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'nitro_api/version'
 
-Gem::Specification.new do |s|
-  s.name = %q{nitroapi}
-  s.version = "0.0.5"
+Gem::Specification.new do |gem|
+  gem.name          = "nitroapi"
+  gem.version       = NitroApi::VERSION
+  gem.authors       = ["Gilad Buchman", "James H. Linder"]
+  gem.email         = ["gems@jlinder.com"]
+  gem.description   = %q{Api client for Bunchball's Nitro. http://www.bunchball.com/nitro/}
+  gem.summary       = %q{Api client for Bunchball's Nitro}
+  gem.homepage      = %q{http://github.com/jlinder/nitroapi}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Gilad Buchman"]
-  s.date = %q{2011-08-10}
-  s.description = %q{Api client for Bunchball's Nitro. http://www.bunchball.com/nitro/}
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "examples/award_challenge.rb",
-    "examples/log_and_check_status.rb",
-    "keys.json.example",
-    "lib/nitro_api.rb",
-    "lib/nitro_api/challenge.rb",
-    "nitroapi.gemspec",
-    "spec/nitro_api_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/Keasinc/nitroapi}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Api client for Bunchball's Nitro}
+  gem.files         = `git ls-files`.split($/)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  # Please keep me alphabetized!
+  gem.add_dependency('activesupport')
+  gem.add_dependency('json')
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-  end
+  gem.add_development_dependency('bundler', ['~> 1.2.2'])
+  gem.add_development_dependency('rspec', ['~> 2.3.0'])
+  gem.add_development_dependency('simplecov', ['~> 0.7.1'])
 end
 

data/spec/nitro_api_spec.rb

@@ -6,22 +6,24 @@ describe NitroApi do
     @api_key = "key"
     @secret = "secret"
     @nitro = NitroApi::NitroApi.new @user, @api_key, @secret
+    @nitro.protocol = 'http'
     @success = {"Nitro" => {"res" => "ok"}}.to_json
     @session = "1"
   end
 
   describe "#sign" do
     it "takes MD5 like in http://wiki.bunchball.com/w/page/12748060/user_login" do
-      to_digest = @api_key + @secret +  Time.now.utc.to_i.to_s + @user.to_s
+      ts = Time.now.utc.to_i.to_s
+      to_digest = @api_key + @secret +  ts + @user.to_s
       to_digest += to_digest.length.to_s
-      @nitro.sign.should  == Digest::MD5.hexdigest(to_digest)
+      @nitro.sign(ts).should  == Digest::MD5.hexdigest(to_digest)
     end
   end
 
   describe "#login" do
     it "should set session id for a successful call" do
       mock_json = {"Nitro" => {"Login" => {"sessionKey" => @session}}}
-      url = NitroApi::HOST + "?.*method=user.login.*"
+      url = @nitro.base_url + "?.*method=user.login.*"
       stub_http_request(:get, Regexp.new(url)).
         to_return(:body => mock_json.to_json)
 
@@ -30,6 +32,34 @@ describe NitroApi do
     end
   end
 
+  describe "#base_url" do
+    before do
+      @user = "user"
+      @api_key = "key"
+      @secret = "secret"
+      @nitro = NitroApi::NitroApi.new @user, @api_key, @secret
+    end
+
+    it "has the correct default URL" do
+      @nitro.base_url.should == 'https://sandbox.bunchball.net/nitro/json'
+    end
+
+    it "correctly uses the configured protocol value" do
+      @nitro.protocol = 'http'
+      @nitro.base_url.should == 'http://sandbox.bunchball.net/nitro/json'
+    end
+
+    it "correctly uses the configured host value" do
+      @nitro.host = 'example.com'
+      @nitro.base_url.should == 'https://example.com/nitro/json'
+    end
+
+    it "correctly uses the configured accepts value" do
+      @nitro.accepts = 'xml'
+      @nitro.base_url.should == 'https://sandbox.bunchball.net/nitro/xml'
+    end
+  end
+
   context "when authenticated" do
     before do
       @nitro.session = @session
@@ -42,7 +72,7 @@ describe NitroApi do
           "sessionKey" => @session,
           "method" => "user.logAction"
         }
-        url = NitroApi::HOST + "?.*method=user.logAction.*"
+        url = @nitro.base_url + "?.*method=user.logAction.*"
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => @success)
@@ -56,38 +86,70 @@ describe NitroApi do
           "sessionKey" => @session,
           "method" => "user.logAction"
         }
-        url = NitroApi::HOST + "?.*method=user.logAction.*"
+        url = @nitro.base_url + "?.*method=user.logAction.*"
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => @success)
 
         @nitro.log_action actions
       end
+
+      it "sends one action with specified session key on query string" do
+        action_name = "action"
+        session = '2'
+        params = {"tags" => action_name,
+                  "sessionKey" => session,
+                  "method" => "user.logAction"
+        }
+        opts = {session_key: session}
+        url = @nitro.base_url + "?.*method=user.logAction.*"
+        stub_http_request(:get, Regexp.new(url)).
+            with(:query => params).
+            to_return(:body => @success)
+
+        @nitro.log_action action_name, opts
+      end
     end
 
     describe "#challenge_progress" do
-      it "returns the challenge part of the response" do
+      before do
         params = {
           "showOnlyTrophies" => "false",
           "sessionKey" => @session,
           "method" => "user.getChallengeProgress"
         }
-        url = NitroApi::HOST + "?.*method=user.getChallengeProgress.*"
+        url = @nitro.base_url + "?.*method=user.getChallengeProgress.*"
+        mock_rules = {"goal" => "1", "type" => "none", "completed" => "false",
+          "actionTag" => "action"}
+
         mock_data = [{"completionCount"=>"1",
           "description" => "some description",
-          "name" => "Watch 10 Videos"}]
+          "name" => "Watch 10 Videos",
+          "rules" => {"Rule" => mock_rules}}]
 
         mock_json = {"Nitro" => {"challenges" => {"Challenge" => mock_data}}}
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => mock_json.to_json)
 
-        progress = @nitro.challenge_progress
-        progress.should_not be_empty
-        challenge = progress[0]
-        challenge.should_not be_nil
-        challenge.description.should == "some description"
-        challenge.completed.should == 1
+        response = @nitro.challenge_progress
+        @challenge = response[0]
+      end
+
+      it "returns the challenge part of the response" do
+        @challenge.should_not be_nil
+        @challenge.description.should == "some description"
+        @challenge.completed.should == 1
+      end
+
+      it "has rules in the challenge" do
+        @challenge.rules.should_not be_empty
+        @challenge.rules.size.should == 1
+        rule = @challenge.rules.first
+        rule.type.should == :none
+        rule.completed.should be_false
+        rule.action.should == "action"
+        rule.goal.should == 1
       end
     end
 
@@ -99,7 +161,7 @@ describe NitroApi do
           "challenge" => "TestChallenge",
           "method" => "user.awardChallenge"
         }
-        url = NitroApi::HOST + "?.*method=user.awardChallenge.*"
+        url = @nitro.base_url + "?.*method=user.awardChallenge.*"
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => @success)
@@ -126,7 +188,7 @@ describe NitroApi do
           "sessionKey" => @session,
           "method" => "user.getActionHistory"
         }
-        url = NitroApi::HOST + "?.*method=user.getActionHistory.*"
+        url = @nitro.base_url + "?.*method=user.getActionHistory.*"
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => @mock_json)
@@ -144,7 +206,7 @@ describe NitroApi do
           "method" => "user.getActionHistory",
           "tags" => "action1"
         }
-        url = NitroApi::HOST + "?.*method=user.getActionHistory.*"
+        url = @nitro.base_url + "?.*method=user.getActionHistory.*"
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => @mock_json)
@@ -159,7 +221,7 @@ describe NitroApi do
           "sessionKey" => @session,
           "method" => "user.joinGroup"
         }
-        url = NitroApi::HOST + "?.*method=user.joinGroup.*"
+        url = @nitro.base_url + "?.*method=user.joinGroup.*"
         stub_http_request(:get, Regexp.new(url)).
           with(:query => params).
           to_return(:body => @success)
@@ -167,5 +229,246 @@ describe NitroApi do
         @nitro.join_group "group"
       end      
     end
+
+    describe "#get_points_balance options_hash" do
+      it "gets the default points" do
+        params = {"sessionKey" => @session,
+                  "method" => "user.getPointsBalance"
+        }
+        url = @nitro.base_url + "?.*method=user.getPointsBalance.*"
+        stub_http_request(:get, Regexp.new(url)).
+            with(:query => params).
+            to_return(:body => @success)
+
+        @nitro.get_points_balance
+      end
+
+      it "passes through all the expected parameters" do
+        options = {
+            'point_category' => 'other_points',
+            'criteria' => 'BALANCE',
+            'start' => '1354636962',
+            'end' => '1354637015',
+            'tags' => 'beans,rice',
+            'user_id' => 'another_user',
+        }
+        url = @nitro.base_url + '?criteria=BALANCE&end=1354637015&method=user.getPointsBalance&pointCategory=other_points&sessionKey=1&start=1354636962&tags=beans,rice&userId=another_user'
+        stub_http_request(:get, url).
+            to_return(:body => @success)
+
+        @nitro.get_points_balance options
+      end
+
+      it "passes through only the expected parameters" do
+        options = {
+            'point_category' => 'other_points',
+            'criteria' => 'BALANCE',
+            'start' => '1354636962',
+            'end' => '1354637015',
+            'tags' => 'beans,rice',
+            'user_id' => 'another_user',
+            'non_param' => 'some_unknown_param'
+        }
+        url = @nitro.base_url + '?criteria=BALANCE&end=1354637015&method=user.getPointsBalance&pointCategory=other_points&sessionKey=1&start=1354636962&tags=beans,rice&userId=another_user'
+        stub_http_request(:get, url).
+            to_return(:body => @success)
+
+        @nitro.get_points_balance options
+      end
+    end
+
+    describe "#get_points_leaders options_hash" do
+      it "gets points leaders" do
+        options = {
+          'return_count' => 20,
+          'duration' => 'ALLTIME',
+          'point_category' => 'points',
+          'criteria' => 'CREDITS'
+        }
+
+        results = { 'Nitro' => {
+          "res"=>"ok",
+          "method"=>"site.getPointsLeaders",
+          "leaders"=> {
+            "Leader"=>[ {
+              "UserPreferences"=>true,
+              "userId"=>"user_id1",
+              "points"=>"860"
+            }, {
+              "UserPreferences"=>true,
+              "userId"=>"user_id2",
+              "points"=>"620"
+            } ]
+          }
+        }}
+
+        # TODO: Figure out why when passing these params into the http request stub
+        #       the mock doesn't work (it errors out).
+        #params = {
+        #    'method' => 'site.getPointsLeaders',
+        #    'sessionKey' => @session,
+        #    'returnCount' => 20,
+        #    'duration' => 'ALLTIME',
+        #    'pointCategory' => 'points',
+        #    'criteria' => 'CREDITS'
+        #}
+
+        url = @nitro.base_url + "?.*method=site.getPointsLeaders.*"
+        stub_http_request(:any, Regexp.new(url)).
+            #with(:query => params).
+            to_return(status: 200, body: results.to_json)
+
+        s = @nitro.get_points_leaders options
+        s['res'].should == results['Nitro']['res']
+        s['method'].should == results['Nitro']['method']
+        s['leaders']['Leader'][0]['userId'].should == results['Nitro']['leaders']['Leader'][0]['userId']
+        s['leaders']['Leader'][0]['points'].should == results['Nitro']['leaders']['Leader'][0]['points']
+        s['leaders']['Leader'][1]['userId'].should == results['Nitro']['leaders']['Leader'][1]['userId']
+        s['leaders']['Leader'][1]['points'].should == results['Nitro']['leaders']['Leader'][1]['points']
+      end
+    end
+  end
+
+
+  context "batch jobs" do
+    describe "#start_batch!" do
+      it "starts a batch successfully" do
+        @nitro.start_batch!
+      end
+
+      it "errors on second call to start_batch!" do
+        @nitro.start_batch!
+        expect {@nitro.start_batch!}.to raise_error(NitroApi::NitroError)
+      end
+    end
+
+    describe "#cancel_batch" do
+      it "cancels a batch successfully" do
+        @nitro.start_batch!
+        @nitro.cancel_batch
+      end
+    end
+
+    describe "#run_batch" do
+      describe "#login" do
+        it "should set session id for a successful batch call" do
+          mock_json = {'Nitro' => {'Login' => {'sessionKey' => @session}, 'method' => 'user.login', 'res' => 'ok'}}
+          url = @nitro.base_url #+ "?.*method=batch.run.*"
+          stub_http_request(:get, Regexp.new(url)).
+              to_return(:body => mock_json.to_json)
+
+          @nitro.start_batch!
+          @nitro.login
+          @nitro.run_batch
+
+          @nitro.session.should == @session
+        end
+      end
+
+      it "should call two methods successfully" do
+        action_name = "action"
+        mock_json = { 'Nitro' =>
+            { 'res' => 'ok',
+              'method' => 'batch.run',
+              'Nitro' => [
+                  {'Login' => {'sessionKey' => @session}, 'method' => 'user.login', 'res' => 'ok'},
+                  {'res' => 'ok', 'method' => 'user.logAction'}
+              ]
+            }
+        }
+        url = @nitro.base_url #+ "?.*method=batch.run.*"
+        stub_http_request(:post, Regexp.new(url)).
+            to_return(:body => mock_json.to_json)
+
+        @nitro.start_batch!
+        @nitro.login
+        @nitro.log_action action_name
+        s = @nitro.run_batch
+
+        @nitro.session.should == @session
+        s['res'].should == mock_json['Nitro']['res']
+        s['method'].should == mock_json['Nitro']['method']
+        s['Nitro'][1]['res'].should == mock_json['Nitro']['Nitro'][1]['res']
+        s['Nitro'][1]['method'].should == mock_json['Nitro']['Nitro'][1]['method']
+      end
+
+      it "should call the same method twice successfully" do
+        action_name1 = "action1"
+        action_name2 = "action2"
+        mock_json = { 'Nitro' =>
+                          { 'res' => 'ok',
+                            'method' => 'batch.run',
+                            'Nitro' => [
+                                {'res' => 'ok', 'method' => 'user.logAction'},
+                                {'res' => 'ok', 'method' => 'user.logAction'}
+                            ]
+                          }
+        }
+        url = @nitro.base_url #+ "?.*method=batch.run.*"
+        stub_http_request(:post, Regexp.new(url)).
+            to_return(:body => mock_json.to_json)
+
+        @nitro.session = @session
+        @nitro.start_batch!
+        @nitro.log_action action_name1
+        @nitro.log_action action_name2
+        s = @nitro.run_batch
+
+        s['res'].should == mock_json['Nitro']['res']
+        s['method'].should == mock_json['Nitro']['method']
+        s['Nitro'][1]['res'].should == mock_json['Nitro']['Nitro'][1]['res']
+        s['Nitro'][1]['method'].should == mock_json['Nitro']['Nitro'][1]['method']
+      end
+
+      it "should call the same method twice but using different session keys successfully" do
+        action_name1 = "action1"
+        action_name2 = "action2"
+        session_key1 = '111'
+        session_key2 = '222'
+
+        mock_json = { 'Nitro' =>
+                          { 'res' => 'ok',
+                            'method' => 'batch.run',
+                            'Nitro' => [
+                                {'res' => 'ok', 'method' => 'user.logAction'},
+                                {'res' => 'ok', 'method' => 'user.logAction'}
+                            ]
+                          }
+        }
+        expected_post_body = "method=batch.run&methodFeed=%5B%22tags%3Daction1%26method%3Duser.logAction%26sessionKey%3D111%22%2C%22tags%3Daction2%26method%3Duser.logAction%26sessionKey%3D222%22%5D"
+
+        url = @nitro.base_url #+ "?.*method=batch.run.*"
+        stub_http_request(:post, Regexp.new(url)).
+            with(body: expected_post_body).
+            to_return(body: mock_json.to_json)
+
+        @nitro.session = @session
+        @nitro.start_batch!
+        @nitro.log_action(action_name1, {session_key: session_key1})
+        @nitro.log_action(action_name2, {session_key: session_key2})
+        s = @nitro.run_batch
+
+        s['res'].should == mock_json['Nitro']['res']
+        s['method'].should == mock_json['Nitro']['method']
+        s['Nitro'][1]['res'].should == mock_json['Nitro']['Nitro'][1]['res']
+        s['Nitro'][1]['method'].should == mock_json['Nitro']['Nitro'][1]['method']
+      end
+
+      describe "#challenge_progress" do
+        it "should not allow the call in batch mode" do
+          @nitro.start_batch
+          expect {@nitro.challenge_progress }.to raise_error(NitroApi::NitroError)
+        end
+      end
+
+      describe "#action_history" do
+        it "should not allow the call in batch mode" do
+          @nitro.start_batch
+          expect {@nitro.action_history 'action1'}.to raise_error(NitroApi::NitroError)
+        end
+      end
+
+    end
   end
 end
+