rid 0.5.2 → 1.0.2

data/rid.gemspec

@@ -5,125 +5,96 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rid}
-  s.version = "0.5.2"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Johannes J. Schmidt"]
-  s.date = %q{2010-03-17}
+  s.date = %q{2010-08-20}
   s.default_executable = %q{rid}
-  s.description = %q{With Couch you can easy build a standalone CouchDB application. Couch aims to bring some of the Rails beauty to CouchDB. Currently Couch supports Rails style Generators you will love, using the same awesome Thor library used in Rails3.}
+  s.description = %q{Rid is a toolkit to relax in web development. Based on CouchDB you get a distributed, high scaling web application infrastructure with Rid. This is the Rid core.}
   s.email = %q{schmidt@netzmerk.com}
   s.executables = ["rid"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README"
   ]
   s.files = [
     ".gitignore",
-     ".gitmodules",
      "LICENSE",
-     "README.rdoc",
+     "README",
      "Rakefile",
+     "VERSION",
      "bin/rid",
      "lib/rid.rb",
-     "lib/rid/actions/base.rb",
-     "lib/rid/actions/pull.rb",
-     "lib/rid/actions/push.rb",
-     "lib/rid/actions/routes.rb",
+     "lib/rid/app.rb",
      "lib/rid/attachments.rb",
      "lib/rid/commands.rb",
-     "lib/rid/commands/destroy.rb",
-     "lib/rid/commands/generate.rb",
-     "lib/rid/commands/pull.rb",
-     "lib/rid/commands/push.rb",
-     "lib/rid/commands/routes.rb",
      "lib/rid/core_ext/hash.rb",
-     "lib/rid/design_document.rb",
-     "lib/rid/generators.rb",
-     "lib/rid/generators/application/USAGE",
-     "lib/rid/generators/application/application_generator.rb",
-     "lib/rid/generators/application/templates/README",
-     "lib/rid/generators/application/templates/_attachments/index.html",
-     "lib/rid/generators/application/templates/_attachments/stylesheets/application.css",
-     "lib/rid/generators/application/templates/_id",
-     "lib/rid/generators/application/templates/gitignore",
-     "lib/rid/generators/application/templates/lib/mustache.js",
-     "lib/rid/generators/application/templates/lib/path.js",
-     "lib/rid/generators/application/templates/lib/templates/layout.mustache",
-     "lib/rid/generators/application/templates/ridrc",
-     "lib/rid/generators/application/templates/validate_doc_update.js",
-     "lib/rid/generators/base.rb",
-     "lib/rid/generators/list/USAGE",
-     "lib/rid/generators/list/list_generator.rb",
-     "lib/rid/generators/list/templates/index.mustache",
-     "lib/rid/generators/list/templates/list.js",
-     "lib/rid/generators/named_base.rb",
-     "lib/rid/generators/scaffold/USAGE",
-     "lib/rid/generators/scaffold/scaffold_generator.rb",
-     "lib/rid/generators/show/USAGE",
-     "lib/rid/generators/show/show_generator.rb",
-     "lib/rid/generators/show/templates/delete.mustache",
-     "lib/rid/generators/show/templates/deleted.mustache",
-     "lib/rid/generators/show/templates/form.mustache",
-     "lib/rid/generators/show/templates/show.js",
-     "lib/rid/generators/show/templates/show.mustache",
-     "lib/rid/generators/update/USAGE",
-     "lib/rid/generators/update/templates/update.js",
-     "lib/rid/generators/update/update_generator.rb",
-     "lib/rid/generators/validation/USAGE",
-     "lib/rid/generators/validation/templates/validate_doc_update.js",
-     "lib/rid/generators/validation/validation_generator.rb",
-     "lib/rid/generators/view/USAGE",
-     "lib/rid/generators/view/templates/map.js",
-     "lib/rid/generators/view/view_generator.rb",
-     "lib/rid/makros.rb",
-     "lib/rid/version.rb",
+     "lib/rid/database.rb",
+     "lib/rid/document.rb",
      "rid.gemspec",
+     "spec/mock_app/_database",
+     "spec/rid/app_spec.rb",
      "spec/rid/attachments_spec.rb",
+     "spec/rid/commands_spec.rb",
      "spec/rid/core_ext/hash_spec.rb",
-     "spec/rid/design_document_spec.rb",
-     "spec/rid/makros_spec.rb",
-     "spec/rid_spec.rb",
+     "spec/rid/database_spec.rb",
+     "spec/rid/document_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://jo.github.com/rid/}
+  s.homepage = %q{http://rid.github.com/rid}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rid}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Standalone Couchdb Application Development Suite}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Rest in development core.}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/rid_spec.rb",
      "spec/rid/core_ext/hash_spec.rb",
-     "spec/rid/makros_spec.rb",
+     "spec/rid/database_spec.rb",
+     "spec/rid/commands_spec.rb",
+     "spec/rid/app_spec.rb",
      "spec/rid/attachments_spec.rb",
-     "spec/rid/design_document_spec.rb"
+     "spec/rid/document_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<thor>, [">= 0.13.4"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 1.4.1"])
-      s.add_runtime_dependency(%q<json_pure>, [">= 1.2.2"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<commander>, [">= 4.0.3"])
+      s.add_runtime_dependency(%q<filander>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 1.5.0"])
+      s.add_runtime_dependency(%q<json_pure>, [">= 1.4.2"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<rid-push>, [">= 0"])
+      s.add_runtime_dependency(%q<rid-init>, [">= 0"])
+      s.add_runtime_dependency(%q<rid-dd>, [">= 0"])
+      s.add_runtime_dependency(%q<rid-export>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<thor>, [">= 0.13.4"])
-      s.add_dependency(%q<rest-client>, [">= 1.4.1"])
-      s.add_dependency(%q<json_pure>, [">= 1.2.2"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+      s.add_dependency(%q<commander>, [">= 4.0.3"])
+      s.add_dependency(%q<filander>, [">= 0.6.0"])
+      s.add_dependency(%q<rest-client>, [">= 1.5.0"])
+      s.add_dependency(%q<json_pure>, [">= 1.4.2"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rid-push>, [">= 0"])
+      s.add_dependency(%q<rid-init>, [">= 0"])
+      s.add_dependency(%q<rid-dd>, [">= 0"])
+      s.add_dependency(%q<rid-export>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<thor>, [">= 0.13.4"])
-    s.add_dependency(%q<rest-client>, [">= 1.4.1"])
-    s.add_dependency(%q<json_pure>, [">= 1.2.2"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta"])
+    s.add_dependency(%q<commander>, [">= 4.0.3"])
+    s.add_dependency(%q<filander>, [">= 0.6.0"])
+    s.add_dependency(%q<rest-client>, [">= 1.5.0"])
+    s.add_dependency(%q<json_pure>, [">= 1.4.2"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rid-push>, [">= 0"])
+    s.add_dependency(%q<rid-init>, [">= 0"])
+    s.add_dependency(%q<rid-dd>, [">= 0"])
+    s.add_dependency(%q<rid-export>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/spec/mock_app/_database

@@ -0,0 +1 @@
+mydb

data/spec/rid/app_spec.rb

@@ -0,0 +1,59 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rid/app'
+
+describe "App" do
+  describe "initialization" do
+    it "should set root as pathname" do
+      app = Rid::App.new
+      app.root.should be_a(Pathname)
+    end
+
+    it "should set root from options" do
+      app = Rid::App.new(OpenStruct.new(:root => "myroot"))
+      app.root.should == Pathname.new("myroot")
+    end
+
+    it "should default root to pwd" do
+      app = Rid::App.new
+      app.root.should == Pathname.new(Dir.pwd)
+    end
+
+    it "should set database url from options" do
+      app = Rid::App.new(OpenStruct.new(:database => "mydb"))
+      app.db_url.should == "mydb"
+    end
+
+    it "should default database url to contents of _database file at root" do
+      app = Rid::App.new(OpenStruct.new(:root => mock_app_root))
+      app.db_url.should == "mydb"
+    end
+  end
+
+  describe "db" do
+    before do
+      @app = Rid::App.new(OpenStruct.new(:database => "mydb"))
+    end
+
+    it "should return an instance od Rid::Database" do
+      @app.db.should be_a(Rid::Database)
+    end
+
+    it "should return a database set to db_name" do
+      @app.db.name.should == 'mydb'
+    end
+  end
+
+  describe "documents" do
+    before do
+      @app = Rid::App.new(OpenStruct.new(:root => mock_app_root))
+    end
+
+    it "should be an array" do
+      @app.documents.should be_a(Array)
+    end
+
+    it "should return Document instances" do
+      @app.documents.all? { |d| d.should be_a(Rid::Document) }
+    end
+  end
+end

data/spec/rid/attachments_spec.rb

@@ -1,9 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-require 'rid/design_document'
+require 'rid/document'
 
 describe "Attachments" do
   before do
-    @doc = Rid::DesignDocument.new
+    @doc = Rid::Document.new
   end
 
   describe "map" do

data/spec/rid/commands_spec.rb

@@ -0,0 +1,14 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rid/commands'
+
+describe "Commands" do
+  describe "gems" do
+    it "should be an array" do
+      Rid::Commands.gems.should be_a(Array)
+    end
+
+    it "should not include rid gem" do
+      Rid::Commands.gems.should_not include("rid")
+    end
+  end
+end

data/spec/rid/database_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rid/database'
+
+describe "Database" do
+  before do
+    @name = "http://127.0.0.1:5984/rid-tests"
+    @db = Rid::Database.new(@name)
+  end
+
+  after do
+    RestClient.delete(@name) rescue nil
+  end
+
+  describe "initialization" do
+    it "should initialize database by name" do
+      @db.name.should == @name
+    end
+  end
+
+  describe "get" do
+    it "should return nil if document was not found" do
+      @db.get(Rid::Document.new).should be_nil
+    end
+  end
+end

data/spec/rid/document_spec.rb

@@ -0,0 +1,36 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'rid/document'
+
+describe "Document" do
+  before do
+    @doc = Rid::Document.new
+    @hash = {}
+  end
+
+  describe "read!" do
+  end
+
+  describe "to_json" do
+    it "should convert key-value pair" do
+      @doc.hash = { "key" => "value" }
+      @doc.to_json.should == '{"key":"value"}'
+    end
+
+    it "should convert nested hash" do
+      @doc.hash = { "hash" => { "key" => "value" } }
+      @doc.to_json.should == '{"hash":{"key":"value"}}'
+    end
+  end
+
+  describe "json=" do
+    it "should read key-value pair" do
+      @doc.json = '{"key":"value"}'
+      @doc.hash.should == { "key" => "value" }
+    end
+
+    it "should read nested hash" do
+      @doc.json = '{"hash":{"key":"value"}}'
+      @doc.hash.should == { "hash" => { "key" => "value" } }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -7,3 +7,9 @@ require 'spec/autorun'
 Spec::Runner.configure do |config|
   
 end
+
+# returns the dirname of the mock app
+#
+def mock_app_root
+  File.expand_path('../mock_app', __FILE__)
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rid
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
+  - 1
   - 0
-  - 5
   - 2
-  version: 0.5.2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Johannes J. Schmidt
@@ -14,81 +15,160 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-17 00:00:00 +01:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: rid
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: commander
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
-        - 0
-        - 13
         - 4
-        version: 0.13.4
+        - 0
+        - 3
+        version: 4.0.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: filander
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
-        - 1
-        - 4
-        - 1
-        version: 1.4.1
+        - 0
+        - 6
+        - 0
+        version: 0.6.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: json_pure
+  name: rest-client
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 1
-        - 2
-        - 2
-        version: 1.2.2
+        - 5
+        - 0
+        version: 1.5.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: json_pure
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 3
         - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rid-push
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
         - 0
-        - beta
-        version: 3.0.0.beta
+        version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rid-init
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rid-dd
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: rid-export
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id005
-description: With Couch you can easy build a standalone CouchDB application. Couch aims to bring some of the Rails beauty to CouchDB. Currently Couch supports Rails style Generators you will love, using the same awesome Thor library used in Rails3.
+  version_requirements: *id010
+description: Rid is a toolkit to relax in web development. Based on CouchDB you get a distributed, high scaling web application infrastructure with Rid. This is the Rid core.
 email: schmidt@netzmerk.com
 executables: 
 - rid
@@ -96,77 +176,33 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README
 files: 
 - .gitignore
-- .gitmodules
 - LICENSE
-- README.rdoc
+- README
 - Rakefile
+- VERSION
 - bin/rid
 - lib/rid.rb
-- lib/rid/actions/base.rb
-- lib/rid/actions/pull.rb
-- lib/rid/actions/push.rb
-- lib/rid/actions/routes.rb
+- lib/rid/app.rb
 - lib/rid/attachments.rb
 - lib/rid/commands.rb
-- lib/rid/commands/destroy.rb
-- lib/rid/commands/generate.rb
-- lib/rid/commands/pull.rb
-- lib/rid/commands/push.rb
-- lib/rid/commands/routes.rb
 - lib/rid/core_ext/hash.rb
-- lib/rid/design_document.rb
-- lib/rid/generators.rb
-- lib/rid/generators/application/USAGE
-- lib/rid/generators/application/application_generator.rb
-- lib/rid/generators/application/templates/README
-- lib/rid/generators/application/templates/_attachments/index.html
-- lib/rid/generators/application/templates/_attachments/stylesheets/application.css
-- lib/rid/generators/application/templates/_id
-- lib/rid/generators/application/templates/gitignore
-- lib/rid/generators/application/templates/lib/mustache.js
-- lib/rid/generators/application/templates/lib/path.js
-- lib/rid/generators/application/templates/lib/templates/layout.mustache
-- lib/rid/generators/application/templates/ridrc
-- lib/rid/generators/application/templates/validate_doc_update.js
-- lib/rid/generators/base.rb
-- lib/rid/generators/list/USAGE
-- lib/rid/generators/list/list_generator.rb
-- lib/rid/generators/list/templates/index.mustache
-- lib/rid/generators/list/templates/list.js
-- lib/rid/generators/named_base.rb
-- lib/rid/generators/scaffold/USAGE
-- lib/rid/generators/scaffold/scaffold_generator.rb
-- lib/rid/generators/show/USAGE
-- lib/rid/generators/show/show_generator.rb
-- lib/rid/generators/show/templates/delete.mustache
-- lib/rid/generators/show/templates/deleted.mustache
-- lib/rid/generators/show/templates/form.mustache
-- lib/rid/generators/show/templates/show.js
-- lib/rid/generators/show/templates/show.mustache
-- lib/rid/generators/update/USAGE
-- lib/rid/generators/update/templates/update.js
-- lib/rid/generators/update/update_generator.rb
-- lib/rid/generators/validation/USAGE
-- lib/rid/generators/validation/templates/validate_doc_update.js
-- lib/rid/generators/validation/validation_generator.rb
-- lib/rid/generators/view/USAGE
-- lib/rid/generators/view/templates/map.js
-- lib/rid/generators/view/view_generator.rb
-- lib/rid/makros.rb
-- lib/rid/version.rb
+- lib/rid/database.rb
+- lib/rid/document.rb
 - rid.gemspec
+- spec/mock_app/_database
+- spec/rid/app_spec.rb
 - spec/rid/attachments_spec.rb
+- spec/rid/commands_spec.rb
 - spec/rid/core_ext/hash_spec.rb
-- spec/rid/design_document_spec.rb
-- spec/rid/makros_spec.rb
-- spec/rid_spec.rb
+- spec/rid/database_spec.rb
+- spec/rid/document_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
-homepage: http://jo.github.com/rid/
+homepage: http://rid.github.com/rid
 licenses: []
 
 post_install_message: 
@@ -175,30 +211,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: rid
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Standalone Couchdb Application Development Suite
+summary: Rest in development core.
 test_files: 
 - spec/spec_helper.rb
-- spec/rid_spec.rb
 - spec/rid/core_ext/hash_spec.rb
-- spec/rid/makros_spec.rb
+- spec/rid/database_spec.rb
+- spec/rid/commands_spec.rb
+- spec/rid/app_spec.rb
 - spec/rid/attachments_spec.rb
-- spec/rid/design_document_spec.rb
+- spec/rid/document_spec.rb

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/mustache.js"]
-	path = vendor/mustache.js
-	url = git://github.com/janl/mustache.js.git