bone 0.3.1 → 0.3.2

data/CHANGES.txt

@@ -1,5 +1,10 @@
 BONE, CHANGES
 
+#### 0.3.2 (2010-12-20) ###############################
+
+* ADDED: Updated canonical_host handling for String input
+
+
 #### 0.3.1 (2010-12-17) ###############################
 
 * FIXED: Bone::VERSION

data/Rakefile

@@ -25,7 +25,7 @@ begin
     gem.email = "delano@solutious.com"
     gem.homepage = "https://github.com/solutious/bone"
     gem.authors = ["Delano Mandelbaum"]
-    gem.add_dependency("familia",            ">= 0.6.0")
+    gem.add_dependency("familia",            ">= 0.6.1")
     gem.add_dependency("em-http-request")
   end
   Jeweler::GemcutterTasks.new

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :MAJOR: 0
 :MINOR: 3
-:PATCH: 1
+:PATCH: 2

data/bone.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bone}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Delano Mandelbaum"]
-  s.date = %q{2010-12-17}
+  s.date = %q{2010-12-20}
   s.default_executable = %q{bone}
   s.description = %q{A simple store for remote environment variables}
   s.email = %q{delano@solutious.com}
@@ -66,14 +66,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<familia>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<familia>, [">= 0.6.1"])
       s.add_runtime_dependency(%q<em-http-request>, [">= 0"])
     else
-      s.add_dependency(%q<familia>, [">= 0.6.0"])
+      s.add_dependency(%q<familia>, [">= 0.6.1"])
       s.add_dependency(%q<em-http-request>, [">= 0"])
     end
   else
-    s.add_dependency(%q<familia>, [">= 0.6.0"])
+    s.add_dependency(%q<familia>, [">= 0.6.1"])
     s.add_dependency(%q<em-http-request>, [">= 0"])
   end
 end

data/lib/bone/api.rb

@@ -174,10 +174,14 @@ class Bone
         end
         
         def canonical_host host
-          if URI === host
-            host.port ||= 80
-            host = [host.host.to_s, host.port.to_s].join(':')
+          unless URI === host
+            host = host.to_s unless String === host
+            host.strip!
+            host = "http://#{host}" unless host.match(/^https?:\/\//)
+            host = URI.parse(host)
           end
+          host.port ||= 80
+          host = [host.host.to_s, host.port.to_s].join(':')
           host.downcase
         end
         
@@ -332,7 +336,7 @@ class Bone
       end
       def destroy(token, secret)
         Token.tokens.delete token
-        Token.new(token).secret.destroy!
+        Token.new(token).secret.delete
       end
       def register(token, secret)
         raise RuntimeError, "Could not generate token" if token.nil? || token?(token)

data/lib/bone/cli.rb

@@ -71,7 +71,7 @@ class Bone::CLI < Drydock::Command
     unless t.nil?
       puts "# Your token for #{Bone.source}"
       puts "BONE_TOKEN=#{t}"
-      puts "BONE_SECRET=#{s}"
+      puts "BONE_SECRET='#{s}'"
     end
   #rescue Bone::NoToken => ex
   #  update_token_dialog

data/try/25_key_token_object_try.rb

@@ -9,7 +9,7 @@ Bone::API::Redis::Token.redis_objects.keys.collect(&:to_s).sort
 
 ## Bone::API::Redis::Token.redis_objects
 Bone::API::Redis::Token.class_redis_objects.keys
-#=> [:tokens]
+#=> [:tokens, :instances]
 
 ## Bone::API::Redis::Token.new
 @tobj = Bone::API::Redis::Token.new :atoken
@@ -18,7 +18,7 @@ Bone::API::Redis::Token.class_redis_objects.keys
 
 ## Bone::API::Redis::Token#secret
 @tobj.secret.class
-#=> Familia::Object::String
+#=> Familia::String
 
 ## Bone::API::Redis::Token#secret= doesn't exist
 @tobj.secret = :poop
@@ -26,7 +26,7 @@ Bone::API::Redis::Token.class_redis_objects.keys
 
 ## Bone::API::Redis::Token#secret isn't affected by secret=
 @tobj.secret.class
-#=> Familia::Object::String
+#=> Familia::String
 
 ## Bone::API::Redis::Token#secret to_s
 @tobj.secret.to_s
@@ -43,7 +43,7 @@ Bone::API::Redis::Key.redis_objects.keys
 
 ## Bone::API::Redis::Key#value
 @kobj.value.class
-#=> Familia::Object::String
+#=> Familia::String
 
 ## Bone::API::Redis::Key#value to_s returns empty string
 @kobj.value.to_s
@@ -59,7 +59,7 @@ Bone::API::Redis::Key.redis_objects.keys
 
 ## Bone::API::Redis::Key#value set
 @kobj.value.set 'avalue2'
-#=> 'avalue2'
+#=> 'OK'
 
 ## Bone::API::Redis::Key#value clear
 @kobj.value.clear

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bone
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 3
-  - 1
-  version: 0.3.1
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-17 00:00:00 -05:00
+date: 2010-12-20 00:00:00 -05:00
 default_executable: bone
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 0
         - 6
-        - 0
-        version: 0.6.0
+        - 1
+        version: 0.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency