wix 0.0.2 → 0.0.3

data/lib/wix.rb

@@ -1,5 +1,9 @@
+require 'base64'
+require 'json'
+require 'openssl'
 require "wix/instance"
 require "wix/version"
+require 'wix/errors/wix_error'
 
 module Wix
   extend self

data/lib/wix/errors/wix_error.rb

@@ -0,0 +1,13 @@
+module Wix
+  class WixError < StandardError
+    attr_reader :message
+
+    def initialize(message=nil)
+      @message = message
+    end
+
+    def to_s
+      "#{@message}"
+    end
+  end
+end

data/lib/wix/instance.rb

@@ -1,15 +1,27 @@
 module Wix
   class Instance
+    MISSING_WIX_SIGNED_INSTANCE = "You must pass a wix_signed_instance value to parse"
+    INVALID_WIX_SIGNED_INSTANCE = "The wix_signed_instance you passed is invalid"
+    INVALID_WIX_SIGNATURE       = "The signature from the wix_signed_instance you passed does not match your signature"
+
     def self.parse(wix_signed_instance)
-      signature, encoded_json = wix_signed_instance.split('.', 2)
-      
-      raise "Invalid signature" if !valid_signature(signature, encoded_json)
+      wix_signed_instance = wix_signed_instance.to_s.strip
+      raise WixError.new(MISSING_WIX_SIGNED_INSTANCE) if wix_signed_instance.empty?
+
+      split_wix_signed_instance = wix_signed_instance.split('.')
+      raise WixError.new(INVALID_WIX_SIGNED_INSTANCE) if split_wix_signed_instance.length != 2
+
+      signature     = split_wix_signed_instance[0]
+      encoded_json  = split_wix_signed_instance[1]
+      raise WixError.new(INVALID_WIX_SIGNATURE) if !valid_signature(signature, encoded_json)
 
       encoded_json_hack   = encoded_json + ('=' * (4 - encoded_json.length.modulo(4)))
       json_string         = Base64.urlsafe_decode64(encoded_json_hack)
       hash                = JSON.parse(json_string)
 
       RecursiveOpenStruct.new(hash, :recurse_over_arrays => true)
+    rescue => error
+      raise WixError.new(error.message)
     end
 
     def self.valid_signature(signature, encoded_json)

data/lib/wix/version.rb

@@ -1,3 +1,3 @@
 module Wix
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/wix/instance_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe Wix::Instance do
+  let(:instance) { Wix::Instance.parse(wix_signed_instance) }
+
+  context "nil for wix_signed_instance" do
+    let(:wix_signed_instance)        { nil }
+
+    it { lambda { instance }.should raise_error(StandardError, Wix::Instance::MISSING_WIX_SIGNED_INSTANCE) }
+  end
+
+  context "empty string for wix_signed_instance" do
+    let(:wix_signed_instance)        { "" }
+
+    it { lambda { instance }.should raise_error(StandardError, Wix::Instance::MISSING_WIX_SIGNED_INSTANCE) }
+  end
+
+  context "empty string with spaces for wix_signed_instance" do
+    let(:wix_signed_instance)        { " " }
+
+    it { lambda { instance }.should raise_error(StandardError, Wix::Instance::MISSING_WIX_SIGNED_INSTANCE) }
+  end
+
+  context "string without a . delimiter" do
+    let(:wix_signed_instance)        { "string-no-dot-delimiter" }
+
+    it { lambda { instance }.should raise_error(StandardError, Wix::Instance::INVALID_WIX_SIGNED_INSTANCE) }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wix
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -105,9 +105,11 @@ files:
 - README.md
 - Rakefile
 - lib/wix.rb
+- lib/wix/errors/wix_error.rb
 - lib/wix/instance.rb
 - lib/wix/version.rb
 - spec/spec_helper.rb
+- spec/wix/instance_spec.rb
 - spec/wix_spec.rb
 - wix.gemspec
 homepage: http://github.com/scottmotte/wix
@@ -124,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2201631256068211097
+      hash: 3518911956414316239
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2201631256068211097
+      hash: 3518911956414316239
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -142,4 +144,5 @@ specification_version: 3
 summary: Rubygem to interact with Wix's add-on marketplace API.
 test_files:
 - spec/spec_helper.rb
+- spec/wix/instance_spec.rb
 - spec/wix_spec.rb