ragios-client 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 09b98557ec97a23273955677e3c7a598b203b62c
+  data.tar.gz: 1a085ade4b9fc6db130fc147378011d854ccb346
+SHA512:
+  metadata.gz: 23b1f879fe0702210f7af4d3faee489f2cfbe731d7ab1cf05d2b9f51da670902366e5ad1c8f9daa75d0f52c56e3918658bb18d8247b7c06101890750a4c420ed
+  data.tar.gz: fed5f2b956daac6d810c34928ec0e0db1c788dcdc96f36b4c526526ba3dd85c4cbfe552dda708615b6f9286edde0da5de038cb83571aa35dc1b5fc91a6a274bd

data/Gemfile

@@ -3,15 +3,14 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem "rest-client"
-gem "yajl-ruby"
+gem "json_pure"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "pry"
-  gem "shoulda", ">= 0"
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.0"
   gem "jeweler", "~> 1.8.7"
-  gem "simplecov"
+  gem "rspec"
 end

data/Gemfile.lock

@@ -1,17 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
     addressable (2.3.5)
-    atomic (1.1.14)
     builder (3.2.2)
     coderay (1.1.0)
-    docile (1.1.1)
+    diff-lcs (1.2.4)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     git (1.2.6)
@@ -25,7 +18,6 @@ GEM
     hashie (2.0.5)
     highline (1.6.20)
     httpauth (0.2.0)
-    i18n (0.6.9)
     jeweler (1.8.8)
       builder
       bundler (~> 1.0)
@@ -36,11 +28,11 @@ GEM
       rake
       rdoc
     json (1.8.1)
+    json_pure (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
     method_source (0.8.2)
     mime-types (1.25.1)
-    minitest (4.7.5)
     multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
@@ -62,22 +54,15 @@ GEM
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    shoulda (3.5.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (>= 1.4.1, < 3.0)
-    shoulda-context (1.1.6)
-    shoulda-matchers (2.4.0)
-      activesupport (>= 3.0.0)
-    simplecov (0.8.2)
-      docile (~> 1.1.0)
-      multi_json
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.6)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     slop (3.4.7)
-    thread_safe (0.1.3)
-      atomic
-    tzinfo (0.3.38)
-    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby
@@ -85,9 +70,8 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0)
   jeweler (~> 1.8.7)
+  json_pure
   pry
   rdoc (~> 3.12)
   rest-client
-  shoulda
-  simplecov
-  yajl-ruby
+  rspec

data/Rakefile

@@ -25,21 +25,6 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-#require 'rcov/rcovtask'
-#Rcov::RcovTask.new do |test|
-#  test.libs << 'test'
-#  test.pattern = 'test/**/test_*.rb'
-#  test.verbose = true
-#  test.rcov_opts << '--exclude "gems/*"'
-#end
-
 task :repl do
   ragios_client_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'ragios-client/lib/ragios-client'))
   irb = "bundle exec pry -r #{ragios_client_file}"

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/ragios-client.rb

@@ -1,5 +1,5 @@
 require 'rest_client'
-require 'yajl'
+require 'json/pure'
 require 'uri'
 
 module Ragios
@@ -26,66 +26,42 @@ module Ragios
     end
 
     def add(monitors)
-      response = RestClient.post "#{address_port}/monitors/", json(monitors), http_request_options
-      parse_json(response.body)
-    rescue => e
-      raise_error(e)
+      api_request { RestClient.post "#{address_port}/monitors/", generate_json(monitors), http_request_options }
     end
-
     def find(monitor_id)
-      response = RestClient.get "#{address_port}/monitors/#{monitor_id}/", auth_cookie
-      parse_json(response.body)
-    rescue => e
-      raise_error(e)
+      api_request { RestClient.get "#{address_port}/monitors/#{monitor_id}/", auth_cookie }
     end
-
     def all
-      response = RestClient.get "#{address_port}/monitors/", auth_cookie
-      parse_json(response.body)
+      api_request { RestClient.get "#{address_port}/monitors/", auth_cookie }
     end
-
     def stop(monitor_id)
-      response = RestClient.put "#{address_port}/monitors/#{monitor_id}",{:status => "stopped"}, http_request_options
-      parse_json(response)
-    rescue => e
-      raise_error(e)
+      api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",{:status => "stopped"}, http_request_options }
     end
-
     def restart(monitor_id)
-      response = RestClient.put "#{address_port}/monitors/#{monitor_id}",{:status => "active"},http_request_options
-      parse_json(response)
-    rescue => e
-      raise_error(e)
+      api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",{:status => "active"},http_request_options }
     end
-
     def delete(monitor_id)
-      response = RestClient.delete "#{address_port}/monitors/#{monitor_id}", auth_cookie
-      parse_json(response)
-    rescue => e
-      raise_error(e)
+      api_request { RestClient.delete "#{address_port}/monitors/#{monitor_id}", auth_cookie }
     end
-
     def where(options)
-      response = RestClient.get "#{address_port}/monitors?#{URI.encode_www_form(options)}", auth_cookie
-      parse_json(response)
+      api_request { RestClient.get "#{address_port}/monitors?#{URI.encode_www_form(options)}", auth_cookie }
     end
-
     def update(monitor_id, options)
-      response = RestClient.put "#{address_port}/monitors/#{monitor_id}",json(options), http_request_options
-      parse_json(response)
-    rescue => e
-      raise_error(e)
+      api_request { RestClient.put "#{address_port}/monitors/#{monitor_id}",generate_json(options), http_request_options }
     end
 
     def test(monitor_id)
-      response = RestClient.post "#{address_port}/tests", {:id => monitor_id}, http_request_options
+      api_request { RestClient.post "#{address_port}/tests", {:id => monitor_id}, http_request_options }
+    end
+
+private
+    def api_request
+      response = yield
       parse_json(response)
     rescue => e
       raise_error(e)
     end
 
-private
-
     def raise_error(e)
       e.respond_to?('response') ? raise(ClientException, e.response) : raise(e)
     end
@@ -104,19 +80,18 @@ private
       "#{@address}:#{@port}"
     end
 
-    def json(str)
-      Yajl::Encoder.encode(str)
+    def generate_json(str)
+      JSON.generate(str)
     end
 
     def parse_json(str)
-      Yajl::Parser.parse(str, :symbolize_keys => true)
+      JSON.parse(str, symbolize_names: true)
     end
 
     def auth_session
-      #deal with performance when it becomes a problem not yet a priority
       auth = RestClient.post "#{address_port}/session", { :username=> @username, :password => @password}
-      hash = Yajl::Parser.parse(auth.to_str)
-      hash['AuthSession']
+      hash = parse_json(auth)
+      hash[:AuthSession]
     rescue => e
       raise_error(e)
     end

data/ragios-client.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: ragios-client 0.0.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ragios-client"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["obi-a"]
-  s.date = "2014-04-18"
+  s.date = "2014-04-26"
   s.description = "ruby client for ragios"
   s.email = "obioraakubue@yahoo.com"
   s.extra_rdoc_files = [
@@ -30,41 +32,37 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/obi-a/ragios-client"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.28"
+  s.rubygems_version = "2.2.2"
   s.summary = "Ruby client for ragios"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 0"])
       s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
+      s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
+    s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
 

data/spec/ragios-client_spec.rb

@@ -60,7 +60,7 @@ describe "Ragios Client" do
   end
 
   it "cannot add a badly formed monitor" do
-    expect{@ragios.add("bad data")}.to raise_error(Ragios::ClientException)
+    expect{@ragios.add("bad data")}.to raise_error(JSON::GeneratorError)
   end
 
   it "should retrieve a monitor by id" do
@@ -158,7 +158,7 @@ describe "Ragios Client" do
     monitor_id = returned_monitors.first[:_id]
     #setup ends
 
-    expect { @ragios.update(monitor_id,"bad data") }.to raise_error(Ragios::ClientException)
+    expect { @ragios.update(monitor_id,"bad data") }.to raise_error(JSON::GeneratorError)
 
     #teardown
     hash = @ragios.delete(monitor_id)

metadata

@@ -1,142 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ragios-client
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - obi-a
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.8.7
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ruby client for ragios
@@ -147,7 +116,7 @@ extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 files:
-- .document
+- ".document"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -160,29 +129,25 @@ files:
 homepage: http://github.com/obi-a/ragios-client
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3019979110214078763
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.28
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby client for ragios
 test_files: []