medea 0.6.6 → 0.6.7

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 
-# Dependencies are specified in medea.gemspec  
+# All dependencies are specified in medea.gemspec
 gemspec

data/lib/medea.rb

@@ -1,6 +1,7 @@
 
 module Medea
   require 'rubygems'
+  require 'pr_geohash'
   require 'medea/version'
   require 'medea/inheritable_attributes'
   require 'medea/active_model_methods'

data/lib/medea/jason_base.rb

@@ -124,6 +124,9 @@ 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(",")
+      end
       @__jason_state = :stale
     end
 

data/lib/medea/jason_blob.rb

@@ -26,8 +26,12 @@ module Medea
       end
     end
 
-    def to_url
-      "#{@parent.to_url}/#{@attachment_name}"
+    def to_url mode=:secure
+      "#{@parent.to_url mode}/#{@attachment_name}"
+    end
+
+    def to_public_url
+      to_url :public
     end
 
     def load_from_jasondb

data/lib/medea/jasondb.rb

@@ -19,8 +19,12 @@ module JasonDB
       host = "rest.jasondb.com"
     end
     protocol = "http"
-    protocol << "s" if mode == :secure
-    "#{protocol}://#{user}:#{password}@#{host}/#{topic}/"
+    if mode == :secure
+      protocol << "s"
+      "#{protocol}://#{user}:#{password}@#{host}/#{topic}/"
+    else #mode == :public
+      "#{protocol}://#{host}/#{topic}/"
+    end
   end
 
 end

data/lib/medea/jasonlistproperty.rb

@@ -23,9 +23,10 @@ module Medea
 
     def method_missing name, *args, &block
       #is this a list property on the base class?
-      if (@type.class_variable_defined? :@@lists) && (@type.send(:class_variable_get, :@@lists).has_key? name)
+      lists = @type.class_variable_defined?(:@@opts) ? (@type.class_variable_get :@@opts)[:lists] : nil
+      if lists && lists.has_key?(name)
         #if so, we'll just return a new ListProperty with my query as the parent
-        new_list_class, new_list_type = @type.send(:class_variable_get, :@@lists)[name]
+        new_list_class, new_list_type = lists[name]
         base_query = self.clone
         base_query.result_format = :keylist
         JasonListProperty.new base_query, name.to_sym, new_list_class, new_list_type

data/lib/medea/jasonobject.rb

@@ -7,6 +7,9 @@ module Medea
 
   class JasonObject < JasonBase
 
+    #these verbs are able to be made public
+    HTTP_VERBS = [:GET, :POST, :PUT, :DELETE]
+
     include Medea::ActiveModelMethods
     if defined? ActiveModel
       extend ActiveModel::Naming
@@ -18,8 +21,7 @@ module Medea
 
     #Here we're going to put the "query" interface
 
-    #create a JasonDeferredQuery with no conditions, other than HTTP_X_CLASS=self.name
-    #if mode is set to :eager, we create the JasonDeferredQuery, invoke it's execution and then return it
+    #create a JasonDeferredQuery for all records of this class & with some optional conditions
     def JasonObject.all(opts=nil)
       q = JasonDeferredQuery.new :class => self, :filters => {:VERSION0 => nil, :FILTER => {:HTTP_X_CLASS => self, :HTTP_X_ACTION => :POST}}
       if opts && opts[:limit]
@@ -112,12 +114,17 @@ module Medea
 
     def initialize initialiser = nil, mode = :eager
       @attachments = {}
-      if self.class.class_variable_defined? :@@attachments
-        (self.class.class_variable_get :@@attachments).each do |k|
+      if opts[:attachments]
+        opts[:attachments].each do |k|
           @attachments[k] = nil
         end
       end
 
+      @public = []
+      if opts[:public]
+        opts[:public].each {|i| @public << i}
+      end
+
       if initialiser
         if initialiser.is_a? Hash
           @__jason_state = :new
@@ -175,11 +182,45 @@ module Medea
         #no changes? no save!
         return if @__jason_state == :stale or @__jason_state == :ghost
 
+        #validations
+        if self.class.owned
+          #the parent object needs to be defined!
+          raise "#{self.class.name} cannot be saved without setting a parent and list!" unless self.jason_parent && self.jason_parent_list
+        end
+
         persist_changes :post
     end
 
-    def to_url
-      "#{JasonDB::db_auth_url}#{self.class.name}/#{self.jason_key}"
+    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
+
+    def to_public_url
+      to_url :public
     end
 
     def persist_changes method = :post
@@ -194,14 +235,24 @@ module Medea
       }
       post_headers["IF-MATCH"] = @__jason_etag if @__jason_state == :dirty
 
-      if self.class.owned
-        #the parent object needs to be defined!
-        raise "#{self.class.name} cannot be saved without setting a parent and list!" unless self.jason_parent && self.jason_parent_list
-      end
-
       post_headers["X-PARENT"] = self.jason_parent.jason_key if self.jason_parent
       post_headers["X-LIST"] = self.jason_parent_list if self.jason_parent_list
 
+      if opts[:located]
+        #set the location headers
+        if geohash?
+          post_headers["X-GEOHASH"] = geohash
+        end
+        if latitude? && longitude?
+          post_headers["X-LATITUDE"] = latitude
+          post_headers["X-LONGITUDE"] = longitude
+        end
+      end
+
+      if @public.any?
+        post_headers["X-PUBLIC"] = @public.join(",")
+      end
+
       url = to_url()
 
       #puts "Saving to #{url}"
@@ -227,5 +278,14 @@ module Medea
     end
 
     #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/meta_properties.rb

@@ -4,11 +4,18 @@ module JasonObjectMetaProperties
   end
   
   module MetaProperties
+    def _class_options &block
+      self.send(:class_variable_set, :@@opts, {}) unless self.send(:class_variable_defined?, :@@opts)
+      opts = self.send(:class_variable_get, :@@opts)
+      yield opts
+      self.send(:class_variable_set, :@@opts, opts)
+    end
+
     def create_member_list list_name, list_class, list_type
-      list = {}
-      list = self.send(:class_variable_get, :@@lists) if self.class_variable_defined? :@@lists
-      list[list_name] = [list_class, list_type]
-      self.send(:class_variable_set, "@@lists", list)
+      _class_options do |o|
+        o[:lists] ||= {}
+        o[:lists][list_name] = [list_class, list_type]
+      end
 
       define_method(list_name) do
         #puts "Looking at the #{list_name.to_s} list, which is full of #{list_type.name}s"
@@ -29,16 +36,40 @@ module JasonObjectMetaProperties
     end
 
     def has_attachment attachment_name
-      attachments = []
-      attachments = self.send(:class_variable_get, :@@attachments) if self.class_variable_defined? :@@attachments
-      attachments << attachment_name
-      attachments.uniq!
-      self.send(:class_variable_set, "@@attachments", attachments)
+      _class_options do |o|
+        o[:attachments] ||= []
+        o[:attachments] << attachment_name
+        o[:attachments].uniq!
+      end
+    end
+
+    def has_location
+      _class_options do |o|
+        o[:located] = true
+       end
+    end
+
+    #sets the default public/private status for objects in this class
+    def public *args
+      verbs = [:GET, :POST, :PUT, :DELETE]
+      args.reject! do |i|
+        not verbs.include? i
+      end
+      _class_options do |o|
+        o[:public] ||= []
+        o[:public] << args
+        o[:public].flatten!
+        o[:public].uniq!
+      end
     end
 
     def key_field field_name
       #this field must be present to save, and it must be unique
-      self.send(:class_variable_set, :@@key_field, field_name)
+      _class_options do |o|
+        o[:key_fields] ||= []
+        o[:key_fields] << field_name
+        o[:key_fields].uniq!
+      end
     end
   end
 end

data/lib/medea/version.rb

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

data/medea.gemspec

@@ -1,3 +1,4 @@
+
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "medea/version"
@@ -20,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "json"
   s.add_dependency "rest-client"
   s.add_dependency "uuidtools"
+  s.add_dependency "pr_geohash"
 
   s.add_development_dependency "rspec"
 end

data/spec/jason_object_spec.rb

@@ -92,4 +92,49 @@ describe "JasonObject" do
     user2.jason_timestamp.should_not be_nil
     user2.jason_timestamp.should be > t
   end
+
+  it "should post location information properly" do
+    @user.geohash = "r1r0rshvpuxg"
+    RestClient.should_receive(:post).with(anything(), anything(), hash_including("X-GEOHASH" => "r1r0rshvpuxg")).and_return(DummyResponse.new)
+    @user.save!
+    @user.latitude, @user.longitude = [-37.901949, 145.180206]
+    RestClient.should_receive(:post).with(anything(), anything(), hash_including("X-LATITUDE" => -37.901949,
+                                                                                 "X-LONGITUDE" => 145.180206)).and_return(DummyResponse.new)
+    @user.save!
+  end
+
+  it "should load location information properly" do
+    @user.geohash = "r1r0rshvpuxg"
+    @user.latitude, @user.longitude = [-37.901949, 145.180206]
+    @user.save!
+    retrieved_user = User.get_by_key(@user.jason_key)
+    retrieved_user.geohash.should eq(@user.geohash)
+    retrieved_user.latitude.should eq(@user.latitude)
+    retrieved_user.longitude.should eq(@user.longitude)
+  end
+
+  it "should provide it's public (insecure) url" do
+    #should return url non-https, and with no user/password
+    (@user.to_url :public).should match(/http:\/\/rest.jasondb.com/)
+    @user.to_public_url.should eq(@user.to_url :public)
+  end
+
+  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)
+    @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)
+    @user.save!
+  end
+
+  it "should load security information properly" 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"])
+  end
 end

data/spec/spec_helper.rb

@@ -7,13 +7,21 @@ class Message < Medea::JasonObject
 end
 
 class User < Medea::JasonObject
+  has_location
   has_many :followees, User
   owns_many :messages, Message
 end
 
-#mock the db url
-module JasonDB
-  def JasonDB::db_auth_url mode=:secure
-    "https://michael:password@rest.jasondb.com/medea-test/"
+class DummyResponse
+  def code
+    201
   end
-end
+  def headers
+    {:Etag => "sometag",
+     :timestamp => "12345678"}
+  end
+end
+
+ENV["jason_user"] = "michael"
+ENV["jason_topic"] = "medea-test"
+ENV["jason_password"] = "password"

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: medea
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 6
-  version: 0.6.6
+  prerelease: 
+  version: 0.6.7
 platform: ruby
 authors: 
 - Michael Jensen
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +11:00
+date: 2011-02-07 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -38,8 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -51,24 +43,31 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: pr_geohash
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Simple wrapper for persisting objects to JasonDB
 email: 
 - michaelj@jasondb.com
@@ -122,21 +121,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Simple wrapper for persisting objects to JasonDB