hyperdrive 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07f5a0eb011e90e579c34dce6b40de76283317ab
-  data.tar.gz: e8a2a287eeb5eab40734d3a7280b63542277ef68
+  metadata.gz: d771b35e3bf1f63f0319a13657e7cf5b8eed07b4
+  data.tar.gz: 0a023a7d94436547475ca7c3c52a2e879edeabde
 SHA512:
-  metadata.gz: 292b94365b311ae7c868982be4216a26ebb184b8b34761409d624479cf5fccbc6265fbd8e200bfbef9f69c66448bbff4e51f00e40d042010376b41c5e137b1e3
-  data.tar.gz: 3878db43f89d42c364cc1da9dedd8c2a07eb8ea2c60919a3618bf4365fea8c9d2a65d073835b54c8fd70d7f0fae3d26f34a2121473cdd62bd3cb4f828677e044
+  metadata.gz: e57fcc5a0fc983d0eef36c18773346c3b013c3be3f59e2081ccf94c96dc930f040faaac655c695fe5e55076690f4fa7cec3cbf8d34be6b976530b7ece110f4d2
+  data.tar.gz: 4b79e421774282b70f94d40354d62957e4db5d9c5b839888193a6f71228417b9c463e62244409985ef8323782e85dc3ccf47e7a8d27078d89e59b227de6f8b94

data/lib/hyperdrive/resource.rb

@@ -6,13 +6,15 @@ module Hyperdrive
     attr_reader :id, :namespace, :endpoint, :params, :filters, :request_handlers, :version
     attr_accessor :name, :description
 
-    def initialize(name, hyperdrive_config = hyperdrive.config)
-      @namespace = name.to_s.en.plural
-      @endpoint = "/#{namespace}"
+    def initialize(resource, options = {})
+      @resource = resource.to_s.split('_')
+      @resource[-1] = @resource[-1].en.plural
+      @namespace = @resource.join(':')
+      @endpoint = options.fetch(:endpoint) { "/#{@resource.join('/')}" }
       @params = default_params
       @filters = default_filters
       @request_handlers = default_request_handlers
-      @config = hyperdrive_config
+      @config = hyperdrive.config
       @id = [@config[:vendor], @namespace].join(':')
     end
 
@@ -41,11 +43,12 @@ module Hyperdrive
 
     def acceptable_content_types(http_request_method)
       content_types = []
+      media_type_namepace = @resource.join('.')
       @config[:media_types].each do |media_type|
         available_versions(http_request_method).each do |version|
-          content_types << "application/vnd.#{@config[:vendor]}.#{namespace}.#{version}+#{media_type}"
+          content_types << "application/vnd.#{@config[:vendor]}.#{media_type_namepace}.#{version}+#{media_type}"
         end
-        content_types << "application/vnd.#{@config[:vendor]}.#{namespace}+#{media_type}"
+        content_types << "application/vnd.#{@config[:vendor]}.#{media_type_namepace}+#{media_type}"
         content_types << "application/vnd.#{@config[:vendor]}+#{media_type}"
       end
       content_types

data/lib/hyperdrive/version.rb

@@ -1,3 +1,3 @@
 module Hyperdrive
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/hyperdrive/resource_spec.rb

@@ -2,12 +2,16 @@ require 'spec_helper'
 
 describe Hyperdrive::Resource do
   before do
-    @resource = Hyperdrive::Resource.new(:thing, { vendor: 'hyperdrive', media_types: ['json'] })
+    @resource = Hyperdrive::Resource.new(:thing)
     @resource.register_param(:name, 'Thing Name')
     @resource.register_filter(:parent_id, 'Parent ID', required: true)
     @resource.register_request_handler(:get, Proc.new { |env| 'v1' })
     @resource.register_request_handler(:get, Proc.new { |env| 'v2' }, 'v2')
-    @media_types = ["application/vnd.hyperdrive.things.v2+json",
+    @media_types = ["application/vnd.hyperdrive.things.v2+hal+json",
+                    "application/vnd.hyperdrive.things.v1+hal+json",
+                    "application/vnd.hyperdrive.things+hal+json",
+                    "application/vnd.hyperdrive+hal+json",
+                    "application/vnd.hyperdrive.things.v2+json",
                     "application/vnd.hyperdrive.things.v1+json",
                     "application/vnd.hyperdrive.things+json",
                     "application/vnd.hyperdrive+json"]
@@ -126,4 +130,40 @@ describe Hyperdrive::Resource do
   it "returns a hash representation of the resource" do
     @resource.to_hash.must_be_kind_of Hash
   end
+
+  context "compound namspaces" do
+    before do
+      @compound_resource = Hyperdrive::Resource.new(:goof_ball)
+    end
+
+    it "has an ID" do
+      @compound_resource.id.must_equal "hyperdrive:goof:balls"
+    end
+
+    it "has a namespace" do
+      @compound_resource.namespace.must_equal 'goof:balls'
+    end
+
+    it "has an endpoint" do
+      @compound_resource.endpoint.must_equal '/goof/balls'
+    end
+  end
+
+  context "options" do
+    before do
+      @resource_with_options = Hyperdrive::Resource.new(:great_thing, endpoint: '/great-things')
+    end
+
+    it "has an ID" do
+      @resource_with_options.id.must_equal "hyperdrive:great:things"
+    end
+
+    it "has a namespace" do
+      @resource_with_options.namespace.must_equal 'great:things'
+    end
+
+    it "has an endpoint" do
+      @resource_with_options.endpoint.must_equal '/great-things'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperdrive
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - StyleSeek Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-10 00:00:00.000000000 Z
+date: 2014-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linguistics