zipmark 0.0.1.beta.1 → 0.0.1.beta.2

data/lib/zipmark/adapters/httparty_adapter.rb

@@ -1,5 +1,8 @@
 module Zipmark
   module Adapters
+    # Public: The HTTParty Adapter.
+    #
+    # Important Note: PUT is broken in HTTParty when using Digest Auth
     class HTTPartyAdapter
       begin
         require 'httparty'

data/lib/zipmark/adapters/httpclient_adapter.rb

@@ -4,7 +4,7 @@ module Zipmark
       begin
         require 'httpclient'
       rescue LoadError
-        puts 'You must install httpclient to use Zipmark::Adapters::HTTClientAdapter '
+        puts 'You must install httpclient to use Zipmark::Adapters::HTTPClientAdapter '
       end
 
       attr_accessor :username, :password, :production

data/lib/zipmark/callback.rb

@@ -1,17 +1,33 @@
+require'base64'
+require 'openssl'
+
 module Zipmark
   class Callback
-    attr_accessor :request, :errors
+    attr_accessor :request, :errors, :client
 
     def initialize(request, options = {})
       raise ArgumentError, "Request cannot be nil" unless request
       @request = request
       @errors = {}
+      @client = options[:client]
     end
 
     def body
       @request.raw_post
     end
 
+    def identifier
+      client.identifier if client
+    end
+
+    def application_identifier
+      client.adapter.username if client
+    end
+
+    def secret
+      client.adapter.password if client
+    end
+
     def event
       raise "unimplemented"
     end
@@ -37,7 +53,12 @@ module Zipmark
     end
 
     def date_within_range?
-      date && date < Time.now + 15.minutes && date > Time.now - 15.minutes
+      date && date < Time.now + allowable_interval && date > Time.now - allowable_interval
+    end
+
+    def allowable_interval
+      # 15 minutes
+      15 * 60
     end
 
     def valid?
@@ -45,13 +66,13 @@ module Zipmark
     end
 
     def validate_authorization
-      string_to_sign = ["POST",hashed_content,'application/json',date.rfc2822,uri,identifier].join("\n")
-      signed_string = ActiveSupport::Base64.encode64s(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret, string_to_sign))
-      valid_authorization = "ZM #{ActiveSupport::Base64.encode64s(identifier)}:#{signed_string}"
+      string_to_sign = ["POST",hashed_content,'application/json',date.rfc2822,uri,application_identifier].join("\n")
+      signed_string = Base64.strict_encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret, string_to_sign))
+      valid_authorization = "ZM #{Base64.strict_encode64(identifier)}:#{signed_string}"
       if authorization_header == valid_authorization
         return true
       else
-        @errors[:authorization] = "Signature does not match."
+        errors[:authorization] = "Signature does not match."
         return false
       end
     end
@@ -60,7 +81,7 @@ module Zipmark
       if date_within_range?
         return true
       else
-        @errors[:date] = "Date is not within bounds."
+        errors[:date] = "Date is not within bounds."
         return false
       end
     end

data/lib/zipmark/client.rb

@@ -12,19 +12,23 @@ module Zipmark
 
     # Public: Initialize a Zipmark Client
     #
+    # options - Hash options used to configure the Client (default: {})
     # application_id - The Identifier for your application
     # application_secret - The Secret for your Application
-    # options - Hash options used to configure the Client (default: {})
     #      :adapter - The Instance of an Adapter that wraps your preferred HTTP Client
     #      :production - The Boolean determining if Production Mode is enabled
-    def initialize(application_id, application_secret, options = {})
+    def initialize(options = {})
       @adapter = options[:adapter] || Zipmark::Adapters::HTTPClientAdapter.new
       adapter.production = options[:production]
-      adapter.username = application_id
-      adapter.password = application_secret
+      adapter.username = options[:application_id]
+      adapter.password = options[:application_secret]
+      @identifier = options[:vendor_identifier]
       @resources = load_resources
     end
 
+    def identifier
+      @identifier
+    end
 
     # Public: Send a GET Request to the given API Path
     #
@@ -56,6 +60,10 @@ module Zipmark
       adapter.delete(path)
     end
 
+    def build_callback(request)
+      Zipmark::Callback.new(request, :client => self)
+    end
+
     def method_missing(meth, *args, &block)
       @resources[meth.to_s] || raise(NoMethodError, "No resource or method: '#{meth}'")
     end

data/lib/zipmark/entity.rb

@@ -10,6 +10,10 @@ module Zipmark
       @resource_type = @attributes.delete("resource_type")
     end
 
+    def inspect
+      "<Entity:#{object_id} #{attributes.inspect}>"
+    end
+
     def method_missing(meth, *args, &block)
       if meth =~ /=$/
         dirty_attributes[meth.to_s.sub(/=$/, '')] = args.first

data/lib/zipmark/input.rb

@@ -1,5 +1,21 @@
+# Plans to support  the following input types:
+# checkbox
+# date
+# datetime
+# email
+# month
+# number
+# password
+# radio
+# range
+# search
+# tel
+# text
+# time
+# url
+# week
 module Zipmark
   class Input
-    attr_accessor :type, :required, :name, :title, :placeholder, :value
+    attr_accessor :type, :required, :name, :placeholder, :value
   end
 end

data/lib/zipmark/version.rb

@@ -1,3 +1,3 @@
 module Zipmark
-  VERSION = '0.0.1.beta.1'
+  VERSION = '0.0.1.beta.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zipmark
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta.1
+  version: 0.0.1.beta.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-01 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Simple Client Library to connect to the Zipmark API
 email: jake@zipmark.com