invoiced 0.7.0 → 0.8.0

data/lib/invoiced/object.rb

@@ -1,167 +1,167 @@
 module Invoiced
-	class Object
-		include Enumerable
-
-		attr_reader :client
-
-		 @@permanent_attributes = Set.new([:id])
-
-		def initialize(client, id=nil, values={})
-			@client = client
-			class_name = self.class.name.split('::').last
-			@endpoint_base = ''
-			@endpoint = '/' + class_name.underscore.pluralize.downcase
-
-			@id = id
-			@values = {}
-
-			if !id.nil?
-				@endpoint += "/#{id}"
-				@unsaved = Set.new
-				refresh_from(values.dup.merge({:id => id}))
-			end
-		end
-
-		def set_endpoint_base(base)
-			@endpoint_base = base
-			self
-		end
-
-		def endpoint_base()
-			@endpoint_base
-		end
-
-		def endpoint()
-			@endpoint_base + @endpoint
-		end
-
-	    def retrieve(id, opts={})
-	    	if !id
-	    		raise ArgumentError.new("Missing ID.")
-	    	end
-
-	    	response = @client.request(:get, "#{self.endpoint()}/#{id}", opts)
-
-	    	Util.convert_to_object(self, response[:body])
-	    end
-
-	    def load(opts={})
-	    end
-
-	    def to_s(*args)
-	    	JSON.pretty_generate(@values)
-	    end
-
-		def inspect
-			id_string = (!@id.nil?) ? " id=#{@id}" : ""
-			"#<#{self.class}:0x#{self.object_id.to_s(16)}#{id_string}> JSON: " + JSON.pretty_generate(@values)
-		end
-
-		def refresh_from(values)
-			removed = Set.new(@values.keys - values.keys)
-			added = Set.new(values.keys - @values.keys)
-
-			instance_eval do
-				remove_accessors(removed)
-				add_accessors(added)
-			end
-			removed.each do |k|
-				@values.delete(k)
-				@unsaved.delete(k)
-			end
-			values.each do |k, v|
-				@values[k] = v
-				@unsaved.delete(k)
-			end
-
-			return self
-		end
-
-	    def [](k)
-	    	@values[k.to_sym]
-	    end
-
-	    def []=(k, v)
-	    	send(:"#{k}=", v)
-	    end
-
-	    def keys
-	    	@values.keys
-	    end
-
-	    def values
-	    	@values.values
-	    end
-
-	    def to_json(*a)
-	    	JSON.generate(@values)
-	    end
-
-	    def to_hash
-	    	@values.inject({}) do |acc, (key, value)|
-	        	acc[key] = value.respond_to?(:to_hash) ? value.to_hash : value
-	        	acc
-	    	end
-	    end
-
-	    def each(&blk)
-	    	@values.each(&blk)
-	    end
-
-		def metaclass
-			class << self; self; end
-		end
-
-		def remove_accessors(keys)
-			metaclass.instance_eval do
-				keys.each do |k|
-					next if @@permanent_attributes.include?(k)
-					k_eq = :"#{k}="
-					remove_method(k) if method_defined?(k)
-					remove_method(k_eq) if method_defined?(k_eq)
-				end
-			end
-		end
-
-		def add_accessors(keys)
-			metaclass.instance_eval do
-				keys.each do |k|
-					next if @@permanent_attributes.include?(k)
-					k_eq = :"#{k}="
-					define_method(k) { @values[k] }
-					define_method(k_eq) do |v|
-						if v == ""
-							raise ArgumentError.new(
-								"You cannot set #{k} to an empty string." \
-								"We interpret empty strings as nil in requests." \
-								"You may set #{self}.#{k} = nil to delete the property.")
-						end
-						@values[k] = v
-						@unsaved.add(k)
-					end
-				end
-			end
-		end
-
-		def method_missing(name, *args)
-			if name.to_s.end_with?('=')
-				attr = name.to_s[0...-1].to_sym
-				add_accessors([attr])
-				begin
-					mth = method(name)
-				rescue NameError
-					raise NoMethodError.new("Cannot set #{attr} on this object. HINT: you can't set: #{@@permanent_attributes.to_a.join(', ')}")
-				end
-				return mth.call(args[0])
-			else
-				return @values[name] if @values.has_key?(name)
-			end
-
-			begin
-				super
-			rescue NoMethodError => e
-				raise e
-			end
-		end
-	end
+    class Object
+        include Enumerable
+
+        attr_reader :client
+
+         @@permanent_attributes = Set.new([:id])
+
+        def initialize(client, id=nil, values={})
+            @client = client
+            class_name = self.class.name.split('::').last
+            @endpoint_base = ''
+            @endpoint = '/' + class_name.underscore.pluralize.downcase
+
+            @id = id
+            @values = {}
+
+            if !id.nil?
+                @endpoint += "/#{id}"
+                @unsaved = Set.new
+                refresh_from(values.dup.merge({:id => id}))
+            end
+        end
+
+        def set_endpoint_base(base)
+            @endpoint_base = base
+            self
+        end
+
+        def endpoint_base()
+            @endpoint_base
+        end
+
+        def endpoint()
+            @endpoint_base + @endpoint
+        end
+
+        def retrieve(id, opts={})
+            if !id
+                raise ArgumentError.new("Missing ID.")
+            end
+
+            response = @client.request(:get, "#{self.endpoint()}/#{id}", opts)
+
+            Util.convert_to_object(self, response[:body])
+        end
+
+        def load(opts={})
+        end
+
+        def to_s(*args)
+            JSON.pretty_generate(@values)
+        end
+
+        def inspect
+            id_string = (!@id.nil?) ? " id=#{@id}" : ""
+            "#<#{self.class}:0x#{self.object_id.to_s(16)}#{id_string}> JSON: " + JSON.pretty_generate(@values)
+        end
+
+        def refresh_from(values)
+            removed = Set.new(@values.keys - values.keys)
+            added = Set.new(values.keys - @values.keys)
+
+            instance_eval do
+                remove_accessors(removed)
+                add_accessors(added)
+            end
+            removed.each do |k|
+                @values.delete(k)
+                @unsaved.delete(k)
+            end
+            values.each do |k, v|
+                @values[k] = v
+                @unsaved.delete(k)
+            end
+
+            return self
+        end
+
+        def [](k)
+            @values[k.to_sym]
+        end
+
+        def []=(k, v)
+            send(:"#{k}=", v)
+        end
+
+        def keys
+            @values.keys
+        end
+
+        def values
+            @values.values
+        end
+
+        def to_json(*a)
+            JSON.generate(@values)
+        end
+
+        def to_hash
+            @values.inject({}) do |acc, (key, value)|
+                acc[key] = value.respond_to?(:to_hash) ? value.to_hash : value
+                acc
+            end
+        end
+
+        def each(&blk)
+            @values.each(&blk)
+        end
+
+        def metaclass
+            class << self; self; end
+        end
+
+        def remove_accessors(keys)
+            metaclass.instance_eval do
+                keys.each do |k|
+                    next if @@permanent_attributes.include?(k)
+                    k_eq = :"#{k}="
+                    remove_method(k) if method_defined?(k)
+                    remove_method(k_eq) if method_defined?(k_eq)
+                end
+            end
+        end
+
+        def add_accessors(keys)
+            metaclass.instance_eval do
+                keys.each do |k|
+                    next if @@permanent_attributes.include?(k)
+                    k_eq = :"#{k}="
+                    define_method(k) { @values[k] }
+                    define_method(k_eq) do |v|
+                        if v == ""
+                            raise ArgumentError.new(
+                                "You cannot set #{k} to an empty string." \
+                                "We interpret empty strings as nil in requests." \
+                                "You may set #{self}.#{k} = nil to delete the property.")
+                        end
+                        @values[k] = v
+                        @unsaved.add(k)
+                    end
+                end
+            end
+        end
+
+        def method_missing(name, *args)
+            if name.to_s.end_with?('=')
+                attr = name.to_s[0...-1].to_sym
+                add_accessors([attr])
+                begin
+                    mth = method(name)
+                rescue NameError
+                    raise NoMethodError.new("Cannot set #{attr} on this object. HINT: you can't set: #{@@permanent_attributes.to_a.join(', ')}")
+                end
+                return mth.call(args[0])
+            else
+                return @values[name] if @values.has_key?(name)
+            end
+
+            begin
+                super
+            rescue NoMethodError => e
+                raise e
+            end
+        end
+    end
 end

data/lib/invoiced/operations/create.rb

@@ -1,11 +1,11 @@
 module Invoiced
-	module Operations
-		module Create
-			def create(body={})
-    			response = @client.request(:post, self.endpoint(), body)
+    module Operations
+        module Create
+            def create(body={})
+                response = @client.request(:post, self.endpoint(), body)
 
-    			Util.convert_to_object(self, response[:body])
-    		end
-		end
-	end
+                Util.convert_to_object(self, response[:body])
+            end
+        end
+    end
 end

data/lib/invoiced/operations/delete.rb

@@ -1,18 +1,18 @@
 module Invoiced
-	module Operations
-		module Delete
-			def delete
-    			response = @client.request(:delete, self.endpoint())
+    module Operations
+        module Delete
+            def delete
+                response = @client.request(:delete, self.endpoint())
 
-    			if response[:code] == 204
+                if response[:code] == 204
                     refresh_from({:id => @id})
                 elsif response[:code] == 200
                     # update the local values with the response
                     refresh_from(response[:body].dup.merge({:id => self.id}))
-    			end
+                end
 
-    			return response[:code] == 204 || response[:code] == 200
-    		end
-		end
-	end
+                return response[:code] == 204 || response[:code] == 200
+            end
+        end
+    end
 end

data/lib/invoiced/operations/list.rb

@@ -1,17 +1,17 @@
 module Invoiced
-	module Operations
-		module List
-			def list(opts={})
-    			response = @client.request(:get, self.endpoint(), opts)
+    module Operations
+        module List
+            def list(opts={})
+                response = @client.request(:get, self.endpoint(), opts)
 
-    			# build objects
-    			objects = Util.build_objects(self, response[:body])
+                # build objects
+                objects = Util.build_objects(self, response[:body])
 
-				# store the metadata from the list operation
-				metadata = Invoiced::List.new(response[:headers][:link], response[:headers][:x_total_count])
+                # store the metadata from the list operation
+                metadata = Invoiced::List.new(response[:headers][:link], response[:headers][:x_total_count])
 
-    			return objects, metadata
-    		end
-		end
-	end
+                return objects, metadata
+            end
+        end
+    end
 end

data/lib/invoiced/operations/update.rb

@@ -1,27 +1,27 @@
 module Invoiced
-	module Operations
-		module Update
-			def save(params = {})
-		        update = {}
+    module Operations
+        module Update
+            def save(params = {})
+                update = {}
 
-		        @unsaved.each do |k|
-		        	update[k] = @values[k]
-		        end
+                @unsaved.each do |k|
+                    update[k] = @values[k]
+                end
 
-		        update.merge(params)
+                update.merge(params)
 
-				# perform the update if there are any changes
-		        if update.length > 0
-    				response = @client.request(:patch, self.endpoint(), update)
+                # perform the update if there are any changes
+                if update.length > 0
+                    response = @client.request(:patch, self.endpoint(), update)
 
-    				# update the local values with the response
-    				refresh_from(response[:body].dup.merge({:id => self.id}))
+                    # update the local values with the response
+                    refresh_from(response[:body].dup.merge({:id => self.id}))
 
-    				return response[:code] == 200
-		        end
+                    return response[:code] == 200
+                end
 
-		        false
-    		end
-		end
-	end
+                false
+            end
+        end
+    end
 end

data/lib/invoiced/subscription.rb

@@ -1,12 +1,12 @@
 module Invoiced
     class Subscription < Object
-		include Invoiced::Operations::List
-		include Invoiced::Operations::Create
-		include Invoiced::Operations::Update
-		include Invoiced::Operations::Delete
+        include Invoiced::Operations::List
+        include Invoiced::Operations::Create
+        include Invoiced::Operations::Update
+        include Invoiced::Operations::Delete
 
-		def cancel
-			delete
-		end
-	end
+        def cancel
+            delete
+        end
+    end
 end

data/lib/invoiced/transaction.rb

@@ -1,22 +1,22 @@
 module Invoiced
     class Transaction < Object
-		include Invoiced::Operations::List
-		include Invoiced::Operations::Create
-		include Invoiced::Operations::Update
-		include Invoiced::Operations::Delete
+        include Invoiced::Operations::List
+        include Invoiced::Operations::Create
+        include Invoiced::Operations::Update
+        include Invoiced::Operations::Delete
 
-		def send(opts={})
-			response = @client.request(:post, "#{self.endpoint()}/emails", opts)
+        def send(opts={})
+            response = @client.request(:post, "#{self.endpoint()}/emails", opts)
 
-			# build email objects
-			email = Email.new(@client)
-			Util.build_objects(email, response[:body])
-		end
+            # build email objects
+            email = Email.new(@client)
+            Util.build_objects(email, response[:body])
+        end
 
-		def refund(opts={})
-			response = @client.request(:post, "#{self.endpoint()}/refunds", opts)
+        def refund(opts={})
+            response = @client.request(:post, "#{self.endpoint()}/refunds", opts)
 
-			Util.convert_to_object(self, response[:body])
-		end
-	end
+            Util.convert_to_object(self, response[:body])
+        end
+    end
 end

data/lib/invoiced/util.rb

@@ -1,60 +1,60 @@
 module Invoiced
-	class Util
-		class << self
-		    def auth_header(api_key)
-		    	"Basic " + Base64.strict_encode64(api_key + ":")
-		    end
+    class Util
+        class << self
+            def auth_header(api_key)
+                "Basic " + Base64.strict_encode64(api_key + ":")
+            end
 
-			def uri_encode(params)
-				flatten_params(params).
-	      			map { |k,v| "#{k}=#{url_encode(v)}" }.join('&')
-			end
+            def uri_encode(params)
+                flatten_params(params).
+                    map { |k,v| "#{k}=#{url_encode(v)}" }.join('&')
+            end
 
-			def build_objects(_class, objects)
-    			objects.map {
-    				|object| convert_to_object(_class, object)
-				}
-			end
+            def build_objects(_class, objects)
+                objects.map {
+                    |object| convert_to_object(_class, object)
+                }
+            end
 
-			def convert_to_object(_class, values)
-				object = _class.class.new(_class.client, values[:id], values)
-				object.set_endpoint_base(_class.endpoint_base())
-			end
+            def convert_to_object(_class, values)
+                object = _class.class.new(_class.client, values[:id], values)
+                object.set_endpoint_base(_class.endpoint_base())
+            end
 
-			private
+            private
 
-			def url_encode(params)
-				URI.escape(params.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-			end
+            def url_encode(params)
+                URI.encode_www_form_component(params)
+            end
 
-			def flatten_params(params, parent_key=nil)
-				result = []
-				params.each do |key, value|
-					calculated_key = parent_key ? "#{parent_key}[#{url_encode(key)}]" : url_encode(key)
-					if value.is_a?(Hash)
-						result += flatten_params(value, calculated_key)
-					elsif value.is_a?(Array)
-						result += flatten_params_array(value, calculated_key)
-					else
-						result << [calculated_key, value]
-					end
-				end
-				result
-			end
+            def flatten_params(params, parent_key=nil)
+                result = []
+                params.each do |key, value|
+                    calculated_key = parent_key ? "#{parent_key}[#{url_encode(key)}]" : url_encode(key)
+                    if value.is_a?(Hash)
+                        result += flatten_params(value, calculated_key)
+                    elsif value.is_a?(Array)
+                        result += flatten_params_array(value, calculated_key)
+                    else
+                        result << [calculated_key, value]
+                    end
+                end
+                result
+            end
 
-			def flatten_params_array(value, calculated_key)
-				result = []
-				value.each do |elem|
-					if elem.is_a?(Hash)
-						result += flatten_params(elem, "#{calculated_key}[]")
-					elsif elem.is_a?(Array)
-						result += flatten_params_array(elem, calculated_key)
-					else
-						result << ["#{calculated_key}[]", elem]
-					end
-				end
-				result
-			end
-		end
-	end
+            def flatten_params_array(value, calculated_key)
+                result = []
+                value.each do |elem|
+                    if elem.is_a?(Hash)
+                        result += flatten_params(elem, "#{calculated_key}[]")
+                    elsif elem.is_a?(Array)
+                        result += flatten_params_array(elem, calculated_key)
+                    else
+                        result << ["#{calculated_key}[]", elem]
+                    end
+                end
+                result
+            end
+        end
+    end
 end

data/lib/invoiced/version.rb

@@ -1,3 +1,3 @@
 module Invoiced
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end