sinatra_resource 0.3.1 → 0.3.2

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/examples/datacatalog/models/user.rb

@@ -45,6 +45,12 @@ module DataCatalog
       s = "#{Time.now.to_f}#{salt}#{rand(100_000_000)}#{name}#{email}"
       Digest::SHA1.hexdigest(s)
     end
+    
+    # == Various Instance Methods
+    
+    def token
+      Digest::SHA1.hexdigest("#{id}/#{email}/123456789")
+    end
 
   end
 

data/examples/datacatalog/resources/users.rb

@@ -20,6 +20,10 @@ module DataCatalog
     property :email,      :r => :owner
     property :role,       :r => :owner, :w => :admin
     property :_api_key,   :r => :owner, :w => :admin
+    
+    property :token, :r => :owner do |user|
+      user.token
+    end
 
     # == Callbacks
   end

data/examples/datacatalog/test/resources/users/users_get_many_test.rb

@@ -78,7 +78,8 @@ class UsersGetManyResourceTest < ResourceTestCase
       test "body elements should be correct" do
         parsed_response_body.each do |element|
           if element["id"] == user_for(role).id
-            assert_properties(%w(name email role _api_key id created_at updated_at), element)
+            assert_properties(%w(name email role _api_key token
+              id created_at updated_at), element)
           else
             assert_properties(%w(name id created_at updated_at), element)
           end
@@ -109,7 +110,7 @@ class UsersGetManyResourceTest < ResourceTestCase
         assert_equal EMAILS, actual.sort
       end
       
-      docs_properties %w(name email role _api_key id created_at updated_at)
+      docs_properties %w(name email role _api_key token id created_at updated_at)
     end
   end
   

data/examples/datacatalog/test/resources/users/users_get_one_test.rb

@@ -47,29 +47,31 @@ class UsersGetOneResourceTest < ResourceTestCase
       before do
         get "/#{@user.id}", :api_key => api_key_for(role)
       end
-
+  
       use "return 200 Ok"
       doc_properties %w(name id created_at updated_at)
     end
   end
-  
+
   context "owner : get /:id" do
     before do
       get "/#{@user.id}", :api_key => @user._api_key
     end
-
+  
     use "return 200 Ok"
-    doc_properties %w(name email role _api_key id created_at updated_at)
+    doc_properties %w(name email role _api_key token
+      id created_at updated_at)
   end
-
+  
   %w(admin).each do |role|
     context "#{role} : get /:id" do
       before do
         get "/#{@user.id}", :api_key => api_key_for(role)
       end
-
+  
       use "return 200 Ok"
-      doc_properties %w(name email role _api_key id created_at updated_at)
+      doc_properties %w(name email role _api_key token
+        id created_at updated_at)
     end
   end
 

data/examples/datacatalog/test/resources/users/users_post_test.rb

@@ -110,7 +110,8 @@ class UsersPostResourceTest < ResourceTestCase
       use "return 201 Created"
       location_header "users"
       use "one new user"
-      doc_properties %w(name email role _api_key id created_at updated_at)
+      doc_properties %w(name email role _api_key token
+        id created_at updated_at)
 
       test "should set all fields in database" do
         user = User.find_by_id(parsed_response_body["id"])

data/examples/datacatalog/test/resources/users/users_put_test.rb

@@ -162,7 +162,8 @@ class UsersPutResourceTest < ResourceTestCase
         end
       
         use "return 200 Ok"
-        doc_properties %w(name email role _api_key id created_at updated_at)
+        doc_properties %w(name email role _api_key token
+          id created_at updated_at)
   
         test "should change correct fields in database" do
           user = User.find_by_id(@user.id)
@@ -189,7 +190,8 @@ class UsersPutResourceTest < ResourceTestCase
       end
       
       use "return 200 Ok"
-      doc_properties %w(name email role _api_key id created_at updated_at)
+      doc_properties %w(name email role _api_key token
+        id created_at updated_at)
   
       test "should change all fields in database" do
         user = User.find_by_id(@user.id)

data/lib/resource.rb

@@ -145,15 +145,20 @@ module SinatraResource
           raise DefinitionError, "property #{name.inspect} already declared in #{self}"
         end
         @resource_config[:properties][name] = {}
+
         if block
           @resource_config[:properties][name][:w] = :nobody
           @resource_config[:properties][name][:read_proc] = block
-        else
-          access_rules.each_pair do |kind, role|
-            @resource_config[:roles].validate_role(role)
-            @resource_config[:properties][name][kind] = role
+          if access_rules[:w] && access_rules[:w] != :nobody
+            raise DefinitionError, "property #{name.inspect} is using block " +
+              "form. :w => :nobody is assumed and cannot be overridden."
           end
         end
+
+        access_rules.each_pair do |kind, role|
+          @resource_config[:roles].validate_role(role)
+          @resource_config[:properties][name][kind] = role
+        end
       end
       
       # Declare a relation with a block of code.

data/sinatra_resource.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - David James