yaccl 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3482ae343f4d0c79b82399b817a3d91fa1ced4c2
-  data.tar.gz: 5af3fa3c01e7fbb37a187e80cbce0163a89ed419
+  metadata.gz: 7ef5855ab2cec718cc226594fe83ce087460eed8
+  data.tar.gz: 78bef86bac1386f1e0045a0f7fee4bf33348d058
 SHA512:
-  metadata.gz: f2d52a9fa114b694eddd0a7933c5c92feac4a97ff6f7ff0a5c9307d2ebc7c09d766412a7500549e0106e578d66dbb13ab3a8b272733eb05b8b3078fd70a743aa
-  data.tar.gz: a4e0cf077d4b0ee4440a45bc774202107a30dde24b4ee7d4e7771a0403a0979f78356f2b567e8a575804c76dc90b99c8721df76aa89f0c50e61680ac92dfb328
+  metadata.gz: 50531092037d4c21586510f205c9b64a9546fbfe1ee32ac4c5e9fafdbc66c0e36f3a85a507fa11a2d3f4bf704b1cb41f1bd91695a30df1f20ac435f0127a3761
+  data.tar.gz: afd6f11dfbee74bef6e9dc592cb5ee2ecf3e25883a404bf2b41b7756f79fa4425fd258f7790962d89ca1518dbb007e02d3f5488483fd2e6b80100433c2c7221d

data/examples/create_type_manual.rb

@@ -36,5 +36,5 @@ type.add_property_definition(
 )
 
 full_type = repository.create_type(type)
-puts full_type.to_hash
+# puts full_type.to_hash
 full_type.delete

data/lib/yaccl/services/internal/browser_binding_service.rb

@@ -1,4 +1,4 @@
-require 'httparty'
+require 'typhoeus'
 require 'net/http/post/multipart'
 require 'multi_json'
 require_relative 'simple_cache'
@@ -34,14 +34,15 @@ module YACCL
             if params.has_key?(:content)
               @basement.multipart_post(url, params, headers)
             else
-              @basement.post(url, body: params, headers: headers)
+              @basement.post(url: url, body: params, headers: headers)
             end
           else
-            @basement.get(url, query: params, headers: headers)
+            @basement.get(url: url, query: params, headers: headers)
           end
 
+
           result = response.body
-          if response.content_type == 'application/json'
+          if response.headers['Content-Type'] =~ /application\/json/
             result = MultiJson.load(result, symbolize_keys: true)
           end
           unless (200...300).include?(response.code.to_i)
@@ -67,7 +68,7 @@ module YACCL
 
         def repository_urls(repository_id)
           if @@url_cache[repository_id].nil?
-            repository_infos = @basement.get(@service_url)
+            repository_infos = MultiJson.load( @basement.get(url: @service_url).body , symbolize_keys: false)            
             raise "No repository found with ID #{repository_id}." unless repository_infos.has_key?(repository_id)
             repository_info = repository_infos[repository_id]
             @@url_cache[repository_id] = { repository_url: repository_info['repositoryUrl'],
@@ -118,20 +119,39 @@ module YACCL
         end
 
         class Basement
-          include HTTParty
 
           def initialize(user, pass)
             @username = user
             @password = pass
-            self.class.basic_auth(user, pass)
           end
 
-          def get(*params)
-            self.class.get(*params)
+          def get(params)
+            # puts "##{params.class}#"
+            # old
+            # @basement.get(url, query: params, headers: headers) @ useage
+            request = Typhoeus::Request.new(
+              params[:url],
+              userpwd: "#{@username}:#{@password}",
+              method: :get,
+              body: params[:body],
+              params: params[:query],
+              headers: params[:headers],
+            )
+            request.run
           end
 
-          def post(*params)
-            self.class.post(*params)
+          def post(params)
+            # puts "*#{params.class}*"
+            # @basement.post(url, body: params, headers: headers)
+            request = Typhoeus::Request.new(
+              params[:url],
+              userpwd: "#{@username}:#{@password}",
+              method: :post,
+              body: params[:body],
+              params: params[:query],
+              headers: params[:headers],
+            )
+            request.run
           end
 
           def multipart_post(url, options, headers)

data/lib/yaccl/version.rb

@@ -1,3 +1,3 @@
 module YACCL
-  VERSION = '0.0.34'
+  VERSION = '0.0.35'
 end

data/yaccl.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.summary = 'CMIS browser binding client lib.'
   s.description = 'A Ruby CMIS browser binding client library implementation.'
 
-  s.add_dependency 'httparty', '~> 0.10'
+  s.add_dependency 'typhoeus', '~> 0.6'
   s.add_dependency 'multipart-post', '~> 1.1'
   s.add_dependency 'multi_json', '~> 1.5'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaccl
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement