her 0.2 → 0.2.1

data/spec/model/hooks_spec.rb

@@ -116,8 +116,7 @@ describe Her::Model::Hooks do
         FakeWeb.register_uri(:put, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
         FakeWeb.register_uri(:delete, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
 
-        spawn_model :User
-        class User
+        spawn_model :User do
           attr_accessor :internal_save_id, :internal_create_id, :internal_update_id, :internal_destroy_id
           attr_accessor :internal_after_save_id, :internal_after_create_id, :internal_after_update_id, :internal_after_destroy_id
 

data/spec/model/introspection_spec.rb

@@ -12,12 +12,12 @@ describe Her::Model::Introspection do
     describe "#inspect" do
       it "outputs resource attributs for an existing resource" do # {{{
         @user = User.find(1)
-        @user.inspect.should == "#<User(users/1) id=1 name=\"Tobias Fünke\">"
+        @user.inspect.should == "#<User(/users/1) id=1 name=\"Tobias Fünke\">"
       end # }}}
 
       it "outputs resource attributs for an not-saved-yet resource" do # {{{
         @user = User.new(:name => "Tobias Fünke")
-        @user.inspect.should == "#<User(users) name=\"Tobias Fünke\">"
+        @user.inspect.should == "#<User(/users) name=\"Tobias Fünke\">"
       end # }}}
     end
   end

data/spec/model/orm_spec.rb

@@ -4,13 +4,14 @@ require File.join(File.dirname(__FILE__), "../spec_helper.rb")
 describe Her::Model::ORM do
   context "mapping data to Ruby objects" do
     before do # {{{
-      @api = Her::API.new
-      @api.setup :base_uri => "https://api.example.com"
+      api = Her::API.new
+      api.setup :base_uri => "https://api.example.com"
       FakeWeb.register_uri(:get, "https://api.example.com/users/1", :body => { :id => 1, :name => "Tobias Fünke" }.to_json)
       FakeWeb.register_uri(:get, "https://api.example.com/users", :body => [{ :id => 1, :name => "Tobias Fünke" }, { :id => 2, :name => "Lindsay Fünke" }].to_json)
 
-      spawn_model :User
-      User.uses_api @api
+      spawn_model :User do
+        uses_api api
+      end
     end # }}}
 
     it "maps a single resource to a Ruby object" do # {{{

data/spec/model/paths_spec.rb

@@ -0,0 +1,131 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), "../spec_helper.rb")
+
+describe Her::Model::Paths do
+  context "building request paths" do
+    before do # {{{
+      spawn_model :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"
+      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"
+      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"
+      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"
+      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)
+      end # }}}
+    end
+  end
+
+  context "making HTTP requests" do
+    before do # {{{
+      api = Her::API.new
+      api.setup :base_uri => "https://api.example.com"
+      FakeWeb.register_uri(:get, "https://api.example.com/organizations/2/users", :body => [{ :id => 1, :fullname => "Tobias Fünke", :organization_id => 2 }, { :id => 2, :fullname => "Lindsay Fünke", :organization_id => 2 }].to_json)
+      FakeWeb.register_uri(:post, "https://api.example.com/organizations/2/users", :body => { :id => 1, :fullname => "Tobias Fünke", :organization_id => 2 }.to_json)
+      FakeWeb.register_uri(:put, "https://api.example.com/organizations/2/users/1", :body => { :id => 1, :fullname => "Lindsay Fünke", :organization_id => 2 }.to_json)
+      FakeWeb.register_uri(:get, "https://api.example.com/organizations/2/users/1", :body => { :id => 1, :fullname => "Tobias Fünke", :organization_id => 2, :active => true }.to_json)
+      FakeWeb.register_uri(:delete, "https://api.example.com/organizations/2/users/1", :body => { :id => 1, :fullname => "Lindsay Fünke", :organization_id => 2, :active => false }.to_json)
+
+      spawn_model :User do
+        uses_api api
+        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.id.should == 1
+        @user.fullname.should == "Tobias Fünke"
+      end # }}}
+    end
+
+    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.length.should == 2
+        @users.first.fullname.should == "Tobias Fünke"
+      end # }}}
+    end
+
+    describe "handling new resource" do
+      it "handles new resource" do # {{{
+        @new_user = 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.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.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.save
+        @user.fullname.should == "Tobias Fünke"
+      end # }}}
+    end
+
+    context "updating resources" do
+      it "handle resource data update without saving it" do # {{{
+        @user = 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.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.fullname = "Lindsay Fünke"
+        @user.save
+        @user.fullname.should == "Lindsay Fünke"
+      end # }}}
+    end
+
+    context "deleting resources" do
+      it "handle resource deletion through the .destroy class method" do # {{{
+        @user = 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.destroy
+        @user.active.should be_false
+      end # }}}
+    end
+  end
+end

data/spec/model/relationships_spec.rb

@@ -50,14 +50,16 @@ describe Her::Model::Relationships do
       FakeWeb.register_uri(:get, "https://api.example.com/users/2/role", :body => { :id => 2, :body => "User" }.to_json)
       FakeWeb.register_uri(:get, "https://api.example.com/organizations/1", :body => { :id => 1, :name => "Bluth Company" }.to_json)
 
-      spawn_model :User
+      spawn_model :User do
+        has_many :comments
+        has_one :role
+        belongs_to :organization
+      end
+
       spawn_model :Organization
       spawn_model :Comment
       spawn_model :Role
 
-      User.has_many :comments
-      User.has_one :role
-      User.belongs_to :organization
 
       @user_with_included_data = User.find(1)
       @user_without_included_data = User.find(2)

data/spec/spec_helper.rb

@@ -19,7 +19,8 @@ class Array
   def to_json; MultiJson.dump(self); end
 end
 
-def spawn_model(klass, attrs={})
+def spawn_model(klass, attrs={}, &block)
   Object.instance_eval { remove_const klass } if Object.const_defined?(klass)
-  eval "class #{klass}; include Her::Model; end"
+  Object.const_set(klass, Class.new).send(:include, Her::Model)
+  Object.const_get(klass).class_eval(&block) if block_given?
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,56 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.2.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -80,82 +80,146 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.3
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: growl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.3
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-description: Her is an ORM that maps REST resources to Ruby objects
+        version: 1.3.4
+description: Her is an ORM that maps REST resources and collections to Ruby objects
 email:
 - remi@exomel.com
 executables: []
@@ -165,12 +229,22 @@ files:
 - .gitignore
 - .travis.yml
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
+- examples/twitter-oauth/Gemfile
+- examples/twitter-oauth/app.rb
+- examples/twitter-oauth/config.ru
+- examples/twitter-oauth/views/index.haml
+- examples/twitter-search/Gemfile
+- examples/twitter-search/app.rb
+- examples/twitter-search/config.ru
+- examples/twitter-search/views/index.haml
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb
+- lib/her/errors.rb
 - lib/her/middleware.rb
 - lib/her/middleware/first_level_parse_json.rb
 - lib/her/middleware/second_level_parse_json.rb
@@ -180,6 +254,7 @@ files:
 - lib/her/model/http.rb
 - lib/her/model/introspection.rb
 - lib/her/model/orm.rb
+- lib/her/model/paths.rb
 - lib/her/model/relationships.rb
 - lib/her/version.rb
 - spec/api_spec.rb
@@ -189,9 +264,10 @@ files:
 - spec/model/http_spec.rb
 - spec/model/introspection_spec.rb
 - spec/model/orm_spec.rb
+- spec/model/paths_spec.rb
 - spec/model/relationships_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/remiprev/her
+homepage: http://remiprev.github.com/her
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -205,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2358268706124465287
+      hash: 453966821948784652
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +290,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2358268706124465287
+      hash: 453966821948784652
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.18
@@ -230,6 +306,7 @@ test_files:
 - spec/model/http_spec.rb
 - spec/model/introspection_spec.rb
 - spec/model/orm_spec.rb
+- spec/model/paths_spec.rb
 - spec/model/relationships_spec.rb
 - spec/spec_helper.rb
 has_rdoc: