rapidash 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a317197b608c00d1116ad4be65b62238b0a98034
-  data.tar.gz: cdc69d6da7a4e33c58d83d0fc89e1b0a70cfb72c
+  metadata.gz: f0efe6c53b4dda6119666b7b280aa8ab1315640a
+  data.tar.gz: 229e2f7d0836fc06ae2f8656d23fe30e7713f0b2
 SHA512:
-  metadata.gz: c85000a1ed1351fadcfc1567a4469d54c4920a23eb8e6aa6e60de579b2b6abdd4867179eb7bbc2c844c6c9d745d8ec95ef4114d6c05312c4abdb4e33a3a06751
-  data.tar.gz: 71ef9f5d5e1669de47f6681a86c9c541b7712d9cc29b57add9cc4cd86ac15acbb73f20fc0c972881bfebbd38088dc86c92e720f9476781c84cbe2766d1ed94cc
+  metadata.gz: 7efc8162ed268a6512bcaf02fb3529a2df0a0ab3f17448740aefa98454023f56ae73f63475fbf81c37daa0efb74c9b290c77afe6e4bf183c1ca7994a5e465c4c
+  data.tar.gz: 332545525ee072dc890f708eb58ef9b251759d05bc41e8e485e7184258044b6cbf1423425b63cb51391e5e0971018cb0f4f38e40ead5aa32d78417ec33047d19

data/lib/rapidash/resourceable.rb

@@ -24,20 +24,24 @@ module Rapidash
         options = names.extract_options!
 
         mod = self.to_s.split("::")[0...-1]
-        mod = mod.empty? ? Object : Object.const_get(mod.join("::"))
+        mod = mod.empty? ? Object : mod.join("::").constantize
 
         names.each do |name|
           if options[:class_name]
-            class_name = options[:class_name]
+            class_name = options[:class_name].to_s
           else
             class_name = name.to_s.camelcase.singularize
+
+            unless mod == Object
+              class_name = "#{mod}::#{class_name}"
+            end
           end
 
           begin
-            klass = "#{mod}::#{class_name}".constantize
+            klass = class_name.constantize
           rescue NameError
             Kernel.warn "[DEPRECATED] - RAPIDASH WARNING using #{class_name.pluralize} instead of #{class_name.singularize} - please either use `#{class_name.singularize}` or set the class name with `resource #{name}, :class_name => #{class_name.pluralize}` implicit plural naming will be deprecated in Rapidash 1.0"
-            klass = "#{mod}::#{class_name}".pluralize.constantize
+            klass = class_name.pluralize.constantize
           end
 
           define_method(name) do |*args|

data/lib/rapidash/version.rb

@@ -1,3 +1,3 @@
 module Rapidash
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/rapidash/resourceable_spec.rb

@@ -120,7 +120,7 @@ describe Rapidash::Resourceable do
     end
 
     it "should not fail when presented with a multi-word resource" do
-      expect { 
+      expect {
         class ClientTester
           resource :admin_users
         end
@@ -205,9 +205,14 @@ describe Rapidash::Resourceable do
       end
     end
 
-    module Its
-      module A
-        class DeepResource
+    module SomeModule
+      module SomeSubModule
+        class User
+          def initialize(*args)
+          end
+        end
+
+        class Post
           def initialize(*args)
           end
         end
@@ -218,7 +223,8 @@ describe Rapidash::Resourceable do
       include Rapidash::Resourceable
       resource :users, :class_name => "Facebook::User"
       resource :posts, :class_name => Facebook::Posts
-      resource :deep_resources, :class_name => Its::A::DeepResource
+      resource :deep_users, :class_name => "SomeModule::SomeSubModule::User"
+      resource :deep_posts, :class_name => SomeModule::SomeSubModule::Post
     end
 
     it "should find user in another module" do
@@ -229,8 +235,25 @@ describe Rapidash::Resourceable do
       ModuleTester.new.posts.class.should eql(Facebook::Posts)
     end
 
-    it "should find deep_resource in a nested module" do
-      ModuleTester.new.deep_resources.class.should eql(Its::A::DeepResource)
+    it "should find deep_users in a nested module" do
+      ModuleTester.new.deep_users.class.should eql(SomeModule::SomeSubModule::User)
+    end
+
+    it "should find deep_posts in a nested class name" do
+      ModuleTester.new.deep_posts.class.should eql(SomeModule::SomeSubModule::Post)
     end
+
+    it "should not raise a wrong constant NameError" do
+      expect {
+        module Deep
+          module ModuleTester
+            class MyResource < Rapidash::Base
+              resource :users, :class_name => "Facebook::User"
+            end
+          end
+        end
+      }.to_not raise_error(NameError)
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapidash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Gary 'Gazler' Rennie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler