dao 3.2.0 → 3.3.0

data/dao.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "dao"
-  spec.version = "3.2.0"
+  spec.version = "3.3.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "dao"
   spec.description = "description: dao kicks the ass"
@@ -14,6 +14,8 @@ Gem::Specification::new do |spec|
  "TODO",
  "a.rb",
  "dao.gemspec",
+ "db",
+ "db/dao.yml",
  "lib",
  "lib/dao",
  "lib/dao.rb",

data/db/dao.yml

@@ -0,0 +1,5 @@
+--- 
+foo: 
+  "1": 
+    id: 1
+    bar: 44

data/lib/dao.rb

@@ -10,7 +10,7 @@
 # dao libs
 #
   module Dao
-    Version = '3.2.0' unless defined?(Version)
+    Version = '3.3.0' unless defined?(Version)
 
     def version
       Dao::Version

data/lib/dao/api/interfaces.rb

@@ -11,6 +11,7 @@ module Dao
         @state ||= {
           :interfaces => {},
           :blocks => {},
+          :README => [],
           :docs => []
         }
       end
@@ -37,8 +38,8 @@ module Dao
         state[:interfaces]
       end
 
-      def description(string)
-        doc(:description => Dao.unindent(string))
+      def description(*args)
+        doc(:description => lines_for(*args))
       end
       alias_method('desc', 'description')
 
@@ -47,7 +48,7 @@ module Dao
         doc = docs.last
         options = Dao.options_for!(args)
         if options.empty?
-          options[:description] = args.join(' ')
+          options[:description] = lines_for(*args)
         end
         doc.update(options)
         doc
@@ -57,8 +58,26 @@ module Dao
         state[:docs]
       end
 
+      def readme(*args)
+        if args.empty?
+          state[:README]
+        else
+          state[:README] = lines_for(args)
+        end
+      end
+      alias_method('README', 'readme')
+
+      def lines_for(*args)
+        Dao.unindent(args.flatten.compact.join("\n")).split(/\n/)
+      end
+
+      def readme=(readme)
+        self.readme = readme.to_s
+      end
+
       def index
         index = Map.new
+        index[:README] = readme
         interfaces.each do |path, interface|
           index[path] = interface.doc || {'description' => ''}
         end

data/lib/dao/db.rb

@@ -44,6 +44,13 @@ module Dao
         find(id)
       end
 
+      def []=(id, data = {})
+        data.delete(:id)
+        data.delete('id')
+        data[:id] = id
+        save(data)
+      end
+
       def delete(id)
         @db.delete(@name, id)
       end
@@ -61,9 +68,10 @@ module Dao
       end
     end
 
-    def [](name)
+    def collection(name)
       Collection.new(name, db)
     end
+    alias_method('[]', 'collection')
 
     def transaction(*args, &block)
       ystore.transaction(*args, &block)

data/lib/dao/rails/lib/generators/dao/templates/api.rb

@@ -1,13 +1,28 @@
 Api = 
   Dao.api do
+  ##
+  #
+    README <<-__
+      this a dao api
+      
+        so nice
+
+      so good
+    __
 
-    description 'ping!'
-    interface('/ping'){
+  ##
+  #
+    doc '/ping - hello world without a user'
+    call('/ping'){
       data.update :time => Time.now
     }
 
-
-
+    doc '/pong - hello world with a user'
+    call('/pong'){
+      require_current_user!
+      data.update :time => Time.now
+      data.update :current_user => current_user.id
+    }
 
   ## this is simply a suggested way to model your api.  it is not required.
   #
@@ -23,6 +38,8 @@ Api =
       @real_user ||= @effective_user
     end
 
+  ## no doubt you'll want to customize this!
+  #
     def user_for(arg)
       User.respond_to?(:for) ? User.for(arg) : User.find(arg)
     end
@@ -51,6 +68,25 @@ Api =
     def current_user?
       !!effective_user
     end
+
+    def require_effective_user!
+      unless effective_user?
+        status :unauthorized
+        return!
+      end
+    end
+
+    def require_real_user!
+      unless effective_user?
+        status :unauthorized
+        return!
+      end
+    end
+
+    def require_current_user!
+      require_effective_user! and require_real_user!
+    end
+    alias_method('require_user!', 'require_current_user!')
   end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dao
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 3
-  - 2
+  - 3
   - 0
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 -06:00
+date: 2011-06-09 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - TODO
 - a.rb
 - dao.gemspec
+- db/dao.yml
 - lib/dao.rb
 - lib/dao/active_record.rb
 - lib/dao/api.rb