dbox 0.7.0 → 0.7.1

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.1 / 2012-11-13
+  * Bug Fixes
+    * Resolved issue where push operations would fail when renaming files with spaces to underscores or vice versa.
+
 == 0.7.0 / 2012-11-05
   * Major Enhancements
     * Changed to be case insensitive, like Dropbox.

data/Rakefile

@@ -18,7 +18,6 @@ Jeweler::Tasks.new do |gem|
   gem.add_dependency "oauth", ">= 0.4.5"
   gem.add_dependency "json", ">= 1.5.3"
   gem.add_dependency "sqlite3", ">= 1.3.3"
-  gem.add_dependency "insensitive_hash", ">= 0.3.0"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/dbox.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "dbox"
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ken Pratt"]
-  s.date = "2012-11-06"
+  s.date = "2012-11-13"
   s.description = "An easy-to-use Dropbox client with fine-grained control over syncs."
   s.email = "ken@kenpratt.net"
   s.executables = ["dbox"]
@@ -48,7 +48,8 @@ Gem::Specification.new do |s|
     "vendor/dropbox-ruby-sdk/lib/trusted-certs.crt",
     "vendor/dropbox-ruby-sdk/search_cache.json",
     "vendor/dropbox-ruby-sdk/search_cache.rb",
-    "vendor/dropbox-ruby-sdk/web_file_browser.rb"
+    "vendor/dropbox-ruby-sdk/web_file_browser.rb",
+    "vendor/insensitive_hash_patched.rb"
   ]
   s.homepage = "http://github.com/kenpratt/dbox"
   s.licenses = ["MIT"]
@@ -64,20 +65,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<oauth>, [">= 0.4.5"])
       s.add_runtime_dependency(%q<json>, [">= 1.5.3"])
       s.add_runtime_dependency(%q<sqlite3>, [">= 1.3.3"])
-      s.add_runtime_dependency(%q<insensitive_hash>, [">= 0.3.0"])
     else
       s.add_dependency(%q<multipart-post>, [">= 1.1.2"])
       s.add_dependency(%q<oauth>, [">= 0.4.5"])
       s.add_dependency(%q<json>, [">= 1.5.3"])
       s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
-      s.add_dependency(%q<insensitive_hash>, [">= 0.3.0"])
     end
   else
     s.add_dependency(%q<multipart-post>, [">= 1.1.2"])
     s.add_dependency(%q<oauth>, [">= 0.4.5"])
     s.add_dependency(%q<json>, [">= 1.5.3"])
     s.add_dependency(%q<sqlite3>, [">= 1.3.3"])
-    s.add_dependency(%q<insensitive_hash>, [">= 0.3.0"])
   end
 end
 

data/lib/dbox.rb

@@ -1,5 +1,6 @@
 ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 $:.unshift File.join(ROOT_PATH, "lib")
+$:.unshift File.join(ROOT_PATH, "vendor")
 $:.unshift File.join(ROOT_PATH, "vendor", "dropbox-ruby-sdk", "lib")
 
 require "dropbox_sdk"
@@ -9,7 +10,7 @@ require "yaml"
 require "logger"
 require "cgi"
 require "sqlite3"
-require "insensitive_hash/minimal"
+require "insensitive_hash_patched"
 
 require "dbox/loggable"
 require "dbox/utils"

data/vendor/insensitive_hash_patched.rb

@@ -0,0 +1,191 @@
+# A slightly patched version of https://github.com/junegunn/insensitive_hash v0.3.0
+# that is not insensitive to underscores vs. strings.
+#
+# Copyright (c) 2011 Junegunn Choi
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+#                                                             "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class InsensitiveHash < Hash
+  class KeyClashError < Exception
+  end
+
+  def initialize default = nil, &block
+    if block_given?
+      raise ArgumentError.new('wrong number of arguments') unless default.nil?
+      super &block
+    else
+      super
+    end
+
+    @key_map    = {}
+    @safe       = false
+  end
+
+  # Sets whether to detect key clashes
+  # @param [Boolean] 
+  # @return [Boolean]
+  def safe= s
+    raise ArgumentError.new("Neither true nor false") unless [true, false].include?(s)
+    @safe = s
+  end
+
+  # @return [Boolean] Key-clash detection enabled?
+  def safe?
+    @safe
+  end
+  
+  # Returns a normal, sensitive Hash
+  # @return [Hash]
+  def to_hash
+    {}.merge self
+  end
+  alias sensitive to_hash
+
+  def self.[] *init
+    h = Hash[*init]
+    InsensitiveHash.new.tap do |ih|
+      ih.merge! h
+    end
+  end
+
+  %w[[] assoc has_key? include? key? member?].each do |symb|
+    class_eval <<-EVAL
+      def #{symb} key
+        super lookup_key(key)
+      end
+    EVAL
+  end
+
+  def []= key, value
+    delete key
+    ekey = encode key
+    @key_map[ekey] = key
+    super key, value
+  end
+  alias store []=
+
+  def merge! other_hash
+    detect_clash other_hash
+    other_hash.each do |key, value|
+      deep_set key, value
+    end
+    self
+  end
+  alias update! merge!
+
+  def merge other_hash
+    InsensitiveHash.new.tap do |ih|
+      ih.replace self
+      ih.merge! other_hash
+    end
+  end
+  alias update merge
+
+  def delete key, &block
+    super lookup_key(key, true), &block
+  end
+
+  def clear
+    @key_map.clear
+    super
+  end
+
+  def replace other
+    super other
+
+    self.safe = other.respond_to?(:safe?) ? other.safe? : safe?
+
+    @key_map.clear
+    self.each do |k, v|
+      ekey = encode k
+      @key_map[ekey] = k
+    end
+  end
+
+  def shift
+    super.tap do |ret|
+      @key_map.delete_if { |k, v| v == ret.first }
+    end
+  end
+
+  def values_at *keys
+    keys.map { |k| self[k] }
+  end
+
+  def fetch *args, &block
+    args[0] = lookup_key(args[0]) if args.first
+    super *args, &block
+  end
+
+  def dup
+    super.tap { |copy|
+      copy.instance_variable_set :@key_map, @key_map.dup
+    }
+  end
+
+  def clone
+    super.tap { |copy|
+      copy.instance_variable_set :@key_map, @key_map.dup
+    }
+  end
+
+private
+  def deep_set key, value
+    wv = wrap value
+    self[key] = wv
+  end
+
+  def wrap value
+    case value
+    when InsensitiveHash
+      value
+    when Hash
+      InsensitiveHash[value]
+    when Array
+      value.map { |v| wrap v }
+    else
+      value
+    end
+  end
+
+  def lookup_key key, delete = false
+    ekey = encode key
+    if @key_map.has_key?(ekey)
+      delete ? @key_map.delete(ekey) : @key_map[ekey]
+    else
+      key
+    end
+  end
+
+  def encode key
+    case key
+    when String, Symbol
+      key.to_s.downcase
+    else
+      key
+    end
+  end
+
+  def detect_clash hash
+    hash.keys.map { |k| encode k }.tap { |ekeys|
+      raise KeyClashError.new("Key clash detected") if ekeys != ekeys.uniq
+    } if @safe
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dbox
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Ken Pratt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-06 00:00:00 Z
+date: 2012-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multipart-post
@@ -81,22 +81,6 @@ dependencies:
         version: 1.3.3
   type: :runtime
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: insensitive_hash
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  type: :runtime
-  version_requirements: *id005
 description: An easy-to-use Dropbox client with fine-grained control over syncs.
 email: ken@kenpratt.net
 executables: 
@@ -138,6 +122,7 @@ files:
 - vendor/dropbox-ruby-sdk/search_cache.json
 - vendor/dropbox-ruby-sdk/search_cache.rb
 - vendor/dropbox-ruby-sdk/web_file_browser.rb
+- vendor/insensitive_hash_patched.rb
 homepage: http://github.com/kenpratt/dbox
 licenses: 
 - MIT