her 0.2.6 → 0.3

data/spec/model/http_spec.rb

@@ -7,8 +7,10 @@ describe Her::Model::HTTP do
       api = Her::API.new
       api.setup :url => "https://api.example.com"
 
-      spawn_model :User do
-        uses_api api
+      spawn_model "Foo::User"
+      Foo::User.uses_api api
+
+      Foo::User.class_eval do
         @her_api.should_not == nil
         @her_api.base_uri.should == "https://api.example.com"
       end
@@ -17,7 +19,9 @@ describe Her::Model::HTTP do
     it "binds a model directly to Her::API" do # {{{
       Her::API.setup :url => "https://api.example.com"
 
-      spawn_model :User do
+      spawn_model "Foo::User"
+
+      Foo::User.class_eval do
         @her_api.should_not == nil
         @her_api.base_uri.should == "https://api.example.com"
       end
@@ -30,8 +34,10 @@ describe Her::Model::HTTP do
         builder.use Faraday::Request::UrlEncoded
       end
 
-      spawn_model :User do
-        uses_api api1
+      spawn_model "Foo::User"
+      Foo::User.uses_api api1
+
+      Foo::User.class_eval do
         @her_api.base_uri.should == "https://api1.example.com"
       end
 
@@ -41,8 +47,10 @@ describe Her::Model::HTTP do
         builder.use Faraday::Request::UrlEncoded
       end
 
-      spawn_model :Comment do
-        uses_api api2
+      spawn_model "Foo::Comment"
+      Foo::Comment.uses_api api2
+
+      Foo::Comment.class_eval do
         @her_api.base_uri.should == "https://api2.example.com"
       end
     end # }}}
@@ -53,7 +61,9 @@ describe Her::Model::HTTP do
         builder.use Faraday::Request::UrlEncoded
       end
 
-      spawn_model :User do
+      spawn_model "Foo::User"
+
+      Foo::User.class_eval do
         @her_api.base_uri.should == "https://api1.example.com"
       end
 
@@ -63,8 +73,10 @@ describe Her::Model::HTTP do
         builder.use Faraday::Request::UrlEncoded
       end
 
-      spawn_model :Comment do
-        uses_api api
+      spawn_model "Foo::Comment"
+      Foo::Comment.uses_api api
+
+      Foo::Comment.class_eval do
         @her_api.base_uri.should == "https://api2.example.com"
       end
     end # }}}
@@ -92,78 +104,78 @@ describe Her::Model::HTTP do
         end
       end
 
-      spawn_model :User
+      spawn_model "Foo::User"
     end # }}}
 
     it "handle GET wrapper method" do # {{{
-      @users = User.get(:popular)
+      @users = Foo::User.get(:popular)
       @users.length.should == 2
       @users.first.id.should == 1
 
-      @user = User.get(:"1")
+      @user = Foo::User.get(:"1")
       @user.id.should == 1
     end # }}}
 
     it "handle raw GET" do # {{{
-      User.get_raw("/users") do |parsed_data|
+      Foo::User.get_raw("/users") do |parsed_data|
         parsed_data[:data].should == [{ :id => 1 }]
       end
     end # }}}
 
     it "handle raw POST" do # {{{
-      User.post_raw("/users") do |parsed_data|
+      Foo::User.post_raw("/users") do |parsed_data|
         parsed_data[:data].should == [{ :id => 3 }]
       end
     end # }}}
 
     it "handle raw PUT" do # {{{
-      User.put_raw("/users/4") do |parsed_data|
+      Foo::User.put_raw("/users/4") do |parsed_data|
         parsed_data[:data].should == [{ :id => 4 }]
       end
     end # }}}
 
     it "handle raw PATCH" do # {{{
-      User.patch_raw("/users/6") do |parsed_data|
+      Foo::User.patch_raw("/users/6") do |parsed_data|
         parsed_data[:data].should == [{ :id => 6 }]
       end
     end # }}}
 
     it "handle raw DELETE" do # {{{
-      User.delete_raw("/users/5") do |parsed_data|
+      Foo::User.delete_raw("/users/5") do |parsed_data|
         parsed_data[:data].should == [{ :id => 5 }]
       end
     end # }}}
 
     it "handle querystring parameters" do # {{{
-      User.get_raw("/users", :page => 2) do |parsed_data|
+      Foo::User.get_raw("/users", :page => 2) do |parsed_data|
         parsed_data[:data].should == [{ :id => 2 }]
       end
     end # }}}
 
     it "handle GET collection" do # {{{
-      @users = User.get_collection("/users/popular")
+      @users = Foo::User.get_collection("/users/popular")
       @users.length.should == 2
       @users.first.id.should == 1
     end # }}}
 
     it "handle GET resource" do # {{{
-      @user = User.get_resource("/users/1")
+      @user = Foo::User.get_resource("/users/1")
       @user.id.should == 1
     end # }}}
 
     it "handle GET collection through a symbol" do # {{{
-      @users = User.get_collection(:popular)
+      @users = Foo::User.get_collection(:popular)
       @users.length.should == 2
       @users.first.id.should == 1
     end # }}}
 
     it "handle GET resource through a symbol" do # {{{
-      @user = User.get_resource(:"1")
+      @user = Foo::User.get_resource(:"1")
       @user.id.should == 1
     end # }}}
 
     it "handle raw GET through a symbol" do # {{{
-      User.get_raw(:popular) do |parsed_data|
+      Foo::User.get_raw(:popular) do |parsed_data|
         parsed_data[:data].should == [{ :id => 1 }, { :id => 2 }]
       end
     end # }}}
@@ -180,26 +192,25 @@ describe Her::Model::HTTP do
         end
       end
 
-      spawn_model :User do
-        custom_get :popular, :foobar
-        custom_post :from_default
-      end
+      spawn_model "Foo::User"
+      Foo::User.custom_get :popular, :foobar
+      Foo::User.custom_post :from_default
     end # }}}
 
     it "handles custom methods" do # {{{
-      User.respond_to?(:popular).should be_true
-      User.respond_to?(:foobar).should be_true
-      User.respond_to?(:from_default).should be_true
+      Foo::User.respond_to?(:popular).should be_true
+      Foo::User.respond_to?(:foobar).should be_true
+      Foo::User.respond_to?(:from_default).should be_true
     end # }}}
 
     it "handles custom GET requests" do # {{{
-      @users = User.popular
+      @users = Foo::User.popular
       @users.length.should == 2
       @users.first.id.should == 1
     end # }}}
 
     it "handles custom POST requests" do # {{{
-      @user = User.from_default(:name => "Tobias Fünke")
+      @user = Foo::User.from_default(:name => "Tobias Fünke")
       @user.id.should be_true
     end # }}}
   end

data/spec/model/introspection_spec.rb

@@ -8,23 +8,44 @@ describe Her::Model::Introspection do
         builder.use Her::Middleware::FirstLevelParseJSON
         builder.use Faraday::Request::UrlEncoded
         builder.adapter :test do |stub|
-          stub.get("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
+          stub.post("/users")     { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
+          stub.get("/users/1")    { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
+          stub.put("/users/1")    { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
+          stub.delete("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Funke" }.to_json] }
         end
       end
 
-      spawn_model :User
+      spawn_model "Foo::User"
     end # }}}
 
     describe "#inspect" do
       it "outputs resource attributs for an existing resource" do # {{{
-        @user = User.find(1)
-        ["#<User(/users/1) name=\"Tobias Funke\" id=1>", "#<User(/users/1) id=1 name=\"Tobias Funke\">"].should include(@user.inspect)
+        @user = Foo::User.find(1)
+        ["#<Foo::User(/users/1) name=\"Tobias Funke\" id=1>", "#<Foo::User(/users/1) id=1 name=\"Tobias Funke\">"].should include(@user.inspect)
       end # }}}
 
       it "outputs resource attributs for an not-saved-yet resource" do # {{{
-        @user = User.new(:name => "Tobias Funke")
-        @user.inspect.should == "#<User(/users) name=\"Tobias Funke\">"
+        @user = Foo::User.new(:name => "Tobias Funke")
+        @user.inspect.should == "#<Foo::User(/users) name=\"Tobias Funke\">"
       end # }}}
     end
   end
+
+  describe "#nearby_class" do
+    context "for a class inside of a module" do
+      before do
+        spawn_model "Foo::User"
+        spawn_model "Foo::AccessRecord"
+        spawn_model "AccessRecord"
+        spawn_model "Log"
+      end
+
+      it "returns a sibling class, if found" do
+        Foo::User.nearby_class("AccessRecord").should == Foo::AccessRecord
+        AccessRecord.nearby_class("Log").should == Log
+        Foo::User.nearby_class("Log").should == Log
+        Foo::User.nearby_class("X").should be_nil
+      end
+    end
+  end
 end

data/spec/model/orm_spec.rb

@@ -15,49 +15,48 @@ describe Her::Model::ORM do
         end
       end
 
-      spawn_model :User do
+      spawn_model "Foo::User" do
         uses_api api
       end
 
-      spawn_model :AdminUser do
+      spawn_model "Foo::AdminUser" do
         uses_api api
       end
     end # }}}
 
     it "maps a single resource to a Ruby object" do # {{{
-      @user = User.find(1)
+      @user = Foo::User.find(1)
       @user.id.should == 1
       @user.name.should == "Tobias Fünke"
     end # }}}
 
     it "maps a collection of resources to an array of Ruby objects" do # {{{
-      @users = User.all
+      @users = Foo::User.all
       @users.length.should == 2
       @users.first.name.should == "Tobias Fünke"
 
-      @users = AdminUser.all
+      @users = Foo::AdminUser.all
       @users.length.should == 2
       @users.first.name.should == "Tobias Fünke"
     end # }}}
 
     it "handles new resource" do # {{{
-      @new_user = User.new(:fullname => "Tobias Fünke", :medicine_license => nil)
+      @new_user = Foo::User.new(:fullname => "Tobias Fünke")
       @new_user.new?.should be_true
       @new_user.fullname.should == "Tobias Fünke"
-      @new_user.medicine_license.should be_nil
 
-      @existing_user = User.find(1)
+      @existing_user = Foo::User.find(1)
       @existing_user.new?.should be_false
     end # }}}
 
     it "handles method missing for getter" do# {{{
-      @new_user = User.new(:fullname => 'Mayonegg')
+      @new_user = Foo::User.new(:fullname => 'Mayonegg')
       lambda { @new_user.unknown_method_for_a_user }.should raise_error(NoMethodError)
       expect { @new_user.fullname }.to_not raise_error(NoMethodError)
     end# }}}
 
     it "handles method missing for setter" do# {{{
-      @new_user = User.new
+      @new_user = Foo::User.new
       expect { @new_user.fullname = "Tobias Fünke" }.to_not raise_error(NoMethodError)
     end# }}}
   end
@@ -166,17 +165,17 @@ describe Her::Model::ORM do
         end
       end
 
-      spawn_model :User
+      spawn_model "Foo::User"
     end # }}}
 
     it "handle one-line resource creation" do # {{{
-      @user = User.create(:fullname => "Tobias Fünke")
+      @user = Foo::User.create(:fullname => "Tobias Fünke")
       @user.id.should == 1
       @user.fullname.should == "Tobias Fünke"
     end # }}}
 
     it "handle resource creation through Model.new + #save" do # {{{
-      @user = User.new(:fullname => "Tobias Fünke")
+      @user = Foo::User.new(:fullname => "Tobias Fünke")
       @user.save
       @user.fullname.should == "Tobias Fünke"
     end # }}}
@@ -193,23 +192,23 @@ describe Her::Model::ORM do
         end
       end
 
-      spawn_model :User
+      spawn_model "Foo::User"
     end # }}}
 
     it "handle resource data update without saving it" do # {{{
-      @user = User.find(1)
+      @user = Foo::User.find(1)
       @user.fullname.should == "Tobias Fünke"
       @user.fullname = "Kittie Sanchez"
       @user.fullname.should == "Kittie Sanchez"
     end # }}}
 
     it "handle resource update through the .update class method" do # {{{
-      @user = User.save_existing(1, { :fullname => "Lindsay Fünke" })
+      @user = Foo::User.save_existing(1, { :fullname => "Lindsay Fünke" })
       @user.fullname.should == "Lindsay Fünke"
     end # }}}
 
     it "handle resource update through #save on an existing resource" do # {{{
-      @user = User.find(1)
+      @user = Foo::User.find(1)
       @user.fullname = "Lindsay Fünke"
       @user.save
       @user.fullname.should == "Lindsay Fünke"
@@ -227,16 +226,16 @@ describe Her::Model::ORM do
         end
       end
 
-      spawn_model :User
+      spawn_model "Foo::User"
     end # }}}
 
     it "handle resource deletion through the .destroy class method" do # {{{
-      @user = User.destroy_existing(1)
+      @user = Foo::User.destroy_existing(1)
       @user.active.should be_false
     end # }}}
 
     it "handle resource deletion through #destroy on an existing resource" do # {{{
-      @user = User.find(1)
+      @user = Foo::User.find(1)
       @user.destroy
       @user.active.should be_false
     end # }}}

data/spec/model/paths_spec.rb

@@ -5,85 +5,85 @@ describe Her::Model::Paths do
   context "building request paths" do
     context "simple model" do
       before do # {{{
-        spawn_model :User
+        spawn_model "Foo::User"
       end # }}}
 
       describe "#build_request_path" do
         it "builds paths with defaults" do # {{{
-          User.build_request_path(:id => "foo").should == "/users/foo"
-          User.build_request_path.should == "/users"
+          Foo::User.build_request_path(:id => "foo").should == "/users/foo"
+          Foo::User.build_request_path.should == "/users"
         end # }}}
 
         it "builds paths with custom collection path" do # {{{
-          User.collection_path "/utilisateurs"
-          User.build_request_path(:id => "foo").should == "/utilisateurs/foo"
-          User.build_request_path.should == "/utilisateurs"
+          Foo::User.collection_path "/utilisateurs"
+          Foo::User.build_request_path(:id => "foo").should == "/utilisateurs/foo"
+          Foo::User.build_request_path.should == "/utilisateurs"
         end # }}}
 
         it "builds paths with custom collection path with multiple variables" do # {{{
-          User.collection_path "/organizations/:organization_id/utilisateurs"
-          User.build_request_path(:id => "foo", :_organization_id => "acme").should == "/organizations/acme/utilisateurs/foo"
-          User.build_request_path(:_organization_id => "acme").should == "/organizations/acme/utilisateurs"
+          Foo::User.collection_path "/organizations/:organization_id/utilisateurs"
+          Foo::User.build_request_path(:id => "foo", :_organization_id => "acme").should == "/organizations/acme/utilisateurs/foo"
+          Foo::User.build_request_path(:_organization_id => "acme").should == "/organizations/acme/utilisateurs"
         end # }}}
 
         it "builds paths with custom item path" do # {{{
-          User.resource_path "/utilisateurs/:id"
-          User.build_request_path(:id => "foo").should == "/utilisateurs/foo"
-          User.build_request_path.should == "/users"
+          Foo::User.resource_path "/utilisateurs/:id"
+          Foo::User.build_request_path(:id => "foo").should == "/utilisateurs/foo"
+          Foo::User.build_request_path.should == "/users"
         end # }}}
 
         it "raises exceptions when building a path without required custom variables" do # {{{
-          User.collection_path "/organizations/:organization_id/utilisateurs"
-          expect { User.build_request_path(:id => "foo") }.should raise_error(Her::Errors::PathError)
+          Foo::User.collection_path "/organizations/:organization_id/utilisateurs"
+          expect { Foo::User.build_request_path(:id => "foo") }.to raise_error(Her::Errors::PathError)
         end # }}}
       end
     end
 
     context "simple model with multiple words" do
       before do # {{{
-        spawn_model :AdminUser
+        spawn_model "Foo::AdminUser"
       end # }}}
 
       describe "#build_request_path" do
         it "builds paths with defaults" do # {{{
-          AdminUser.build_request_path(:id => "foo").should == "/admin_users/foo"
-          AdminUser.build_request_path.should == "/admin_users"
+          Foo::AdminUser.build_request_path(:id => "foo").should == "/admin_users/foo"
+          Foo::AdminUser.build_request_path.should == "/admin_users"
         end # }}}
 
         it "builds paths with custom collection path" do # {{{
-          AdminUser.collection_path "/users"
-          AdminUser.build_request_path(:id => "foo").should == "/users/foo"
-          AdminUser.build_request_path.should == "/users"
+          Foo::AdminUser.collection_path "/users"
+          Foo::AdminUser.build_request_path(:id => "foo").should == "/users/foo"
+          Foo::AdminUser.build_request_path.should == "/users"
         end # }}}
 
         it "builds paths with custom collection path with multiple variables" do # {{{
-          AdminUser.collection_path "/organizations/:organization_id/users"
-          AdminUser.build_request_path(:id => "foo", :_organization_id => "acme").should == "/organizations/acme/users/foo"
-          AdminUser.build_request_path(:_organization_id => "acme").should == "/organizations/acme/users"
+          Foo::AdminUser.collection_path "/organizations/:organization_id/users"
+          Foo::AdminUser.build_request_path(:id => "foo", :_organization_id => "acme").should == "/organizations/acme/users/foo"
+          Foo::AdminUser.build_request_path(:_organization_id => "acme").should == "/organizations/acme/users"
         end # }}}
 
         it "builds paths with custom item path" do # {{{
-          AdminUser.resource_path "/users/:id"
-          AdminUser.build_request_path(:id => "foo").should == "/users/foo"
-          AdminUser.build_request_path.should == "/admin_users"
+          Foo::AdminUser.resource_path "/users/:id"
+          Foo::AdminUser.build_request_path(:id => "foo").should == "/users/foo"
+          Foo::AdminUser.build_request_path.should == "/admin_users"
         end # }}}
 
         it "raises exceptions when building a path without required custom variables" do # {{{
-          AdminUser.collection_path "/organizations/:organization_id/users"
-          expect { AdminUser.build_request_path(:id => "foo") }.should raise_error(Her::Errors::PathError)
+          Foo::AdminUser.collection_path "/organizations/:organization_id/users"
+          expect { Foo::AdminUser.build_request_path(:id => "foo") }.to raise_error(Her::Errors::PathError)
         end # }}}
       end
     end
 
     context "nested model" do
       before do # {{{
-        spawn_submodel :Base, :User
+        spawn_model "Foo::User"
       end # }}}
 
       describe "#build_request_path" do
         it "builds paths with defaults" do # {{{
-          Base::User.build_request_path(:id => "foo").should == "/users/foo"
-          Base::User.build_request_path.should == "/users"
+          Foo::User.build_request_path(:id => "foo").should == "/users/foo"
+          Foo::User.build_request_path.should == "/users"
         end # }}}
       end
     end
@@ -103,14 +103,14 @@ describe Her::Model::Paths do
         end
       end
 
-      spawn_model :User do
+      spawn_model "Foo::User" do
         collection_path "/organizations/:organization_id/users"
       end
     end # }}}
 
     describe "fetching a resource" do
       it "maps a single resource to a Ruby object" do # {{{
-        @user = User.find(1, :_organization_id => 2)
+        @user = Foo::User.find(1, :_organization_id => 2)
         @user.id.should == 1
         @user.fullname.should == "Tobias Fünke"
       end # }}}
@@ -118,7 +118,7 @@ describe Her::Model::Paths do
 
     describe "fetching a collection" do
       it "maps a collection of resources to an array of Ruby objects" do # {{{
-        @users = User.all(:_organization_id => 2)
+        @users = Foo::User.all(:_organization_id => 2)
         @users.length.should == 2
         @users.first.fullname.should == "Tobias Fünke"
       end # }}}
@@ -126,23 +126,23 @@ describe Her::Model::Paths do
 
     describe "handling new resource" do
       it "handles new resource" do # {{{
-        @new_user = User.new(:fullname => "Tobias Fünke", :organization_id => 2)
+        @new_user = Foo::User.new(:fullname => "Tobias Fünke", :organization_id => 2)
         @new_user.new?.should be_true
 
-        @existing_user = User.find(1, :_organization_id => 2)
+        @existing_user = Foo::User.find(1, :_organization_id => 2)
         @existing_user.new?.should be_false
       end # }}}
     end
 
     describe "creating resources" do
       it "handle one-line resource creation" do # {{{
-        @user = User.create(:fullname => "Tobias Fünke", :organization_id => 2)
+        @user = Foo::User.create(:fullname => "Tobias Fünke", :organization_id => 2)
         @user.id.should == 1
         @user.fullname.should == "Tobias Fünke"
       end # }}}
 
       it "handle resource creation through Model.new + #save" do # {{{
-        @user = User.new(:fullname => "Tobias Fünke", :organization_id => 2)
+        @user = Foo::User.new(:fullname => "Tobias Fünke", :organization_id => 2)
         @user.save
         @user.fullname.should == "Tobias Fünke"
       end # }}}
@@ -150,19 +150,19 @@ describe Her::Model::Paths do
 
     context "updating resources" do
       it "handle resource data update without saving it" do # {{{
-        @user = User.find(1, :_organization_id => 2)
+        @user = Foo::User.find(1, :_organization_id => 2)
         @user.fullname.should == "Tobias Fünke"
         @user.fullname = "Kittie Sanchez"
         @user.fullname.should == "Kittie Sanchez"
       end # }}}
 
       it "handle resource update through the .update class method" do # {{{
-        @user = User.save_existing(1, { :fullname => "Lindsay Fünke", :organization_id => 2 })
+        @user = Foo::User.save_existing(1, { :fullname => "Lindsay Fünke", :organization_id => 2 })
         @user.fullname.should == "Lindsay Fünke"
       end # }}}
 
       it "handle resource update through #save on an existing resource" do # {{{
-        @user = User.find(1, :_organization_id => 2)
+        @user = Foo::User.find(1, :_organization_id => 2)
         @user.fullname = "Lindsay Fünke"
         @user.save
         @user.fullname.should == "Lindsay Fünke"
@@ -171,12 +171,12 @@ describe Her::Model::Paths do
 
     context "deleting resources" do
       it "handle resource deletion through the .destroy class method" do # {{{
-        @user = User.destroy_existing(1, :_organization_id => 2)
+        @user = Foo::User.destroy_existing(1, :_organization_id => 2)
         @user.active.should be_false
       end # }}}
 
       it "handle resource deletion through #destroy on an existing resource" do # {{{
-        @user = User.find(1, :_organization_id => 2)
+        @user = Foo::User.find(1, :_organization_id => 2)
         @user.destroy
         @user.active.should be_false
       end # }}}