shaman 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6129447825ba95c5b5a182269fb5ccf10fbd533f
-  data.tar.gz: 2caed2e406353fc44d3d5d7b48879e94d71f61aa
+  metadata.gz: 7cd52348febf120902db58d4f50ea4e66c5211e8
+  data.tar.gz: 11b1a43720cc211d9b60d586e598d6469e7932c7
 SHA512:
-  metadata.gz: e4033a914b6bbcfbfceea5514ba6b10a1fbe7eb82fb41dffd2753010f3640e300e8051692c3466e67d3180aa95f093b61b375bdc2bcb5ce07f2a2fc34d73e2ac
-  data.tar.gz: 9514099d6e5a21516452226be3dae9462ea42aa11355df5a0b0a4ae2a00c69032b30b7777a34b8caf854ff421dd59ca4fe009ba3c612078b3a650bfab579bf30
+  metadata.gz: b45bb6d541bb36ecffa7ddaaeb65803933dd7920cf015dc219929af1b1d39d273ea9c555b273ed47b4af514dc2e80be0246a8d44158c72791c8ff557897964f5
+  data.tar.gz: 5ec1995754fcb71c413e5b556624d84474a87708bc2cc688b0f74985facacbdda6927913ab8d2ce9d55912cc49f158124b80612a8c109a78c8b580045e9b7696

data/lib/shaman.rb

@@ -1,5 +1,7 @@
-require "shaman/version"
+require 'shaman/version'
+require 'digest'
 require 'oj'
+require 'active_support/core_ext/hash/conversions'
 
 class Shaman
   attr_reader :body
@@ -12,24 +14,38 @@ class Shaman
     Digest::MD5.hexdigest(prepped_body.to_s)
   end
 
-  def valid_json_body?
-    parsed_body.class == Hash
+  def valid_json?
+    parsed_json.class == Hash
   end
+  alias valid_json_body? valid_json?
 
-  private
-
-  def prepped_body
-    if valid_json_body?
-      Hash[parsed_body.sort]
-    else
-      parsed_body
-    end
+  def valid_xml?
+    parsed_xml.class == Hash
   end
 
-  def parsed_body
-    @parsed_body ||= Oj.load(body)
+  def parsed_json
+    @parsed_json ||= Oj.load(body)
   rescue Oj::ParseError
     body
   end
 
+  def parsed_xml
+    @parsed_xml ||= Hash.from_xml(body)
+  rescue REXML::ParseException
+    body
+  end
+
+  def prepped_body
+    sort_body = parsed_json or parsed_xml or body
+    sorted_hash(sort_body)
+  end
+
+  def sorted_hash(obj)
+    return obj unless obj.is_a?(Hash)
+    hash = Hash.new
+    obj.each { |k, v| hash[k] = sorted_hash(v) }
+    sorted = hash.sort { |a, b| a[0].to_s <=> b[0].to_s }
+    Hash[sorted]
+  end
+
 end

data/lib/shaman/version.rb

@@ -1,3 +1,3 @@
 class Shaman
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/shaman.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "oj"
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pry"
 end

data/spec/lib/shaman_spec.rb

@@ -1,42 +1,77 @@
+require 'oj'
 require 'shaman'
 
 describe Shaman do
 
-  describe "#valid_json_body?" do
-    subject { described_class.new(body) }
-    context "when #body can be parsed to a Hash" do
-      let(:body) { %q[{"foo":"bar"}] }
-      it "returns true" do
-        expect(subject.valid_json_body?).to be true
-      end
+  subject do
+    described_class.new(body)
+  end
+
+  context "when #body can be parsed to a Hash" do
+    let(:body) { %q[{"foo":"bar"}] }
+    it "returns true" do
+      expect(subject.valid_json_body?).to be true
     end
-    context "when #body can't be parsed to a Hash" do
-      let(:body) { %q["{foo"] }
-      it "returns false" do
-        expect(subject.valid_json_body?).to be false
-      end
+  end
+
+  context "when #body can't be parsed to a Hash" do
+    let(:body) { %q["{foo"] }
+    it "returns false" do
+      expect(subject.valid_json?).to be false
+    end
+  end
+
+  context "when #body cannot be parsed" do
+    let(:body) { %q[{foo] }
+    it "returns false" do
+      expect(subject.valid_json?).to be false
+    end
+  end
+
+  describe "#sha" do
+
+    subject do
+      described_class.new(body).sha
     end
-    context "when #body cannot be parsed" do
-      let(:body) { %q[{foo] }
-      it "returns false" do
-        expect(subject.valid_json_body?).to be false
+
+    context "when request is valid JSON" do
+      let(:body) { %q[{"foo":"bar"}] }
+      it "creates a sha of the parsed JSON" do
+        expect(subject).to eq('f59494512dabbab0cd0a421c43834271')
       end
     end
+    context "when request is not valid JSON"
+    let(:body) { %q[{foo] }
+    it "creates a sha of the body" do
+      expect(subject).to eq('594b979db0ddeee4bed8d10e9a2d21b1')
+    end
 
-    describe "#sha" do
-      subject { described_class.new(body).sha }
-      context "when request is valid JSON" do
-        let(:body) { %q[{"foo":"bar"}] }
-        it "creates a sha of the parsed JSON" do
-          expect(subject).to eq('f59494512dabbab0cd0a421c43834271')
-        end
+    context "with nested valid JSON" do
+      let(:body) do
+        foo = {
+          z: {yar: "dar"},
+          a: {c: "baz"},
+          b: {
+            d: "mother",
+            a: "father"
+          }
+        }
+        Oj.dump(foo)
       end
-      context "when request is not valid JSON"
-      let(:body) { %q[{foo] }
-      it "creates a sha of the body" do
-        expect(subject).to eq('594b979db0ddeee4bed8d10e9a2d21b1')
+
+      it "creates a sha of the parsed sorted json" do
+        expect(subject).to eq("27bd24ec44f579a3a9d843121b9daaa8")
       end
     end
+  end
 
+  describe "valid xml body" do
+    context "when #body can be parsed to a Hash" do
+      let(:body) { %q[<xml><foo>bar></foo></xml>] }
+      it "returns true" do
+        expect(subject.valid_xml?).to be true
+      end
+    end
   end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shaman
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Micah Cooper
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Convert a string into a MD5. If the string is Valid JSON, parse it, sort
   the keys, and then turn it into a MD5.
 email: