grifter 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/grifter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "grifter"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Schultheis"]
-  s.date = "2013-05-09"
+  s.date = "2013-05-14"
   s.description = "convention based approach to interfacing with an HTTP JSON API."
   s.email = "rob@knewton.com"
   s.executables = ["grift"]

data/lib/grifter.rb

@@ -49,12 +49,11 @@ class Grifter
 
   def load_grifter_file filename
     Log.debug "Loading extension file '#{filename}'"
-    anon_mod = Module.new
     #by evaling in a anonymous module, we protect this class's namespace
-    load_dir = File.dirname(filename)
-    $: << load_dir
-    anon_mod.class_eval(IO.read(filename), filename, 1)
-    $:.pop
+    anon_mod = Module.new
+    with_local_load_path File.dirname(filename) do
+      anon_mod.class_eval(IO.read(filename), filename, 1)
+    end
     self.extend anon_mod
   end
 
@@ -63,7 +62,9 @@ class Grifter
     raise "No such file '#{filename}'" unless File.exist? filename
     #by running in a anonymous class, we protect this class's namespace
     anon_class = BlankSlate.new(self)
-    anon_class.instance_eval(IO.read(filename), filename, 1)
+    with_local_load_path File.dirname(filename) do
+      anon_class.instance_eval(IO.read(filename), filename, 1)
+    end
   end
 
   #calls all methods that end with grifter_authenticate
@@ -74,4 +75,14 @@ class Grifter
       self.send(m)
     end
   end
+
+private
+  def with_local_load_path load_path, &block
+    $: << load_path
+    rtn = yield block
+    #delete only the first occurrence, in case something else if changing load path too
+    idx = $:.index(load_path)
+    $:.delete_at(idx) if idx
+    rtn
+  end
 end

data/lib/grifter/json_helpers.rb

@@ -18,7 +18,6 @@ class Grifter
     rescue Exception
       obj.to_s
     end
-    #module_function :jsonify
 
     #attempts to parse json strings into native ruby objects
     def objectify json_string
@@ -32,7 +31,6 @@ class Grifter
       Log.debug "Unable to parse non-json object: #{e.to_s}"
       json_string
     end
-    #module_function :objectify
 
   end
 end

data/spec/json_helpers_spec.rb

@@ -50,4 +50,28 @@ describe Grifter::JsonHelpers do
     end
 
   end
+
+  describe :objectify do
+    it "should turn a json map string into a Hash" do
+      hsh = {'str' => 'abc', 'int' => 123, 'dec' => 12.34, 'bool' => true}
+      json = JSON.generate hsh
+      json_helper.objectify(json).should eql hsh
+    end
+
+    it "turn a json array string into an Array" do
+      arr = [1, 2.34, 'three', true]
+      json = JSON.generate arr
+      json_helper.objectify(json).should =~ arr
+    end
+
+    it "should return a non-string object as itself" do
+      obj = 12.34
+      json_helper.objectify(obj).should eql obj
+    end
+
+    it "should return a non-json string as itself" do
+      str = 'abc;123'
+      json_helper.objectify(str).should eql str
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grifter
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-09 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 95742656892023611
+      hash: -4169256621702839743
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: