casper-client 0.0.3 → 0.0.4

data/casper-client.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "casper-client"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Daniel Tamiosso"]
   s.email       = ["email@danieltamiosso.com"]

data/lib/casper-client.rb

@@ -1,4 +1,6 @@
 require 'rest_client'
+require 'json'
+require 'base64'
 
 module Casper
 
@@ -10,13 +12,24 @@ module Casper
       options = {:host => 'http://casper.jrs-labs.com:8080'}.merge!(options)
       report = Report.new
       report.instance_eval(&block)
-      RestClient.post options[:host], {'casper[jrxml]' => report.template, 'casper[data]' => report.xml, 'casper[xpath]' => report.xpath}
+      RestClient.post options[:host], report.to_json, :content_type => :json, :accept => :json
     end
   
   end
   
   class Report
       attr_accessor :xml, :template, :xpath
+      
+      def to_json
+        {:casper =>
+              {
+                :jrxml => Base64.encode64(self.template.read),
+                :data => Base64.encode64((self.xml.kind_of? File) ? self.xml.read : xml),
+                :xpath => self.xpath
+              }
+        }.to_json
+      end
+      
   end
 
 end

data/spec/casper_client_spec.rb

@@ -1,42 +1,64 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe Casper::Client do
-  
-  TEMPLATE = open(File.join(File.dirname(__FILE__), 'data', 'report.jrxml'))
-  DATASET = open(File.join(File.dirname(__FILE__), 'data','dataset.xml'))
-    
+      
   describe 'a basic flow of generation of a report' do
     
     before(:each) do
       RestClient.stub!(:post).and_return('report')
     end
 
-    it 'should build the correct request to a report with a xml datasource' do
+    it 'should build the correct request to a report with a xml file as datasource' do
       RestClient.should_receive(:post).with(
         'http://casper.jrs-labs.com:8080',
-        {'casper[jrxml]'=> TEMPLATE, 
-          'casper[data]'=> DATASET, 
-          'casper[xpath]'=>'//root'
-        }
+        {:casper =>
+              {
+                :jrxml => Base64.encode64(open(File.join(File.dirname(__FILE__),'data/report.jrxml')).read),
+                :data => Base64.encode64(open(File.join(File.dirname(__FILE__),'data/dataset.xml')).read),
+                :xpath => '//root'
+              }
+        }.to_json, :content_type => :json, :accept => :json
       )
       report = Casper::Client.build do |report|
-        report.xml = DATASET
-        report.template = TEMPLATE
+        report.template = open(File.join(File.dirname(__FILE__),'data/report.jrxml'))
+        report.xml = open(File.join(File.dirname(__FILE__),'data/dataset.xml'))
+        report.xpath = '//root'
+      end
+    end
+
+    it 'should build the correct request to a report with a xml file as datasource with a optional host' do
+      RestClient.should_receive(:post).with(
+        'http://myserver',
+        {:casper =>
+              {
+                :jrxml => Base64.encode64(open(File.join(File.dirname(__FILE__),'data/report.jrxml')).read),
+                :data => Base64.encode64(open(File.join(File.dirname(__FILE__),'data/dataset.xml')).read),
+                :xpath => '//root'
+              }
+        }.to_json, :content_type => :json, :accept => :json
+      )
+      report = Casper::Client.build :host => 'http://myserver' do |report|
+        report.template = open(File.join(File.dirname(__FILE__),'data/report.jrxml'))
+        report.xml = open(File.join(File.dirname(__FILE__),'data/dataset.xml'))        
         report.xpath = '//root'
       end
     end
     
-    it 'should build the correct request to a report with a xml datasource with a optional host' do
+ 
+    it 'should build the correct request to a report with a xml string as datasource' do
       RestClient.should_receive(:post).with(
         'http://mycasperserver.com',
-        {'casper[jrxml]'=> TEMPLATE, 
-          'casper[data]'=> DATASET, 
-          'casper[xpath]'=> '//root'
-        }
+        {:casper =>
+              {
+                :jrxml => Base64.encode64(open(File.join(File.dirname(__FILE__),'data/report.jrxml')).read),
+                :data => Base64.encode64('<model/>'),
+                :xpath => '//root'
+              }
+        }.to_json, :content_type => :json, :accept => :json
       )
       report = Casper::Client.build :host => 'http://mycasperserver.com' do |report|
-        report.xml = DATASET
-        report.template = TEMPLATE
+        report.template = open(File.join(File.dirname(__FILE__),'data/report.jrxml'))
+        report.xml = '<model/>'
         report.xpath = '//root'
       end
     end

data/spec/spec_helper.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), '..','lib','casper_client')
+require File.join(File.dirname(__FILE__), '..','lib','casper-client')

metadata

@@ -2,7 +2,7 @@
 name: casper-client
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Tamiosso