medea 0.6.9 → 0.7.0

data/lib/medea/jason_base.rb

@@ -2,9 +2,12 @@ module Medea
   class JasonBase
     #meta-programming interface for lists
     include ClassLevelInheritableAttributes
-    inheritable_attributes :owned
+    inheritable_attributes :owned, :public
     @owned = false
 
+    #these verbs are able to be made public
+    HTTP_VERBS = [:GET, :POST, :PUT, :DELETE]
+
     #the resolve method takes a key and returns the JasonObject that has that key
     #This is useful when you have the key, but not the class
     def self.resolve(key, mode=:lazy)
@@ -30,6 +33,13 @@ module Medea
       end
     end
 
+    def initialize
+      @public = []
+      if opts[:public]
+        opts[:public].each {|i| @public << i}
+      end
+    end
+
     def ==(other)
       return false if not other.is_a? JasonBase
       jason_key == other.jason_key
@@ -124,12 +134,72 @@ module Medea
       @__jason_data = JSON.parse response
       @__jason_etag = response.headers[:etag]
       @__jason_timestamp = response.headers[:timestamp]
-      if response.headers[:http_x_public]
-        @public = response.headers[:http_x_public].split(",")
+      if response.headers[:http_x_permissions]
+        @public = []
+        response.headers[:http_x_permissions].match /PUBLIC:\[([A-Z]+)(,[A-Z]+)*\]/ do |m|
+          m.captures.each do |c|
+            @public << c.slice(/[A-Z]+/)
+          end
+        end
       end
       @__jason_state = :stale
     end
 
+    def add_public *args
+      args.reject! do |i|
+        not HTTP_VERBS.include? i
+      end
+      args.uniq!
+      @public += args
+      @public.uniq!
+      @__jason_state = :dirty unless args.empty?
+    end
+
+    def remove_public *args
+      args.reject! do |i|
+        not HTTP_VERBS.include? i
+      end
+      @public -= args
+      @public.uniq!
+      @__jason_state = :dirty unless args.empty?
+    end
 
+    def set_public *args
+      args.reject! do |i|
+        not HTTP_VERBS.include? i
+      end
+      args.uniq!
+      @__jason_state = :dirty unless args.sort == @public.sort
+      @public = args
+    end
+
+    def get_public
+      @public
+    end
+
+    def permissions_header
+      permissions = {}
+      if self.get_public.any?
+        permissions["PUBLIC"] = self.get_public.join(",")
+      end
+
+      result = []
+      
+      permissions.each do |k, v|
+        result << "#{k}:[#{v}]"
+      end
+
+      {"X-PERMISSIONS" => "{#{result.join ","}}"}
+    end
+
+    private
+    def opts
+      if self.class.class_variable_defined? :@@opts
+        self.class.class_variable_get :@@opts
+      else
+        {}
+      end
+    end
+    
   end
 end

data/lib/medea/jason_blob.rb

@@ -1,8 +1,14 @@
 module Medea
-  class JasonBlob < JasonBase
+  class JasonBlob < Medea::JasonBase
     attr_accessor :parent, :attachment_name
 
     def initialize initialiser=nil, mode=:eager
+
+      @public = []
+      if opts[:public]
+        opts[:public].each {|i| @public << i}
+      end
+
       if initialiser
         if initialiser.is_a? Hash
           @parent = initialiser[:parent]
@@ -102,6 +108,8 @@ module Medea
           #may also want to add any other indexable fields that the user specifies?
       }
 
+      post_headers.merge! permissions_header
+
       resp = RestClient.post to_url, contents, post_headers
 
       if resp.code == 201

data/lib/medea/jasondb.rb

@@ -23,7 +23,8 @@ module JasonDB
       protocol << "s"
       "#{protocol}://#{user}:#{password}@#{host}/#{topic}/"
     else #mode == :public
-      "#{protocol}://#{host}/#{topic}/"
+      #TODO Remove the dummy "a:a" here...
+      "#{protocol}://a:a@#{host}/#{topic}/"
     end
   end
 

data/lib/medea/jasonobject.rb

@@ -5,10 +5,7 @@ module Medea
   require 'json'
   require 'uuidtools'
 
-  class JasonObject < JasonBase
-
-    #these verbs are able to be made public
-    HTTP_VERBS = [:GET, :POST, :PUT, :DELETE]
+  class JasonObject < Medea::JasonBase
 
     include Medea::ActiveModelMethods
     if defined? ActiveModel
@@ -192,30 +189,6 @@ module Medea
         persist_changes :post
     end
 
-    def add_public *args
-      args.reject! do |i|
-        not HTTP_VERBS.include? i
-      end
-      @public += args
-      @public.uniq!
-    end
-
-    def remove_public *args
-      args.reject! do |i|
-        not HTTP_VERBS.include? i
-      end
-      @public -= args
-      @public.uniq!
-    end
-
-    def set_public *args
-      args.reject! do |i|
-        not HTTP_VERBS.include? i
-      end
-      @public = args
-      @public.uniq!
-    end
-
     def to_url mode=:secure
       "#{JasonDB::db_auth_url mode}#{self.class.name}/#{self.jason_key}"
     end
@@ -250,9 +223,7 @@ module Medea
         end
       end
 
-      if @public.any?
-        post_headers["X-PUBLIC"] = @public.join(",")
-      end
+      post_headers.merge! permissions_header
 
       url = to_url()
 
@@ -280,13 +251,6 @@ module Medea
 
     #end object persistence
 
-    private
-    def opts
-      if self.class.class_variable_defined? :@@opts
-        self.class.class_variable_get :@@opts
-      else
-        {}
-      end
-    end
+
   end
 end

data/lib/medea/version.rb

@@ -1,5 +1,5 @@
 module Medea
-  VERSION = "0.6.9"
+  VERSION = "0.7.0"
 
   #When the templates are changed, this version should be incremented
   #This version is used when uploading/updating the templates

data/spec/deferred_query_spec.rb

@@ -33,7 +33,7 @@ describe "Deferred Query" do
   end
 
   it "should be able to fetch those since a particular time" do
-    u = User.all[10]
+    u = User.all[User.all.count - 1]
     User.all(:since => u.jason_timestamp).each do |i|
       i.jason_timestamp.should be >= u.jason_timestamp
     end

data/spec/jason_object_spec.rb

@@ -121,13 +121,13 @@ describe "JasonObject" do
 
   it "should post security information properly" do
     @user.add_public :GET, :POST
-    RestClient.should_receive(:post).with(anything(), anything(), hash_including("X-PUBLIC" => "GET,POST")).and_return(DummyResponse.new)
+    RestClient.should_receive(:post).with(anything(), anything(), hash_including("X-PERMISSIONS" => "{PUBLIC:[GET,POST]}")).and_return(DummyResponse.new)
     @user.save!
   end
 
   it "should only post valid verbs" do
     @user.add_public :GET, :FAKEVERB
-    RestClient.should_receive(:post).with(anything(), anything(), hash_including("X-PUBLIC" => "GET")).and_return(DummyResponse.new)
+    RestClient.should_receive(:post).with(anything(), anything(), hash_including("X-PERMISSIONS" => "{PUBLIC:[GET]}")).and_return(DummyResponse.new)
     @user.save!
   end
 
@@ -135,6 +135,6 @@ describe "JasonObject" do
     @user.set_public :GET, :POST
     @user.save!
     retrieved_user = User.get_by_key @user.jason_key
-    (retrieved_user.send(:instance_variable_get, :@public)).should eq(["GET", "POST"])
+    retrieved_user.get_public.should eq(["GET", "POST"])
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: medea
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors: 
 - Michael Jensen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +11:00
+date: 2011-02-28 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency