neuron-client 0.0.1 → 0.0.2

data/Rakefile

@@ -22,9 +22,3 @@ task :console do
   puts "Loading development console..."
   system "irb -I #{File.join('.', 'lib')} -r #{File.join('.', 'lib', 'neuron-client')}"
 end
-
-task :force_release do
-  gem_helper = Bundler::GemHelper.new(Dir.pwd)
-  built_gem_path = gem_helper.build_gem
-  gem_helper.send(:rubygem_push, built_gem_path)
-end

data/lib/neuron-client/api.rb

@@ -27,7 +27,7 @@ module Neuron
           rescue
             raise "Invalid admin_url: #{@config.admin_url}"
           end
-          self.connection = Connection.new(@config.admin_url, @config.key)
+          self.connection = Connection.new(@config.admin_url, @config.admin_key)
           true
         end
 

data/lib/neuron-client/connection.rb

@@ -18,21 +18,31 @@ module Neuron
       end
 
       def get(path="", attrs={})
-        RestClient.get("#{@url}/#{path}.json?#{query_string(attrs)}", :content_type => :json, :accept => :json) do |response, request, result, &block|
+        format = attrs.delete(:format) || :json
+        RestClient.get("#{@url}/#{[path, format].select(&:present?).join(".")}?#{query_string(attrs)}", 
+          format.present? ? {:content_type => format, :accept => format} : {}) do |response, request, result, &block|
+          # follow redirection
+          if [301, 302, 307].include? response.code
+            response.follow_redirection(request, result, &block)
+          end
+
           case response.code
           when 200
-            return Yajl.load(response.to_str)
+            return (format == :json ? Yajl.load(response.to_str) : response.to_str)
           else
-            raise "Error : #{response.code} - #{response.to_str}"
+            raise "Error : #{response.inspect}"
           end
         end
       end
 
       def post(path="", form={}, attrs={})
-        RestClient.post("#{@url}/#{path}.json?#{query_string(attrs)}", Yajl.dump(form), :content_type => :json, :accept => :json) do |response, request, result, &block|
+        format = attrs.delete(:format) || :json
+        RestClient.post("#{@url}/#{[path, format].select(&:present?).join(".")}?#{query_string(attrs)}", 
+          (format == :json ? Yajl.dump(form) : form), 
+          format.present? ? {:content_type => format, :accept => format} : {}) do |response, request, result, &block|
           case response.code
           when 201
-            return Yajl.load(response.to_str)
+            return (format == :json ? Yajl.load(response.to_str) : response.to_str)
           else
             raise "Error : #{response.code} - #{response.to_str}"
           end
@@ -40,10 +50,13 @@ module Neuron
       end
 
       def put(path="", form={}, attrs={})
-        RestClient.put("#{@url}/#{path}.json?#{query_string}", Yajl.dump(form), :content_type => :json, :accept => :json) do |response, request, result, &block|
+        format = attrs.delete(:format) || :json
+        RestClient.put("#{@url}/#{[path, format].select(&:present?).join(".")}?#{query_string}", 
+          (format == :json ? Yajl.dump(form) : form), 
+          format.present? ? {:content_type => format, :accept => format} : {}) do |response, request, result, &block|
           case response.code
           when 200
-            return Yajl.load(response.to_str)
+            return (format == :json ? Yajl.load(response.to_str) : response.to_str)
           else
             raise "Error : #{response.code} - #{response.to_str}"
           end
@@ -51,10 +64,12 @@ module Neuron
       end
 
       def delete(path="", attrs={})
-        RestClient.delete("#{@url}/#{path}.json?#{query_string(attrs)}", :content_type => :json, :accept => :json) do |response, request, result, &block|
+        format = attrs.delete(:format) || :json
+        RestClient.delete("#{@url}/#{[path, format].select(&:present?).join(".")}?#{query_string(attrs)}", 
+          format.present? ? {:content_type => format, :accept => format} : {}) do |response, request, result, &block|
           case response.code
           when 200
-            return Yajl.load(response.to_str)
+            return (format == :json ? Yajl.load(response.to_str) : response.to_str)
           else
             raise "Error : #{response.code} - #{response.to_str}"
           end

data/lib/neuron-client/report.rb

@@ -0,0 +1,16 @@
+module Neuron
+  module Client
+    class Report
+      include Connected
+      resource_name("report")
+      resources_name("reports")
+
+      attr_accessor :errors
+      attr_accessor :template, :parameters, :status
+
+      def result
+        self.class.connection.get("reports/#{id}/result", :format => "")
+      end
+    end
+  end
+end

data/lib/neuron-client/version.rb

@@ -1,5 +1,5 @@
 module Neuron
   module Client
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/neuron-client.rb

@@ -9,4 +9,16 @@ require "neuron-client/blocked_user_agent"
 require "neuron-client/real_time_stats"
 require "neuron-client/report"
 require "neuron-client/s3_file"
-require "neuron-client/zone"
+require "neuron-client/zone"
+
+class Object
+  def blank?
+    return true if self.nil?
+    return true if self.respond_to?(:empty) && self.empty?
+    false
+  end
+
+  def present?
+    !self.blank?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neuron-client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 -05:00
+date: 2011-07-26 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153592420 !ruby/object:Gem::Requirement
+  requirement: &2161396140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.6.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153592420
+  version_requirements: *2161396140
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2153591920 !ruby/object:Gem::Requirement
+  requirement: &2161395640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 0.8.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153591920
+  version_requirements: *2161395640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153591460 !ruby/object:Gem::Requirement
+  requirement: &2161395180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2153591460
+  version_requirements: *2161395180
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2153591000 !ruby/object:Gem::Requirement
+  requirement: &2161394720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 0.4.2
   type: :development
   prerelease: false
-  version_requirements: *2153591000
+  version_requirements: *2161394720
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2153590500 !ruby/object:Gem::Requirement
+  requirement: &2161394220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *2153590500
+  version_requirements: *2161394220
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153622280 !ruby/object:Gem::Requirement
+  requirement: &2161393760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *2153622280
+  version_requirements: *2161393760
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2153621820 !ruby/object:Gem::Requirement
+  requirement: &2161393300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2153621820
+  version_requirements: *2161393300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153621360 !ruby/object:Gem::Requirement
+  requirement: &2161392840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2153621360
+  version_requirements: *2161392840
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2153620900 !ruby/object:Gem::Requirement
+  requirement: &2161392380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2153620900
+  version_requirements: *2161392380
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &2153620440 !ruby/object:Gem::Requirement
+  requirement: &2161391920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 1.10.2
   type: :development
   prerelease: false
-  version_requirements: *2153620440
+  version_requirements: *2161391920
 description: Neuron Admin Client Gem
 email:
 - devteam@rmmonline.com