npolar-api-client-ruby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDdhMjk4MzM4MmFjMDg1NWY1NDg5N2UyMWZlYjBkYmE0ODg4NjA0Mg==
+    YmViMjQ5ZTdhNWU0YmVhNGY5MTc5YTYyZjUxNjk3M2Y3MGI2NDZlYw==
   data.tar.gz: !binary |-
-    NjY3MzQ4YzMxNDA3YjU2NjliNWRjZmViZmMxNjZlYWI4YTJkMjQzZQ==
+    YWY0YTE2MzcxN2NhY2I4OTAzYTE4MjY4NGE4NDI4YTgzZjUxNTA0Zg==
 SHA512:
   metadata.gz: !binary |-
-    NGE5ZWQwODBlYmU5NWRjMmE0OGFlM2Q2MTBmNzhjMDY2YTM2OTE0MTVmMjc3
-    MDk0NTVhYjk4NjMyMWU3YjE2MDE3OWNhMGFkNzg5NWUxYjlkNDk2Nzg5OTlk
-    MzhiMDFlN2ExMjYwNGYwNTM0ZjQ4OTZlZmNlNTMzNTAzODhlY2E=
+    MmRiZDE4ZGFlYmJhY2VmYjE4OWQwMjlmMjQzZDM5OTg1YWU2MThjYWQxNmQ3
+    MzcyZjNhY2U2YmU4NWNhYjVmNzhlYjlhNjlhMGQ5ZWVlNmIzY2RjOGM2M2Q1
+    ZGY4MjE1OTk3YTUxYmRhMDA2ODIwZWNjODQ0ZGE5ZDEyYjY2OTY=
   data.tar.gz: !binary |-
-    YmVlYjcxNzllODI4YTY1NGQzMGZmZmNlY2I3MTk5YjQ5YTExM2Y2ZGMxYjk1
-    MGE3YzAwODJjOTRlNWZmODYwZjJlZTkwZjBkOTIwYmU3YWExODgzYTFkZGZk
-    YmJkN2Q1YTk4YjU1OTI0MmZjZmVhODg2NjEyNjg1NTkwYjJmMTc=
+    ZDlmYzNlNDg4OWE4YWNiYjA5NGJlMmM1MTBkZWFiNGZiNjcxZTQ1ZGFiZGUy
+    NjBjMDU3NTE2OWQxMGE2ZTBkZjg3OTQ3ZGJiNDY1YjI5OTM1YjlmNjU3ODlh
+    NTFjNTJiMDc4NDA1ZDZlYzQxZTI0Yzc4YmE0YTA0ZmIwMjhlNTc=

data/lib/npolar/api/client/json_api_client.rb

@@ -36,7 +36,7 @@ module Npolar::Api::Client
     class << self
       attr_accessor :key
     end
-    attr_accessor :model, :log, :authorization, :concurrency, :slice, :param, :header
+    attr_accessor :model, :log, :authorization, :concurrency, :slice, :param, :options
     attr_reader :uri, :responses, :response, :options
 
     extend ::Forwardable
@@ -80,7 +80,6 @@ module Npolar::Api::Client
       @concurrency = 5
       @slice = 1000
       @param={}
-      @header={}
     end
 
     # All documents
@@ -124,10 +123,19 @@ module Npolar::Api::Client
 
     # Request header Hash
     def header
-      options[:headers]
-      # merge!
+      options[:headers] 
     end
     alias :headers :header
+    
+    def header=(header)
+      if header.is_a? Array
+        options[:headers]=header
+      else
+        options[:headers].merge! header
+      end
+      
+    end
+    alias :headers= :header=
 
     def http_method
       @method
@@ -223,7 +231,7 @@ module Npolar::Api::Client
     alias :multi_get :get_uris
 
     # HEAD
-    def head(path=nil, param={}, header={})
+    def head(path=nil)
       execute(request(path, :head, nil, param, header))
     end
 
@@ -244,9 +252,9 @@ module Npolar::Api::Client
     
     # POST
     # @param [Array, Hash, String] body
-    def post(body, path=nil, param={}, header={})        
+    def post(body, path=nil)
       if header["Content-Type"] =~ /application\/(\w+[+])?json/
-        chunk_save(path, "POST", body, param, header)
+         chunk_save(path, "POST", body, param, header)
       else
         execute(
           request(path, :post, body, param, header)
@@ -255,7 +263,7 @@ module Npolar::Api::Client
     end
 
     # PUT
-    def put(body, path=nil, param={}, header={})
+    def put(body, path=nil)
       execute(
         request(path, :put, body, param, header)
       )

data/lib/npolar/api/client.rb

@@ -1,6 +1,7 @@
 require "yajl/json_gem"
 require "hashie"
 require "typhoeus"
+
 require "forwardable"
 require "uri"
 
@@ -8,7 +9,7 @@ module Npolar
   module Api
     module Client
 
-      VERSION = "0.2.0"
+      VERSION = "0.3.0"
 
       USER_AGENT = "npolar-api-client-ruby-#{VERSION}/Typhoeus-#{Typhoeus::VERSION}/libcurl-#{`curl --version`.chomp.split(" ")[1]}"
 

data/npolar-api-client-ruby.gemspec

@@ -7,14 +7,22 @@ $:.unshift lib unless $:.include?(lib)
   
 Gem::Specification.new do |s|
   s.name        = "npolar-api-client-ruby"
-  s.version     = "0.2.0" # Not DRY, trouble with include Npolar::Api::Client::VERSION
+  s.version     = "0.3.0" # Not DRY, trouble with include Npolar::Api::Client::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Conrad Helgeland"]
   s.email       = ["data*npolar.no"]
   s.homepage    = "http://github.com/npolar/npolar-api-client-ruby"
   s.summary     = "Ruby client library and command line tools for https://api.npolar.no"
   s.description = "Official Ruby client for the Norwegian Polar Institute's API."
-  s.add_development_dependency "rspec", "~> 2.0"
+
+  #s.add_development_dependency "rspec", "~> 2.0"
+  #s.add_development_dependency "bundler", "~> 2.0"
+
+  s.add_runtime_dependency "hashie" #, "~> 1"
+  s.add_runtime_dependency "typhoeus" #, "~> 0"
+  s.add_runtime_dependency "yajl-ruby" #, "~> 0"
+  s.add_runtime_dependency "uuidtools" #, "~> 1"
+  
   s.files        = Dir.glob("{lib}/**/*") + %w(README.md)
   s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths      = ["lib"]
@@ -22,4 +30,4 @@ Gem::Specification.new do |s|
   s.files              = git_files # + whatever_else
   s.test_files         = `git ls-files -- {test,spec}/*`.split("\n")
   s.require_paths      = ["lib"]
-end
+end

metadata

@@ -1,29 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: npolar-api-client-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Conrad Helgeland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Official Ruby client for the Norwegian Polar Institute's API.
 email:
 - data*npolar.no