cloudkit 0.10.1 → 0.11.0

data/{test/helper.rb → spec/spec_helper.rb}

@@ -1,7 +1,5 @@
 $:.unshift File.expand_path(File.dirname(__FILE__)) + '/../lib'
 require 'cloudkit'
-require 'test/unit'
-require 'shoulda'
 require 'rexml/document'
 
 TEST_REMOTE_USER = '/cloudkit_users/abcdef'.freeze
@@ -18,3 +16,17 @@ end
 def app_headers(content)
   {'Content-Type' => 'text/html', 'Content-Length' => content.length.to_s}
 end
+
+module Rack
+  class Config
+    def initialize(app, &block)
+      @app = app
+      @block = block
+    end
+
+    def call(env)
+      @block.call(env)
+      @app.call(env)
+    end
+  end
+end

data/spec/store_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "A CloudKit::Store" do
+
+  it "should know its version" do
+    store = CloudKit::Store.new(:collections => [:items])
+    store.version.should == 1
+  end
+
+end

data/spec/uri_spec.rb

@@ -0,0 +1,93 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "A URI" do
+
+  it "should know its string form" do
+    CloudKit::URI.new('/items/123').string.should == '/items/123'
+  end
+
+  it "should know its parent resource collection" do
+    ['/items', '/items/123', '/items/123/versions', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).collection_uri_fragment.should == '/items'
+    }
+  end
+
+  it "should split itself into components" do
+    CloudKit::URI.new('/items/123/versions/abc').components.should == ['items', '123', 'versions', 'abc']
+  end
+
+  it "should know its collection type" do
+    ['/items', '/items/123', '/items/123/versions', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).collection_type.should == :items
+    }
+  end
+
+  it "should know the URI of its current version" do
+    ['/items/123', '/items/123/versions', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).current_resource_uri.should == '/items/123'
+    }
+  end
+
+  it "should know if it is a meta URI" do
+    ['/items', '/items/123', '/items/123/versions', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_meta_uri
+    }
+    CloudKit::URI.new('/cloudkit-meta').should be_meta_uri
+  end
+
+  it "should know if it is a resource collection URI" do
+    ['/items/123', '/items/123/versions', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_resource_collection_uri
+    }
+    CloudKit::URI.new('/items').should be_resource_collection_uri
+  end
+
+  it "should know if it is a resolved resource collection URI" do
+    ['/items', '/items/123', '/items/123/versions', '/items/123/versions/_resolved', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_resolved_resource_collection_uri
+    }
+    CloudKit::URI.new('/items/_resolved').should be_resolved_resource_collection_uri
+  end
+
+  it "should know if it is a resource URI" do
+    ['/items', '/items/_resolved', '/items/123/versions', '/items/123/versions/_resolved', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_resource_uri
+    }
+    CloudKit::URI.new('/items/123').should be_resource_uri
+  end
+
+  it "should know if it is a version collection URI" do
+    ['/items', '/items/_resolved', '/items/123', '/items/123/versions/_resolved', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_version_collection_uri
+    }
+    CloudKit::URI.new('/items/123/versions').should be_version_collection_uri
+  end
+
+  it "should know if it is a resolved version collection URI" do
+    ['/items', '/items/_resolved', '/items/123', '/items/123/versions', '/items/123/versions/abc'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_resolved_version_collection_uri
+    }
+    CloudKit::URI.new('/items/123/versions/_resolved').should be_resolved_version_collection_uri
+  end
+
+  it "should know if it is a resource version URI" do
+    ['/items', '/items/_resolved', '/items/123', '/items/123/versions', '/items/123/versions/_resolved'].each { |uri|
+      CloudKit::URI.new(uri).should_not be_resource_version_uri
+    }
+    CloudKit::URI.new('/items/123/versions/abc').should be_resource_version_uri
+  end
+
+  it "should know its cannonical URI string" do
+    CloudKit::URI.new('/items/123').cannonical_uri_string.should == '/items/123'
+  end
+
+  it "should generate its cannonical URI string when needed" do
+    CloudKit::URI.new('/items').cannonical_uri_string.should match(/\/items\/.+/)
+  end
+
+  it "should fail when attempting to generate a cannonical URI string for versioned resources" do
+    lambda {
+      CloudKit::URI.new('/items/123/versions/abc').cannonical_uri_string
+    }.should raise_error(CloudKit::InvalidURIFormat)
+  end
+end

data/spec/user_store_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "A UserStore" do
+
+  it "should know its version" do
+    store = CloudKit::UserStore.new
+    store.version.should == 1
+  end
+
+end

data/spec/util_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/spec_helper'
+include CloudKit::Util
+
+describe "CloudKit::Util" do
+
+  it "should create routers" do
+    router = r(:get, '/path')
+    router.class.should == Rack::Router
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudkit
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors: 
 - Jon Crosby
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-27 00:00:00 -08:00
+date: 2008-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.9"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rack-config
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: uuid
   type: :runtime
@@ -42,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.1
     version: 
-- !ruby/object:Gem::Dependency 
-  name: sequel
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.9"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: oauth
   type: :runtime
@@ -82,16 +62,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.2.4
-    version: 
 description: An Open Web JSON Appliance.
 email: jon@joncrosby.me
 executables: []
@@ -120,10 +90,10 @@ files:
 - examples/3.ru
 - examples/4.ru
 - examples/5.ru
-- examples/6.ru
 - examples/TOC
 - lib/cloudkit.rb
 - lib/cloudkit/constants.rb
+- lib/cloudkit/exceptions.rb
 - lib/cloudkit/flash_session.rb
 - lib/cloudkit/oauth_filter.rb
 - lib/cloudkit/oauth_store.rb
@@ -134,32 +104,35 @@ files:
 - lib/cloudkit/request.rb
 - lib/cloudkit/service.rb
 - lib/cloudkit/store.rb
-- lib/cloudkit/store/adapter.rb
-- lib/cloudkit/store/extraction_view.rb
+- lib/cloudkit/store/memory_table.rb
+- lib/cloudkit/store/resource.rb
 - lib/cloudkit/store/response.rb
 - lib/cloudkit/store/response_helpers.rb
-- lib/cloudkit/store/sql_adapter.rb
 - lib/cloudkit/templates/authorize_request_token.erb
 - lib/cloudkit/templates/oauth_descriptor.erb
 - lib/cloudkit/templates/oauth_meta.erb
 - lib/cloudkit/templates/openid_login.erb
 - lib/cloudkit/templates/request_authorization.erb
 - lib/cloudkit/templates/request_token_denied.erb
+- lib/cloudkit/uri.rb
 - lib/cloudkit/user_store.rb
 - lib/cloudkit/util.rb
-- test/ext_test.rb
-- test/flash_session_test.rb
-- test/helper.rb
-- test/oauth_filter_test.rb
-- test/oauth_store_test.rb
-- test/openid_filter_test.rb
-- test/openid_store_test.rb
-- test/rack_builder_test.rb
-- test/request_test.rb
-- test/service_test.rb
-- test/store_test.rb
-- test/user_store_test.rb
-- test/util_test.rb
+- spec/ext_spec.rb
+- spec/flash_session_spec.rb
+- spec/memory_table_spec.rb
+- spec/oauth_filter_spec.rb
+- spec/oauth_store_spec.rb
+- spec/openid_filter_spec.rb
+- spec/openid_store_spec.rb
+- spec/rack_builder_spec.rb
+- spec/request_spec.rb
+- spec/resource_spec.rb
+- spec/service_spec.rb
+- spec/spec_helper.rb
+- spec/store_spec.rb
+- spec/uri_spec.rb
+- spec/user_store_spec.rb
+- spec/util_spec.rb
 has_rdoc: false
 homepage: http://getcloudkit.com
 post_install_message: 
@@ -187,15 +160,18 @@ signing_key:
 specification_version: 2
 summary: An Open Web JSON Appliance.
 test_files: 
-- test/ext_test.rb
-- test/flash_session_test.rb
-- test/oauth_filter_test.rb
-- test/oauth_store_test.rb
-- test/openid_filter_test.rb
-- test/openid_store_test.rb
-- test/rack_builder_test.rb
-- test/request_test.rb
-- test/service_test.rb
-- test/store_test.rb
-- test/user_store_test.rb
-- test/util_test.rb
+- spec/ext_spec.rb
+- spec/flash_session_spec.rb
+- spec/memory_table_spec.rb
+- spec/oauth_filter_spec.rb
+- spec/oauth_store_spec.rb
+- spec/openid_filter_spec.rb
+- spec/openid_store_spec.rb
+- spec/rack_builder_spec.rb
+- spec/request_spec.rb
+- spec/resource_spec.rb
+- spec/service_spec.rb
+- spec/store_spec.rb
+- spec/uri_spec.rb
+- spec/user_store_spec.rb
+- spec/util_spec.rb

data/examples/6.ru

@@ -1,10 +0,0 @@
-$:.unshift File.expand_path(File.dirname(__FILE__)) + '/../lib'
-require 'cloudkit'
-use Rack::Config do |env|
-  env[CLOUDKIT_STORAGE_URI] = 'mysql://user:pass@localhost/cloudkit_example'
-end
-use Rack::Session::Pool
-use CloudKit::OAuthFilter
-use CloudKit::OpenIDFilter
-use CloudKit::Service, :collections => [:notes]
-run lambda{|env| [200, {'Content-Type' => 'text/html', 'Content-Length' => '5'}, ['HELLO']]}

data/lib/cloudkit/store/adapter.rb

@@ -1,8 +0,0 @@
-module CloudKit
-
-  # A common interface for pluggable storage adapters
-  class Adapter
-
-    # TODO extract from SQLAdapter
-  end
-end

data/lib/cloudkit/store/extraction_view.rb

@@ -1,57 +0,0 @@
-module CloudKit
-
-  # An ExtractionView observes a resource collection and extracts specified
-  # elements for querying.
-  class ExtractionView
-    attr_accessor :name, :observe, :extract
-
-    # Initialize an ExtractionView.
-    #
-    # ==Examples
-    #
-    # Observe a "notes" collection and extract the titles and colors.
-    #   view = ExtractionView.new(
-    #     :name => :note_features,
-    #     :observe => :notes,
-    #     :extract => [:title, :color])
-    #
-    def initialize(name, options)
-      @name    = name
-      @observe = options[:observe]
-      @extract = options[:extract]
-    end
-
-    # Map the provided data into a collection for querying.
-    def map(db, collection, uri, data)
-      if @observe == collection
-        elements = @extract.inject({}) do |e, field|
-          e.merge(field.to_s => data[field.to_s])
-        end
-        elements.merge!('uri' => uri)
-        db.transaction do
-          db[@name].filter(:uri => uri).delete
-          db[@name].insert(elements)
-        end
-      end
-    end
-
-    # Remove the data with the specified URI from the view
-    def unmap(db, type, uri)
-      if @observe == type
-        db[@name].filter(:uri => uri).delete
-      end
-    end
-
-    # Initialize the storage for this view
-    def initialize_storage(db)
-      extractions = @extract
-      db.create_table @name do
-        extractions.each do |field|
-          text field
-        end
-        primary_key :id
-        varchar     :uri
-      end unless db.table_exists?(@name)
-    end
-  end
-end

data/lib/cloudkit/store/sql_adapter.rb

@@ -1,36 +0,0 @@
-module CloudKit
-
-  # Adapts a CloudKit::Store to a SQL backend.
-  class SQLAdapter < Adapter
-
-    # Initialize a new SQL backend. Defaults to in-memory SQLite.
-    def initialize(uri=nil, options={})
-      @db = uri ? Sequel.connect(uri, options) : Sequel.sqlite
-      # TODO accept views as part of a store, then initialize them here
-      initialize_storage
-    end
-
-    # method_missing is a placeholder for future interface extraction into
-    # CloudKit::Adapter.
-    def method_missing(method, *args, &block)
-      @db.send(method, *args, &block)
-    end
-
-    protected
-
-    # Initialize the HTTP-oriented storage if it does not exist.
-    def initialize_storage
-      @db.create_table CLOUDKIT_STORE do
-        primary_key :id
-        varchar     :uri, :unique => true
-        varchar     :etag
-        varchar     :collection_reference
-        varchar     :resource_reference
-        varchar     :last_modified
-        varchar     :remote_user
-        text        :content
-        boolean     :deleted, :default => false
-      end unless @db.table_exists?(CLOUDKIT_STORE)
-    end
-  end
-end

data/test/ext_test.rb

@@ -1,76 +0,0 @@
-require 'helper'
-class ExtTest < Test::Unit::TestCase
-
-  context "A Hash" do
-
-    should "re-key an entry if it exists" do
-      x = {:a => 1, :b => 2}
-      x.rekey!(:b, :c)
-      assert x == {:a => 1, :c => 2}
-      x.rekey!(:d, :b)
-      assert x == {:a => 1, :c => 2}
-    end
-    
-    should "re-key false and nil values" do
-      x = {:a => false, :b => nil}
-      x.rekey!(:b, :c)
-      assert x == {:a => false, :c => nil}
-      x.rekey!(:d, :b)
-      assert x == {:a => false, :c => nil}
-    end
-
-    should "merge conditionally" do
-      x = {:a => 1}
-      y = {:b => 2}
-      x.filter_merge!(:c => y[:c])
-      assert x == {:a => 1}
-      x.filter_merge!(:c => y[:b])
-      assert x == {:a => 1, :c => 2}
-      x = {}.filter_merge!(:a => 1)
-      assert x == {:a => 1}
-    end
-
-    should "merge false values correctly" do
-      x = {:a => 1}
-      y = {:b => 2}
-      x.filter_merge!(:c => false)
-      assert x == {:a => 1, :c => false}
-      x.filter_merge!(:c => y[:b])
-      assert x == {:a => 1, :c => 2}
-      x = {}.filter_merge!(:a => false)
-      assert x == {:a => false}
-    end
-
-    should "exclude pairs using a single key" do
-      x = {:a => 1, :b => 2}
-      y = x.excluding(:b)
-      assert y == {:a => 1}
-    end
-
-    should "exclude pairs using a list of keys" do
-      x = {:a => 1, :b => 2, :c => 3}
-      y = x.excluding(:b, :c)
-      assert y == {:a => 1}
-    end
-  end
-
-  context "An Array" do
-
-    should "exclude elements" do
-      x = [0, 1, 2, 3]
-      y = x.excluding(1, 3)
-      assert_equal [0, 2], y
-    end
-  end
-
-  context "An Object" do
-
-    should "try" do
-      x = {:a => 'a'}
-      result = x[:a].try(:upcase)
-      assert_equal 'A', result
-      assert_nothing_raised {x[:b].try(:upcase)}
-    end
-  end
-
-end