moo_moo 0.3.0 → 0.4.0

data/README.md

@@ -51,15 +51,18 @@ configuration for the library to use.
 Now you can call a variety of commands to deal with domains, nameservers, etc.
 Here's how to check the availability of a domain name:
 
-    res = lookup.lookup_domain(:attributes => { :domain => 'example.com' })
-    p res.success?
+    lookup.api_lookup(:attributes => { :domain => 'example.com' })
+    p lookup.successful?
 
     true
 
-Each method returns an `OpenSRSResponse` object which you can use to determine
-if the call was successful and retrieve the response code and/or error
-message. The result variable is a hash that contains all of the relevant data
-returned by the call.
+After calling the service method, you can use the following methods to access
+the response:
+
+  response    - the http response
+  message     - the "response_text"
+  attributes  - the "attributes" hash with relevant data
+  successful? - wheater the request was successful or not
 
 Currently, there is support for the following services:
 
@@ -69,6 +72,14 @@ Currently, there is support for the following services:
   * Provisioning
   * Transfer
 
+API services are namespaced with api. For example, for the Lookup "get" api method,
+it will be named "api_get".
+
+MooMoo provides custom methods that should make it easier to deal with the OpenSRS
+api (e.g. Lookup :domain_contacts). This custom methods are not namespaced.
+Check their documentation to see what parameters does it expect and what responses
+does it return.
+
 Note on Patches/Pull Requests
 -----------------------------
 

data/lib/moo_moo/{base.rb → base_command.rb}

@@ -1,28 +1,33 @@
 module MooMoo
-  class Base
-    attr_reader :host, :key, :username, :password, :port
+  # Defines the basic command structure.
+  #
+  # For OpenSRS api methods, create them like this, using the proper api action
+  # name and object:
+  #
+  #     register_service :action_one, :object_one
+  #
+  # If you need customized responses, create a custom method:
+  #
+  #     def custom_action(parameter)
+  #       api_action_one(... custom parameter ...)
+  #       ... custom response processing ...
+  #     end
+  class BaseCommand
+    attr_reader :host, :key, :username, :password, :port, :response
 
     # Register an api service for the current class.
     #
     #     register_service :action_one, :object_one
     #
-    # That will generate the following method for this class:
-    #
-    #    def action_one(params)
-    #      run_command :action_one, :object_one, params, cookie
-    #    end
+    # A method called "api_action_one" will then be created.
     #
     # === Parameters
     #
-    # * <tt>method_name</tt> - the method name
+    # * <tt>action_name</tt> - the api action to be called
     # * <tt>object</tt> - the object
-    # * <tt>action_name</tt> - the api action to be called; by default it is the same as method_name
-    def self.register_service(method_name, object, action_name = method_name, &block)
-      define_method(method_name) do |*args|
-        params = args.first || {}
-
-        instance_exec(params, &block) if block
-        run_command action_name, object, params
+    def self.register_service(action_name, object)
+      define_method("api_#{action_name}") do |*args|
+        perform(action_name, object, args.first || {})
       end
     end
 
@@ -44,6 +49,23 @@ module MooMoo
       @port     = params[:port]     || MooMoo.config.port     || 55443
     end
 
+    # Returns whether or not the command executed was successful
+    def successful?
+      response.body['is_success'].to_i == 1
+    end
+
+    # Returns the response message if one is present
+    def message
+      response.body['response_text']
+    end
+
+    # Returns the response attributes.
+    def attributes
+      response.body['attributes']
+    end
+
+    private
+
     # Runs a command
     #
     # === Required
@@ -52,11 +74,19 @@ module MooMoo
     #
     # === Optional
     #  * <tt>:params</tt> - parameters for the command
-    def run_command(action, object, params = {})
-      Response.new Command.new(action, object, params).run(@host, @key, @username, @port)
+    def perform(action, object, params = {})
+      (@response = faraday_request(action, object, params)) && attributes
     end
 
-    private
+    # Performs the Faraday request.
+    def faraday_request(action, object, params)
+      Faraday.new(:url => "https://#{host}:#{port}", :ssl => {:verify => true}) do |c|
+        c.request  :open_srs_xml_builder, action, object, params, key, username
+        c.response :parse_open_srs
+        c.response :open_srs_errors
+        c.adapter  :net_http
+      end.post
+    end
 
     # Indexes an array by building a hash with numeric keys
     #

data/lib/moo_moo/middleware/parse_open_srs.rb

@@ -21,8 +21,6 @@ module MooMoo
     def parse_response(data)
       doc = REXML::Document.new(data)
 
-      values = {}
-
       elements = doc.elements["/OPS_envelope/body/data_block/dt_assoc"].select { |item|
         item.is_a? REXML::Element
       }
@@ -55,4 +53,4 @@ module MooMoo
     end
 
   end
-end
+end

data/lib/moo_moo/services/cookie.rb

@@ -1,5 +1,5 @@
 module MooMoo
-  class Cookie < Base
+  class Cookie < BaseCommand
 
     ##
     # Creates a cookie for use in commands where a cookie is required to access OpenSRS.
@@ -23,6 +23,6 @@ module MooMoo
     # Cleanly terminates the connection.
     #
     # http://www.opensrs.com/docs/apidomains/quit_session.htm
-    register_service :quit_session, :session, :quit
+    register_service :quit, :session
   end
 end

data/lib/moo_moo/services/dns_zone.rb

@@ -1,5 +1,5 @@
 module MooMoo
-  class DnsZone < Base
+  class DnsZone < BaseCommand
 
     ##
     # Creates a custom DNS zone for managed DNS service.
@@ -14,7 +14,7 @@ module MooMoo
     register_service :delete_dns_zone, :domain
 
     ##
-    # Changes the nameservers on your domain to use the 
+    # Changes the nameservers on your domain to use the
     # nameservers for managed DNS service.
     #
     # http://www.opensrs.com/docs/apidomains/Request_parameters_for_force_dns_nameservers.htm
@@ -28,8 +28,8 @@ module MooMoo
 
     ##
     # Sets the DNS zone to the values in the specified template.
-    # If a template is not specified in the command, the records 
-    # are set to what was in the template that was used to enable 
+    # If a template is not specified in the command, the records
+    # are set to what was in the template that was used to enable
     # the DNS service.
     #
     # http://www.opensrs.com/docs/apidomains/reset_dns_zone_request.htm

data/lib/moo_moo/services/lookup.rb

@@ -1,6 +1,5 @@
 module MooMoo
-  class Lookup < Base
-
+  class Lookup < BaseCommand
     ##
     # Determines whether the domain belongs to the RSP who issued the command.
     #
@@ -30,9 +29,8 @@ module MooMoo
     # returns the nameservers currently acting as DNS servers for the domain.
     #
     # http://www.opensrs.com/docs/apidomains/get_domain.htm
-    register_service :get_domain, :domain, :get
+    register_service :get, :domain
 
-    ##
     # Queries contact information for a list of domains.
     #
     # http://www.opensrs.com/docs/apidomains/get_domains_contacts.htm
@@ -84,7 +82,7 @@ module MooMoo
     # Determines the availability of a specified domain name.
     #
     # http://www.opensrs.com/docs/apidomains/lookup_domain.htm
-    register_service :lookup_domain, :domain, :lookup
+    register_service :lookup, :domain
 
     ##
     # Checks whether a specified name, word, or phrase is available for registration in gTLDs and
@@ -93,5 +91,42 @@ module MooMoo
     #
     # http://www.opensrs.com/docs/apidomains/name_suggest_domain.htm
     register_service :name_suggest, :domain
+
+    ##
+    # Queries contact information for a domain using get_domains_contacts.
+    #
+    # * <tt>:domain</tt> - the domain to query for. E.g.: "domain1.com"
+    #
+    # Returns an array like:
+    #     [
+    #       {
+    #         :type =>       "type", # admin, billing, etc
+    #         :first_name => "first_name",
+    #         :last_name =>  "last_name"
+    #         ... other attributes ...
+    #       }
+    #     ]
+    def domain_contacts(domain)
+      api_get_domains_contacts({ :attributes => { :domain_list => [domain] }})
+
+      attributes[domain]["contact_set"].map do |(type, attributes)|
+         {
+          :type =>       type,
+          :first_name => attributes["first_name"],
+          :last_name =>  attributes["last_name"],
+          :org_name =>   attributes["org_name"],
+          :address1 =>   attributes["address1"],
+          :address2 =>   attributes["address2"],
+          :address3 =>   attributes["address3"],
+          :city =>       attributes["city"],
+          :state =>      attributes["state"],
+          :country =>    attributes["country"],
+          :postal_code =>attributes["postal_code"],
+          :phone =>      attributes["phone"],
+          :fax =>        attributes["fax"],
+          :email =>      attributes["email"]
+        }
+      end
+    end
   end
 end

data/lib/moo_moo/services/nameserver.rb

@@ -1,5 +1,5 @@
 module MooMoo
-  class Nameserver < Base
+  class Nameserver < BaseCommand
 
     ##
     # Creates a nameserver in the same domain space as the cookie's domain.

data/lib/moo_moo/services/provisioning.rb

@@ -1,5 +1,5 @@
 module MooMoo
-  class Provisioning < Base
+  class Provisioning < BaseCommand
 
     ##
     # Cancels a Trust Service order
@@ -31,7 +31,7 @@ module MooMoo
     # Renews a domain and allows you to set the auto-renewal flag on a domain.
     #
     # http://www.opensrs.com/docs/apidomains/renew_domain.htm
-    register_service :renew_domain, :domain, :renew
+    register_service :renew, :domain
 
     ##
     # Removes the domain at the registry. Use this command to request a refund for a domain purchase.
@@ -53,10 +53,54 @@ module MooMoo
     #
     # http://www.opensrs.com/docs/apidomains/sw_register.htm
     # Note: Requirements vary depending on TLD
-    register_service :register_domain, :domain, :sw_register
+    register_service :sw_register, :domain
 
     ##
     # Submits a new registration request or transfer order
     register_service :register_trust_service, :trust_service
+
+    ##
+    # Updates contact information for a domain using modify.
+    #
+    # * <tt>:domain</tt> - the domain to update for. E.g.: "domain1.com"
+    # * <tt>:attributes</tt> - a contact attributes hash like:
+    #     {
+    #       type:        "type", # admin, billing, etc
+    #       first_name:  "first_name",
+    #       last_name:   "last_name"
+    #       ... other attributes ...
+    #     }
+    #
+    # In case of errors, an errors array like this will be returned:
+    #
+    #     ["Error1", "Error2"]
+    def update_contact(domain, contact_attributes)
+      contact_set = {
+        contact_attributes[:type] => contact_attributes
+      }
+
+      # Removes the type key from contact_attributes
+      contact_set[contact_attributes[:type]].delete(:type)
+
+      response = api_modify(params_with_domain(domain).merge({
+        :attributes => {
+          :affect_domains => "0",
+          :data =>           "contact_info",
+          :contact_set =>    contact_set
+        }
+      }))
+
+      if successful?
+        response
+      else
+        attributes["details"][domain]["response_text"].split("\n")
+      end
+    end
+
+    private
+
+    def params_with_domain(domain)
+      { :domain => domain }
+    end
   end
 end

data/lib/moo_moo/services/transfer.rb

@@ -1,5 +1,5 @@
 module MooMoo
-  class Transfer < Base
+  class Transfer < BaseCommand
 
     ##
     # Cancels transfers that are pending owner approval.
@@ -55,6 +55,6 @@ module MooMoo
     # transferred and so no charges are incurred.
     #
     # http://www.opensrs.com/docs/apidomains/rsp2rsp_push_transfer.htm
-    register_service :push_transfer, :domain, :rsp2rsp_push_transfer
+    register_service :rsp2rsp_push_transfer, :domain
   end
 end

data/lib/moo_moo/version.rb

@@ -1,3 +1,3 @@
 module MooMoo
-  VERSION = Version = "0.3.0"
+  VERSION = Version = "0.4.0"
 end

data/lib/moo_moo.rb

@@ -2,9 +2,7 @@ require 'moo_moo/exceptions'
 require 'faraday'
 require 'moo_moo/version'
 require 'moo_moo/config'
-require 'moo_moo/command'
-require 'moo_moo/response'
-require 'moo_moo/base'
+require 'moo_moo/base_command'
 require 'moo_moo/middleware/open_srs_errors'
 require 'moo_moo/middleware/parse_open_srs'
 require 'moo_moo/middleware/open_srs_xml_builder'

data/spec/integration_spec.rb

@@ -6,8 +6,8 @@ describe "Real World integration" do
     lookup = MooMoo::Lookup.new
 
     VCR.use_cassette("integration/lookup") do
-      response = lookup.lookup_domain(:domain => "opensrs.net")
-      response.attributes["status"].should == "taken"
+      lookup.api_lookup(:domain => "opensrs.net")
+      lookup.attributes["status"].should == "taken"
     end
   end
 

data/spec/moo_moo/base_command_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+class SampleService < MooMoo::BaseCommand
+  register_service :service1, :object1
+end
+
+describe MooMoo::BaseCommand do
+
+  subject { SampleService.new(:host => "thehost.com", :key => "thekey",
+      :username => "theuser", :password => "thepass", :port => "12345") }
+
+  let(:response) { double("Response", :body => {"attributes" => { :the => :attrs }})}
+
+  describe "class methods" do
+    describe "#register_service" do
+      let(:request_params) { {:the => :params, :cookie => "thecookie"} }
+
+      it "service1" do
+        subject.should_receive(:faraday_request).
+                with(:service1, :object1, request_params).
+                and_return(response)
+
+        subject.api_service1(request_params).should == {:the => :attrs}
+      end
+    end
+  end
+
+  describe "#successful?" do
+    it "is successful" do
+      subject.instance_variable_set("@response",
+        double("Response", :body => { "is_success" => "1" }))
+
+      subject.should be_successful
+    end
+
+    it "is not successful" do
+      subject.instance_variable_set("@response",
+        double("Response", :body => { "is_success" => "0" }))
+
+      subject.should_not be_successful
+    end
+  end
+
+  describe "#message" do
+    it "retrives the response text" do
+      subject.instance_variable_set("@response",
+        double("Response", :body => { "response_text" => "thetext" }))
+
+      subject.message.should == "thetext"
+    end
+  end
+
+  describe "#response_attributes" do
+    it "retrives the response attributes" do
+      subject.instance_variable_set("@response",
+        double("Response", :body => { "attributes" => { :the => :attributes } }))
+
+      subject.attributes.should == { :the => :attributes }
+    end
+  end
+
+  describe "#perform" do
+    let(:xml)      { "xmlcontent" }
+    let(:response) { {:status => 200, :body => File.open("spec/fixtures/success_response.xml")} }
+
+    before :each do
+      @request  = stub_request(:post, "https://thehost.com:12345/").to_return(response)
+      subject.send(:perform, :service1, :object1)
+    end
+
+    it "posts with correct parameters" do
+      @request.should have_been_made
+    end
+
+    it "returns the response" do
+      subject.message.should == "Command Successful"
+    end
+  end
+end

data/spec/moo_moo/services/cookie_spec.rb

@@ -4,5 +4,5 @@ describe MooMoo::Cookie do
   it { should have_registered_service(:set, :cookie) }
   it { should have_registered_service(:delete, :cookie) }
   it { should have_registered_service(:update, :cookie) }
-  it { should have_registered_service(:quit_session, :session, :quit) }
+  it { should have_registered_service(:quit, :session) }
 end

data/spec/moo_moo/services/lookup_spec.rb

@@ -2,17 +2,67 @@ require 'spec_helper'
 require 'date'
 
 describe MooMoo::Lookup do
+  subject { MooMoo::Lookup.new }
+
   it { should have_registered_service(:belongs_to_rsp, :domain) }
   it { should have_registered_service(:get_balance, :balance) }
   it { should have_registered_service(:get_deleted_domains, :domain) }
-  it { should have_registered_service(:get_domain, :domain, :get) }
-  it { should have_registered_service(:get_domains_contacts, :domain) }
+  it { should have_registered_service(:get, :domain) }
   it { should have_registered_service(:get_domains_by_expiredate, :domain) }
+  it { should have_registered_service(:get_domains_contacts, :domain) }
   it { should have_registered_service(:get_notes, :domain) }
   it { should have_registered_service(:get_order_info, :domain) }
   it { should have_registered_service(:get_orders_by_domain, :domain) }
   it { should have_registered_service(:get_price, :domain) }
   it { should have_registered_service(:get_product_info, :trust_service) }
-  it { should have_registered_service(:lookup_domain, :domain, :lookup) }
+  it { should have_registered_service(:lookup, :domain) }
   it { should have_registered_service(:name_suggest, :domain) }
+
+  describe "#get_domains_contacts" do
+    it "retrieves a list of a domain contacts" do
+      subject.should_receive(:faraday_request).with(:get_domains_contacts, :domain, { :attributes => { :domain_list => ["domain1.com"] }}).and_return(double("Response", :body => {
+         "attributes" => {
+            "domain1.com" => {
+              "contact_set" => {
+                "admin" => {
+                  "first_name"  => "FirstName",
+                  "last_name"   => "LastName",
+                  "org_name"    => "OrgName",
+                  "address1"    => "Address1",
+                  "address2"    => "Address2",
+                  "address3"    => "Address3",
+                  "city"        => "City",
+                  "state"       => "State",
+                  "country"     => "Country",
+                  "postal_code" => "PostalCode",
+                  "phone"       => "Phone",
+                  "fax"         => "Fax",
+                  "email"       => "Email"
+                }
+              }
+            }
+          }
+       }))
+
+      subject.domain_contacts("domain1.com").should ==
+        [
+          {
+            :type =>        "admin",
+            :first_name =>  "FirstName",
+            :last_name =>   "LastName",
+            :org_name =>    "OrgName",
+            :address1 =>    "Address1",
+            :address2 =>    "Address2",
+            :address3 =>    "Address3",
+            :city =>        "City",
+            :state =>       "State",
+            :country =>     "Country",
+            :postal_code => "PostalCode",
+            :phone =>       "Phone",
+            :fax =>         "Fax",
+            :email =>       "Email"
+          }
+        ]
+    end
+  end
 end

data/spec/moo_moo/services/provisioning_spec.rb

@@ -2,13 +2,97 @@ require 'spec_helper'
 require 'date'
 
 describe MooMoo::Provisioning do
+  subject { MooMoo::Provisioning.new }
+
+  let(:success_response) do
+    double("Response", :body => { "is_success" => "1" })
+  end
+
   it { should have_registered_service(:cancel_order, :trust_service) }
   it { should have_registered_service(:cancel_pending_orders, :order) }
   it { should have_registered_service(:modify, :domain) }
   it { should have_registered_service(:process_pending, :domain) }
-  it { should have_registered_service(:renew_domain, :domain, :renew) }
+  it { should have_registered_service(:renew, :domain) }
   it { should have_registered_service(:revoke, :domain) }
   it { should have_registered_service(:update_contacts, :domain) }
-  it { should have_registered_service(:register_domain, :domain, :sw_register) }
+  it { should have_registered_service(:sw_register, :domain) }
   it { should have_registered_service(:register_trust_service, :trust_service) }
+
+  describe "#update_contact" do
+    it "updates a domain contact" do
+      expected_params = {
+        :domain => "thedomain.com",
+        :attributes => {
+          :affect_domains => "0",
+          :data => "contact_info",
+          :contact_set => {
+            "admin" => {
+              :first_name  => "AdminFirst",
+              :last_name   => "AdminLast",
+              :org_name    => "AdminOrg",
+              :address1    => "AdminAddress1",
+              :address2    => "AdminAddress2",
+              :address3    => "AdminAddress3",
+              :city        => "AdminCity",
+              :state       => "AdminState",
+              :country     => "AdminCountry",
+              :postal_code => "AdminPostalCode",
+              :phone       => "AdminPhone",
+              :fax         => "AdminFax",
+              :email       => "AdminEmail"
+            }
+          }
+        }
+      }
+
+      params = {
+        :type        => "admin",
+        :first_name  => "AdminFirst",
+        :last_name   => "AdminLast",
+        :org_name    => "AdminOrg",
+        :address1    => "AdminAddress1",
+        :address2    => "AdminAddress2",
+        :address3    => "AdminAddress3",
+        :city        => "AdminCity",
+        :state       => "AdminState",
+        :country     => "AdminCountry",
+        :postal_code => "AdminPostalCode",
+        :phone       => "AdminPhone",
+        :fax         => "AdminFax",
+        :email       => "AdminEmail"
+      }
+
+      subject.should_receive(:faraday_request).with(:modify, :domain, expected_params).and_return(success_response)
+      subject.update_contact("thedomain.com", params)
+
+      subject.should be_successful
+    end
+
+    it "is unsuccessful when fails" do
+      expected_params = {
+        :domain => "thedomain.com",
+        :attributes => {
+          :affect_domains => "0",
+          :data => "contact_info",
+          :contact_set => { nil => {}}
+        }
+      }
+
+      error_response = double("Response", :body => {
+        "attributes" => {
+          "details" => {
+            "thedomain.com" => {
+              "response_text" => "The error\nAnother error"
+            }
+          }
+        }
+      })
+
+      subject.should_receive(:faraday_request).with(:modify, :domain, expected_params).and_return(error_response)
+      errors = subject.update_contact("thedomain.com", {})
+
+      subject.should_not be_successful
+      errors.should == ["The error", "Another error"]
+    end
+  end
 end

data/spec/moo_moo/services/transfer_spec.rb

@@ -8,5 +8,5 @@ describe MooMoo::Transfer do
   it { should have_registered_service(:get_transfers_in, :domain) }
   it { should have_registered_service(:process_transfer, :transfer) }
   it { should have_registered_service(:send_password, :transfer) }
-  it { should have_registered_service(:push_transfer, :domain, :rsp2rsp_push_transfer) }
+  it { should have_registered_service(:rsp2rsp_push_transfer, :domain) }
 end

data/spec/moo_moo_spec.rb

@@ -18,7 +18,7 @@ describe MooMoo do
         config.password = 'secret2'
       end
 
-      opensrs = MooMoo::Base.new
+      opensrs = MooMoo::BaseCommand.new
 
       opensrs.host.should     == 'host.com'
       opensrs.key.should      == 'secret'

data/spec/spec_helper.rb

@@ -86,12 +86,13 @@ RSpec::Matchers.define(:have_registered_service) do |*args|
 
   match do |object|
     parameters = {:the => :params, :cookie => "thecookie"}
-    object.should_receive(:run_command).
-                  with(action_name, object_name, parameters).
-                  and_return("theresult")
+    response   = double("Response", :body => {"attributes" => { :the => :attrs }})
 
+    object.should_receive(:faraday_request).
+                  with(action_name, object_name, parameters).
+                  and_return(response)
 
-    object.send(method_name, parameters) == "theresult"
+    object.send("api_#{method_name}", parameters) == { :the => :attrs }
   end
 
   description do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moo_moo
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extlib
@@ -139,14 +139,12 @@ files:
 - README.md
 - Rakefile
 - lib/moo_moo.rb
-- lib/moo_moo/base.rb
-- lib/moo_moo/command.rb
+- lib/moo_moo/base_command.rb
 - lib/moo_moo/config.rb
 - lib/moo_moo/exceptions.rb
 - lib/moo_moo/middleware/open_srs_errors.rb
 - lib/moo_moo/middleware/open_srs_xml_builder.rb
 - lib/moo_moo/middleware/parse_open_srs.rb
-- lib/moo_moo/response.rb
 - lib/moo_moo/services/cookie.rb
 - lib/moo_moo/services/dns_zone.rb
 - lib/moo_moo/services/lookup.rb
@@ -157,11 +155,9 @@ files:
 - moo_moo.gemspec
 - spec/fixtures/success_response.xml
 - spec/integration_spec.rb
-- spec/moo_moo/base_spec.rb
-- spec/moo_moo/command_spec.rb
+- spec/moo_moo/base_command_spec.rb
 - spec/moo_moo/config_spec.rb
 - spec/moo_moo/middleware/open_srs_xml_builder_spec.rb
-- spec/moo_moo/response_spec.rb
 - spec/moo_moo/services/cookie_spec.rb
 - spec/moo_moo/services/dns_zone_spec.rb
 - spec/moo_moo/services/lookup_spec.rb
@@ -185,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -294129659865012821
+      hash: -848063552060590534
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -294129659865012821
+      hash: -848063552060590534
 requirements: []
 rubyforge_project: opensrs
 rubygems_version: 1.8.23
@@ -204,11 +200,9 @@ summary: Implements OpenSRS XML API
 test_files:
 - spec/fixtures/success_response.xml
 - spec/integration_spec.rb
-- spec/moo_moo/base_spec.rb
-- spec/moo_moo/command_spec.rb
+- spec/moo_moo/base_command_spec.rb
 - spec/moo_moo/config_spec.rb
 - spec/moo_moo/middleware/open_srs_xml_builder_spec.rb
-- spec/moo_moo/response_spec.rb
 - spec/moo_moo/services/cookie_spec.rb
 - spec/moo_moo/services/dns_zone_spec.rb
 - spec/moo_moo/services/lookup_spec.rb

data/lib/moo_moo/command.rb

@@ -1,32 +0,0 @@
-module MooMoo
-  class Command
-    # Constructor
-    #
-    # ==== Required
-    #  * <tt>:action</tt> - action of the command
-    #  * <tt>:object</tt> - object the command operates on
-    #  * <tt>:params</tt> - additional parameters for the command
-    def initialize(action, object, params = {})
-      @action = action
-      @object = object
-      @params = params
-    end
-
-    # Runs the command against OpenSRS server
-    #
-    # ==== Required
-    #  * <tt>:host</tt> - host of the OpenSRS server
-    #  * <tt>:key</tt> - private key for the account
-    #  * <tt>:user</tt> - username for the account
-    #  * <tt>:port</tt> - port to connect to
-    def run(host, key, user, port)
-      @returned_parameters = Faraday.new(:url => "https://#{host}:#{port}", :ssl => {:verify => true}) do |c|
-        c.request :open_srs_xml_builder, @action, @object, @params, key, user
-        c.response :parse_open_srs
-        c.response :open_srs_errors
-        c.adapter :net_http
-      end.post.body
-    end
-
-  end
-end

data/lib/moo_moo/response.rb

@@ -1,34 +0,0 @@
-module MooMoo
-  # Based on opensrs_xmlapi.pdf page 25.
-  class Response
-    attr_reader :hash
-
-    # Constructor
-    #
-    # ==== Required
-    #  * <tt>:hash</tt> - response hash
-    def initialize(hash)
-      @hash = hash
-    end
-
-    # Returns whether or not the command executed was successful
-    def success?
-      @hash['is_success'].to_i == 1
-    end
-
-    # Returns the response code if one is present
-    def code
-      @hash['response_code'].to_i
-    end
-
-    # Returns the response message if one is present
-    def text
-      @hash['response_text']
-    end
-
-    # Returns the response attributes.
-    def attributes
-      @hash['attributes']
-    end
-  end
-end

data/spec/moo_moo/base_spec.rb

@@ -1,68 +0,0 @@
-require 'spec_helper'
-
-class SampleService < MooMoo::Base
-  register_service :service1, :object1
-  register_service :service2, :object2, :action2
-  register_service :service3, :object3 do |params|
-    params[:example] = "theexample"
-  end
-end
-
-describe MooMoo::Base do
-
-  before :each do
-    @service = SampleService.new(:host => "thehost", :key => "thekey",
-      :username => "theuser", :password => "thepass", :port => "theport")
-  end
-
-  describe "class methods" do
-    describe "#register_service" do
-      context "calls the services with the given parameters" do
-        it "service1" do
-          params = {:the => :params, :cookie => "thecookie"}
-
-          @service.should_receive(:run_command).
-                  with(:service1, :object1, params).
-                  and_return("theresult")
-
-          @service.service1(params).should == "theresult"
-        end
-
-        it "service2" do
-          params = {:the => :params, :cookie => "thecookie"}
-
-          @service.should_receive(:run_command).
-                  with(:action2, :object2, params).
-                  and_return("theresult")
-
-          @service.service2(params).should == "theresult"
-        end
-
-        it "service3" do
-          params = {:the => :params, :cookie => "thecookie"}
-          expected_params = {:the => :params, :cookie => "thecookie", :example => "theexample"}
-
-          @service.should_receive(:run_command).
-                  with(:service3, :object3, expected_params).
-                  and_return("theresult")
-
-          @service.service3(params).should == "theresult"
-        end
-      end
-    end
-  end
-
-  describe "#run_command" do
-    it "should encapsulate response" do
-      result  = {:the => :result}
-      command = stub()
-      command.should_receive(:run).with("thehost", "thekey", "theuser", "theport").and_return(result)
-      MooMoo::Command.should_receive(:new).
-                     with("theaction", "theobject", {"the" => "params"}).
-                     and_return(command)
-
-      response = @service.run_command("theaction", "theobject", {"the" => "params"})
-      response.hash.should == result
-    end
-  end
-end

data/spec/moo_moo/command_spec.rb

@@ -1,41 +0,0 @@
-require 'spec_helper'
-
-describe MooMoo::Command do
-
-  let(:action)  { "theaction" }
-  let(:object)  { "theobject" }
-  let(:params)  { {
-    :string => "stringparam",
-    :hash => {:the => "hashparam"},
-    :array => [{:param => "arrayvalue1"}, {:param => "arrayvalue2"}],
-    :array_list => ["arrayvalue1", "arrayvalue2"]
-  } }
-
-  let(:command) { MooMoo::Command.new(action, object, params) }
-
-  describe "#run" do
-    describe "success response" do
-      let(:xml)      { "xmlcontent" }
-      let(:response) { {:status => 200, :body => File.open("spec/fixtures/success_response.xml")} }
-
-      before :each do
-        @request = stub_request(:post, "https://thehost.com:12345/").to_return(response)
-        @response = command.run("thehost.com", "thekey", "theuser", "12345")
-      end
-
-      it "posts with correct parameters" do
-        @request.should have_been_made
-      end
-
-      it "returns the response" do
-        @response["response_text"].should == "Command Successful"
-      end
-    end
-
-    it "raises exception on invalid http status" do
-      stub_request(:post, "https://thehost:12345/").to_return(:status => ["401", "Unauthorized"])
-      lambda { command.run("thehost", "thekey", "theuser", "12345") }.should raise_error(MooMoo::OpenSRSException, "Bad HTTP Status: 401")
-    end
-  end
-
-end

data/spec/moo_moo/response_spec.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-require 'date'
-
-describe MooMoo::Response do
-  subject { MooMoo::Response.new(
-    "is_success" => "1", "response_code" => "100",
-    "response_text" => "The message", "attributes" => "The attributes") }
-
-  describe "#hash" do
-    it "retrieves the response hash" do
-      subject.hash.should == { "is_success" => "1", "response_code" => "100",
-        "response_text" => "The message", "attributes" => "The attributes" }
-    end
-  end
-
-  describe "#success?" do
-    it "is true when 1" do
-      subject.success?.should be_true
-    end
-
-    it "is false when not 1" do
-      MooMoo::Response.new("is_success" => "0").success?.should be_false
-    end
-  end
-
-  describe "#code" do
-    it "retrieves response code" do
-      subject.code.should == 100
-    end
-  end
-
-  describe "#text" do
-    it "retrieves response text" do
-      subject.text.should == "The message"
-    end
-  end
-
-  describe "#attributes" do
-    it "retrieves response attributes" do
-      subject.attributes.should == "The attributes"
-    end
-  end
-end