bone 0.2.3 → 0.2.4

data/CHANGES.txt

@@ -1,5 +1,11 @@
 BONE, CHANGES
 
+#### 0.2.4 (2010-01-25) ###############################
+
+* CHANGE: URI path starts with /bone/v1 instead of just /v1
+* CHANGE: Depends on Boned 0.2.4
+
+
 #### 0.2.3 (2010-01-09) ###############################
 
 * CHANGE: Bone.get and Bone[] no longer raise an exception for unknown keys

data/bone.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "bone"
   s.rubyforge_project = 'bone'
-  s.version = "0.2.3"
+  s.version = "0.2.4"
   s.summary = "Get Bones"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -15,7 +15,7 @@
   
   s.executables = %w[bone]
   
-  s.add_dependency 'boned',    '= 0.2.0'
+  s.add_dependency 'boned',    '= 0.2.4'
   
   # = MANIFEST =
   # git ls-files

data/lib/bone.rb

@@ -1,5 +1,6 @@
 require 'uri'
 require 'net/http'
+require 'net/https'
 
 unless defined?(BONE_HOME)
   BONE_HOME = File.expand_path(File.join(File.dirname(__FILE__), '..') )
@@ -7,7 +8,7 @@ end
 
 module Bone
   extend self
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
   APIVERSION = 'v1'.freeze
   
   class Problem < RuntimeError; end
@@ -27,7 +28,7 @@ module Bone
     end
   end
   
-  SOURCE = (ENV['BONE_SOURCE'] || "localhost:6043").freeze
+  SOURCE = (ENV['BONE_SOURCE'] || "http://localhost:6043").freeze
   TOKEN = ENV['BONE_TOKEN'].freeze
   
   # Get a key from the boned server. Same as `get!`  
@@ -119,10 +120,16 @@ module Bone
   
   def request(action, token, key, params={})
     params[:token] = token
-    path = "/#{APIVERSION}/#{action}/#{key}"
-    host, port = *SOURCE.split(':')
-    port ||= 6043
+    path = "/bone/#{APIVERSION}/#{action}/#{key}"
+    source = SOURCE
+    unless source.match(/\Ahttp/)
+      source = ['http:', SOURCE].join('//')
+    end
+    uri = URI.parse source
+    host, port = uri.host, uri.port
+    port ||= (uri.scheme == 'https' ? 443 : 6043)
     
+    Bone.ld "SOURCE: #{uri.to_s}"
     Bone.ld "URI: #{path}"
     Bone.ld "PARAMS: " << params.inspect
     
@@ -144,7 +151,9 @@ module Bone
     else
       raise Bone::Problem, "Unknown action: #{action}"
     end
-    res = Net::HTTP.start(host, port) {|http| http.request(req) }
+    http = Net::HTTP.new(host, port)
+    http.use_ssl = true if uri.scheme == 'https'
+    res = http.request(req) 
     case res
     when Net::HTTPSuccess, Net::HTTPRedirection
       res.body

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bone
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -05:00
+date: 2010-01-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 0.2.4
     version: 
 description: Get Bones
 email: delano@solutious.com