govdelivery-tms 0.8.1 → 0.8.2

data/lib/govdelivery/tms/connection.rb

@@ -22,7 +22,7 @@ class GovDelivery::TMS::Connection
       faraday.use GovDelivery::TMS::Logger, self.logger if self.logger
       faraday.request :json
       faraday.headers['X-AUTH-TOKEN'] = auth_token
-      faraday.headers[:user_agent] = "GovDelivery Ruby TMS::Client #{TMS::VERSION}"
+      faraday.headers[:user_agent] = "GovDelivery Ruby GovDelivery::TMS::Client #{GovDelivery::TMS::VERSION}"
       faraday.response :json, content_type: /\bjson$/
       faraday.adapter :net_http
     end

data/lib/govdelivery/tms/version.rb

@@ -1,5 +1,5 @@
 module GovDelivery
   module TMS #:nodoc:
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govdelivery-tms
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -109,7 +109,6 @@ files:
 - lib/govdelivery/tms/util/core_ext.rb
 - lib/govdelivery/tms/util/hal_link_parser.rb
 - lib/govdelivery/tms/version.rb
-- lib/govdelivery-tms/instance_resource.rb
 - lib/govdelivery-tms.rb
 - spec/client_spec.rb
 - spec/command_types_spec.rb

data/lib/govdelivery-tms/instance_resource.rb

@@ -1,219 +0,0 @@
-module GovDelivery::TMS::InstanceResource
-  def self.included(base)
-    base.send(:include, TMS::Base)
-    base.extend(ClassMethods)
-    base.send(:include, InstanceMethods)
-  end
-
-  attr_accessor :response
-
-  module ClassMethods
-    ##
-    # Writeable attributes are sent on POST/PUT.
-    #
-    def writeable_attributes(*attrs)
-      @writeable_attributes ||= []
-      if attrs.any?
-        @writeable_attributes.map!(&:to_sym).concat(attrs).uniq! if attrs.any?
-        setup_attributes(@writeable_attributes, false)
-      end
-      @writeable_attributes
-    end
-
-    ##
-    # Linkable attributes are sent on POST/PUT.
-    #
-    def linkable_attributes(*attrs)
-      @linkable_attributes ||= []
-      if attrs.any?
-        @linkable_attributes.map!(&:to_sym).concat(attrs).uniq! if attrs.any?
-      end
-      @linkable_attributes
-    end
-
-    ##
-    # Readonly attributes don't get POSTed.
-    # (timestamps are included by default)
-    #
-    def readonly_attributes(*attrs)
-      @readonly_attributes ||= [:created_at, :updated_at, :completed_at]
-      if attrs.any?
-        @readonly_attributes.map!(&:to_sym).concat(attrs).uniq!
-        setup_attributes(@readonly_attributes, true)
-      end
-      @readonly_attributes
-    end
-
-    ##
-    # For collections that are represented as attributes (i.e. inline, no href)
-    #
-    # @example
-    #     collection_attributes :recipients
-    #
-    def collection_attributes(*attrs)
-      @collection_attributes ||= []
-      if attrs.any?
-        @collection_attributes.map!(&:to_sym).concat(attrs).uniq!
-        @collection_attributes.each { |a| setup_collection(a) }
-      end
-      @collection_attributes
-    end
-
-    def custom_class_names
-      @custom_class_names ||= {}
-    end
-
-    ##
-    # For collections that are represented as attributes (i.e. inline, no href)
-    # and that have a class name other than the one we would infer.
-    #
-    # @example
-    #    collection_attributes :recipients, 'EmailRecipient'
-    #
-    def collection_attribute(attr, tms_class)
-      @collection_attributes ||= []
-      @collection_attributes.push(attr).uniq!
-      setup_collection(attr, GovDelivery::TMS.const_get(tms_class))
-    end
-
-    ##
-    # Read-only collection attributes don't get POSTed.
-    # Use this for collections that are represented as attributes, but cannot be modified.
-    #
-    # @example
-    #      readonly_collection_attribute :opens
-    #
-    def readonly_collection_attribute(attr, tms_class)
-      @readonly_collection_attributes ||= []
-      @readonly_collection_attributes.push(attr).uniq!
-      setup_collection(attr, GovDelivery::TMS.const_get(tms_class))
-    end
-
-    def setup_attributes(attrs, readonly=false)
-      attrs.map(&:to_sym).each do |property|
-        self.send :define_method, :"#{property}=", &lambda { |v| @attributes[property] = v } unless readonly
-        self.send :define_method, property.to_sym, &lambda { @attributes[property] }
-      end
-    end
-
-    def setup_collection(property, klass=nil)
-      if klass
-        custom_class_names[property] = klass
-      else
-        klass ||= GovDelivery::TMS.const_get(property.to_s.capitalize)
-      end
-
-      self.send :define_method, property.to_sym, &lambda { @attributes[property] ||= klass.new(self.client, nil, nil) }
-    end
-  end
-
-  module InstanceMethods
-    attr_reader :links
-
-    def initialize(client, href=nil, attrs=nil)
-      super(client, href)
-      @attributes = {}
-      @links = {}
-      set_attributes_from_hash(attrs) if attrs
-    end
-
-    def attributes
-      @attributes
-    end
-
-    def get
-      raise TMS::Errors::InvalidGet if self.new_record?
-      process_response(client.get(self.href), :get) && self
-    end
-    alias_method :get!, :get
-
-    def post
-      self.errors = nil
-      process_response(client.post(self), :post)
-    end
-
-    def post!
-      self.post or raise TMS::Errors::InvalidPost.new(self)
-    end
-
-    def put
-      process_response(client.put(self), :put)
-    end
-
-    def put!
-      process_response(client.put(self), :put) or raise TMS::Errors::InvalidPut.new(self)
-    end
-
-    def delete
-      process_response(client.delete(self.href), :delete)
-    end
-
-    def delete!
-      process_response(client.delete(self.href), :delete) or raise TMS::Errors::InvalidDelete.new(self)
-    end
-
-    def to_s
-      "<#{self.class.inspect}#{' href=' + self.href if self.href} attributes=#{@attributes.inspect}>"
-    end
-
-    def to_json
-      json_hash = {}
-      self.class.writeable_attributes.each do |attr|
-        json_hash[attr] = self.send(attr)
-      end
-      self.class.collection_attributes.each do |coll|
-        json_hash[coll] = self.send(coll).to_json
-      end
-      self.class.linkable_attributes.each do |attr|
-        json_hash[:_links] ||= {}
-        json_hash[:_links][attr] = @links[attr]
-      end
-      json_hash
-    end
-
-    protected
-
-    def relation_class(rel)
-      self.class.custom_class_names[rel.to_sym] || super
-    end
-
-    def process_response(response, method)
-      self.response = response
-      error_class   = TMS::Errors.const_get("Invalid#{method.to_s.capitalize}")
-      case response.status
-        when 204
-          return true
-        when 200..299
-          set_attributes_from_hash(response.body) if response.body.is_a?(Hash)
-          @links = {}
-          self.new_record=false
-          return true
-        when 401
-          raise error_class.new("401 Not Authorized")
-        when 404
-          raise(error_class.new("Can't POST to #{self.href}"))
-        when 500..599
-          raise(TMS::Errors::ServerError.new(response))
-        else # 422?
-          if response.body['errors']
-            self.errors = response.body['errors']
-          end
-      end
-      return false
-    end
-
-    def set_attributes_from_hash(hash)
-      hash.reject { |k, _| k=~/^_/ }.each do |property, value|
-        if self.class.collection_attributes.include?(property.to_sym)
-          klass                        = self.class.custom_class_names[property] || GovDelivery::TMS.const_get(property.to_s.capitalize)
-          @attributes[property.to_sym] = klass.new(client, nil, value)
-        else
-          @attributes[property.to_sym] = value
-        end
-      end
-      self.errors = hash['errors']
-      parse_links(hash['_links'])
-    end
-
-  end
-end