raws 0.0.10 → 0.0.11

data/lib/raws/sdb/adapter.rb

@@ -97,10 +97,8 @@ class RAWS::SDB::Adapter
       connect('GET', URI, PARAMS.merge(params))
     end
 
-    def list_domains(next_token=nil, max_num=nil, &block)
-      params = {'Action' => 'ListDomains'}
-      params['NextToken']          = next_token if next_token
-      params['MaxNumberOfDomains'] = max_num    if max_num
+    def list_domains(params={}, &block)
+      params.merge!('Action' => 'ListDomains')
 
       connect('GET', URI, PARAMS.merge(params), :multiple => %w'DomainName')
     end

data/lib/raws/sdb/model.rb

@@ -1,3 +1,4 @@
+require 'forwardable'
 require 'uuidtools'
 
 module RAWS::SDB::Model
@@ -8,19 +9,30 @@ module RAWS::SDB::Model
     end
 
     def attr_filter(val)
-      @model.new(val.last, val.first)
+      @model.new(val.last, val.first, true)
     end
   end
 
   module ClassMethods
-    attr_accessor :domain_name
+    extend Forwardable
+    def_delegators :domain,
+      :create_domain,
+      :delete_domain,
+      :domain_metadata,
+      :metadata,
+      :get_attributes,
+      :get,
+      :put_attributes,
+      :put,
+      :batch_put_attributes,
+      :batch_put,
+      :delete_attributes,
+      :delete
 
-    def create_domain
-      RAWS::SDB[domain_name].create_domain
-    end
+    attr_accessor :domain_name
 
-    def delete_domain
-      RAWS::SDB[domain_name].delete_domain
+    def domain
+      RAWS::SDB[domain_name]
     end
 
     def select(&block)
@@ -29,47 +41,33 @@ module RAWS::SDB::Model
     alias :all :select
 
     def find(id)
-      if attrs = RAWS::SDB[domain_name].get(id)
-        self.new(attrs, id)
+      if attrs = get_attributes(id)
+        self.new(attrs, id, true)
       end
     end
 
-    def generate_id
-      UUIDTools::UUID.random_create
+    def create_id
+      [
+        UUIDTools::UUID.random_create.raw
+      ].pack('m').sub(/==\n$/, '').tr('+/', '-_')
     end
+  end
 
-    def sdb_reader(*names)
-      names.each do |name|
-        module_eval %Q{
-          def #{name}
-            self['#{name}']
-          end
-        }
-      end
-    end
+  module InstanceMethods
+    attr_accessor :id
+    attr_reader :values
 
-    def sdb_writer(*names)
-      names.each do |name|
-        module_eval %Q{
-          def #{name}=(val)
-            self['#{name}'] = val
-          end
-        }
-      end
+    def initialize(values={}, id=nil, exists=false)
+      @id, @values, @exists = id, values, exists
+      after_initialize
     end
 
-    def sdb_accessor(*names)
-      sdb_reader(*names)
-      sdb_writer(*names)
+    def create_id
+      self.class.create_id
     end
-  end
-
-  module InstanceMethods
-    attr_reader :id, :values
 
-    def initialize(values={}, id=nil)
-      @id, @values = id, values
-      after_initialize
+    def exists?
+      @exists
     end
 
     def [](key)
@@ -80,22 +78,24 @@ module RAWS::SDB::Model
       values[key] = val
     end
 
-    def delete
+    def delete(attrs={})
       before_delete
-      RAWS::SDB[self.class.domain_name].delete(id) if id
+      self.class.delete_attributes(id, attrs) if id
+      @exists = false
       after_delete
     end
 
     def save
       before_save
-      if id
+      if exists?
         before_update
-        RAWS::SDB[self.class.domain_name].put(id, values, *values.keys)
+        self.class.put_attributes(id, values, *values.keys)
         after_update
       else
         before_insert
-        @id = self.class.generate_id
-        RAWS::SDB[self.class.domain_name].put(id, values, *values.keys)
+        @id ||= create_id
+        self.class.put_attributes(id, values, *values.keys)
+        @exists = true
         after_insert
       end
       after_save
@@ -110,6 +110,15 @@ module RAWS::SDB::Model
     def after_update; end
     def before_insert; end
     def after_insert; end
+
+    def method_missing(_name, *args)
+      name = _name.to_s
+      if md = /(.+)=$/.match(name)
+        self[md[1]] = args.unshift
+      elsif values.key?(name)
+        self[name]
+      end
+    end
   end
 
   def self.included(mod)

data/lib/raws/sdb/select.rb

@@ -68,7 +68,7 @@ class RAWS::SDB::Select
       'select',
       @output_list,
       'from',
-      ::RAWS::SDB::Adapter.quote(@domain)
+      "`#{::RAWS::SDB::Adapter.quote(@domain)}`"
     ]
 
     s.push('where',    @condition) if @condition

data/lib/raws/sqs.rb

@@ -1,5 +1,7 @@
 class RAWS::SQS
   autoload :Adapter, 'raws/sqs/adapter'
+  autoload :Message, 'raws/sqs/message'
+  autoload :Model,   'raws/sqs/model'
 
   class << self
     include Enumerable
@@ -10,112 +12,140 @@ class RAWS::SQS
       @http ||= RAWS.http
     end
 
-    def queue_url(queue_name)
-      data = Adapter.list_queues(
-        queue_name
-      )['ListQueuesResponse']['ListQueuesResult']
-
-      data['QueueUrl'].each do |url|
-        _queue_name = URI.parse(url).path.split('/').last
-        if _queue_name == queue_name
-          return url
+    # Returns the queue URL for the +queue_name_or_url+ if exists the queue.
+    def queue_url(queue_name_or_url)
+      if URI.parse(queue_name_or_url).scheme
+        queue_name_or_url
+      else
+        list_queues(queue_name_or_url).map do |sqs|
+          sqs.queue_url
+        end.each do |url|
+          return url if URI.parse(url).path.split('/').last == queue_name_or_url
         end
-      end unless data.empty?
+      end
     end
 
-    def create_queue(queue_name, timeout=nil)
-      self.new(
+    # Creates a new queue and returns the instance of RAWS::SQS.
+    def create_queue(queue_name, default_visibility_timeout=nil)
+      self.new\
         Adapter.create_queue(
           queue_name,
-          timeout
+          default_visibility_timeout
         )['CreateQueueResponse']['CreateQueueResult']['QueueUrl']
-      )
     end
 
-    def delete_queue(queue_url)
-      Adapter.delete_queue(queue_url)
+    # Deletes the queue.
+    def delete_queue(queue_name_or_url)
+      Adapter.delete_queue queue_url(queue_name_or_url)
     end
 
-    def list(prefix=nil)
-      doc = Adapter.list_queues(prefix)
-      doc['ListQueuesResponse']['ListQueuesResult']['QueueUrl'] || []
-    end
-
-    def queues(prefix=nil)
-      list.map do |val|
-        self.new(val)
+    # Returns an array of RAWS::SQS objects.
+    def list_queues(prefix=nil)
+      doc = Adapter.list_queues(prefix)\
+        ['ListQueuesResponse']['ListQueuesResult']
+      if doc
+        doc['QueueUrl'].map do |val|
+          self.new(val)
+        end
+      else
+        []
       end
     end
 
-    def each(&block)
-      queues.each(&block)
+    def each(prefix=nil, &block)
+      list_queues(prefix).each(&block)
     end
 
-    def [](queue_name)
-      if url = queue_url(queue_name)
-        self.new(queue_url(queue_name))
+    def queues(&block)
+      if block_given?
+        each(&block)
+      else
+        map
       end
     end
 
-    def get_attrs(queue_url, *attrs)
+    # Returns the instance of RAWS::SQS.
+    def [](queue_name_or_url)
+      self.new queue_url(queue_name_or_url)
+    end
+
+    # Returns the queue attributes.
+    #
+    # * +attrs+ -
+    #   All,
+    #   ApproximateNumberOfMessages,
+    #   ApproximateNumberOfMessagesNotVisible,
+    #   VisibilityTimeout,
+    #   CreatedTimestamp,
+    #   LastModifiedTimestamp,
+    #   Policy
+    def get_queue_attributes(queue_name_or_url, *attrs)
       Adapter.get_queue_attributes(
-        queue_url,
+        queue_url(queue_name_or_url),
         *attrs
       )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
     end
 
-    def set_attrs(queue_url, attrs={})
-      Adapter.set_queue_attributes(queue_url, attrs)
+    # Sets the queue attributes.
+    #
+    # * +attrs+ - {_AttributeName_ => _AttributeValue_}
+    #   * AttributeName - VisibilityTimeout, Policy
+    def set_queue_attributes(queue_name_or_url, attrs)
+      Adapter.set_queue_attributes queue_url(queue_name_or_url), attrs
     end
 
-    def send(queue_url, msg)
-      Adapter.send_message(queue_url, msg)
+    # Sends a message to the queue.
+    def send_message(queue_name_or_url, msg)
+      Adapter.send_message queue_url(queue_name_or_url), msg
     end
+    alias :send :send_message
 
-    def receive(queue_url, params={}, *attrs)
-      Adapter.receive_message(
-        queue_url,
-        params[:limit],
-        params[:timeout],
+    # Receives one or more messages form the queue.
+    # Returns an array of message data.
+    def receive_message(queue_name_or_url, params={}, *attrs)
+      doc = Adapter.receive_message(
+        queue_url(queue_name_or_url),
+        params,
         *attrs
-      )['ReceiveMessageResponse']['ReceiveMessageResult']['Message'] || []
-    end
-
-    def change_message_visibility(queue_url, handle, timeout)
-      Adapter.change_message_visibility(queue_url, handle, timeout)
-    end
-
-    def delete_message(queue_url, handle)
-      Adapter.delete_message(queue_url, handle)
-    end
-
-    def add_permission(queue_url, label, permission)
-      Adapter.add_permission(queue_url, label, permission)
-    end
-
-    def remove_permission(queue_url, label)
-      Adapter.remove_permission(queue_url, label)
-    end
-  end
-
-  class Message
-    attr_reader :queue
-    attr_reader :data
-
-    def initialize(queue, data)
-      @queue, @data = queue, data
+      )['ReceiveMessageResponse']['ReceiveMessageResult']
+      doc ? doc['Message'] : []
+    end
+    alias :receive :receive_message
+
+    # Changes the message visibility timeout.
+    def change_message_visibility(
+      queue_name_or_url,
+      receipt_handle,
+      visibility_timeout
+    )
+      Adapter.change_message_visibility(
+        queue_url(queue_name_or_url),
+        receipt_handle,
+        visibility_timeout
+      )
     end
 
-    def body
-      data['Body']
+    # Deletes the message.
+    def delete_message(queue_name, receipt_handle)
+      Adapter.delete_message queue_url(queue_name), receipt_handle
     end
 
-    def visibility=(timeout)
-      queue.change_message_visibility data['ReceiptHandle'], timeout
+    # Adds the permissions.
+    #
+    # * +permissions+ - {_AWSAccountId_ => [_ActionName_, ...], ...}
+    #   * +ActionName+ - *,
+    #     SendMessage,
+    #     ReceiveMessage,
+    #     DeleteMessage,
+    #     ChangeMessageVisibility,
+    #     GetQueueAttributes
+    def add_permission(queue_name, label, permissions)
+      Adapter.add_permission queue_url(queue_name), label, permissions
     end
 
-    def delete
-      queue.delete_message data['ReceiptHandle']
+    # Removes the permission.
+    def remove_permission(queue_name, label)
+      Adapter.remove_permission queue_url(queue_name), label
     end
   end
 
@@ -127,42 +157,78 @@ class RAWS::SQS
     @queue_name = URI.parse(@queue_url).path.split('/').last
   end
 
+  # Delete the queue.
   def delete_queue
-    self.class.delete_queue(queue_url)
+    self.class.delete_queue queue_url
   end
 
-  def get_attrs(*attrs)
-    self.class.get_attrs(queue_url, *attrs)
+  # Returns the queue attributes.
+  #
+  # * +attrs+ -
+  #   All,
+  #   ApproximateNumberOfMessages,
+  #   ApproximateNumberOfMessagesNotVisible,
+  #   VisibilityTimeout,
+  #   CreatedTimestamp,
+  #   LastModifiedTimestamp,
+  #   Policy
+  def get_queue_attributes(*attrs)
+    self.class.get_queue_attributes queue_url, *attrs
   end
 
-  def set_attrs(attrs={})
-    self.class.set_attrs(queue_url, attrs)
+  # Sets the queue attributes.
+  #
+  # * +attrs+ - {_AttributeName_ => _AttributeValue_}
+  #   * AttributeName - VisibilityTimeout, Policy
+  def set_queue_attributes(attrs)
+    self.class.set_queue_attributes queue_url, attrs
   end
 
-  def send(msg)
-    self.class.send(queue_url, msg)
+  # Sends the message to the queue.
+  def send_message(msg)
+    self.class.send_message queue_url, msg
   end
+  alias :send :send_message
 
-  def receive(params={}, *attrs)
-    self.class.receive(queue_url, params, *attrs).map do |val|
-      Message.new(self, val)
+  # Receives the messages form the queue.
+  # Returns an array of RAWS::SQS::Message objects.
+  def receive_message(params={}, *attrs)
+    self.class.receive_message(queue_url, params, *attrs).map do |val|
+      Message.new self, val
     end
   end
-
-  def change_message_visibility(handle, timeout)
-    self.class.change_message_visibility(queue_url, handle, timeout)
+  alias :receive :receive_message
+
+  # Changes the message visivility timeout.
+  def change_message_visibility(receipt_handle, visibility_timeout)
+    self.class.change_message_visibility(
+      queue_url,
+      receipt_handle,
+      visibility_timeout
+    )
   end
 
-  def delete_message(handle)
-    self.class.delete_message(queue_url, handle)
+  # Deletes the message.
+  def delete_message(receipt_handle)
+    self.class.delete_message queue_url, receipt_handle
   end
 
+  # Adds the permissions.
+  #
+  # * +permissions+ - {_AWSAccountId_ => [_ActionName_, ...], ...}
+  #   * +ActionName+ - *,
+  #     SendMessage,
+  #     ReceiveMessage,
+  #     DeleteMessage,
+  #     ChangeMessageVisibility,
+  #     GetQueueAttributes
   def add_permission(label, permission)
-    self.class.add_permission(queue_url, label, permission)
+    self.class.add_permission queue_url, label, permission
   end
 
+  # Removes the permission.
   def remove_permission(label)
-    self.class.remove_permission(queue_url, label)
+    self.class.remove_permission queue_url, label
   end
 
   def <=>(a)