cmis-ruby 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97132317b4609f109b961b1069bd5423e6bb1b89
-  data.tar.gz: a43ebf5d4525804e207d040c0c58feda45e48fd8
+  metadata.gz: 5509c0d7a7ebe328fb70713c0d33286634414c3b
+  data.tar.gz: 1b083a997de518a72a4d3de31b955321f32184ef
 SHA512:
-  metadata.gz: 4ea0dff54def6be22aa39c6ac2738993b6b6dfbb21bc34e0c001bdf2ba6012ac125a5c0cc6382633cefdcc064d53c0a95fd3c8710dcc59b98b971a622b2792b0
-  data.tar.gz: 29ee254a5eda2bca3b4220d64b219ed97b0815a42ed4330aa185ebc77c87cdfa94b32e98e9df20696279193f541a0434df520fee8be0d311ee93f086642e4530
+  metadata.gz: 71aeea351aef546a84493d3090c959b62f8b318c9adc0e13ffbb98ed8125cc7ac03bb63c1ae18d82936ce2a0eb80092b1f71074b9b1b94ea0667fb0bc8ec154a
+  data.tar.gz: 933826ba179011b28eda09faa060b4fc722ff5ea595f0a243a9ddc9dbbec9581b50d50f40151936e02550b590c287f256cc43f5ff18588de3470f22fd73c7ea2

data/lib/cmis/connection.rb

@@ -3,8 +3,8 @@ module CMIS
     def initialize(options)
       options.symbolize_keys!
 
-      @service_url = options[:service_url] || ENV['CMIS_BROWSER_URL'] or raise \
-        "option `:service_url` or ENV['CMIS_BROWSER_URL'] must be set"
+      @service_url = options[:service_url] || ENV['CMIS_BROWSER_URL'] or \
+        raise "option `:service_url` or ENV['CMIS_BROWSER_URL'] must be set"
 
       adapter = (options[:adapter] || :net_http).to_sym
 
@@ -130,17 +130,27 @@ module CMIS
   end
 
   class ResponseParser < Faraday::Middleware
+    JSON_CONTENT_TYPE = /\/(x-)?json(;.+?)?$/
+
     def call(env)
       @app.call(env).on_complete do |env|
-        if env[:response_headers][:content_type] =~ /\/(x-)?json(;.+?)?$/
+        if env[:response_headers][:content_type] =~ JSON_CONTENT_TYPE
           env[:body] = JSON.parse(env[:body]).with_indifferent_access
-          if env[:body].is_a?(Hash) && ex = env[:body][:exception]
-            ruby_exception = "CMIS::Exceptions::#{ex.camelize}".constantize
-            message = "#{ex.underscore.humanize}: #{env[:body][:message]}"
-            raise ruby_exception, message
-          end
+          check_for_exception!(env[:body])
         end
       end
     end
+
+    private
+
+    def check_for_exception!(body)
+      return unless body.is_a?(Hash)
+
+      if ex = body[:exception]
+        ruby_exception = "CMIS::Exceptions::#{ex.camelize}".constantize
+        message = "#{ex.underscore.humanize}: #{body[:message]}"
+        raise ruby_exception, message
+      end
+    end
   end
 end

data/lib/cmis/document.rb

@@ -55,11 +55,13 @@ module CMIS
       if detached?
         @local_content = content
       else
-        update_change_token server.execute!({ cmisaction: 'setContent',
-                                              repositoryId: repository.id,
-                                              objectId: cmis_object_id,
-                                              content: content,
-                                              changeToken: change_token }, opts)
+        with_change_token do
+          server.execute!({ cmisaction: 'setContent',
+                            repositoryId: repository.id,
+                            objectId: cmis_object_id,
+                            content: content,
+                            changeToken: change_token }, opts)
+        end
       end
     end
   end

data/lib/cmis/helpers.rb

@@ -12,13 +12,14 @@ module CMIS
       end
     end
 
-    def update_change_token(r)
-      if r['properties']
-        @change_token = r['properties']['cmis:changeToken']['value']
-      elsif r['succinctProperties']
-        @change_token = r['succinctProperties']['cmis:changeToken']
+    def with_change_token(&block)
+      json = yield
+      if props = json['properties']
+        self.change_token = props['cmis:changeToken']['value']
+      elsif succinct_props = json['succinctProperties']
+        self.change_token = succinct_props['cmis:changeToken']
       else
-        raise "Unexpected input: #{r}"
+        raise "Unexpected input: #{json}"
       end
     end
 

data/lib/cmis/object.rb

@@ -3,7 +3,7 @@ module CMIS
     include Helpers
 
     attr_reader :repository
-    attr_accessor :properties
+    attr_reader :properties
 
     def initialize(raw, repository)
       initialize_properties(raw)
@@ -27,11 +27,13 @@ module CMIS
     end
 
     def update_properties(properties, opts = {})
-      update_change_token server.execute!({ cmisaction: 'update',
-                                            repositoryId: repository.id,
-                                            objectId: cmis_object_id,
-                                            properties: properties,
-                                            changeToken: change_token }, opts)
+      with_change_token do
+        server.execute!({ cmisaction: 'update',
+                          repositoryId: repository.id,
+                          objectId: cmis_object_id,
+                          properties: properties,
+                          changeToken: change_token }, opts)
+      end
     end
 
     def parents(opts = {})

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

data/spec/repository_spec.rb

@@ -42,8 +42,8 @@ describe CMIS::Repository do
     end
 
     it 'repository' do
-      r = CMIS::Server.new.repository('generali')
-      r.name.should eq 'generali'
+      r = CMIS::Server.new.repository('meta')
+      r.name.should eq 'meta'
     end
 
     it 'root' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday