hypertext_client 0.0.6 → 0.0.7

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 0.0.7 (October 11, 2010)
+
+Properly set camel cased parent class name
+
 ## 0.0.6 (October 7, 2010)
 
 More improvements to camel-cased class names

data/lib/hypertext_client/hypertext_client.rb

@@ -18,7 +18,7 @@
 
 # Hypertext provides an HTTP client based on HTTParty, with a few assumptions baked in.
 module HypertextClient
-	VERSION = '0.0.6'
+	VERSION = '0.0.7'
 
 	extend ActiveSupport::Concern
 	# Include HTTParty
@@ -94,7 +94,7 @@ module HypertextClient
 
 		def belongs_to(*classes)
 			self.parents += classes.select {|c| c.respond_to? :model_name}
-			base_url self.base_endpoint + '/' + self.parents.map {|parent| parent.model_name.split('::').last.parameterize}.map{|name| "#{name.pluralize}/|#{name.singularize}|"} * '/'
+			base_url self.base_endpoint + '/' + self.parents.map {|parent| parent.model_name.demodulize.underscore}.map{|name| "#{name.pluralize}/|#{name.singularize}|"} * '/'
 		end
 
 		# Override HTTParty's methods to allow assumptions about a '/' path.
@@ -116,7 +116,7 @@ module HypertextClient
 					options = args.first
 					raise MissingArgumentError.new("Options hash required; must include parent ids") unless options.is_a? Hash
 					self.parents.each do |parent|
-						key = parent.model_name.split('::').last.parameterize.singularize.to_sym
+						key = parent.model_name.demodulize.singularize.underscore.to_sym
 						raise MissingArgumentError.new("Missing required argument: #{key}") unless options.has_key? key
 						base_uri self.base_uri.gsub("|#{key}|", options[key])
 					end

data/test/test_hypertext_client.rb

@@ -38,7 +38,12 @@ FakeWeb.register_uri(:get,
 										 :content_type => 'application/json')
 
 FakeWeb.register_uri(:get,
-										 FAKE_ENDPOINT + '/camelcase_classes/example',
+										 FAKE_ENDPOINT + '/camel_cases/example',
+										 :body => {:property => 'exists'}.to_json,
+										 :content_type => 'application/json')
+
+FakeWeb.register_uri(:get,
+										 FAKE_ENDPOINT + '/camel_cases/example/camel_case_inheritors/123',
 										 :body => {:property => 'exists'}.to_json,
 										 :content_type => 'application/json')
 
@@ -65,10 +70,14 @@ class SkynetClient::Button < ObjectStruct
 	belongs_to Widget
 end
 
-class SkynetClient::CamelcaseClass < ObjectStruct
+class SkynetClient::CamelCase < ObjectStruct
 	include SkynetClient
 end
 
+class SkynetClient::CamelCaseInheritor < ObjectStruct
+  include SkynetClient
+  belongs_to SkynetClient::CamelCase
+end
 
 class HypertextClientTest < MiniTest::Unit::TestCase
 	include ActiveModel::Lint::Tests
@@ -126,7 +135,15 @@ class HypertextClientTest < MiniTest::Unit::TestCase
 	end
 	
 	def test_gets_camelcased_classes_correctly
-		example = SkynetClient::CamelcaseClass.get 'example'
+		example = SkynetClient::CamelCase.get 'example'
 		assert_equal example.property, "exists"
 	end
+	
+	def test_requires_camelcase_id
+		assert_raises HypertextClient::MissingArgumentError do
+			example = SkynetClient::CamelCaseInheritor.get('123')
+		end
+		example = SkynetClient::CamelCaseInheritor.get('123', :camel_case => 'example')
+		assert example
+	end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Quid, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 -07:00
+date: 2010-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency