camlistore 0.0.1 → 0.0.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2JlYWUyODNiNjdhMzBmYTQ5NzE3NjAxYWRmMjI4ZjEzNDUwMDg4YQ==
-  data.tar.gz: !binary |-
-    NDI3NzVkZDBlNDU1NzhiNGNhZDc4ZmE1N2Q1NTM5MmViZWI1NDJmMw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MzMwYjRiMWNhNjdkMWU3ZmNkNmU3MmM4MmE4MDc1MDljNTBiYzU0OThjNTM2
-    M2U5ODIyMTcwZTk4YzMyMzIxMDE3OGJkMjRkMjVmMDU5ZTlkZWJkYWNhOTk3
-    NDQ4MTE1NGVkMTYwNzVkMmMyZjc3ZmE4MzA5OGNjZDcyMzBkOWE=
-  data.tar.gz: !binary |-
-    YjhlNDUyYTI0ZjdhM2UwZWI2NTA2MTdhMjgwYzNkZTAzZjQwMzI1MjVjMjg5
-    NmU3YTBlOWVlODFmZjVkM2UyYWM2MzNjM2FkODAwY2Q5MGFjYWMyNDE1NDAy
-    NDk4MzFmZWQ4MDQxNzBlMTZmZjhmZDkwNjdmZTE5NjdhNjY4ODE=
+SHA1:
+  metadata.gz: efa7c94d5b87809a153c69a9f8de65456c707464
+  data.tar.gz: af9f070609707f40e5164106c38df07f13e4aba6
+SHA512:
+  metadata.gz: a53893d9812102fcebdcb4cd5ebc738d53702722ae763e2ff4fe4d6c4f6411e2abcf718baa3072eb2b2c1ddb1d0c175faf7447fa85f846a23fba957f04f98840
+  data.tar.gz: 895512a4f6bb0989755d8b9dc53aa05c0235c29aa2bc4bf24a66b9acbd7c292591299be53af034331a586c1840fdfee45bb58ea0ce7039b9a2c2644cb8458880

data/Gemfile

@@ -0,0 +1 @@
+gemspec

data/README.md

@@ -7,4 +7,8 @@ require 'camlistore'
 camli = Camlistore.new
 result = camli.enumerate_blobs(limit: 1)
 result.blobs.first.blobRef # => "sha1-..."
+
+camli.find_each do |sha|
+  camli.get(sha) # => some data
+end
 ```

data/camlistore.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
   gem.add_runtime_dependency 'faraday_middleware', '~> 0.9.0'
+  gem.add_runtime_dependency 'activesupport', '>= 4.0.0'
 end

data/lib/camlistore.rb

@@ -5,6 +5,8 @@ require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/string/inflections'
 require 'active_support/concern'
+require 'digest/sha1'
+require 'json'
 
 module Camlistore
   autoload :Configuration, 'camlistore/configuration'

data/lib/camlistore/api.rb

@@ -4,15 +4,35 @@ module Camlistore
     extend ActiveSupport::Concern
 
     def connection
-      @connection ||= Faraday.new(config.bshost) do |conn|
+      @connection ||= Faraday.new(config.host) do |conn|
         conn.response :mashify
         conn.response :json, content_type: 'text/javascript'
         conn.adapter Faraday.default_adapter
       end
     end
 
-    def api_call url, params = {}
-      response = connection.get(url, params)
+    def api_call url, params = {}, headers = {}
+      response = connection.get(url, params, headers) do |conn|
+        yield(conn) if block_given?
+      end
+
+      data = response.body
+
+      # Camlistore doesn't seem to give errors?
+      # error_message = data.error_message
+      # raise ArgumentError, error_message if error_message
+
+      if block_given?
+        yield data
+      else
+        data
+      end
+    end
+
+    def api_post url, params = {}, headers = {}
+      response = connection.post(url, params, headers) do |conn|
+        yield(conn) if block_given?
+      end
 
       data = response.body
 

data/lib/camlistore/client.rb

@@ -1,18 +1,21 @@
 module Camlistore
   Configuration.namespace :camlistore
-  Configuration.keys :bshost
+  Configuration.keys :host
   Configuration.env ENV
 
   class Client
-    attr_reader :config
+    attr_reader :config, :blobroot, :searchroot
     include API
 
     def initialize options = {}
-      @config = Configuration.new(options, bshost: 'http://localhost:3179/bs/')
-      raise ArgumentError, "You must supply blobstore host." unless config.bshost.present?
+      @config = Configuration.new(options, host: 'http://localhost:3179')
+      raise ArgumentError, "You must supply blobstore host." unless config.host.present?
+      remote_configuration = api_call '/', {}, {accept: 'text/x-camli-configuration'}
+      @blobroot = remote_configuration['blobRoot']
+      @searchroot = remote_configuration['searchRoot']
     end
 
-    api_method :enumerate_blobs, 'camli/enumerate-blobs'
+    api_method :enumerate_blobs, '/bs/camli/enumerate-blobs'
 
     def each_blob &block
       data = enumerate_blobs
@@ -30,8 +33,36 @@ module Camlistore
       end
     end
 
+    def blobref content
+      'sha1-' + Digest::SHA1.hexdigest(content)
+    end
+
     def get sha
-      api_call('camli/' + sha)
+      api_call(@blobroot + 'camli/' + sha)
+    end
+
+    def describe sha
+      api_call(@searchroot + 'camli/search/describe', {'blobref' => sha})
+    end
+
+    def search query
+      query = query.to_json if query.is_a?(Hash)
+      api_post(@searchroot + 'camli/search/query', query)
+    end
+
+    def put content
+      sha = blobref(content)
+      boundary = 'randomboundaryXYZ'
+      content_type = "multipart/form-data; boundary=#{boundary}"
+
+post_body = "--#{boundary}
+Content-Disposition: form-data; name='#{sha}'; filename='#{sha}'
+Content-Type: application/octet-stream
+
+#{content}
+--#{boundary}--"
+
+      api_post(@blobroot + 'camli/upload', post_body, {:content_type => content_type})
     end
   end
 

data/lib/camlistore/version.rb

@@ -1,3 +1,3 @@
 module Camlistore
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,36 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: camlistore
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Quinn Shanahan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2014-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: Some access to your camlistore in ruby
 email: quinn@tastehoneyco.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- Gemfile
 - LICENSE
 - README.md
 - camlistore.gemspec
@@ -48,17 +63,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Camlistore client