cmis-ruby 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5f9d4df93396fe4735ee09d4d97db95c48df45
-  data.tar.gz: 8938574723b4af67c631415610fcf4f71c4a1987
+  metadata.gz: dc97717108219ab5cccfdc7ebbcebdae3e49459f
+  data.tar.gz: 7f6f2d04fdf02fdd4e903024f90cf208a3b0fbc0
 SHA512:
-  metadata.gz: db9eec57e4879bcd1ef91cac2f717754e3ac376995cc11fe4f4c3af91dba94b3f777af086447e785eeb4d3887e3ae0247daea4be8f0fbd44e45737b3f42db71a
-  data.tar.gz: d8e06feb0c924488abe759cf1b7525f7d3e1ee33dde2e77e5bee374164d4542bda06b057705dcc974eb806a3f39998db52e0a640a071bdbf3d4ca59ce19f8f2f
+  metadata.gz: b85d9befb1c62a5f7077040094c7100d4dd14d1f09712d831b5e8f2362f46186923e03b236c7bfb3330c5c2795e26a17b73cfb34faa97b55da60d8756d6fb07b
+  data.tar.gz: 8f82470e491ee50316dc856f5ef454749a5118ae542991f89ddbdee16e3b4726681ff892c3016f3b099e44e3c271d7c5b49e77a0d49e3b1b703fe720d07851b5

data/lib/cmis-ruby.rb

@@ -1,6 +1,16 @@
-require 'cmis/core_ext/array'
-require 'cmis/core_ext/hash'
+# ruby
+require 'bigdecimal'
+require 'json'
 
+# core extensions
+require 'active_support/core_ext'
+require 'core_ext'
+
+# HTTP
+require 'typhoeus'
+require 'net/http/post/multipart'
+
+# cmis-ruby
 require 'cmis/connection'
 require 'cmis/exceptions'
 require 'cmis/server'

data/lib/cmis/children.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/slice'
-
 module CMIS
   class Children
     # Options: from, page_size
@@ -66,6 +64,8 @@ module CMIS
       @max_items = @options['page_size'] || 10
       @skip_count = @options['from'] || 0
       @order_by = @options['order_by']
+      @filter = @options['filter']
+      @include_relationships = @options['include_relationships']
       @has_next = true
 
       @opts = @options.slice('query', 'headers')
@@ -80,18 +80,44 @@ module CMIS
     end
 
     def do_get_children
-      result = @folder.connection.execute!({ cmisselector: 'children',
-                                             repositoryId: @folder.repository.id,
-                                             objectId: @folder.cmis_object_id,
-                                             maxItems: @max_items,
-                                             skipCount: @skip_count,
-                                             orderBy: @order_by }, @opts)
-
-      results = result['objects'].map do |r|
-        ObjectFactory.create(r['object'], @folder.repository)
+      repository = @folder.repository
+      result = repository.connection.execute!({ cmisselector: 'children',
+                                                repositoryId: @folder.repository.id,
+                                                objectId: @folder.cmis_object_id,
+                                                maxItems: @max_items,
+                                                skipCount: @skip_count,
+                                                orderBy: @order_by,
+                                                includeRelationships: @include_relationships,
+                                                filter: @filter}, @opts)
+
+      results = result['objects'].map { |o| build_object_with_relationships(o) }
+      QueryResult.new(results, result['numItems'], result['hasMoreItems'])
+    end
+
+    def build_object_with_relationships(json)
+      object = ObjectFactory.create(json['object'], @folder.repository)
+
+      # If relationships are included, override the object method...
+      if relationships = build_relationships(json)
+        metaclass = class << object; self; end
+        metaclass.send(:define_method, :relationships) do
+          # ...and make the Array respond to `each_relationship`
+          def relationships.each_relationship(args, &blck)
+            each(&blck)
+          end
+          relationships
+        end
       end
 
-      QueryResult.new(results, result['numItems'], result['hasMoreItems'])
+      object
+    end
+
+    def build_relationships(json)
+      if json['object']['relationships']
+        json['object']['relationships'].map do |r|
+          ObjectFactory.create(r, @folder.repository)
+        end
+      end
     end
   end
 end

data/lib/cmis/connection.rb

@@ -1,8 +1,3 @@
-require 'active_support'
-require 'json'
-require 'typhoeus'
-require 'net/http/post/multipart'
-
 module CMIS
   class Connection
     def initialize(service_url, username, password, headers)

data/lib/cmis/helpers.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext'
-
 module CMIS
   module Helpers
     def initialize_properties(raw)
@@ -24,6 +22,22 @@ module CMIS
       end
     end
 
+    def self.respond_to?(name, include_private = false)
+      if @properties.has_key?(name.to_s)
+        true
+      else
+        super
+      end
+    end
+
+    def method_missing(name, *args, &block)
+      if @properties.has_key?(name.to_s)
+        @properties[name.to_s]
+      else
+        super
+      end
+    end
+
     private
 
     def method_name(property_name)

data/lib/cmis/object.rb

@@ -2,7 +2,6 @@ module CMIS
   class Object
     include Helpers
 
-    attr_reader :connection
     attr_reader :repository
     attr_accessor :properties
 
@@ -14,7 +13,6 @@ module CMIS
                           cmis:lastModificationDate cmis:changeToken )
 
       @repository = repository
-      @connection = repository.connection
     end
 
     def object_type(opts = {})
@@ -109,5 +107,11 @@ module CMIS
     def detached?
       cmis_object_id.nil?
     end
+
+    private
+
+    def connection
+      repository.connection if repository
+    end
   end
 end

data/lib/cmis/property_definition.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/string/inflections'
-
 module CMIS
   class PropertyDefinition
     def initialize(hash = {})

data/lib/cmis/query.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/slice'
-
 module CMIS
   class Query
     # Options: from, page_size

data/lib/cmis/relationships.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/slice'
-
 module CMIS
   class Relationships
     # Options: from, page_size
@@ -82,14 +80,15 @@ module CMIS
     end
 
     def do_get_relationships
-      result = @object.connection.execute!({ cmisselector: 'relationships',
-                                             repositoryId: @object.repository.id,
-                                             objectId: @object.cmis_object_id,
-                                             maxItems: @max_items,
-                                             skipCount: @skip_count,
-                                             relationshipDirection: @direction,
-                                             includeSubRelationshipTypes: @include_subtypes,
-                                             typeId: @type_id }, @opts)
+      connection = @object.repository.connection
+      result = connection.execute!({ cmisselector: 'relationships',
+                                     repositoryId: @object.repository.id,
+                                     objectId: @object.cmis_object_id,
+                                     maxItems: @max_items,
+                                     skipCount: @skip_count,
+                                     relationshipDirection: @direction,
+                                     includeSubRelationshipTypes: @include_subtypes,
+                                     typeId: @type_id }, @opts)
 
       results = result['objects'].map do |r|
         ObjectFactory.create(r, @object.repository)

data/lib/cmis/server.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/indifferent_access'
-
 module CMIS
   class Server
     attr_reader :connection

data/lib/cmis/type.rb

@@ -1,14 +1,9 @@
-require 'active_support/core_ext/string/inflections'
-
 module CMIS
   class Type
-    attr_accessor :connection
     attr_accessor :repository
 
     def initialize(hash, repository)
       @repository = repository
-      @connection = repository.connection if repository
-
       @hash = hash.with_indifferent_access
 
       properties = %w( id localName localNamespace queryName displayName baseId
@@ -100,5 +95,11 @@ module CMIS
     def to_hash
       @hash
     end
+
+    private
+
+    def connection
+      repository.connection if repository
+    end
   end
 end

data/lib/cmis/version.rb

@@ -1,3 +1,3 @@
 module CMIS
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

data/lib/core_ext.rb

@@ -0,0 +1,3 @@
+Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].each do |path|
+  require path
+end

data/lib/core_ext/array.rb

@@ -0,0 +1 @@
+require 'core_ext/array/indifferent_access'

data/lib/core_ext/hash.rb

@@ -0,0 +1 @@
+require 'core_ext/hash/compact'

data/lib/core_ext/hash/compact.rb

@@ -0,0 +1,22 @@
+# Added in active_support 4.1
+
+class Hash
+  # Returns a hash with non +nil+ values.
+  #
+  #   hash = { a: true, b: false, c: nil}
+  #   hash.compact # => { a: true, b: false}
+  #   hash # => { a: true, b: false, c: nil}
+  #   { c: nil }.compact # => {}
+  def compact
+    self.select { |_, value| !value.nil? }
+  end
+
+  # Replaces current hash with non +nil+ values.
+  #
+  #   hash = { a: true, b: false, c: nil}
+  #   hash.compact! # => { a: true, b: false}
+  #   hash # => { a: true, b: false}
+  def compact!
+    self.reject! { |_, value| value.nil? }
+  end
+end

data/readme.md

@@ -10,7 +10,7 @@ Running the tests requires a running CMIS server.
 
 ## TODO
 
-* cleanup Connection class
+* use Faraday for HTTP
 * facilitate copy between servers (make a flow)
 * caching
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmis-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Kenneth Geerts
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -69,8 +69,6 @@ files:
 - lib/cmis-ruby.rb
 - lib/cmis/children.rb
 - lib/cmis/connection.rb
-- lib/cmis/core_ext/array.rb
-- lib/cmis/core_ext/hash.rb
 - lib/cmis/document.rb
 - lib/cmis/exceptions.rb
 - lib/cmis/folder.rb
@@ -88,6 +86,11 @@ files:
 - lib/cmis/server.rb
 - lib/cmis/type.rb
 - lib/cmis/version.rb
+- lib/core_ext.rb
+- lib/core_ext/array.rb
+- lib/core_ext/array/indifferent_access.rb
+- lib/core_ext/hash.rb
+- lib/core_ext/hash/compact.rb
 - readme.md
 - spec/document_spec.rb
 - spec/folder_spec.rb

data/lib/cmis/core_ext/hash.rb

@@ -1,5 +0,0 @@
-class Hash
-  def compact
-    delete_if { |_, v| v.nil? }
-  end
-end